From 9561fe56531ae776c3309cbf7d8a5cb6f2e06abf Mon Sep 17 00:00:00 2001 From: koalasat Date: Wed, 2 Oct 2024 11:22:07 +0200 Subject: [PATCH 1/5] External Docker --- docker-compose.yml | 10 +--------- src/app/pages/ExternalForumList/index.tsx | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 578db86..650e87c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,15 +23,7 @@ services: - /var/www/certbot/:/var/www/certbot/:rw - /etc/letsencrypt/:/etc/letsencrypt/:rw entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'" - tor: - build: ./tor - container_name: tor - restart: always - volumes: - - ./tor/config:/var/lib/tor - - ./tor/torrc:/etc/tor - networks: - - nginx networks: nginx: driver: bridge + external: true \ No newline at end of file diff --git a/src/app/pages/ExternalForumList/index.tsx b/src/app/pages/ExternalForumList/index.tsx index d510b61..146c4e2 100644 --- a/src/app/pages/ExternalForumList/index.tsx +++ b/src/app/pages/ExternalForumList/index.tsx @@ -67,8 +67,9 @@ export const ExternalForumList: () => JSX.Element = () => { const getForumEvents = (newLang?: string): void => { setLoadingPage(true) - // @ts-expect-error - let filters: NDKFilter = { kinds: [34550], limit: pageSize } + + // let filters: NDKFilter = { kinds: [34550, 39000], limit: pageSize } + let filters: NDKFilter = { kinds: [39000], limit: pageSize } if (externalForums && !newLang) { const array = Array.from(externalForums); From ca3d836f753ab5d6f7b764d15243b5c25954197e Mon Sep 17 00:00:00 2001 From: koalasat Date: Wed, 2 Oct 2024 11:23:02 +0200 Subject: [PATCH 2/5] Fix --- src/app/pages/ExternalForumList/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/pages/ExternalForumList/index.tsx b/src/app/pages/ExternalForumList/index.tsx index 146c4e2..bdf9528 100644 --- a/src/app/pages/ExternalForumList/index.tsx +++ b/src/app/pages/ExternalForumList/index.tsx @@ -68,8 +68,7 @@ export const ExternalForumList: () => JSX.Element = () => { const getForumEvents = (newLang?: string): void => { setLoadingPage(true) - // let filters: NDKFilter = { kinds: [34550, 39000], limit: pageSize } - let filters: NDKFilter = { kinds: [39000], limit: pageSize } + let filters: NDKFilter = { kinds: [34550, 39000], limit: pageSize } if (externalForums && !newLang) { const array = Array.from(externalForums); From 97ec43f404772ac2381a1b227c3caca070390f57 Mon Sep 17 00:00:00 2001 From: koalasat Date: Wed, 2 Oct 2024 11:23:30 +0200 Subject: [PATCH 3/5] Fix --- src/app/pages/ExternalForumList/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/ExternalForumList/index.tsx b/src/app/pages/ExternalForumList/index.tsx index bdf9528..ae61f23 100644 --- a/src/app/pages/ExternalForumList/index.tsx +++ b/src/app/pages/ExternalForumList/index.tsx @@ -68,7 +68,8 @@ export const ExternalForumList: () => JSX.Element = () => { const getForumEvents = (newLang?: string): void => { setLoadingPage(true) - let filters: NDKFilter = { kinds: [34550, 39000], limit: pageSize } + // @ts-expect-error + let filters: NDKFilter = { kinds: [34550], limit: pageSize } if (externalForums && !newLang) { const array = Array.from(externalForums); From c7065cd5a1be61f1bdde6840386cee83158bcee7 Mon Sep 17 00:00:00 2001 From: koalasat Date: Wed, 2 Oct 2024 11:24:21 +0200 Subject: [PATCH 4/5] Fix --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 650e87c..803495f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,4 +26,4 @@ services: networks: nginx: driver: bridge - external: true \ No newline at end of file + external: true From bf37d30693060433db758d328f3b20a831fdfbbc Mon Sep 17 00:00:00 2001 From: koalasat Date: Wed, 2 Oct 2024 11:26:04 +0200 Subject: [PATCH 5/5] Fix --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 803495f..91ad26c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile ports: - - '80:80' + - '82:80' - '443:443' restart: always volumes: