From 4509b6089fcbc0250fa12eebbdcffa8b9e9a25eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?= Date: Tue, 5 Mar 2024 18:16:29 +0800 Subject: [PATCH 01/21] chore: remove volar extension because no longer needed --- .vscode/extensions.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index ac8124f48a..0083604d44 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,6 @@ "recommendations": [ "editorconfig.editorconfig", "vue.volar", - "vue.vscode-typescript-vue-plugin", "arcanis.vscode-zipfs", "orta.vscode-twoslash-queries", "antfu.iconify", From 0d7f9237386e7fb2a9fdf17476123d930be76c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?= Date: Tue, 5 Mar 2024 21:39:41 +0800 Subject: [PATCH 02/21] fix: "explore" not using translate at entrance page --- packages/client/src/pages/welcome.entrance.a.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 49f69692fc..985fce79f5 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -67,7 +67,7 @@ rounded style="margin-left: 12px; margin-top: 12px" onclick="window.location.href='/explore'" - >Explore{{ i18n.ts.explore }} From 02c57a626e711f90d7236611d23786ddb529117e Mon Sep 17 00:00:00 2001 From: Istiaque Ahmed Date: Tue, 5 Mar 2024 12:02:29 +0000 Subject: [PATCH 03/21] locale: update translations (Bengali (Bangladesh)) Currently translated at 74.9% (1428 of 1906 strings) Translation: Firefish/locales Translate-URL: https://hosted.weblate.org/projects/firefish/locales/bn_BD/ --- locales/bn-BD.yml | 53 ++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index a839bd8788..aea2d7f03c 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -15,10 +15,10 @@ ok: "ঠিক" gotIt: "বুঝেছি" cancel: "বাতিল" enterUsername: "ইউজারনেম লিখুন" -renotedBy: "{user} রিনোট করেছেন" -noNotes: "কোন নোট নেই" +renotedBy: "{user} দ্বারা বুস্ট করা হয়েছে" +noNotes: "No posts" noNotifications: "কোনো বিজ্ঞপ্তি নেই" -instance: "ইন্সট্যান্স" +instance: "সার্ভার" settings: "সেটিংস" basicSettings: "সাধারণ সেটিংস" otherSettings: "অন্যান্য সেটিংস" @@ -46,8 +46,8 @@ copyContent: "বিষয়বস্তু কপি করুন" copyLink: "লিঙ্ক কপি করুন" delete: "মুছুন" deleteAndEdit: "মুছুন এবং সম্পাদনা করুন" -deleteAndEditConfirm: "আপনি কি এই নোটটি মুছে এটি সম্পাদনা করার বিষয়ে নিশ্চিত? আপনি - এটির সমস্ত রিঅ্যাকশন, রিনোট এবং জবাব হারাবেন।" +deleteAndEditConfirm: "আপনি কি এই পোস্টটি মুছে ফেলার এবং এটি সম্পাদনা করার বিষয়ে + নিশ্চিত? আপনি এটির সমস্ত প্রতিক্রিয়া, বুস্ট এবং উত্তর হারাবেন।" addToList: "লিস্ট এ যোগ করুন" sendMessage: "একটি বার্তা পাঠান" copyUsername: "ব্যবহারকারীর নাম কপি করুন" @@ -61,18 +61,18 @@ receiveFollowRequest: "অনুসরণ করার জন্য অনুর followRequestAccepted: "অনুসরণ করার অনুরোধ গৃহীত হয়েছে" mention: "উল্লেখ" mentions: "উল্লেখসমূহ" -directNotes: "ডাইরেক্ট নোটগুলি" -importAndExport: "আমদানি এবং রপ্তানি" -import: "আমদানি করুণ" -export: "রপ্তানি" +directNotes: "প্রত্যক্ষ বার্তা" +importAndExport: "ডেটা ইমপোর্ট/এক্সপোর্ট" +import: "ইমপোর্ট করুণ" +export: "এক্সপোর্ট করুন" files: "ফাইলগুলি" download: "ডাউনলোড" driveFileDeleteConfirm: "আপনি কি নিশ্চিত যে আপনি \"{name}\" ডিলিট করতে চান? যে সকল - নোটের সাথে এই ফাইলটি সংযুক্ত সেগুলোও ডিলিট করা হবে।" + পোস্ট এর সাথে এই ফাইলটি সংযুক্ত সেগুলোও ডিলিট করা হবে।" unfollowConfirm: "{name} কে আনফলোও করার ব্যাপারে নিশ্চিত?" -exportRequested: "আপনার তথ্যসমূহ রপ্তানির জন্য অনুরোধ করেছেন। এতে কিছু সময় লাগতে পারে। - রপ্তানি সম্পন্ন হলে তা আপনার ড্রাইভে সংরক্ষিত হবে।" -importRequested: "আপনার তথ্যসমূহ আমদানির জন্য অনুরোধ করেছেন। এতে কিছু সময় লাগতে পারে। " +exportRequested: "আপনার তথ্যসমূহ এক্সপোর্ট জন্য অনুরোধ করেছেন। এতে কিছু সময় লাগতে + পারে। এক্সপোর্ট সম্পন্ন হলে তা আপনার ড্রাইভে সংরক্ষিত হবে।" +importRequested: "আপনার তথ্যসমূহ আমদানির জন্য অনুরোধ করেছেন। এতে কিছু সময় লাগতে পারে।" lists: "লিস্ট" noLists: "কোন লিস্ট নেই" note: "নোট" @@ -87,7 +87,7 @@ somethingHappened: "একটি ত্রুটি হয়েছে" retry: "আবার চেষ্টা করুন" pageLoadError: "পেজ লোড করা যায়নি" pageLoadErrorDescription: "এটি সাধারনত নেটওয়ার্কের সমস্যার বা ব্রাউজার ক্যাশের কারণে - ঘটে থাকে। ব্রাউজার এর ক্যাশ পরিষ্কার করুন এবং একটু পর আবার চেষ্টা করুন। " + ঘটে থাকে। ব্রাউজার এর ক্যাশ পরিষ্কার করুন এবং একটু পর আবার চেষ্টা করুন।" serverIsDead: "এই সার্ভার বর্তমানে সাড়া দিচ্ছে না। একটু পরে আবার চেষ্টা করুন।" youShouldUpgradeClient: "এই পেজ দেখার জন্য আপনার ব্রাউজার রিফ্রেশ করে ক্লায়েন্ট আপডেট করুন। " @@ -102,13 +102,13 @@ unfollow: "অনুসরণ বাতিল" followRequestPending: "অনুসরণ করার অনুরোধ বিচারাধীন" enterEmoji: "ইমোজি প্রবেশ করান" renote: "রিনোট" -unrenote: "রিনোট সরান " -renoted: "রিনোট করা হয়েছে" -cantRenote: "এই নোটটি রিনোট করা যাবে না।" -cantReRenote: "রিনোটকে রিনোট করা যাবে না।" -quote: "উদ্ধৃতি" -pinnedNote: "পিন করা নোট" -pinned: "পিন করা" +unrenote: "বুস্ট ফিরিয়ে নিন" +renoted: "বুস্ট করা হয়েছে।" +cantRenote: "এই পোস্টটি বুস্ট করা যাবে না।" +cantReRenote: "বুস্টকে বুস্ট করা যাবে না।" +quote: "উক্তি" +pinnedNote: "পিন করা পোস্ট" +pinned: "প্রোফাইলে পিন করুন" you: "আপনি" clickToShow: "দেখার জন্য ক্লিক করুন" sensitive: "সংবেদনশীল বিষয়বস্তু" @@ -1761,3 +1761,14 @@ _deck: list: "লিস্ট" mentions: "উল্লেখসমূহ" direct: "ডাইরেক্ট নোটগুলি" +removeReaction: আপনার প্রতিক্রিয়া সরান +addInstance: একটি সার্ভার যোগ করুন +deleted: মুছে ফেলা হয়েছে +editNote: পোস্ট এডিট করুন +edited: '{date} {time} এ সম্পাদিত' +searchPlaceholder: ফায়ারফিশে খুঁজুন +noThankYou: না, ধন্যবাদ +cw: সতর্কবার্তা +replies: উত্তর +quotes: উক্তি গুলো +reactions: প্রতিক্রিয়াগুলি From 69f1c40135938996f941319a93f33e5c1e2970f5 Mon Sep 17 00:00:00 2001 From: jolupa Date: Mon, 4 Mar 2024 18:35:04 +0000 Subject: [PATCH 04/21] locale: update translations (Catalan) Currently translated at 99.8% (1903 of 1906 strings) Translation: Firefish/locales Translate-URL: https://hosted.weblate.org/projects/firefish/locales/ca/ --- locales/ca-ES.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index 6f850e14b5..de588c2185 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -2031,6 +2031,7 @@ _wordMute: de temps. muteLangs: Llenguatges silenciats muteLangsDescription: Separar amb espais o línies no es per una condició OR. + mutePatterns: Patrons per silenciar _auth: shareAccessAsk: Estàs segur que vols autoritzar aquesta aplicació per accedir al teu compte? @@ -2244,3 +2245,16 @@ noSentFollowRequests: No tens cap sol·licitud de seguiment enviada sentFollowRequests: Enviar sol·licituds de seguiment replyMute: Silencia les respostes a les línies de temps replyUnmute: Treu el silencia de les respostes a les línies de temps +searchWordsDescription: "Per cercar publicacions, escriu el terme a buscar. Separa + les paraules amb espais per fer condicions AND o escriules dins de cometes per fer + una cerca OR.\nPer exemple, 'dia nit' trobarà publicacions que continguin tan 'dia' + com 'nit', i 'dia OR nit' trobaran publicacions que continguin tan 'dia' com 'nit' + o ambdues.\nPots combinar condicions AND/OR per exemple '(dia OR nit) endormiscar'.\n + \nSi vols anar a una pàgina d'usuari o publicació en concret, escriu la adreça URL + o la ID en aquest camp i fes clic al botó 'Trobar'. Fent clic a 'Cercar' trobarà + publicacions que, literalment , continguin la ID/adreça URL." +searchPostsWithFiles: Només publicacions amb fitxers +searchCwAndAlt: Inclou avisos de contingut i arxius amb descripcions. +searchUsers: Publicat per (opcional) +searchRange: Publicat dintre de (opcional) +publishTimelines: Publica línies de temps per visitants From f892e4bdbd8ea1ffe81d10e643b477ab5ffc0c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?= Date: Tue, 5 Mar 2024 10:02:39 +0000 Subject: [PATCH 05/21] locale: update translations (Chinese (Simplified)) Currently translated at 100.0% (1906 of 1906 strings) Translation: Firefish/locales Translate-URL: https://hosted.weblate.org/projects/firefish/locales/zh_Hans/ --- locales/zh-CN.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 125d75acd3..06bbecb746 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -2030,7 +2030,7 @@ emojiModPermDescription: "添加：允许该用户添加新的自定义表情符 权限的基础上，允许该用户编辑现有自定义表情符号的名称/类别/标签/授权。\n全部允许：在 “添加和编辑” 权限的基础上，允许该用户删除现有的自定义表情符号。" replyMute: 静音回复 replyUnmute: 取消静音回复 -searchWords: 要搜索的词 / ID 或者要查找的 URL +searchWords: 要搜索的关键词 / 要查询的用户 ID 或 URL searchRange: 发表于（可选） searchUsers: 发布者（可选） searchUsersDescription: "要搜索特定用户/服务器的帖子，请输入 ID（@user@example.com，或 @user 对于本地用户）或域名（example.com）。\n @@ -2039,10 +2039,10 @@ searchPostsWithFiles: 只带有文件的帖子 searchCwAndAlt: 包括内容警告和文件描述 publishTimelines: 为访客发布时间线 publishTimelinesDescription: 如果启用，在用户登出时本地和全局时间线也会显示在 {url} 上。 -searchWordsDescription: "要搜索帖子，请输入搜索词。交集搜索用空格分隔单词，并集搜索单词之间用 OR 分隔。\n例如 '早上 晚上' 将查找包含 - '早上' 和 '晚上' 的帖子，而 '早上 OR 晚上' 将查找包含 '早上' 或 '晚上' （以及同时包含两者）的帖子。\n您还可以组合交集/并集条件，例如 - '(早上 OR 晚上) 困了' 。\n\n如果您想转到特定的用户页面或帖子页面，请在此字段中输入 ID 或 URL，然后单击 “查找” 按钮。 单击 “搜索” - 将搜索字面包含 ID/URL 的帖子。" +searchWordsDescription: "要搜索帖子，请输入关键词。交集搜索关键词之间使用空格进行区分，并集搜索关键词之间使用 OR 进行区分。\n例如 '早上 + 晚上' 将查找包含 '早上' 和 '晚上' 的帖子，而 '早上 OR 晚上' 将查找包含 '早上' 或 '晚上' （以及同时包含两者）的帖子。\n您还可以组合交集/并集条件，例如 + '(早上 OR 晚上) 困了' 。\n\n如果您想转到特定的用户页面或帖子页面，请在此字段中输入用户 ID 或 URL，然后单击 “查询” 按钮。 单击 “搜索” + 将搜索字面包含用户 ID/URL 的帖子。" searchRangeDescription: "如果您要过滤时间段，请按以下格式输入：20220615-20231031\n\n如果您省略年份（例如 0105-0106 或 20231105-0110），它将被解释为当前年份。\n\n您还可以省略开始日期或结束日期。 例如 -0102 将过滤搜索结果以仅显示今年 1 月 2 日之前发布的帖子，而 20231026- 将过滤结果以仅显示 2023 年 10 月 26 日之后发布的帖子。" From 31c2d37afdc89e726d1ea50b211d94cac169329b Mon Sep 17 00:00:00 2001 From: Salif Mehmed Date: Tue, 5 Mar 2024 10:18:58 +0000 Subject: [PATCH 06/21] locale: update translations (Bulgarian) Currently translated at 41.3% (789 of 1906 strings) Translation: Firefish/locales Translate-URL: https://hosted.weblate.org/projects/firefish/locales/bg/ --- locales/bg-BG.yml | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/locales/bg-BG.yml b/locales/bg-BG.yml index 2f26fb9c5c..339e562a43 100644 --- a/locales/bg-BG.yml +++ b/locales/bg-BG.yml @@ -14,8 +14,8 @@ unpin: Откачане от профила copyLink: Копиране на връзката pin: Закачане в профила deleted: Изтрито -deleteAndEditConfirm: Сигурен ли си, че искаш да изтриеш тази публикация и да я редактираш? - Ще загубиш всички реакции, подсилвания и отговори към нея. +deleteAndEditConfirm: Сигурни ли сте, че искате да изтриете тази публикация и да я + редактирате? Ще загубите всички реакции, подсилвания и отговори към нея. copyUsername: Копиране на потребителското име searchUser: Търсене на потребител reply: Отговор @@ -549,8 +549,8 @@ _sfx: antenna: Антени note: Нова публикация _permissions: - "read:favorites": Виж списъка си с отметки - "write:favorites": Редактирай списъка си с отметки + "read:favorites": Преглед на списъка ви с отметки + "write:favorites": Редактиране на списъка ви с отметки _visibility: followers: Последователи specified: Директна @@ -595,18 +595,18 @@ _tutorial: step5_1: Инфопотоци, инфопотоци навсякъде! step3_1: Сега е време да последвате няколко хора! step1_2: Нека да ви настроим. Ще бъдете готови за нула време! - step5_3: Началният {icon} инфопоток е мястото, където можеш да видиш публикации - от акаунтите, които следваш. + step5_3: Началният {icon} инфопоток е мястото, където можете да видите публикации + от акаунтите, които следвате. step6_1: И така, какво е това място? - step5_7: Глобалният {icon} инфопоток е мястото, където можете да видиш публикации + step5_7: Глобалният {icon} инфопоток е мястото, където можете да видите публикации от всеки друг свързан сървър. step4_2: За първата си публикация някои хора обичат да правят публикация {introduction} или просто „Здравей свят!“ step5_2: Вашият сървър има активирани {timelines} различни инфопотоци. - step5_4: Местният {icon} инфопоток е мястото, където можеш да видиш публикации от - всички останали на този сървър. + step5_4: Местният {icon} инфопоток е мястото, където можете да видите публикации + от всички останали на този сървър. step5_5: Социалният {icon} инфопоток е комбинация от Началния и Местния инфопоток. - step5_6: Препоръчаният {icon} инфопоток е мястото, където можеш да видиш публикации + step5_6: Препоръчаният {icon} инфопоток е мястото, където можете да видите публикации от сървъри, препоръчани от администраторите. step6_4: Сега отидете, изследвайте и се забавлявайте! step6_3: Всеки сървър работи по различни начини и не всички сървъри работят с Firefish. @@ -663,7 +663,7 @@ operations: Операции mutedUsers: Заглушени потребители imageUrl: URL адрес на изображение announcements: Оповестявания -removeAreYouSure: Сигурен ли си, че искаш да премахнеш "{x}"? +removeAreYouSure: Сигурни ли сте, че искате да премахнете "{x}"? fromUrl: От URL адрес manageGroups: Управление на групи nUsersRead: прочетено от {n} @@ -758,7 +758,7 @@ reload: Опресняване invites: Покани blockedInstances: Блокирани сървъри inMb: В мегабайти -unfollowConfirm: Сигурен ли си, че искаш да спреш да следваш {name}? +unfollowConfirm: Сигурни ли сте, че искате да прекратите следването на {name}? somethingHappened: Възникна грешка pageLoadError: Възникна грешка при зареждането на страницата. enterListName: Въведи име за списъка @@ -768,9 +768,9 @@ selectChannel: Избор на канал all: Всичко muteAndBlock: Заглушени и блокирани blockedUsers: Блокирани потребители -noteDeleteConfirm: Сигурен ли си, че искаш да изтриеш тази публикация? +noteDeleteConfirm: Сигурни ли сте, че искате да изтриете тази публикация? hiddenTags: Скрити хаштагове -deleteAreYouSure: Сигурен ли си, че искаш да изтриеш "{x}"? +deleteAreYouSure: Сигурни ли сте, че искате да изтриете "{x}"? startMessaging: Започване на нов чат uploadFromUrl: Качване от URL адрес instanceName: Име на сървъра @@ -858,3 +858,13 @@ apply: Прилагане selectAccount: Избор на акаунт muteThread: Заглушаване на нишката ffVisibility: Видимост на Последвани/Последователи +renoteMute: Заглушаване на подсилванията в инфопотоците +replyMute: Заглушаване на отговорите в инфопотоците +blockConfirm: Сигурни ли сте, че искате да блокирате този акаунт? +appearance: Облик +fontSize: Размер на шрифта +describeFile: Добавяне на описание +unblockConfirm: Сигурни ли сте, че искате да отблокирате този акаунт? +followConfirm: Сигурни ли сте, че искате да последвате {name}? +accountMoved: 'Потребителят се премести на нов акаунт:' +inputNewDescription: Въведете ново описание From aaa0b7edde12183fb138305ebd91d1e960017c1c Mon Sep 17 00:00:00 2001 From: atsu1125 Date: Wed, 6 Mar 2024 07:21:27 +0900 Subject: [PATCH 07/21] fix (backend): movedToUri should be either User or null Co-authored-by: naskya --- packages/backend/src/models/repositories/user.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts index 59bba8b44d..d880ac9741 100644 --- a/packages/backend/src/models/repositories/user.ts +++ b/packages/backend/src/models/repositories/user.ts @@ -494,9 +494,7 @@ export const UserRepository = db.getRepository(User).extend({ url: profile!.url, uri: user.uri, movedToUri: user.movedToUri - ? await this.userFromURI(user.movedToUri).catch( - () => user.movedToUri, - ) + ? await this.userFromURI(user.movedToUri).catch(() => null) : null, alsoKnownAs: user.alsoKnownAs, createdAt: user.createdAt.toISOString(), From fb923fa4d8cf8b1c91c66cd04c6fe91d1f14e9c8 Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 6 Mar 2024 07:49:01 +0900 Subject: [PATCH 08/21] style: fix FormSwitch text-align --- packages/client/src/components/form/switch.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/components/form/switch.vue b/packages/client/src/components/form/switch.vue index 2b7c7663c4..f71f607a88 100644 --- a/packages/client/src/components/form/switch.vue +++ b/packages/client/src/components/form/switch.vue @@ -97,6 +97,7 @@ function toggle(x) { display: block; transition: inherit; color: var(--fg); + text-align: initial; > span { display: block; From 7609d78269bcd600b4c7c588a1a84ab29b68d481 Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 6 Mar 2024 07:54:40 +0900 Subject: [PATCH 09/21] style: minor change in search box margin --- packages/client/src/components/MkSearchBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkSearchBox.vue b/packages/client/src/components/MkSearchBox.vue index 0a1e7315af..5d57ddcd05 100644 --- a/packages/client/src/components/MkSearchBox.vue +++ b/packages/client/src/components/MkSearchBox.vue @@ -229,7 +229,7 @@ onBeforeUnmount(() => { } .input { - margin: 10px 0; + margin: 12px 0; } .title { From 5b77777439895d7053899fe05f12ede6da569a86 Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 6 Mar 2024 08:10:28 +0900 Subject: [PATCH 10/21] style: hide scrollbars in simple text windows --- packages/client/src/components/MkSimpleTextWindow.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/client/src/components/MkSimpleTextWindow.vue b/packages/client/src/components/MkSimpleTextWindow.vue index bb9e538123..ceb1e24541 100644 --- a/packages/client/src/components/MkSimpleTextWindow.vue +++ b/packages/client/src/components/MkSimpleTextWindow.vue @@ -32,6 +32,12 @@ const emit = defineEmits<{ .thppypvi { max-height: 70%; overflow-y: scroll; + -ms-overflow-style: none; + scrollbar-width: none; +} + +.thppypvi::-webkit-scrollbar { + display: none; } .zrgnubda { From b71e8a0d1f68bb23e3a39d381bf16c00f1883c49 Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 6 Mar 2024 08:18:52 +0900 Subject: [PATCH 11/21] docs: update changelog --- docs/changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index 16fe645f19..111d554eb2 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -8,6 +8,9 @@ Critical security updates are indicated by the :warning: icon. - Refactoring - Show unlisted posts from following users in antennas (similar to [Fedibird](https://github.com/fedibird/mastodon/tree/fedibird) and [kmyblue](https://github.com/kmycode/mastodon), unlisted posts from people you don't follow won't be shown) - Add ability to publish the Local and Global timelines on `/timeline` page +- Add langage annotation to post contents (!10687) +- Fix bugs +- Update documents ## v20240301 From ddc8f62a16f42c1992be63ab76c915dd3df83d59 Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 6 Mar 2024 09:02:09 +0900 Subject: [PATCH 12/21] meta: remove *.joinfirefish.org URLs --- locales/bg-BG.yml | 1 - locales/ca-ES.yml | 1 - locales/de-DE.yml | 1 - locales/en-US.yml | 4 +-- locales/es-ES.yml | 1 - locales/fr-FR.yml | 1 - locales/id-ID.yml | 1 - locales/it-IT.yml | 1 - locales/ja-JP.yml | 3 +-- locales/ko-KR.yml | 1 - locales/no-NO.yml | 1 - locales/pl-PL.yml | 1 - locales/ru-RU.yml | 1 - locales/th-TH.yml | 1 - locales/tr-TR.yml | 1 - locales/uk-UA.yml | 1 - locales/vi-VN.yml | 1 - locales/zh-CN.yml | 3 +-- locales/zh-TW.yml | 3 +-- .../src/remote/activitypub/renderer/index.ts | 2 +- packages/backend/src/server/nodeinfo.ts | 2 +- packages/backend/test/mfm.ts | 26 +++++++++---------- packages/client/src/components/MkSample.vue | 2 +- packages/client/src/components/MkSignup.vue | 5 ---- packages/client/src/scripts/helpMenu.ts | 19 +++++++------- packages/client/src/ui/visitor/a.vue | 4 ++- packages/client/src/ui/visitor/b.vue | 4 ++- packages/client/src/ui/visitor/kanban.vue | 4 ++- 28 files changed, 39 insertions(+), 57 deletions(-) diff --git a/locales/bg-BG.yml b/locales/bg-BG.yml index 339e562a43..2ac83494ed 100644 --- a/locales/bg-BG.yml +++ b/locales/bg-BG.yml @@ -778,7 +778,6 @@ instanceDescription: Описание на сървъра accept: Приемане enableLocalTimeline: Включване на местния инфопоток enableGlobalTimeline: Включване на глобалния инфопоток -findOtherInstance: Намиране на друг сървър removeMember: Премахване на член isAdmin: Администратор isModerator: Модератор diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index de588c2185..f38779bda4 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -2067,7 +2067,6 @@ _relayStatus: deleted: Eliminat editNote: Edita la publicació edited: 'Editat el {date} {time}' -findOtherInstance: Cercar un altre servidor signupsDisabled: Actualment, les inscripcions en aquest servidor estan desactivades, però sempre podeu registrar-vos en un altre servidor. Si teniu un codi d'invitació per a aquest servidor, introduïu-lo a continuació. diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 42228695a4..44e8fb1d7c 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -2024,7 +2024,6 @@ moveAccountDescription: 'Dieser Vorgang kann nicht rückgängig gemacht werden! sie vor dem Umzug dieses Nutzerkontos sicher, dass Sie einen Namen für Ihr neues Nutzerkonto eingerichtet haben. Bitte geben sie die Bezeichnung des neuen Nutzerkontos wie folgt ein: @name@server.xyz' -findOtherInstance: Einen anderen Server finden sendPushNotificationReadMessage: Löschung der Push-Benachrichtigungen sobald die entsprechenden Benachrichtigungen oder Nachrichten gelesen wurden signupsDisabled: Derzeit sind keine Anmeldungen auf diesem Server möglich! Anmeldungen diff --git a/locales/en-US.yml b/locales/en-US.yml index a2298d9081..e335c9aba2 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1104,10 +1104,8 @@ customKaTeXMacroDescription: "Set up macros to write mathematical expressions ea advanced syntax, such as conditional branching, cannot be used here." enableCustomKaTeXMacro: "Enable custom KaTeX macros" noteId: "Post ID" -signupsDisabled: "Signups on this server are currently disabled, but you can always - sign up at another server! If you have an invitation code for this server, please +signupsDisabled: "Signups on this server are currently disabled. If you have an invitation code for this server, please enter it below." -findOtherInstance: "Find another server" apps: "Apps" sendModMail: "Send Moderation Notice" preventAiLearning: "Prevent AI bot scraping" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index b0b1fc28e1..b0a7059f9d 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1985,7 +1985,6 @@ deleted: Eliminado edited: 'Editado a las {date} {time}' editNote: Editar publicación silenceThisInstance: Silenciar este servidor -findOtherInstance: Buscar otro servidor userSaysSomethingReasonRenote: '{name} impulsó una publicación que contiene {reason]' enableRecommendedTimeline: Habilitar línea de tiempo "Recomendado" searchPlaceholder: Buscar en Firefish diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 05c70afaf4..429ce14835 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -2090,7 +2090,6 @@ _experiments: de leurs anciens comptes Firefish, Misskey, Mastodon, Akkoma et Pleroma. Cela peut entraîner des ralentissements lors du chargement si votre file d'attente est congestionnée. -findOtherInstance: Trouver un autre serveur userSaysSomethingReasonQuote: '{name} a cité une publication contenant {reason}' signupsDisabled: Les inscriptions sur ce serveur sont actuellement désactivés, mais vous pouvez toujours vous inscrire sur un autre serveur ! Si vous avez un code d'invitation diff --git a/locales/id-ID.yml b/locales/id-ID.yml index 3b411ae60c..6b8e2b9407 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -2007,7 +2007,6 @@ enterSendsMessage: Tekan Enter pada Pesan untuk mengirim pesan (matikan dengan C + Enter) showAdminUpdates: Indikasi versi Firefish baru tersedia (hanya admin) noteId: ID Postingan -findOtherInstance: Cari server lain caption: Deskripsi itomatis splash: Layar Percik migration: Migrasi diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 6a8239d007..f12b2ade4a 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1839,7 +1839,6 @@ customKaTeXMacro: Macro KaTeX personalizzate signupsDisabled: Le iscrizioni su questo server al momento non sono possibili, ma puoi sempre iscriverti su un altro server! Se invece hai un codice di invito per questo server, inseriscilo qua sotto. -findOtherInstance: Scegli un altro server apps: App expandOnNoteClick: Apri i post con un click userSaysSomethingReasonReply: '{name} ha risposto a un post che contiene {reason}' diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5a99b7d935..9dcfdbac83 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1942,8 +1942,7 @@ deleted: 削除済み editNote: 投稿を編集 edited: '編集済み: {date} {time}' signupsDisabled: - 現在、このサーバーでは新規登録が一般開放されていません。招待コードをお持ちの場合には、以下の欄に入力してください。招待コードをお持ちでない場合にも、新規登録を開放している他のサーバーには入れますよ！ -findOtherInstance: 他のサーバーを探す + 現在、このサーバーでは新規登録が一般開放されていません。招待コードをお持ちの場合には、以下の欄に入力してください。 newer: 新しい投稿 older: 古い投稿 accessibility: アクセシビリティ diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index ace8aa5f42..75f347a96a 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1824,7 +1824,6 @@ pushNotificationNotSupported: 브라우저 및 서버가 푸시 알림을 지원 enableRecommendedTimeline: 추천 타임라인을 활성화 pushNotificationAlreadySubscribed: 푸시 알림이 활성화되었습니다 caption: 자동으로 설명 붙이기 -findOtherInstance: 다른 서버 둘러보기 enableIdenticonGeneration: 유저 별 Identicon의 생성을 활성화 secureModeInfo: 인증 정보가 없는 리모트 서버로부터의 요청에 응답하지 않습니다. allowedInstances: 허가된 서버 diff --git a/locales/no-NO.yml b/locales/no-NO.yml index d8b80e0e2c..bd643c34e1 100644 --- a/locales/no-NO.yml +++ b/locales/no-NO.yml @@ -1196,7 +1196,6 @@ customKaTeXMacroDescription: 'Sett opp makroer for å skrive matematiske uttrykk signupsDisabled: Registreringer av nye konti på denne tjeneren er slått av, men du kan alltids registrere deg på en annen tjener! Hvis du har en invitasjonskode for denne tjeneren, skriv den inn under. -findOtherInstance: Finn en annen tjener preventAiLearningDescription: Ber tredjeparts AI-språkmodeller om å ikke bruke innhold du laster opp, sliks om poster og bilder. enableCustomKaTeXMacro: Slå på egne KaTeX-makroer diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 73b3939abb..95a05009bd 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1992,7 +1992,6 @@ deleted: Usunięte editNote: Edytuj wpis edited: 'Edytowano o {date} {time}' silenced: Wyciszony -findOtherInstance: Znajdź inny serwer userSaysSomethingReasonReply: '{name} odpowiedział na wpis zawierający {reason}' userSaysSomethingReasonRenote: '{name} podbił post zawierający {reason}' signupsDisabled: Rejestracja na tym serwerze jest obecnie zamknięta, ale zawsze możesz diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 64742e5479..df9d183433 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -2086,7 +2086,6 @@ enableServerMachineStats: Включить статистику серверно enableIdenticonGeneration: Включить генерацию Identicon reactionPickerSkinTone: Предпочитаемый цвет кожи эмодзи sendModMail: Отправить сообщение о модерации -findOtherInstance: Найти другой сервер signupsDisabled: Регистрация на этом сервере сейчас отключена, но вы всегда можете зарегистрироваться на другом сервере! Если у вас есть код приглашения на этот сервер, пожалуйста, введите его ниже. diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 1302f86726..6ae3201f01 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -1288,7 +1288,6 @@ customMOTD: ข้อความหน้าจอเริ่มต้นท swipeOnMobile: อนุญาตให้ปัดระหว่างหน้า breakFollowConfirm: คุณแน่ใจหรือไม่ที่จะลบผู้ติดตาม? defaultReaction: ค่าเริ่มต้นของปฏิกิริยาอีโมจิสำหรับโพสต์ขาออกและขาเข้า -findOtherInstance: ค้นหาเซิร์ฟเวอร์อื่น silenceThisInstance: ปิดเงียบสำหรับเซิร์ฟเวอร์นี้ antennaInstancesDescription: เขียนชื่อเซิร์ฟเวอร์ได้ 1 ชื่อต่อ 1 บรรทัด splash: หน้าจอเริ่มต้น diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml index 16206614b3..7a687dc7c4 100644 --- a/locales/tr-TR.yml +++ b/locales/tr-TR.yml @@ -1284,7 +1284,6 @@ _emailUnavailable: used: Bu mail zaten kullanılıyor format: Bu mail adresi yanlış apps: Uygulamalar -findOtherInstance: Başka bir sunucu bul showWithSparkles: Parıltılarla göster showPopup: Kullanıcıları pop-up ile bilgilendirin silencedWarning: Bu sayfa, bu kullanıcılar yöneticinizin susturduğu sunuculardan olduğu diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index f0b7296b78..5e73078a98 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -1977,7 +1977,6 @@ license: Ліцензія signupsDisabled: Реєстрація на цьому сервері наразі відключена, але ви завжди можете зареєструватися на іншому сервері! Якщо у вас є код запрошення на цей сервер, будь ласка, введіть його нижче. -findOtherInstance: Знайти інший сервер customKaTeXMacro: Користувацькі макроси KaTeX enableCustomKaTeXMacro: Увімкнути користувацькі макроси KaTeX apps: Додатки diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 119c745ac3..527258bdad 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1908,7 +1908,6 @@ renoteMute: Ẩn lượt chia sẻ renoteUnmute: Bỏ ẩn lượt chia sẻ searchPlaceholder: Lướt Firefish edited: Đã sửa {date} {time} -findOtherInstance: Tìm máy chủ khác noThankYou: Từ chối _filters: withFile: Có file diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 06bbecb746..130a9e0647 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1912,10 +1912,9 @@ _skinTones: mediumDark: 中等偏深 isModerator: 监察员 isAdmin: 管理员 -findOtherInstance: 寻找其它服务器 moveFromDescription: 这将为您的旧账号设置一个别名，以便您可以从该旧账号迁移到当前账号。在从旧账号迁移之前执行此操作。请输入格式如 @person@server.com 的账号标签 -signupsDisabled: 该服务器目前关闭注册，但您随时可以在另一台服务器上注册！如果您有该服务器的邀请码，请在下面输入。 +signupsDisabled: 该服务器目前关闭注册。如果您有该服务器的邀请码，请在下面输入。 silencedWarning: 显示这个页面是因为这些用户来自您的管理员设置的禁言服务器，所以他们有可能是垃圾信息。 isBot: 这个账号是一个自动化账号 moveAccountDescription: 这个过程是不可逆的。在迁移之前，请确保您已在新账号上为当前账号设置了别名。请输入格式如 @person@server.com diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 44e7c93b24..97ddaf1b3f 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1870,7 +1870,6 @@ _experiments: enablePostImports: 啟用匯入貼文的功能 postImportsCaption: 允許使用者從舊有的Firefish・Misskey・Mastodon・Akkoma・Pleroma帳號匯入貼文。在伺服器佇列堵塞時匯入貼文可能會導致載入速度變慢。 -findOtherInstance: 找找另一個伺服器 noGraze: 瀏覽器擴充元件 "Graze for Mastodon" 會與Firefish發生衝突，請停用該擴充元件。 userSaysSomethingReasonRenote: '{name} 轉發了包含 {reason} 的貼文' pushNotificationNotSupported: 你的瀏覽器或伺服器不支援推送通知 @@ -1928,7 +1927,7 @@ isModerator: 板主 isAdmin: 管理員 isPatron: Firefish 項目贊助者 silencedWarning: 顯示此頁面是因為這些使用者來自您伺服器管理員已靜音的伺服器，因此他們可能是垃圾訊息。 -signupsDisabled: 此伺服器目前停止註冊，但您隨時可以在另一台伺服器上註冊！如果您有此伺服器的邀請碼，請在下面輸入。 +signupsDisabled: 此伺服器目前停止註冊。如果您有此伺服器的邀請碼，請在下面輸入。 showPopup: 通過彈出式視窗通知使用者 showWithSparkles: 讓標題閃閃發光 youHaveUnreadAnnouncements: 您有未讀的公告 diff --git a/packages/backend/src/remote/activitypub/renderer/index.ts b/packages/backend/src/remote/activitypub/renderer/index.ts index 734d1198c9..2b6229b3e4 100644 --- a/packages/backend/src/remote/activitypub/renderer/index.ts +++ b/packages/backend/src/remote/activitypub/renderer/index.ts @@ -36,7 +36,7 @@ export const renderActivity = (x: any): IActivity | null => { PropertyValue: "schema:PropertyValue", value: "schema:value", // Firefish - firefish: "https://joinfirefish.org/ns#", + firefish: "https://firefish.dev/ns#", speakAsCat: "firefish:speakAsCat", // Misskey misskey: "https://misskey-hub.net/ns#", diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index a05992da59..1cb8eb1eaf 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -53,7 +53,7 @@ const nodeinfo2 = async () => { name: "firefish", version: config.version, repository: meta.repositoryUrl, - homepage: "https://joinfirefish.org/", + homepage: "https://firefish.dev/firefish/firefish", }, protocols: ["activitypub"], services: { diff --git a/packages/backend/test/mfm.ts b/packages/backend/test/mfm.ts index 81ed95848a..97e8e15e91 100644 --- a/packages/backend/test/mfm.ts +++ b/packages/backend/test/mfm.ts @@ -55,33 +55,33 @@ describe("fromHtml", () => { it("link with different text", () => { assert.deepStrictEqual( - fromHtml('

a c d

'), - "a [c](https://joinfirefish.org/b) d", + fromHtml('

a c d

'), + "a [c](https://firefish.dev/firefish) d", ); }); it("link with different text, but not encoded", () => { assert.deepStrictEqual( - fromHtml('

a c d

'), - "a [c]() d", + fromHtml('

a c d

'), + "a [c]() d", ); }); it("link with same text", () => { assert.deepStrictEqual( fromHtml( - '

a https://joinfirefish.org/b d

', + '

a https://firefish.dev/firefish/firefish d

', ), - "a https://joinfirefish.org/b d", + "a https://firefish.dev/firefish/firefish d", ); }); it("link with same text, but not encoded", () => { assert.deepStrictEqual( fromHtml( - '

a https://joinfirefish.org/ä d

', + '

a https://firefish.dev/ä d

', ), - "a d", + "a d", ); }); @@ -98,8 +98,8 @@ describe("fromHtml", () => { it("link without text", () => { assert.deepStrictEqual( - fromHtml('

a d

'), - "a https://joinfirefish.org/b d", + fromHtml('

a d

'), + "a https://firefish.dev/b d", ); }); @@ -110,15 +110,15 @@ describe("fromHtml", () => { it("mention", () => { assert.deepStrictEqual( fromHtml( - '

a @user d

', + '

a @firefish d

', ), - "a @user@joinfirefish.org d", + "a @firefish@info.firefish.dev d", ); }); it("hashtag", () => { assert.deepStrictEqual( - fromHtml('

a #a d

', [ + fromHtml('

a #a d

', [ "#a", ]), "a #a d", diff --git a/packages/client/src/components/MkSample.vue b/packages/client/src/components/MkSample.vue index 6d87494488..a962f340d2 100644 --- a/packages/client/src/components/MkSample.vue +++ b/packages/client/src/components/MkSample.vue @@ -55,7 +55,7 @@ export default defineComponent({ this.$i ? this.$i.username : "guest" }.\nAlso, here is ${config.url} and [example link](${ config.url - }). for more details, see https://joinfirefish.org.\nAs you know #misskey is open-source software.`, + }). for more details, see .\nAs you know #Firefish is open-source software.`, }; }, diff --git a/packages/client/src/components/MkSignup.vue b/packages/client/src/components/MkSignup.vue index d855e09a13..3b4cd48890 100644 --- a/packages/client/src/components/MkSignup.vue +++ b/packages/client/src/components/MkSignup.vue @@ -1,11 +1,6 @@