From ec4ba550aa0950afd9374e9a6c17b26553682dff Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Sun, 14 Jul 2024 13:11:44 +0200 Subject: [PATCH 1/7] fix(post): pending reply to op would show quote link to op --- src/components/post-desktop/post-desktop.tsx | 5 ++--- src/components/post-mobile/post-mobile.tsx | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx index 9ffa4519..ee553d4d 100644 --- a/src/components/post-desktop/post-desktop.tsx +++ b/src/components/post-desktop/post-desktop.tsx @@ -230,8 +230,9 @@ const PostMessage = ({ post }: PostProps) => { const displayContent = content && !isInPostView && content.length > 1000 ? content?.slice(0, 1000) + '(...)' : content; + const quotelinkReply = useComment({ commentCid: parentCid }); const isReply = parentCid; - const isReplyingToReply = postCid !== parentCid; + const isReplyingToReply = (postCid && postCid !== parentCid) || quotelinkReply?.postCid !== parentCid; const stateString = useStateString(post); @@ -239,8 +240,6 @@ const PostMessage = ({ post }: PostProps) => {
{stateString !== 'Failed' ? : stateString}
); - const quotelinkReply = useComment({ commentCid: parentCid }); - return (
{isReply && !(removed || deleted) && state !== 'failed' && isReplyingToReply && } diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx index b216fed0..71946dd5 100644 --- a/src/components/post-mobile/post-mobile.tsx +++ b/src/components/post-mobile/post-mobile.tsx @@ -165,8 +165,9 @@ const PostMessageMobile = ({ post }: PostProps) => { const displayContent = content && !isInPostView && content.length > 1000 ? content?.slice(0, 1000) : content; + const quotelinkReply = useComment({ commentCid: parentCid }); const isReply = parentCid; - const isReplyingToReply = postCid !== parentCid; + const isReplyingToReply = (postCid && postCid !== parentCid) || quotelinkReply?.postCid !== parentCid; const stateString = useStateString(post); @@ -174,8 +175,6 @@ const PostMessageMobile = ({ post }: PostProps) => {
{stateString !== 'Failed' ? : stateString}
); - const quotelinkReply = useComment({ commentCid: parentCid }); - return ( content && (
From 48543a668e0bf5baa557d7155364b2890014cfa8 Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Mon, 15 Jul 2024 13:18:11 +0200 Subject: [PATCH 2/7] Update avatar-settings.module.css --- .../avatar-settings/avatar-settings.module.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/settings-modal/avatar-settings/avatar-settings.module.css b/src/components/settings-modal/avatar-settings/avatar-settings.module.css index a719afdd..2d49129e 100644 --- a/src/components/settings-modal/avatar-settings/avatar-settings.module.css +++ b/src/components/settings-modal/avatar-settings/avatar-settings.module.css @@ -1,9 +1,11 @@ .avatar { - width: 70px; - height: 70px; + width: 64px; + height: 64px; border: 1px solid #aaa; background-color: var(--avatar-background-color, white); margin-left: 10px; + border-radius: 32px; + overflow: hidden; } .avatarPreview { @@ -11,8 +13,8 @@ } .avatar img { - width: 70px; - height: 70px; + width: 64px; + height: 64px; } .emptyAvatar { From 4ffd75010d53dbf068fd6e4040954a6902163d10 Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Mon, 15 Jul 2024 17:08:08 +0200 Subject: [PATCH 3/7] fix(post menu): block button was visible for description and rules --- .../post-desktop/post-menu-desktop/post-menu-desktop.tsx | 2 +- .../post-mobile/post-menu-mobile/post-menu-mobile.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/post-desktop/post-menu-desktop/post-menu-desktop.tsx b/src/components/post-desktop/post-menu-desktop/post-menu-desktop.tsx index e867d882..11c65f83 100644 --- a/src/components/post-desktop/post-menu-desktop/post-menu-desktop.tsx +++ b/src/components/post-desktop/post-menu-desktop/post-menu-desktop.tsx @@ -192,7 +192,7 @@ const PostMenuDesktop = ({ post }: { post: Comment }) => { subplebbitAddress={subplebbitAddress} onClose={handleClose} /> - + {!isDescription && !isRules && } {(isInAllView || isInSubscriptionsView) && } , diff --git a/src/components/post-mobile/post-menu-mobile/post-menu-mobile.tsx b/src/components/post-mobile/post-menu-mobile/post-menu-mobile.tsx index 3d040105..e64315ff 100644 --- a/src/components/post-mobile/post-menu-mobile/post-menu-mobile.tsx +++ b/src/components/post-mobile/post-menu-mobile/post-menu-mobile.tsx @@ -145,8 +145,8 @@ const PostMenuMobile = ({ post }: { post: Comment }) => {
{cid && subplebbitAddress && } {cid && subplebbitAddress && } - {cid && subplebbitAddress && } - {cid && subplebbitAddress && !isInBoardView && } + {cid && subplebbitAddress && !isDescription && !isRules && } + {cid && subplebbitAddress && !isInBoardView && !isDescription && !isRules && } {link && isValidURL(link) && (type === 'image' || type === 'gif' || thumbnail) && url && }
From 3af3208c97f935bf574d5da7d5ae4d50edc69fe8 Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Mon, 15 Jul 2024 21:46:41 +0200 Subject: [PATCH 4/7] add translations --- public/translations/ar/default.json | 5 ++++- public/translations/bn/default.json | 5 ++++- public/translations/cs/default.json | 5 ++++- public/translations/da/default.json | 5 ++++- public/translations/de/default.json | 5 ++++- public/translations/el/default.json | 5 ++++- public/translations/en/default.json | 5 ++++- public/translations/es/default.json | 5 ++++- public/translations/fa/default.json | 5 ++++- public/translations/fi/default.json | 5 ++++- public/translations/fil/default.json | 5 ++++- public/translations/fr/default.json | 5 ++++- public/translations/he/default.json | 5 ++++- public/translations/hi/default.json | 5 ++++- public/translations/hu/default.json | 5 ++++- public/translations/id/default.json | 5 ++++- public/translations/it/default.json | 5 ++++- public/translations/ja/default.json | 5 ++++- public/translations/ko/default.json | 5 ++++- public/translations/mr/default.json | 5 ++++- public/translations/nl/default.json | 5 ++++- public/translations/no/default.json | 5 ++++- public/translations/pl/default.json | 5 ++++- public/translations/pt/default.json | 5 ++++- public/translations/ro/default.json | 5 ++++- public/translations/ru/default.json | 5 ++++- public/translations/sq/default.json | 5 ++++- public/translations/sv/default.json | 5 ++++- public/translations/te/default.json | 5 ++++- public/translations/th/default.json | 5 ++++- public/translations/tr/default.json | 5 ++++- public/translations/uk/default.json | 5 ++++- public/translations/ur/default.json | 5 ++++- public/translations/vi/default.json | 5 ++++- public/translations/zh/default.json | 5 ++++- src/views/catalog/catalog-filters/catalog-filters.tsx | 6 +++--- 36 files changed, 143 insertions(+), 38 deletions(-) diff --git a/public/translations/ar/default.json b/public/translations/ar/default.json index 5ae4ea9d..0e1198b0 100644 --- a/public/translations/ar/default.json +++ b/public/translations/ar/default.json @@ -216,5 +216,8 @@ "links": "الروابط", "avatar": "الصورة الرمزية", "token_address_whitelist": "عنوان الرمز (فقط على الـ <1>قائمة البيضاء)", - "token_id": "تعريف الرمز" + "token_id": "تعريف الرمز", + "nsfw_boards": "المجالس المخلة بالأدب", + "hide_gore_boards": "إخفاء لوحات الجور", + "hide_adult_boards": "إخفاء لوحات الكبار" } \ No newline at end of file diff --git a/public/translations/bn/default.json b/public/translations/bn/default.json index a885326d..fec9dcf1 100644 --- a/public/translations/bn/default.json +++ b/public/translations/bn/default.json @@ -216,5 +216,8 @@ "links": "লিঙ্কগুলি", "avatar": "অবতার", "token_address_whitelist": "টোকেন ঠিকানা (<1>সাফল্যবান কেবল)", - "token_id": "টোকেন আইডি" + "token_id": "টোকেন আইডি", + "nsfw_boards": "এনএসএফডব্লিউ বোর্ডস", + "hide_gore_boards": "গর বোর্ডস লুকান", + "hide_adult_boards": "পুরুষ বোর্ডস লুকান" } \ No newline at end of file diff --git a/public/translations/cs/default.json b/public/translations/cs/default.json index 31e6d675..c0c99373 100644 --- a/public/translations/cs/default.json +++ b/public/translations/cs/default.json @@ -216,5 +216,8 @@ "links": "Odkazy", "avatar": "avatar", "token_address_whitelist": "Tokenová adresa (<1>jen bílý seznam)", - "token_id": "Token ID" + "token_id": "Token ID", + "nsfw_boards": "NSFW desky", + "hide_gore_boards": "Skrýt gore desky", + "hide_adult_boards": "Skrýt dospělé desky" } \ No newline at end of file diff --git a/public/translations/da/default.json b/public/translations/da/default.json index 7466cc99..fd1a654e 100644 --- a/public/translations/da/default.json +++ b/public/translations/da/default.json @@ -216,5 +216,8 @@ "links": "Links", "avatar": "avatar", "token_address_whitelist": "Tokenadresse (<1>kun hvidliste)", - "token_id": "Token ID" + "token_id": "Token ID", + "nsfw_boards": "NSFW boards", + "hide_gore_boards": "Skjul Gore Boards", + "hide_adult_boards": "Skjul Voksne Boards" } \ No newline at end of file diff --git a/public/translations/de/default.json b/public/translations/de/default.json index a7652785..eb8255f8 100644 --- a/public/translations/de/default.json +++ b/public/translations/de/default.json @@ -216,5 +216,8 @@ "links": "Links", "avatar": "Avatar", "token_address_whitelist": "Tokenadresse (<1>nur Weiße Liste)", - "token_id": "Token-ID" + "token_id": "Token-ID", + "nsfw_boards": "NSFW-Boards", + "hide_gore_boards": "Gore-Boards ausblenden", + "hide_adult_boards": "Erwachsenen-Boards ausblenden" } \ No newline at end of file diff --git a/public/translations/el/default.json b/public/translations/el/default.json index ac81502e..cb129e82 100644 --- a/public/translations/el/default.json +++ b/public/translations/el/default.json @@ -216,5 +216,8 @@ "links": "Σύνδεσμοι", "avatar": "εικόνα προφίλ", "token_address_whitelist": "Διεύθυνση του token (<1>μόνο λευκή λίστα)", - "token_id": "Token ID" + "token_id": "Token ID", + "nsfw_boards": "Πινακίδες NSFW", + "hide_gore_boards": "Απόκρυψη των Gore Boards", + "hide_adult_boards": "Απόκρυψη των Adult Boards" } \ No newline at end of file diff --git a/public/translations/en/default.json b/public/translations/en/default.json index d9e0a327..cab478e6 100644 --- a/public/translations/en/default.json +++ b/public/translations/en/default.json @@ -216,5 +216,8 @@ "links": "links", "avatar": "avatar", "token_address_whitelist": "Token address (<1>whitelist only)", - "token_id": "token id" + "token_id": "token id", + "nsfw_boards": "NSFW Boards", + "hide_gore_boards": "Hide Gore Boards", + "hide_adult_boards": "Hide Adult Boards" } \ No newline at end of file diff --git a/public/translations/es/default.json b/public/translations/es/default.json index 99a79296..b297722f 100644 --- a/public/translations/es/default.json +++ b/public/translations/es/default.json @@ -216,5 +216,8 @@ "links": "enlaces", "avatar": "avatar", "token_address_whitelist": "Dirección del token (<1>solo lista blanca)", - "token_id": "ID de token" + "token_id": "ID de token", + "nsfw_boards": "Tableros NSFW", + "hide_gore_boards": "Ocultar tableros de gore", + "hide_adult_boards": "Ocultar tableros para adultos" } \ No newline at end of file diff --git a/public/translations/fa/default.json b/public/translations/fa/default.json index 6b211207..73ad41e6 100644 --- a/public/translations/fa/default.json +++ b/public/translations/fa/default.json @@ -216,5 +216,8 @@ "links": "لینک‌ها", "avatar": "آواتار", "token_address_whitelist": "آدرس توکن (<1>فقط سفیدپوشان)", - "token_id": "شناسه توکن" + "token_id": "شناسه توکن", + "nsfw_boards": "بوردهای NSFW", + "hide_gore_boards": "پنهان کردن تخته های گور", + "hide_adult_boards": "پنهان کردن تخته های بزرگسالان" } \ No newline at end of file diff --git a/public/translations/fi/default.json b/public/translations/fi/default.json index 37b35f43..337a1a05 100644 --- a/public/translations/fi/default.json +++ b/public/translations/fi/default.json @@ -216,5 +216,8 @@ "links": "linkit", "avatar": "avatar", "token_address_whitelist": "Token-osoite (<1>vain valkoinen lista)", - "token_id": "Token-id" + "token_id": "Token-id", + "nsfw_boards": "NSFW-laudat", + "hide_gore_boards": "Piilota Gore-laudat", + "hide_adult_boards": "Piilota Aikuisten lautat" } \ No newline at end of file diff --git a/public/translations/fil/default.json b/public/translations/fil/default.json index 31ef7200..855093be 100644 --- a/public/translations/fil/default.json +++ b/public/translations/fil/default.json @@ -216,5 +216,8 @@ "links": "mga link", "avatar": "avatar", "token_address_whitelist": "Address ng token (<1>whitelist lang)", - "token_id": "Token ID" + "token_id": "Token ID", + "nsfw_boards": "Mga NSFW Boards", + "hide_gore_boards": "Itago ang mga Gore Boards", + "hide_adult_boards": "Itago ang mga Adult Boards" } \ No newline at end of file diff --git a/public/translations/fr/default.json b/public/translations/fr/default.json index b3484b75..c2e83d2a 100644 --- a/public/translations/fr/default.json +++ b/public/translations/fr/default.json @@ -216,5 +216,8 @@ "links": "liens", "avatar": "avatar", "token_address_whitelist": "Adresse du token (<1>liste blanche seulement)", - "token_id": "Identifiant de jeton" + "token_id": "Identifiant de jeton", + "nsfw_boards": "Planches NSFW", + "hide_gore_boards": "Masquer les tableaux Gore", + "hide_adult_boards": "Masquer les tableaux pour adultes" } \ No newline at end of file diff --git a/public/translations/he/default.json b/public/translations/he/default.json index e6ced4c6..64e331d3 100644 --- a/public/translations/he/default.json +++ b/public/translations/he/default.json @@ -216,5 +216,8 @@ "links": "קישורים", "avatar": "אוואטר", "token_address_whitelist": "כתובת הטוקן (<1>רק רשימה לבנה)", - "token_id": "מזהה טוקן" + "token_id": "מזהה טוקן", + "nsfw_boards": "גלריות NSFW", + "hide_gore_boards": "הסתר לוחות Gore", + "hide_adult_boards": "הסתר לוחות המבוגרים" } \ No newline at end of file diff --git a/public/translations/hi/default.json b/public/translations/hi/default.json index 22b6cabc..c933e714 100644 --- a/public/translations/hi/default.json +++ b/public/translations/hi/default.json @@ -216,5 +216,8 @@ "links": "लिंक", "avatar": "अवतार", "token_address_whitelist": "टोकन पता (<1>केवल सफेद सूची)", - "token_id": "टोकन आईडी" + "token_id": "टोकन आईडी", + "nsfw_boards": "एनएसएफडब्ल्यू बोर्ड्स", + "hide_gore_boards": "गोर बोर्ड्स छिपाएं", + "hide_adult_boards": "वयस्क बोर्ड्स छिपाएं" } \ No newline at end of file diff --git a/public/translations/hu/default.json b/public/translations/hu/default.json index 5a201f02..cc529e16 100644 --- a/public/translations/hu/default.json +++ b/public/translations/hu/default.json @@ -216,5 +216,8 @@ "links": "linkek", "avatar": "avatár", "token_address_whitelist": "Token cím (<1>csak fehérlista)", - "token_id": "Token azonosító" + "token_id": "Token azonosító", + "nsfw_boards": "NSFW táblák", + "hide_gore_boards": "Gore táblák elrejtése", + "hide_adult_boards": "Felnőtt táblák elrejtése" } \ No newline at end of file diff --git a/public/translations/id/default.json b/public/translations/id/default.json index 54b1a4ba..2b79bb60 100644 --- a/public/translations/id/default.json +++ b/public/translations/id/default.json @@ -216,5 +216,8 @@ "links": "tautan", "avatar": "avatar", "token_address_whitelist": "Alamat token (<1>hanya daftar putih)", - "token_id": "ID token" + "token_id": "ID token", + "nsfw_boards": "Papan NSFW", + "hide_gore_boards": "Sembunyikan Papan Gore", + "hide_adult_boards": "Sembunyikan Papan Dewasa" } \ No newline at end of file diff --git a/public/translations/it/default.json b/public/translations/it/default.json index c8ccf3fa..f5db74ae 100644 --- a/public/translations/it/default.json +++ b/public/translations/it/default.json @@ -216,5 +216,8 @@ "links": "link", "avatar": "avatar", "token_address_whitelist": "Indirizzo del token (solo se sulla <1>whitelist)", - "token_id": "token id" + "token_id": "token id", + "nsfw_boards": "Bache NSFW", + "hide_gore_boards": "Nascondi tavole Gore", + "hide_adult_boards": "Nascondi tavole per adulti" } \ No newline at end of file diff --git a/public/translations/ja/default.json b/public/translations/ja/default.json index b686d48d..8dd8b346 100644 --- a/public/translations/ja/default.json +++ b/public/translations/ja/default.json @@ -216,5 +216,8 @@ "links": "リンク", "avatar": "アバター", "token_address_whitelist": "トークンアドレス（<1>ホワイトリストのみ）", - "token_id": "トークンID" + "token_id": "トークンID", + "nsfw_boards": "NSFWボード", + "hide_gore_boards": "ゴアボードを非表示にする", + "hide_adult_boards": "アダルトボードを非表示にする" } \ No newline at end of file diff --git a/public/translations/ko/default.json b/public/translations/ko/default.json index 25495d57..c89cc9cc 100644 --- a/public/translations/ko/default.json +++ b/public/translations/ko/default.json @@ -216,5 +216,8 @@ "links": "링크", "avatar": "아바타", "token_address_whitelist": "토큰 주소 (<1>화이트리스트만)", - "token_id": "토큰 ID" + "token_id": "토큰 ID", + "nsfw_boards": "NSFW 게시판", + "hide_gore_boards": "고어 게시판 숨기기", + "hide_adult_boards": "성인 게시판 숨기기" } \ No newline at end of file diff --git a/public/translations/mr/default.json b/public/translations/mr/default.json index d5ab8ebb..d91f4681 100644 --- a/public/translations/mr/default.json +++ b/public/translations/mr/default.json @@ -216,5 +216,8 @@ "links": "लिंक", "avatar": "अवतार", "token_address_whitelist": "टोकन पत्ता (<1>केवळ सफेद सूची)", - "token_id": "टोकन आयडी" + "token_id": "टोकन आयडी", + "nsfw_boards": "NSFW बोर्ड्स", + "hide_gore_boards": "गोर बोर्ड्स लपवा", + "hide_adult_boards": "वयस्क बोर्ड्स लपवा" } \ No newline at end of file diff --git a/public/translations/nl/default.json b/public/translations/nl/default.json index bb73645b..e1152931 100644 --- a/public/translations/nl/default.json +++ b/public/translations/nl/default.json @@ -216,5 +216,8 @@ "links": "links", "avatar": "avatar", "token_address_whitelist": "Tokenadres (<1>alleen whitelist)", - "token_id": "Token-ID" + "token_id": "Token-ID", + "nsfw_boards": "NSFW-boards", + "hide_gore_boards": "Gore Boards verbergen", + "hide_adult_boards": "Volwassenen Boards verbergen" } \ No newline at end of file diff --git a/public/translations/no/default.json b/public/translations/no/default.json index 8623c9f2..24988b7c 100644 --- a/public/translations/no/default.json +++ b/public/translations/no/default.json @@ -216,5 +216,8 @@ "links": "lenker", "avatar": "avatar", "token_address_whitelist": "Tokenadresse (<1>kun hvitelisten)", - "token_id": "Token ID" + "token_id": "Token ID", + "nsfw_boards": "NSFW-boards", + "hide_gore_boards": "Skjul Gore Boards", + "hide_adult_boards": "Skjul voksne Boards" } \ No newline at end of file diff --git a/public/translations/pl/default.json b/public/translations/pl/default.json index 26ff4d42..9c84f12b 100644 --- a/public/translations/pl/default.json +++ b/public/translations/pl/default.json @@ -216,5 +216,8 @@ "links": "linki", "avatar": "avatar", "token_address_whitelist": "Adres tokenu (<1>tylko biała lista)", - "token_id": "Identyfikator tokena" + "token_id": "Identyfikator tokena", + "nsfw_boards": "Deski NSFW", + "hide_gore_boards": "Ukryj Gore Boards", + "hide_adult_boards": "Ukryj Adult Boards" } \ No newline at end of file diff --git a/public/translations/pt/default.json b/public/translations/pt/default.json index 1982062d..d8f2dfb8 100644 --- a/public/translations/pt/default.json +++ b/public/translations/pt/default.json @@ -216,5 +216,8 @@ "links": "links", "avatar": "avatar", "token_address_whitelist": "Endereço do token (<1>apenas lista branca)", - "token_id": "ID do token" + "token_id": "ID do token", + "nsfw_boards": "Quadros NSFW", + "hide_gore_boards": "Ocultar Quadros Gore", + "hide_adult_boards": "Ocultar Quadros para Adultos" } \ No newline at end of file diff --git a/public/translations/ro/default.json b/public/translations/ro/default.json index 04471447..f2580bae 100644 --- a/public/translations/ro/default.json +++ b/public/translations/ro/default.json @@ -216,5 +216,8 @@ "links": "linkuri", "avatar": "avatar", "token_address_whitelist": "Adresa tokenului (<1>doar lista albă)", - "token_id": "ID token" + "token_id": "ID token", + "nsfw_boards": "Plăci NSFW", + "hide_gore_boards": "Ascundeți tablourile Gore", + "hide_adult_boards": "Ascundeți tablourile pentru adulți" } \ No newline at end of file diff --git a/public/translations/ru/default.json b/public/translations/ru/default.json index 191fd78e..e0cff6fa 100644 --- a/public/translations/ru/default.json +++ b/public/translations/ru/default.json @@ -216,5 +216,8 @@ "links": "ссылки", "avatar": "аватар", "token_address_whitelist": "Адрес токена (<1>только белый список)", - "token_id": "Идентификатор токена" + "token_id": "Идентификатор токена", + "nsfw_boards": "NSFW доски", + "hide_gore_boards": "Скрыть доски Gore", + "hide_adult_boards": "Скрыть доски для взрослых" } \ No newline at end of file diff --git a/public/translations/sq/default.json b/public/translations/sq/default.json index 7136d309..aa589dbb 100644 --- a/public/translations/sq/default.json +++ b/public/translations/sq/default.json @@ -216,5 +216,8 @@ "links": "lidhje", "avatar": "avatar", "token_address_whitelist": "Adresa e tokenit (<1>vetëm lista e bardhë)", - "token_id": "ID e tokenit" + "token_id": "ID e tokenit", + "nsfw_boards": "Bordet NSFW", + "hide_gore_boards": "Fshihet Gore Boards", + "hide_adult_boards": "Fshihet Adult Boards" } \ No newline at end of file diff --git a/public/translations/sv/default.json b/public/translations/sv/default.json index ef37850a..83e0e347 100644 --- a/public/translations/sv/default.json +++ b/public/translations/sv/default.json @@ -216,5 +216,8 @@ "links": "länkar", "avatar": "avatar", "token_address_whitelist": "Tokenadress (<1>endast vitlista)", - "token_id": "Token ID" + "token_id": "Token ID", + "nsfw_boards": "NSFW-boards", + "hide_gore_boards": "Dölj Gore Boards", + "hide_adult_boards": "Dölj vuxna Boards" } \ No newline at end of file diff --git a/public/translations/te/default.json b/public/translations/te/default.json index 316478a8..89169703 100644 --- a/public/translations/te/default.json +++ b/public/translations/te/default.json @@ -216,5 +216,8 @@ "links": "లింక్లు", "avatar": "అవతార్", "token_address_whitelist": "టోకెన్ చిరునామా (<1>కేవలం వెలుపల్లి)", - "token_id": "టోకెన్ ఐడి" + "token_id": "టోకెన్ ఐడి", + "nsfw_boards": "NSFW బోర్డ్లు", + "hide_gore_boards": "గోర్ బోర్డ్స్ దాచు", + "hide_adult_boards": "పురుషులు బోర్డ్లు దాచు" } \ No newline at end of file diff --git a/public/translations/th/default.json b/public/translations/th/default.json index 6812dcb1..b4b181ca 100644 --- a/public/translations/th/default.json +++ b/public/translations/th/default.json @@ -216,5 +216,8 @@ "links": "ลิงก์", "avatar": "อวตาร์", "token_address_whitelist": "ที่อยู่โทเค็น (<1>รายชื่อที่ได้รับอนุญาตเท่านั้น)", - "token_id": "รหัสโทเค็น" + "token_id": "รหัสโทเค็น", + "nsfw_boards": "กระดาน NSFW", + "hide_gore_boards": "ซ่อนกระดาน Gore", + "hide_adult_boards": "ซ่อนกระดานสำหรับผู้ใหญ่" } \ No newline at end of file diff --git a/public/translations/tr/default.json b/public/translations/tr/default.json index 52652d2d..08d5a65a 100644 --- a/public/translations/tr/default.json +++ b/public/translations/tr/default.json @@ -216,5 +216,8 @@ "links": "bağlantılar", "avatar": "avatar", "token_address_whitelist": "Token adresi (<1>yalnızca beyaz liste)", - "token_id": "Token kimliği" + "token_id": "Token kimliği", + "nsfw_boards": "NSFW Panoları", + "hide_gore_boards": "Gore Panolarını Gizle", + "hide_adult_boards": "Yetişkin Panolarını Gizle" } \ No newline at end of file diff --git a/public/translations/uk/default.json b/public/translations/uk/default.json index 697c3c9f..4974d45d 100644 --- a/public/translations/uk/default.json +++ b/public/translations/uk/default.json @@ -216,5 +216,8 @@ "links": "посилання", "avatar": "аватар", "token_address_whitelist": "Адреса токена (<1>тільки білий список)", - "token_id": "Ідентифікатор токена" + "token_id": "Ідентифікатор токена", + "nsfw_boards": "NSFW дошки", + "hide_gore_boards": "Сховати дошки Gore", + "hide_adult_boards": "Сховати дошки для дорослих" } \ No newline at end of file diff --git a/public/translations/ur/default.json b/public/translations/ur/default.json index e1fb0874..4932bdbb 100644 --- a/public/translations/ur/default.json +++ b/public/translations/ur/default.json @@ -216,5 +216,8 @@ "links": "لنکس", "avatar": "اوتار", "token_address_whitelist": "ٹوکن کا پتا (<1>صرف سفید فہرست)", - "token_id": "ٹوکن شناخت" + "token_id": "ٹوکن شناخت", + "nsfw_boards": "این ایس ایف ڈبلیو بورڈس", + "hide_gore_boards": "گور بورڈز چھپائیں", + "hide_adult_boards": "بالغ بورڈز چھپائیں" } \ No newline at end of file diff --git a/public/translations/vi/default.json b/public/translations/vi/default.json index b97c72cd..215626c6 100644 --- a/public/translations/vi/default.json +++ b/public/translations/vi/default.json @@ -216,5 +216,8 @@ "links": "liên kết", "avatar": "avatar", "token_address_whitelist": "Địa chỉ token (<1>chỉ danh sách trắng)", - "token_id": "ID token" + "token_id": "ID token", + "nsfw_boards": "Các bảng NSFW", + "hide_gore_boards": "Ẩn Gore Boards", + "hide_adult_boards": "Ẩn Adult Boards" } \ No newline at end of file diff --git a/public/translations/zh/default.json b/public/translations/zh/default.json index 65c715d9..2a4ea982 100644 --- a/public/translations/zh/default.json +++ b/public/translations/zh/default.json @@ -216,5 +216,8 @@ "links": "链接", "avatar": "头像", "token_address_whitelist": "代币地址（<1>仅限白名单）", - "token_id": "令牌ID" + "token_id": "令牌ID", + "nsfw_boards": "NSFW板块", + "hide_gore_boards": "隐藏Gore板块", + "hide_adult_boards": "隐藏成人板块" } \ No newline at end of file diff --git a/src/views/catalog/catalog-filters/catalog-filters.tsx b/src/views/catalog/catalog-filters/catalog-filters.tsx index 2d64bb46..77d20b0e 100644 --- a/src/views/catalog/catalog-filters/catalog-filters.tsx +++ b/src/views/catalog/catalog-filters/catalog-filters.tsx @@ -30,14 +30,14 @@ const FiltersModal = ({ closeModal }: { closeModal: () => void }) => { )} {isInAllView && (
-
NSFW Boards
+
{t('nsfw_boards')}
)} From 75ed99c57873175a71e1c3a8bda7b486c618cf1a Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Tue, 16 Jul 2024 10:33:31 +0200 Subject: [PATCH 5/7] Update avatar-settings.module.css --- .../settings-modal/avatar-settings/avatar-settings.module.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/settings-modal/avatar-settings/avatar-settings.module.css b/src/components/settings-modal/avatar-settings/avatar-settings.module.css index 2d49129e..163afba8 100644 --- a/src/components/settings-modal/avatar-settings/avatar-settings.module.css +++ b/src/components/settings-modal/avatar-settings/avatar-settings.module.css @@ -24,7 +24,6 @@ text-align: center; height: 100%; color: var(--avatar-text-color); - cursor: pointer; } .avatarSettingsForm { From 01dacc82705f0c9a6ef20fe53673de3c06c220e5 Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Tue, 16 Jul 2024 13:13:04 +0200 Subject: [PATCH 6/7] fix(post): include pending replies in "x replies omitted" count --- src/components/post-desktop/post-desktop.tsx | 5 +++-- src/hooks/use-replies.ts | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx index ee553d4d..e497971b 100644 --- a/src/components/post-desktop/post-desktop.tsx +++ b/src/components/post-desktop/post-desktop.tsx @@ -344,7 +344,7 @@ const Reply = ({ openReplyModal, postReplyCount, reply, roles }: PostProps) => { const PostDesktop = ({ openReplyModal, post, roles, showAllReplies, showReplies = true }: PostProps) => { const { t } = useTranslation(); - const { author, cid, content, link, pinned, postCid, replyCount, subplebbitAddress } = post || {}; + const { author, cid, content, link, pinned, postCid, subplebbitAddress } = post || {}; const { isDescription, isRules } = post || {}; // custom properties, not from api const params = useParams(); const location = useLocation(); @@ -357,6 +357,7 @@ const PostDesktop = ({ openReplyModal, post, roles, showAllReplies, showReplies const replies = useReplies(post); const visiblelinksCount = useCountLinksInReplies(post, 5); const totalLinksCount = useCountLinksInReplies(post); + const replyCount = replies?.length; const repliesCount = pinned ? replyCount : replyCount - 5; const linksCount = pinned ? totalLinksCount : totalLinksCount - visiblelinksCount; const { showOmittedReplies, setShowOmittedReplies } = useShowOmittedReplies(); @@ -391,7 +392,7 @@ const PostDesktop = ({ openReplyModal, post, roles, showAllReplies, showReplies {!isHidden && !content &&
} {!isHidden && content && }
- {!isHidden && !isDescription && !isRules && !isInPendingPostView && (repliesCount > 5 || (pinned && repliesCount > 0)) && !isInPostPageView && ( + {!isHidden && !isDescription && !isRules && !isInPendingPostView && (replyCount > 5 || (pinned && repliesCount > 0)) && !isInPostPageView && ( { // filter against the original comment's CID and all CIDs in flattened replies const filter = useCallback( (accountComment: Comment) => { - const parentCid = accountComment.parentCid || 'n/a'; - const isCidInDocument = !!document.querySelector(`[data-cid="${parentCid}"]`); - return parentCid === (comment?.cid || 'n/a') || replyCids.has(parentCid) || isCidInDocument; + const parentCid = accountComment.parentCid; + return parentCid === (comment?.cid || 'n/a') || replyCids.has(parentCid); }, [comment?.cid, replyCids], ); From 3ddf26c93029cc60452d2aa3e13a752e3c4284fc Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Tue, 16 Jul 2024 13:20:24 +0200 Subject: [PATCH 7/7] fix(post): permalink (c/) of pending reply shouldn't link to anything --- src/components/post-desktop/post-desktop.tsx | 21 ++++++++++++-------- src/components/post-mobile/post-mobile.tsx | 21 ++++++++++++-------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx index e497971b..e10edede 100644 --- a/src/components/post-desktop/post-desktop.tsx +++ b/src/components/post-desktop/post-desktop.tsx @@ -128,15 +128,20 @@ const PostInfo = ({ openReplyModal, post, postReplyCount = 0, roles, isHidden }: )} {!(isDescription || isRules) && ( - !cid && e.preventDefault()}> - c/ - - {!cid ? ( - {state === 'failed' || stateString === 'Failed' ? 'Failed' : 'Pending'} + {cid ? ( + <> + !cid && e.preventDefault()}> + c/ + + openReplyModal && openReplyModal(cid)}> + {shortCid} + + ) : ( - openReplyModal && openReplyModal(cid)}> - {shortCid} - + <> + c/ + {state === 'failed' || stateString === 'Failed' ? 'Failed' : 'Pending'} + )} )} diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx index 71946dd5..3bc81123 100644 --- a/src/components/post-mobile/post-mobile.tsx +++ b/src/components/post-mobile/post-mobile.tsx @@ -118,15 +118,20 @@ const PostInfoAndMedia = ({ openReplyModal, post, postReplyCount = 0, roles }: P {getFormattedDate(timestamp)}} content={getFormattedTimeAgo(timestamp)} />{' '} {!(isDescription || isRules) && ( - !cid && e.preventDefault()}> - c/ - - {!cid ? ( - {state === 'failed' || stateString === 'Failed' ? 'Failed' : 'Pending'} + {cid ? ( + <> + !cid && e.preventDefault()}> + c/ + + openReplyModal && openReplyModal(cid)}> + {shortCid} + + ) : ( - openReplyModal && openReplyModal(cid)}> - {shortCid} - + <> + c/ + {state === 'failed' || stateString === 'Failed' ? 'Failed' : 'Pending'} + )} )}