diff --git a/.github/workflows/api-cherrypick-js.yml b/.github/workflows/api-cherrypick-js.yml index 7c688dc30b..4a9cdd847f 100644 --- a/.github/workflows/api-cherrypick-js.yml +++ b/.github/workflows/api-cherrypick-js.yml @@ -14,7 +14,7 @@ jobs: - run: corepack enable - name: Setup Node.js - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version-file: '.node-version' cache: 'pnpm' diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml index d5646e3250..1aefda730c 100644 --- a/.github/workflows/get-api-diff.yml +++ b/.github/workflows/get-api-diff.yml @@ -44,7 +44,7 @@ jobs: version: 8 run_install: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' @@ -126,7 +126,7 @@ jobs: version: 8 run_install: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0ed67a578d..534856004c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: with: version: 8 run_install: false - - uses: actions/setup-node@v3.8.1 + - uses: actions/setup-node@v4.0.0 with: node-version-file: '.node-version' cache: 'pnpm' @@ -46,7 +46,7 @@ jobs: with: version: 7 run_install: false - - uses: actions/setup-node@v3.8.1 + - uses: actions/setup-node@v4.0.0 with: node-version-file: '.node-version' cache: 'pnpm' @@ -72,7 +72,7 @@ jobs: with: version: 7 run_install: false - - uses: actions/setup-node@v3.8.1 + - uses: actions/setup-node@v4.0.0 with: node-version-file: '.node-version' cache: 'pnpm' diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index 19c90a9e28..b161b4f877 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -38,7 +38,7 @@ jobs: version: 8 run_install: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' diff --git a/.github/workflows/test-cherrypick-js.yml b/.github/workflows/test-cherrypick-js.yml index b1d24f47ae..e740fc70e8 100644 --- a/.github/workflows/test-cherrypick-js.yml +++ b/.github/workflows/test-cherrypick-js.yml @@ -26,7 +26,7 @@ jobs: - run: corepack enable - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml index f7ae1574bf..44f721ad2d 100644 --- a/.github/workflows/test-frontend.yml +++ b/.github/workflows/test-frontend.yml @@ -25,7 +25,7 @@ jobs: version: 8 run_install: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' @@ -83,7 +83,7 @@ jobs: version: 7 run_install: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml index 6399f10255..34289c9797 100644 --- a/.github/workflows/test-production.yml +++ b/.github/workflows/test-production.yml @@ -28,7 +28,7 @@ jobs: version: 8 run_install: false - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.0 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fcf3b919f..803c2c86b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,22 +16,49 @@ ### General - Feat: アイコンデコレーション機能 + - サーバーで用意された画像をアイコンに重ねることができます + - 画像のテンプレートはこちらです: https://misskey-hub.net/avatar-decoration-template.png + - 最大でも黄色いエリア内にデコレーションを収めることを推奨します。 + - 画像は512x512pxを推奨します。 - Enhance: すでにフォローしたすべての人の返信をTLに追加できるように +- Enhance: ローカリゼーションの更新 +- Enhance: 依存関係の更新 ### Client - Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました - 外部サイトでの実装が必要です。詳細は Misskey Hub をご覧ください https://misskey-hub.net/docs/advanced/publish-on-your-website.html -- Feat: AiScript関数`Mk:nyaize()`が追加されました +- Enhance: スワイプしてタイムラインを再読込できるように + - PCの場合は右上のボタンからでも再読込できます +- Enhance: タイムラインの自動更新を無効にできるように +- Enhance: コードのシンタックスハイライトエンジンをShikiに変更 + - AiScriptのシンタックスハイライトに対応 + - MFMでAiScriptをハイライトする場合、コードブロックの開始部分を ` ```is ` もしくは ` ```aiscript ` としてください +- Enhance: データセーバー有効時はアニメーション付きのアバター画像が停止するように +- Enhance: プラグインを削除した際には、使用されていたアクセストークンも同時に削除されるようになりました +- Enhance: プラグインで`Plugin:register_note_view_interruptor`を用いてnoteの代わりにnullを返却することでノートを非表示にできるようになりました +- Enhance: AiScript関数`Mk:nyaize()`が追加されました - Fix: 投稿フォームでのユーザー変更がプレビューに反映されない問題を修正 +- Fix: ユーザーページの ノート > ファイル付き タブにリプライが表示されてしまう +- Fix: 「検索」MFMにおいて一部の検索キーワードが正しく認識されない問題を修正 +- Fix: 一部の言語でMisskey Webがクラッシュする問題を修正 +- Fix: チャンネルの作成・更新時に失敗した場合何も表示されない問題を修正 #11983 +- Fix: 個人カードのemojiがバッテリーになっている問題を修正 +- Fix: 標準テーマと同じIDを使用してインストールできてしまう問題を修正 ### Server - Enhance: RedisへのTLのキャッシュをオフにできるように +- Enhance: フォローしているチャンネルをフォロー解除した時（またはその逆）、タイムラインに反映される間隔を改善 +- Enhance: プロフィールの自己紹介欄のMFMが連合するようになりました + - 相手がMisskey v2023.11.0以降である必要があります - Fix: リストTLに自分のフォロワー限定投稿が含まれない問題を修正 - Fix: ローカルタイムラインに投稿者自身の投稿への返信が含まれない問題を修正 - Fix: 自分のフォローしているユーザーの自分のフォローしていないユーザーの visibility: followers な投稿への返信がストリーミングで流れてくる問題を修正 - Fix: RedisへのTLキャッシュが有効の場合にHTL/LTL/STLが空になることがある問題を修正 - Fix: STLでフォローしていないチャンネルが取得される問題を修正 +- Fix: `hashtags/trend`にてRedisからトレンドの情報が取得できない際にInternal Server Errorになる問題を修正 +- Fix: HTLをリロードまたは遡行したとき、フォローしているチャンネルのノートが含まれない問題を修正 #11765 #12181 +- Fix: リノートをリノートできるのを修正 ## 2023.10.2 diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index f8fb260481..ce98aedc3c 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -30,11 +30,11 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE ### Client - Feat: 본문 미리보기의 프로필을 표시하지 않도록 설정할 수 있음 -- Feat: 스와이프하여 타임라인을 다시 불러올 수 있음 (misskey-dev/misskey#12113) - - PC의 경우 오른쪽 상단의 버튼을 통해서도 다시 불러올 수 있습니다 -- Feat: 타임라인 자동 업데이트를 비활성화할 수 있음 (misskey-dev/misskey#12113) - Feat: 이모티콘 피커의 카테고리를 다중 계층 폴더로 분류할 수 있음 (misskey-dev/misskey#12132) -- Feat: AiScript 함수 `Mk:nyaize()`가 추가됨 (misskey-dev/misskey#12136) +- Enhance: 스와이프하여 타임라인을 다시 불러올 수 있음 (misskey-dev/misskey#12113) + - PC의 경우 오른쪽 상단의 버튼을 통해서도 다시 불러올 수 있습니다 +- Enhance: 타임라인 자동 업데이트를 비활성화할 수 있음 (misskey-dev/misskey#12113) +- Enhance: AiScript 함수 `Mk:nyaize()`가 추가됨 (misskey-dev/misskey#12136) - Enhance: 노트 작성 폼에서 노트를 게시한 뒤에 textarea의 높이를 원래대로 되돌림 - Enhance: 노트 상세 페이지의 답글 목록 개선 - Enhance: 유저 페이지 개선 diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index 9669ae33ac..d022aaae94 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -1013,6 +1013,7 @@ expired: "منتهية صلاحيته" icon: "الصورة الرمزية" replies: "رد" renotes: "أعد النشر" +flip: "اقلب" _initialAccountSetting: accountCreated: "نجح إنشاء حسابك!" letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي." diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 70d40a4e35..f15aa16a70 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -853,6 +853,7 @@ youFollowing: "অনুসরণ করা হচ্ছে" icon: "প্রোফাইল ছবি" replies: "জবাব" renotes: "রিনোট" +flip: "উল্টান" _role: priority: "অগ্রাধিকার" _priority: diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index 7bcf9418c9..3aa46cfa32 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -1096,6 +1096,7 @@ iHaveReadXCarefullyAndAgree: "Přečetl jsem si text \"{x}\" a souhlasím s ním icon: "Avatar" replies: "Odpovědět" renotes: "Přeposlat" +flip: "Otočit" _initialAccountSetting: accountCreated: "Váš účet byl úspěšně vytvořen!" letsStartAccountSetup: "Pro začátek si nastavte svůj profil." diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 77cf4bd59c..8c28916819 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1146,6 +1146,10 @@ mutualFollow: "Gegenseitig gefolgt" fileAttachedOnly: "Nur Notizen mit Dateien" showRepliesToOthersInTimeline: "Antworten in Chronik anzeigen" hideRepliesToOthersInTimeline: "Antworten nicht in Chronik anzeigen" +showRepliesToOthersInTimelineAll: "Antworten von allen momentan gefolgten Benutzern in Chronik anzeigen" +hideRepliesToOthersInTimelineAll: "Antworten von allen momentan gefolgten Benutzern nicht in Chronik anzeigen" +confirmShowRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern in der Chronik anzeigen?" +confirmHideRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern nicht in der Chronik anzeigen?" externalServices: "Externe Dienste" impressum: "Impressum" impressumUrl: "Impressums-URL" @@ -1153,6 +1157,12 @@ impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung, privacyPolicy: "Datenschutzerklärung" privacyPolicyUrl: "Datenschutzerklärungs-URL" tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung" +avatarDecorations: "Profilbilddekoration" +attach: "Anbringen" +detach: "Entfernen" +angle: "Winkel" +flip: "Umdrehen" +showAvatarDecorations: "Profilbilddekoration anzeigen" _announcement: forExistingUsers: "Nur für existierende Nutzer" forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt." @@ -1188,6 +1198,7 @@ _serverSettings: manifestJsonOverride: "Überschreiben von manifest.json" shortName: "Abkürzung" shortNameDescription: "Ein Kürzel für den Namen der Instanz, der angezeigt werden kann, falls der volle Instanzname lang ist." + fanoutTimelineDescription: "Ist diese Option aktiviert, kann eine erhebliche Verbesserung im Abrufen von Chroniken und eine Reduzierung der Datenbankbelastung erzielt werden, im Gegenzug zu einer Steigerung in der Speichernutzung von Redis. Bei geringem Serverspeicher oder Serverinstabilität kann diese Option deaktiviert werden." _accountMigration: moveFrom: "Von einem anderen Konto zu diesem migrieren" moveFromSub: "Alias für ein anderes Konto erstellen" @@ -2235,6 +2246,9 @@ _moderationLogTypes: createAd: "Werbung erstellt" deleteAd: "Werbung gelöscht" updateAd: "Werbung aktualisiert" + createAvatarDecoration: "Profilbilddekoration erstellt" + updateAvatarDecoration: "Profilbilddekoration aktualisiert" + deleteAvatarDecoration: "Profilbilddekoration gelöscht" _fileViewer: title: "Dateiinformationen" type: "Dateityp" @@ -2243,3 +2257,44 @@ _fileViewer: uploadedAt: "Hochgeladen am" attachedNotes: "Zugehörige Notizen" thisPageCanBeSeenFromTheAuthor: "Nur der Benutzer, der diese Datei hochgeladen hat, kann diese Seite sehen." +_externalResourceInstaller: + title: "Von externer Seite installieren" + checkVendorBeforeInstall: "Überprüfe vor Installation die Vertrauenswürdigkeit des Vertreibers." + _plugin: + title: "Möchtest du dieses Plugin installieren?" + metaTitle: "Plugininformation" + _theme: + title: "Möchten du dieses Farbschema installieren?" + metaTitle: "Farbschemainfo" + _meta: + base: "Farbschemavorlage" + _vendorInfo: + title: "Vertreiber" + endpoint: "Referenzierter Endpunkt" + hashVerify: "Hash-Verifikation" + _errors: + _invalidParams: + title: "Ungültige Parameter" + description: "Es fehlen Informationen zum Laden der externen Ressource. Überprüfe die übergebene URL." + _resourceTypeNotSupported: + title: "Diese Ressource wird nicht unterstützt" + description: "Dieser Ressourcentyp wird nicht unterstützt. Bitte kontaktiere den Seitenbesitzer." + _failedToFetch: + title: "Fehler beim Abrufen der Daten" + fetchErrorDescription: "Während der Kommunikation mit der externen Seite ist ein Fehler aufgetreten. Kontaktiere den Seitenbesitzer, falls ein erneutes Probieren dieses Problem nicht löst." + parseErrorDescription: "Während dem Auslesen der externen Daten ist ein Fehler aufgetreten. Kontaktiere den Seitenbesitzer." + _hashUnmatched: + title: "Datenverifizierung fehlgeschlagen" + description: "Die Integritätsprüfung der geladenen Daten ist fehlgeschlagen. Aus Sicherheitsgründen kann die Installation nicht fortgesetzt werden. Kontaktiere den Seitenbesitzer." + _pluginParseFailed: + title: "AiScript-Fehler" + description: "Die angeforderten Daten wurden erfolgreich abgerufen, jedoch trat während des AiScript-Parsings ein Fehler auf. Kontaktiere den Autor des Plugins. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden." + _pluginInstallFailed: + title: "Das Plugin konnte nicht installiert werden" + description: "Während der Installation des Plugin ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden." + _themeParseFailed: + title: "Parsing des Farbschemas fehlgeschlagen" + description: "Die angeforderten Daten wurden erfolgreich abgerufen, jedoch trat während des Farbschema-Parsings ein Fehler auf. Kontaktiere den Autor des Farbschemas. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden." + _themeInstallFailed: + title: "Das Farbschema konnte nicht installiert werden" + description: "Während der Installation des Farbschemas ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden." diff --git a/locales/en-US.yml b/locales/en-US.yml index bf789ddefb..fbeb8c19bd 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1220,6 +1220,10 @@ mutualFollow: "Mutual follow" fileAttachedOnly: "Only notes with files" showRepliesToOthersInTimeline: "Show replies to others in timeline" hideRepliesToOthersInTimeline: "Hide replies to others from timeline" +showRepliesToOthersInTimelineAll: "Show replies to others from everyone you follow in timeline" +hideRepliesToOthersInTimelineAll: "Hide replies to others from everyone you follow in timeline" +confirmShowRepliesAll: "This operation is irreversible. Would you really like to show replies to others from everyone you follow in your timeline?" +confirmHideRepliesAll: "This operation is irreversible. Would you really like to hide replies to others from everyone you follow in your timeline?" externalServices: "External Services" impressum: "Impressum" impressumUrl: "Impressum URL" @@ -1227,6 +1231,12 @@ impressumDescription: "In some countries, like germany, the inclusion of operato privacyPolicy: "Privacy Policy" privacyPolicyUrl: "Privacy Policy URL" tosAndPrivacyPolicy: "Terms of Service and Privacy Policy" +avatarDecorations: "Avatar decorations" +attach: "Attach" +detach: "Remove" +angle: "Angle" +flip: "Flip" +showAvatarDecorations: "Show avatar decorations" releaseToRefresh: "Release to refresh" refreshing: "Loading..." pullDownToRefresh: "Pull down to refresh" @@ -1361,6 +1371,7 @@ _serverSettings: manifestJsonOverride: "manifest.json Override" shortName: "Short name" shortNameDescription: "A shorthand for the instance's name that can be displayed if the full official name is long." + fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability." _accountMigration: moveFrom: "Migrate another account to this one" moveFromSub: "Create alias to another account" @@ -2435,6 +2446,9 @@ _moderationLogTypes: createAd: "Ad created" deleteAd: "Ad deleted" updateAd: "Ad updated" + createAvatarDecoration: "Avatar decoration created" + updateAvatarDecoration: "Avatar decoration updated" + deleteAvatarDecoration: "Avatar decoration deleted" _fileViewer: title: "File details" type: "File type" @@ -2443,6 +2457,47 @@ _fileViewer: uploadedAt: "Uploaded at" attachedNotes: "Attached notes" thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file." +_externalResourceInstaller: + title: "Install from external site" + checkVendorBeforeInstall: "Make sure the distributor of this resource is trustworthy before installation." + _plugin: + title: "Do you want to install this plugin?" + metaTitle: "Plugin information" + _theme: + title: "Do you want to install this theme?" + metaTitle: "Theme information" + _meta: + base: "Base color scheme" + _vendorInfo: + title: "Distributor information" + endpoint: "Referenced endpoint" + hashVerify: "Hash verification" + _errors: + _invalidParams: + title: "Invalid parameters" + description: "There is not enough information to load data from an external site. Please confirm the entered URL." + _resourceTypeNotSupported: + title: "This external resource is not supported" + description: "The type of this external resource is not supported. Please contact the site administrator." + _failedToFetch: + title: "Failed to fetch data" + fetchErrorDescription: "An error occurred communicating with the external site. If trying again does not fix this issue, please contact the site administrator." + parseErrorDescription: "An error occurred processing the data loaded from the external site. Please contact the site administrator." + _hashUnmatched: + title: "Data verification failed" + description: "An error occurred verifying the integrity of the fetched data. As a security measure, installation cannot continue. Please contact the site administrator." + _pluginParseFailed: + title: "AiScript Error" + description: "The requested data was fetched successfully, but an error occurred during AiScript parsing. Please contact the plugin author. Error details can be viewed in the Javascript console." + _pluginInstallFailed: + title: "Plugin installation failed" + description: "A problem occurred during plugin installation. Please try again. Error details can be viewed in the Javascript console." + _themeParseFailed: + title: "Theme parsing failed" + description: "The requested data was fetched successfully, but an error occurred during theme parsing. Please contact the theme author. Error details can be viewed in the Javascript console." + _themeInstallFailed: + title: "Failed to install theme" + description: "A problem occurred during theme installation. Please try again. Error details can be viewed in the Javascript console." _abuse: _resolver: 1hour: "one hour" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index a68c24aad7..4c904612a5 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1153,6 +1153,7 @@ impressumDescription: "En algunos países, como Alemania, la inclusión del oper privacyPolicy: "Política de Privacidad" privacyPolicyUrl: "URL de la Política de Privacidad" tosAndPrivacyPolicy: "Condiciones de Uso y Política de Privacidad" +flip: "Echar de un capirotazo" _announcement: forExistingUsers: "Solo para usuarios registrados" forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán." diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 7af2539402..706f7742e9 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -540,6 +540,7 @@ objectStorageSetPublicRead: "Régler sur « public » lors de l'envoi" serverLogs: "Journal du serveur" deleteAll: "Supprimer tout" showFixedPostForm: "Afficher le formulaire de publication en haut du fil d'actualité" +withRepliesByDefaultForNewlyFollowed: "Afficher les réponses des nouvelles personnes que vous suivez dans le fil par défaut" newNoteRecived: "Voir les nouvelles notes" sounds: "Sons" sound: "Sons" @@ -622,7 +623,7 @@ permission: "Autorisations " enableAll: "Tout activer" disableAll: "Tout désactiver" tokenRequested: "Autoriser l'accès au compte" -pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici." +pluginTokenRequestedDescription: "Cette extension pourra utiliser les autorisations définies ici." notificationType: "Type de notifications" edit: "Editer" emailServer: "Serveur de messagerie" @@ -986,6 +987,7 @@ manageCustomEmojis: "Gestion des émojis personnalisés" youCannotCreateAnymore: "Vous avez atteint la limite de création." cannotPerformTemporary: "Temporairement indisponible" invalidParamError: "Paramètres invalides" +permissionDeniedError: "Opération refusée" preset: "Préréglage" selectFromPresets: "Sélectionner à partir des préréglages" achievements: "Accomplissements" @@ -1037,7 +1039,11 @@ displayOfNote: "Affichage de la note" initialAccountSetting: "Réglage initial du profil" youFollowing: "Abonné·e" preventAiLearning: "Refuser l'usage dans l'apprentissage automatique d'IA générative" +preventAiLearningDescription: "Demander aux robots d'indexation de ne pas utiliser le contenu publié, tel que les notes et les images, dans l'apprentissage automatique d'IA générative. Cela est réalisé en incluant le drapeau « noai » dans la réponse HTML. Une prévention complète n'est toutefois pas possible, car il est au robot d'indexation de respecter cette demande." options: "Options" +specifyUser: "Spécifier l'utilisateur" +failedToPreviewUrl: "Aperçu d'URL échoué" +update: "Mettre à jour" later: "Plus tard" goToMisskey: "Retour vers CherryPick" expirationDate: "Date d’expiration" @@ -1061,6 +1067,25 @@ notifyNotes: "Notifier à propos des nouvelles notes" authentication: "Authentification" authenticationRequiredToContinue: "Veuillez vous authentifier pour continuer" showRenotes: "Afficher les renotes" +showRepliesToOthersInTimeline: "Afficher les réponses aux autres dans le fil" +hideRepliesToOthersInTimeline: "Masquer les réponses aux autres dans le fil" +showRepliesToOthersInTimelineAll: "Afficher les réponses de toutes les personnes que vous suivez dans le fil" +hideRepliesToOthersInTimelineAll: "Masquer les réponses de toutes les personnes que vous suivez dans le fil" +confirmShowRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment afficher les réponses de toutes les personnes que vous suivez dans le fil ?" +confirmHideRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment masquer les réponses de toutes les personnes que vous suivez dans le fil ?" +externalServices: "Services externes" +impressum: "Impressum" +impressumUrl: "URL de l'impressum" +impressumDescription: "Dans certains pays comme l'Allemagne, il est obligatoire d'afficher les informations sur l'opérateur d'un site (un impressum)." +privacyPolicy: "Politique de confidentialité" +privacyPolicyUrl: "URL de la politique de confidentialité" +tosAndPrivacyPolicy: "Conditions d'utilisation et politique de confidentialité" +avatarDecorations: "Décorations d'avatar" +attach: "Mettre" +detach: "Enlever" +angle: "Angle" +flip: "Inverser" +showAvatarDecorations: "Afficher les décorations d'avatar" _announcement: readConfirmTitle: "Marquer comme lu ?" _initialAccountSetting: @@ -1253,6 +1278,8 @@ _ad: back: "Retour" reduceFrequencyOfThisAd: "Voir cette publicité moins souvent" hide: "Cacher " + adsSettings: "Réglages des publicités" + notesPerOneAd: "Intervalle de diffusion de publicités lors de la mise à jour en temps réel (nombre de notes par publicité)" _forgotPassword: enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte. Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette adresse." ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice de votre instance." @@ -1268,9 +1295,9 @@ _email: _receiveFollowRequest: title: "Vous avez reçu une demande de suivi" _plugin: - install: "Installation de plugin" + install: "Installation d'extensions" installWarn: "N’installez que des extensions provenant de sources de confiance." - manage: "Gestion des plugins" + manage: "Gestion des extensions" viewSource: "Afficher la source" _preferencesBackups: list: "Sauvegardes créées" @@ -1825,5 +1852,85 @@ _webhookSettings: name: "Nom" active: "Activé" _moderationLogTypes: - suspend: "Suspendre" - resetPassword: "Réinitialiser le mot de passe" + createRole: "Rôle créé" + deleteRole: "Rôle supprimé" + updateRole: "Rôle mis à jour" + assignRole: "Rôle attribué" + unassignRole: "Rôle enlevé" + suspend: "Utilisateur suspendu" + unsuspend: "Suspension d'un utilisateur levée" + addCustomEmoji: "Émoji personnalisé ajouté" + updateCustomEmoji: "Émoji personnalisé mis à jour" + deleteCustomEmoji: "Émoji personnalisé supprimé" + updateServerSettings: "Réglages du serveur mis à jour" + updateUserNote: "Note de modération mise à jour" + deleteDriveFile: "Fichier supprimé" + deleteNote: "Note supprimée" + createGlobalAnnouncement: "Annonce globale créée" + createUserAnnouncement: "Annonce individuelle créée" + updateGlobalAnnouncement: "Annonce globale mise à jour" + updateUserAnnouncement: "Annonce individuelle mise à jour" + deleteGlobalAnnouncement: "Annonce globale supprimée" + deleteUserAnnouncement: "Annonce individuelle supprimée" + resetPassword: "Mot de passe réinitialisé" + suspendRemoteInstance: "Instance distante suspendue" + unsuspendRemoteInstance: "Suspension d'une instance distante levée" + markSensitiveDriveFile: "Fichier marqué comme sensible" + unmarkSensitiveDriveFile: "Marquage du fichier comme sensible enlevé" + resolveAbuseReport: "Signalement résolu" + createInvitation: "Code d'invitation créé" + createAd: "Publicité créée" + deleteAd: "Publicité supprimée" + updateAd: "Publicité mise à jour" + createAvatarDecoration: "Décoration d'avatar créée" + updateAvatarDecoration: "Décoration d'avatar mise à jour" + deleteAvatarDecoration: "Décoration d'avatar supprimée" +_fileViewer: + title: "Détails du fichier" + type: "Type du fichier" + size: "Taille du fichier" + url: "URL" + uploadedAt: "Date de téléversement" + attachedNotes: "Notes avec ce fichier" + thisPageCanBeSeenFromTheAuthor: "Cette page ne peut être vue que par l'utilisateur qui a téléversé ce fichier." +_externalResourceInstaller: + title: "Installer depuis un site externe" + checkVendorBeforeInstall: "Veuillez confirmer que le distributeur est fiable avant l'installation." + _plugin: + title: "Voulez-vous installer cette extension ?" + metaTitle: "Informations sur l'extension" + _theme: + title: "Voulez-vous installer ce thème ?" + metaTitle: "Informations sur le thème" + _meta: + base: "Palette de couleurs de base" + _vendorInfo: + title: "Informations sur le distributeur" + endpoint: "Point de terminaison référencé" + hashVerify: "Vérification de l'intégrité du fichier" + _errors: + _invalidParams: + title: "Paramètres invalides" + description: "Il y a un manque d'informations nécessaires pour obtenir des données à partir de sites externes. Veuillez vérifier l'URL." + _resourceTypeNotSupported: + title: "Cette ressource externe n'est pas prise en charge." + description: "Le type de ressource obtenue à partir de ce site externe n'est pas pris en charge. Veuillez contacter l'administrateur du site." + _failedToFetch: + title: "Échec de récupération des données" + fetchErrorDescription: "La communication avec le site externe a échoué. Si vous réessayez et que cela ne s'améliore pas, veuillez contacter l'administrateur du site." + parseErrorDescription: "Les données obtenues à partir du site externe n'ont pas pu être parsées. Veuillez contacter l'administrateur du site." + _hashUnmatched: + title: "Échec de vérification des données" + description: "La vérification de l'intégrité des données fournies a échoué. Pour des raisons de sécurité, l'installation ne peut pas continuer. Veuillez contacter l'administrateur du site." + _pluginParseFailed: + title: "Erreur d'AiScript" + description: "Bien que les données aient été obtenues, elles n'ont pas pu être lues, car il y a eu une erreur lors du parsage d'AiScript. Veuillez contacter l'auteur de l'extension. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript." + _pluginInstallFailed: + title: "Échec d'installation de l'extension" + description: "Il y a eu un problème lors de l'installation de l'extension. Veuillez réessayer. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript." + _themeParseFailed: + title: "Erreur de parsage du thème" + description: "Bien que les données aient été obtenues, elles n'ont pas pu être lues, car il y a eu une erreur lors du parsage du fichier du thème. Veuillez contacter l'auteur du thème. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript." + _themeInstallFailed: + title: "Échec d'installation du thème" + description: "Il y a eu un problème lors de l'installation du thème. Veuillez réessayer. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript." diff --git a/locales/id-ID.yml b/locales/id-ID.yml index 177a3e168b..e1fd5d8c6b 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -45,6 +45,7 @@ pin: "Sematkan ke profil" unpin: "Lepas sematan dari profil" copyContent: "Salin konten" copyLink: "Salin tautan" +copyLinkRenote: "Salin tautan renote" delete: "Hapus" deleteAndEdit: "Hapus dan sunting" deleteAndEditConfirm: "Apakah kamu yakin ingin menghapus note ini dan menyuntingnya? Kamu akan kehilangan semua reaksi, renote dan balasan di note ini." @@ -156,6 +157,7 @@ addEmoji: "Tambahkan emoji" settingGuide: "Pengaturan rekomendasi" cacheRemoteFiles: "Tembolokkan berkas dari instansi luar" cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas dari instansi luar akan dimuat langsung. Menonaktifkan ini akan mengurangi penggunaan penyimpanan peladen, namun dapat menyebabkan peningkatan lalu lintas bandwidth, karena keluku tidak dihasilkan." +youCanCleanRemoteFilesCache: "Kamu dapat mengosongkan tembolok dengan mengeklik tombol 🗑️ pada layar manajemen berkas." cacheRemoteSensitiveFiles: "Tembolokkan berkas dari instansi luar" cacheRemoteSensitiveFilesDescription: "Menonaktifkan pengaturan ini menyebabkan berkas sensitif dari instansi luar ditautkan secara langsung, bukan ditembolok." flagAsBot: "Atur akun ini sebagai Bot" @@ -193,6 +195,7 @@ perHour: "per Jam" perDay: "per Hari" stopActivityDelivery: "Berhenti mengirim aktivitas" blockThisInstance: "Blokir instansi ini" +silenceThisInstance: "Senyapkan instansi ini" operations: "Tindakan" software: "Perangkat lunak" version: "Versi" @@ -212,6 +215,8 @@ clearCachedFiles: "Hapus tembolok" clearCachedFilesConfirm: "Apakah kamu yakin ingin menghapus seluruh tembolok berkas instansi luar?" blockedInstances: "Instansi terblokir" blockedInstancesDescription: "Daftar nama host dari instansi yang diperlukan untuk diblokir. Instansi yang didaftarkan tidak akan dapat berkomunikasi dengan instansi ini." +silencedInstances: "Instansi yang disenyapkan" +silencedInstancesDescription: "Daftar nama host dari instansi yang ingin kamu senyapkan. Semua akun dari instansi yang terdaftar akan diperlakukan sebagai disenyapkan. Hal ini membuat akun hanya dapat membuat permintaan mengikuti, dan tidak dapat menyebutkan akun lokal apabila tidak mengikuti. Hal ini tidak akan mempengaruhi instansi yang diblokir." muteAndBlock: "Bisukan / Blokir" mutedUsers: "Pengguna yang dibisukan" blockedUsers: "Pengguna yang diblokir" @@ -409,10 +414,14 @@ aboutMisskey: "Tentang CherryPick" administrator: "Admin" token: "Token" 2fa: "Autentikasi 2-faktor" +setupOf2fa: "Atur autentikasi 2-faktor" totp: "Aplikasi autentikator" totpDescription: "Gunakan aplikasi autentikator untuk mendapatkan kata sandi sekali pakai" moderator: "Moderator" moderation: "Moderasi" +moderationNote: "Catatan moderasi" +addModerationNote: "Tambahkan catatan moderasi" +moderationLogs: "Log moderasi" nUsersMentioned: "{n} pengguna disebut" securityKeyAndPasskey: "Security key dan passkey" securityKey: "Kunci keamanan" @@ -440,7 +449,7 @@ groups: "Grup" createGroup: "Buat grup" ownedGroups: "Grup yang dimiliki" joinedGroups: "Grup yang diikuti" -invites: "Undang" +invites: "Undangan" groupName: "Nama grup" members: "Anggota" transfer: "Transfer" @@ -459,7 +468,7 @@ noMessagesYet: "Tidak ada pesan" newMessageExists: "Kamu mendapatkan pesan baru" onlyOneFileCanBeAttached: "Kamu hanya dapat melampirkan satu berkas ke dalam pesan" signinRequired: "Silahkan login" -invitations: "Undang" +invitations: "Undangan" invitationCode: "Kode undangan" checking: "Memeriksa" available: "Tersedia" @@ -518,7 +527,7 @@ showFeaturedNotesInTimeline: "Tampilkan catatan yang diunggulkan di lini masa" objectStorage: "Object Storage" useObjectStorage: "Gunakan object storage" objectStorageBaseUrl: "Base URL" -objectStorageBaseUrlDesc: "Prefix URL digunakan untuk mengkonstruksi URL ke object (media) referencing. Tentukan URL jika kamu menggunakan CDN atau Proxy, jika tidak tentukan alamat yang dapat diakses secara publik sesuai dengan panduan dari layanan yang akan kamu gunakan, contohnya. 'https://.s3.amazonaws.com' untuk AWS S3, dan 'https://storage.googleapis.com/' untuk GCS." +objectStorageBaseUrlDesc: "Prefix URL digunakan untuk mengonstruksi URL ke object (media) referencing. Tentukan URL jika kamu menggunakan CDN atau Proxy. Jika tidak, tentukan alamat yang dapat diakses secara publik sesuai dengan panduan dari layanan yang akan kamu gunakan. Contohnya: 'https://.s3.amazonaws.com' untuk AWS S3, dan 'https://storage.googleapis.com/' untuk GCS." objectStorageBucket: "Bucket" objectStorageBucketDesc: "Mohon tentukan nama bucket yang digunakan pada layanan yang telah dikonfigurasi." objectStoragePrefix: "Prefix" @@ -535,8 +544,9 @@ objectStorageSetPublicRead: "Setel \"public-read\" disaat mengunggah" s3ForcePathStyleDesc: "Jika s3ForcePathStyle dinyalakan, nama bucket harus dimasukkan dalam path URL dan bukan URL nama host tersebut. Kamu perlu menyalakan pengaturan ini jika menggunakan layanan seperti instansi Minio yang self-hosted." serverLogs: "Log Peladen" deleteAll: "Hapus semua" -showFixedPostForm: "Tampilkan form posting di atas lini masa." +showFixedPostForm: "Tampilkan form posting di atas lini masa" showFixedPostFormInChannel: "Tampilkan form posting di atas lini masa (Kanal)" +withRepliesByDefaultForNewlyFollowed: "Termasuk balasan dari pengguna baru yang diikuti pada lini masa secara bawaan" newNoteRecived: "Kamu mendapat catatan baru" sounds: "Bunyi" sound: "Bunyi" @@ -639,7 +649,7 @@ testEmail: "Tes pengiriman surel" wordMute: "Bisukan kata" regexpError: "Kesalahan ekspresi reguler" regexpErrorDescription: "Galat terjadi pada baris {line} ekspresi reguler dari {tab} kata yang dibisukan:" -instanceMute: "Bisuka instansi" +instanceMute: "Bisukan instansi" userSaysSomething: "{name} mengatakan sesuatu" makeActive: "Aktifkan" display: "Tampilkan" @@ -664,6 +674,7 @@ behavior: "Perilaku" sample: "Contoh" abuseReports: "Laporkan" reportAbuse: "Laporkan" +reportAbuseRenote: "Laporkan renote" reportAbuseOf: "Laporkan {name}" fillAbuseReportDescription: "Mohon isi rincian laporan. Jika laporan ini mengenai catatan yang spesifik, mohon lampirkan serta URL catatan tersebut." abuseReported: "Laporan kamu telah dikirimkan. Terima kasih." @@ -716,6 +727,7 @@ lockedAccountInfo: "Kecuali kamu menyetel visibilitas catatan milikmu ke \"Hanya alwaysMarkSensitive: "Tandai media dalam catatan sebagai media sensitif" loadRawImages: "Tampilkan lampiran gambar secara penuh daripada thumbnail" disableShowingAnimatedImages: "Jangan mainkan gambar bergerak" +highlightSensitiveMedia: "Sorot media sensitif" verificationEmailSent: "Surel verifikasi telah dikirimkan. Mohon akses tautan yang telah disertakan untuk menyelesaikan verifikasi." notSet: "Tidak disetel" emailVerified: "Surel telah diverifikasi" @@ -1032,6 +1044,7 @@ retryAllQueuesConfirmText: "Hal ini akan meningkatkan beban sementara ke peladen enableChartsForRemoteUser: "Buat bagan data pengguna instansi luar" enableChartsForFederatedInstances: "Buat bagan data peladen instansi luar" showClipButtonInNoteFooter: "Tambahkan \"Klip\" ke menu aksi catatan" +reactionsDisplaySize: "Ukuran tampilan reaksi" noteIdOrUrl: "ID catatan atau URL" video: "Video" videos: "Video" @@ -1112,9 +1125,44 @@ icon: "Avatar" forYou: "Untuk Anda" currentAnnouncements: "Pengumuman Saat Ini" pastAnnouncements: "Pengumuman Terdahulu" +youHaveUnreadAnnouncements: "Terdapat pengumuman yang belum dibaca" +useSecurityKey: "Mohon ikuti instruksi peramban atau perangkat kamu untuk menggunakan kunci pengaman atau passkey." replies: "Balas" renotes: "Renote" +loadReplies: "Tampilkan balasan" +loadConversation: "Tampilkan percakapan" +pinnedList: "Daftar yang dipin" +keepScreenOn: "Biarkan layar tetap menyala" +verifiedLink: "Tautan kepemilikan telah diverifikasi" +notifyNotes: "Beritahu mengenai catatan baru" +unnotifyNotes: "Berhenti memberitahu mengenai catatan baru" +authentication: "Autentikasi" +authenticationRequiredToContinue: "Mohon autentikasikan terlebih dahulu sebelum melanjutkan" dateAndTime: "Tanggal dan Waktu" +showRenotes: "Tampilkan renote" +edited: "Telah disunting" +notificationRecieveConfig: "Pengaturan notifikasi" +mutualFollow: "Saling mengikuti" +fileAttachedOnly: "Hanya catatan dengan berkas" +showRepliesToOthersInTimeline: "Tampilkan balasan ke pengguna lain dalam lini masa" +hideRepliesToOthersInTimeline: "Sembunyikan balasan ke orang lain dari lini masa" +externalServices: "Layanan eksternal" +impressum: "Impressum" +impressumUrl: "Tautan Impressum" +impressumDescription: "Pada beberapa negara seperti Jerman, inklusi dari informasi kontak operator (sebuah Impressum) diperlukan secara legal untuk situs web komersil." +privacyPolicy: "Kebijakan Privasi" +privacyPolicyUrl: "Tautan Kebijakan Privasi" +tosAndPrivacyPolicy: "Syarat dan Ketentuan serta Kebijakan Privasi" +flip: "Balik" +_announcement: + forExistingUsers: "Hanya pengguna yang telah ada" + forExistingUsersDescription: "Pengumuman ini akan dimunculkan ke pengguna yang sudah ada dari titik waktu publikasi jika dinyalakan. Apabila dimatikan, mereka yang baru mendaftar setelah publikasi ini akan juga melihatnya." + needConfirmationToRead: "Membutuhkan konfirmasi terpisah bahwa telah dibaca" + needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan. Pengumuman ini juga akan dikecualikan dari fungsi \"Tandai semua telah dibaca\"." + end: "Arsipkan pengumuman" + tooManyActiveAnnouncementDescription: "Terlalu banyak pengumuman dapat memperburuk pengalaman pengguna. Mohon pertimbangkan untuk mengarsipkan pengumuman yang sudah usang/tidak relevan." + readConfirmTitle: "Tandai telah dibaca?" + readConfirmText: "Aksi ini akan menandai konten dari \"{title}\" telah dibaca." _initialAccountSetting: accountCreated: "Akun kamu telah sukses dibuat!" letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu." @@ -1134,6 +1182,13 @@ _serverRules: description: "Daftar peraturan akan ditampilkan sebelum pendaftaran. Mengatur ringkasan dari Syarat dan Ketentuan sangat direkomendasikan." _serverSettings: iconUrl: "URL ikon" + appIconDescription: "Tentukan ikon yang digunakan ketika {host} ditampilkan sebagai aplikasi." + appIconUsageExample: "Contoh: Sebagai PWA, atau ketika ditampilkan sebagai markah layar beranda pada ponsel" + appIconStyleRecommendation: "Karena ikon berkemungkinan dipotong menjadi persegi atau lingkaran, ikon dengan margin terwanai di sekeliling konten sangat direkomendasikan." + appIconResolutionMustBe: "Minimum resolusi adalah {resolution}." + manifestJsonOverride: "Ambil alih manifest.json" + shortName: "Nama pendek" + shortNameDescription: "Inisial untuk nama instansi yang dapat ditampilkan apabila nama lengkap resmi terlalu panjang." _accountMigration: moveFrom: "Pindahkan akun lain ke akun ini" moveFromSub: "Buat alias ke akun lain" @@ -1388,6 +1443,9 @@ _achievements: title: "Brain Diver" description: "Posting tautan mengenai Brain Diver" flavor: "CherryPick-CherryPick La-Tu-Ma" + _smashTestNotificationButton: + title: "Tes overflow" + description: "Picu tes notifikasi secara berulang dalam waktu yang sangat pendek" _role: new: "Buat peran" edit: "Sunting peran" @@ -1445,6 +1503,7 @@ _role: descriptionOfRateLimitFactor: "Batas kecepatan yang rendah tidak begitu membatasi, batas kecepatan tinggi lebih membatasi. " canHideAds: "Dapat menyembunyikan iklan" canSearchNotes: "Penggunaan pencarian catatan" + canUseTranslator: "Penggunaan penerjemah" _condition: isLocal: "Pengguna lokal" isRemote: "Pengguna remote" @@ -1493,6 +1552,10 @@ _ad: reduceFrequencyOfThisAd: "Tampilkan iklan ini lebih sedikit" hide: "Jangan tampilkan" timezoneinfo: "Hari dalam satu minggu ditentukan dari zona waktu peladen." + adsSettings: "Pengaturan iklan" + notesPerOneAd: "Interval penempatan pemutakhiran iklan secara real-time (catatan per iklan)" + setZeroToDisable: "Atur nilai ini ke 0 untuk menonaktifkan pemutakhiran iklan secara real-time" + adsTooClose: "Interval iklan saat ini kemungkinan memperburuk pengalaman pengguna secara signifikan karena diatur pada nilai yang terlalu rendah." _forgotPassword: enterEmail: "Masukkan alamat surel yang kamu gunakan pada saat mendaftar. Sebuah tautan untuk mengatur ulang kata sandi kamu akan dikirimkan ke alamat surel tersebut." ifNoEmail: "Apabila kamu tidak menggunakan surel pada saat pendaftaran, mohon hubungi admin segera." @@ -1753,17 +1816,19 @@ _timelineTutorial: step4_1: "Kamu dapat menyisipkan \"Reaksi\" ke dalam catatan." step4_2: "Untuk menyisipkan reaksi, tekan tanda \"+\" dalam catatan dan pilih emoji yang kamu suka untuk mereaksi catatan tersebut." _2fa: - alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor." + alreadyRegistered: "Kamu telah mendaftarkan perangkat autentikasi 2-faktor." registerTOTP: "Daftarkan aplikasi autentikator" - step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu." + step1: "Pertama, pasang aplikasi autentikasi (seperti {a} atau {b}) di perangkat kamu." step2: "Lalu, pindai kode QR yang ada di layar." step2Click: "Mengeklik kode QR ini akan membolehkanmu untuk mendaftarkan 2FA ke security-key atau aplikasi autentikator ponsel." + step2Uri: "Masukkan URI berikut jika kamu menggunakan program desktop" step3Title: "Masukkan kode autentikasi" step3: "Masukkan token yang telah disediakan oleh aplikasimu untuk menyelesaikan pemasangan." - step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi otentikasi kamu." + setupCompleted: "Penyetelan autentikasi 2-faktor selesai" + step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi autentikasi kamu." securityKeyNotSupported: "Peramban kamu tidak mendukung security key." registerTOTPBeforeKey: "Mohon atur aplikasi autentikator untuk mendaftarkan security key atau passkey." - securityKeyInfo: "Kamu dapat memasang otentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau otentikasi PIN pada perangkatmu." + securityKeyInfo: "Kamu dapat memasang autentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau autentikasi PIN pada perangkatmu." registerSecurityKey: "Daftarkan security key atau passkey." securityKeyName: "Masukkan nama key." tapSecurityKey: "Mohon ikuti peramban kamu untuk mendaftarkan security key atau passkey" @@ -1774,7 +1839,11 @@ _2fa: renewTOTPConfirm: "Hal ini akan menyebabkan kode verifikasi dari aplikasi autentikator sebelumnya berhenti bekerja" renewTOTPOk: "Atur ulang" renewTOTPCancel: "Tidak sekarang." + checkBackupCodesBeforeCloseThisWizard: "Sebelum kamu menutup jendela ini, pastikan untuk memperhatikan dan mencadangkan kode cadangan berikut." backupCodes: "Kode Pencadangan" + backupCodesDescription: "Kamu dapat menggunakan kode ini untuk mendapatkan akses ke akun kamu apabila berada dalam situasi tidak dapat menggunakan aplikasi autentikasi 2-faktor yang kamu miliki. Setiap kode hanya dapat digunakan satu kali. Mohon simpan kode ini di tempat yang aman." + backupCodeUsedWarning: "Kode cadangan telah digunakan. Mohon mengatur ulang autentikasi 2-faktor secepatnya apabila kamu sudah tidak dapat menggunakannya lagi." + backupCodesExhaustedWarning: "Semua kode cadangan telah digunakan. Apabila kamu kehilangan akses pada aplikasi autentikasi 2-faktor milikmu, kamu tidak dapat mengakses akun ini lagi. Mohon atur ulang autentikasi 2-faktor kamu." _permissions: "read:account": "Lihat informasi akun" "write:account": "Sunting informasi akun" @@ -1808,6 +1877,10 @@ _permissions: "write:gallery": "Sunting galeri" "read:gallery-likes": "Lihat daftar postingan galeri yang disukai" "write:gallery-likes": "Sunting daftar postingan galeri yang disukai" + "read:flash": "Lihat Play" + "write:flash": "Sunting Play" + "read:flash-likes": "Lihat daftar Play yang disukai" + "write:flash-likes": "Sunting daftar Play yang disukai" _auth: shareAccessTitle: "Mendapatkan ijin akses aplikasi" shareAccess: "Apakah kamu ingin mengijinkan \"{name}\" untuk mengakses akun ini?" @@ -1824,6 +1897,7 @@ _antennaSources: users: "Catatan dari pengguna tertentu" userList: "Catatan dari daftar tertentu" userGroup: "Catatan dari pengguna dalam grup yang ditentukan" + userBlacklist: "Semua catatan kecuali untuk satu pengguna atau lebih yang telah ditentukan" _weekday: sunday: "Minggu" monday: "Senin" @@ -1923,6 +1997,7 @@ _profile: metadataContent: "Isi" changeAvatar: "Ubah avatar" changeBanner: "Ubah header" + verifiedLinkDescription: "Dengan memasukkan URL yang mengandung tautan ke profil kamu di sini, ikon verifikasi kepemilikan dapat ditampilkan di sebelah kolom ini." _exportOrImport: allNotes: "Semua catatan" favoritedNotes: "Catatan favorit" @@ -1932,6 +2007,7 @@ _exportOrImport: userLists: "Daftar" excludeMutingUsers: "Kecualikan pengguna yang dibisukan" excludeInactiveUsers: "Kecualikan pengguna tidak aktif" + withReplies: "Termasuk balasan dari pengguna yang diimpor ke dalam lini masa" _charts: federation: "Federasi" apRequest: "Permintaan" @@ -2045,11 +2121,17 @@ _notification: yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima" youWereInvitedToGroup: "Telah diundang ke grup" pollEnded: "Hasil Kuesioner telah keluar" + newNote: "Catatan baru" unreadAntennaNote: "Antena {name}" emptyPushNotificationMessage: "Pembaruan notifikasi dorong" achievementEarned: "Pencapaian didapatkan" + testNotification: "Tes notifikasi" + checkNotificationBehavior: "Cek tampilan notifikasi" + sendTestNotification: "Kirim tes notifikasi" + notificationWillBeDisplayedLikeThis: "Notifikasi akan terlihat seperti ini" _types: all: "Semua" + note: "Catatan baru" follow: "Ikuti" mention: "Sebut" reply: "Balasan" @@ -2084,6 +2166,8 @@ _deck: introduction2: "Klik \"+\" pada kanan layar untuk menambahkan kolom baru kapanpun yang kamu mau." widgetsIntroduction: "Mohon pilih \"Sunting gawit\" pada menu kolom dan tambahkan gawit." useSimpleUiForNonRootPages: "Gunakan antarmuka sederhana ke halaman yang dituju" + usedAsMinWidthWhenFlexible: "Lebar minimum akan digunakan untuk ini ketika opsi \"Atur-otomatis lebar\" dinyalakan" + flexible: "Atur-otomatis lebar" _columns: main: "Utama" widgets: "Widget" @@ -2119,6 +2203,41 @@ _webhookSettings: reaction: "Ketika menerima reaksi" mention: "Ketika sedang disebut" _moderationLogTypes: + createRole: "Peran telah dibuat" + deleteRole: "Peran telah dihapus" + updateRole: "Peran telah diperbaharui" + assignRole: "Yang ditugaskan dalam peran" + unassignRole: "Dihapus dari peran" suspend: "Tangguhkan" + unsuspend: "Batal ditangguhkan" + addCustomEmoji: "Emoji kustom ditambahkan" + updateCustomEmoji: "Emoji kustom diperbaharui" + deleteCustomEmoji: "Emoji kustom dihapus" + updateServerSettings: "Pengaturan peladen diperbaharui" + updateUserNote: "Catatan moderasi diperbaharui" + deleteDriveFile: "Berkas dihapus" + deleteNote: "Catatan dihapus" + createGlobalAnnouncement: "Pengumuman global dibuat" + createUserAnnouncement: "Pengumuman pengguna dibuat" + updateGlobalAnnouncement: "Pengumuman global diperbaharui" + updateUserAnnouncement: "Pengumuman pengguna diperbaharui" + deleteGlobalAnnouncement: "Pengumuman global telah dihapus" + deleteUserAnnouncement: "Pengumuman pengguna telah dihapus." resetPassword: "Atur ulang kata sandi" + suspendRemoteInstance: "Instansi luar telah ditangguhkan" + unsuspendRemoteInstance: "Instansi luar batal ditangguhkan" + markSensitiveDriveFile: "Berkas ditandai sensitif" + unmarkSensitiveDriveFile: "Berkas batal ditandai sensitif" + resolveAbuseReport: "Laporan terselesaikan" createInvitation: "Buat kode undangan" + createAd: "Iklan telah dibuat" + deleteAd: "Iklan telah dihapus" + updateAd: "Iklan telah diperbaharui" +_fileViewer: + title: "Rincian berkas" + type: "Jenis berkas" + size: "Ukuran berkas" + url: "URL" + uploadedAt: "Diunggah pada" + attachedNotes: "Catatan yang dilampirkan" + thisPageCanBeSeenFromTheAuthor: "Halaman ini hanya dapat dilihat oleh pengguna yang mengunggah bekas ini." diff --git a/locales/index.d.ts b/locales/index.d.ts index 3a8ec962bc..4b7d3805d9 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1063,6 +1063,7 @@ export interface Locale { "unassign": string; "color": string; "manageCustomEmojis": string; + "manageAvatarDecorations": string; "youCannotCreateAnymore": string; "cannotPerformTemporary": string; "cannotPerformTemporaryDescription": string; @@ -1769,6 +1770,7 @@ export interface Locale { "inviteLimitCycle": string; "inviteExpirationTime": string; "canManageCustomEmojis": string; + "canManageAvatarDecorations": string; "driveCapacity": string; "alwaysMarkNsfw": string; "pinMax": string; @@ -1910,6 +1912,7 @@ export interface Locale { "donate": string; "morePatrons": string; "patrons": string; + "projectMembers": string; "_kokonect": { "serverStatus": string; "donate": string; diff --git a/locales/it-IT.yml b/locales/it-IT.yml index cd22acaea5..235e8310d4 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -250,7 +250,7 @@ newPassword: "Nuova Password" newPasswordRetype: "Conferma password" attachFile: "Allega file" more: "Di più!" -featured: "Tendenze" +featured: "In evidenza" usernameOrUserId: "Nome utente o ID" noSuchUser: "Profilo non trovato" lookup: "Ricerca remota" @@ -1146,13 +1146,23 @@ mutualFollow: "Follow reciproco" fileAttachedOnly: "Solo con allegati" showRepliesToOthersInTimeline: "Risposte altrui nella TL" hideRepliesToOthersInTimeline: "Nascondi Riposte altrui nella TL" +showRepliesToOthersInTimelineAll: "Mostra le risposte dei tuoi follow nella TL" +hideRepliesToOthersInTimelineAll: "Nascondi le risposte dei tuoi follow nella TL" +confirmShowRepliesAll: "Questa è una attività irreversibile. Vuoi davvero includere tutte le risposte dei following in TL?" +confirmHideRepliesAll: "Questa è una attività irreversibile. Vuoi davvero escludere tutte le risposte dei following in TL?" externalServices: "Servizi esterni" impressum: "Dichiarazione di proprietà" impressumUrl: "URL della dichiarazione di proprietà" impressumDescription: "La dichiarazione di proprietà, è obbligatoria in alcuni paesi come la Germania (Impressum)." -privacyPolicy: "Informativa privacy ai sensi del Regolamento UE 2016/679 (GDPR)" +privacyPolicy: "Informativa ai sensi del Reg. UE 2016/679 (GDPR)" privacyPolicyUrl: "URL della informativa privacy" tosAndPrivacyPolicy: "Condizioni d'uso e informativa privacy" +avatarDecorations: "Decorazioni foto profilo" +attach: "Applica" +detach: "Rimuovi" +angle: "Angolo" +flip: "Inverti" +showAvatarDecorations: "Mostra decorazione della foto profilo" _announcement: forExistingUsers: "Solo ai profili attuali" forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio." @@ -1188,6 +1198,7 @@ _serverSettings: manifestJsonOverride: "Sostituire il file manifest.json" shortName: "Abbreviazione" shortNameDescription: "Un'abbreviazione o un nome comune che può essere visualizzato al posto del nome ufficiale lungo del server." + fanoutTimelineDescription: "Attivando questa funzionalità migliori notevolmente la capacità delle Timeline di collezionare Note, riducendo il carico sul database. Tuttavia, aumenterà l'impiego di memoria RAM per Redis. Disattiva se il tuo server ha poca RAM o la funzionalità è irregolare." _accountMigration: moveFrom: "Migra un altro profilo dentro a questo" moveFromSub: "Crea un alias verso un altro profilo remoto" @@ -1690,7 +1701,7 @@ _channel: edit: "Gerisci canale" setBanner: "Scegli intestazione" removeBanner: "Rimuovi intestazione" - featured: "Tendenze" + featured: "Di tendenza" owned: "I miei canali" following: "Seguiti" usersCount: "{n} partecipanti" @@ -1914,7 +1925,7 @@ _widgets: notifications: "Notifiche" timeline: "Timeline" calendar: "Calendario" - trends: "Tendenze" + trends: "Di tendenza" clock: "Orologio" rss: "Aggregatore rss" rssTicker: "Ticker RSS" @@ -2234,6 +2245,9 @@ _moderationLogTypes: createAd: "Banner creato" deleteAd: "Banner eliminato" updateAd: "Banner aggiornato" + createAvatarDecoration: "Creazione decorazione della foto profilo" + updateAvatarDecoration: "Aggiornamento decorazione foto profilo" + deleteAvatarDecoration: "Eliminazione decorazione della foto profilo" _fileViewer: title: "Dettagli del file" type: "Tipo di file" @@ -2242,3 +2256,44 @@ _fileViewer: uploadedAt: "Caricato il" attachedNotes: "Note a cui è allegato" thisPageCanBeSeenFromTheAuthor: "Questa pagina può essere vista solo da chi ha caricato il file." +_externalResourceInstaller: + title: "Installa da sito esterno" + checkVendorBeforeInstall: "Prima di installare, assicurati che la fonte sia affidabile." + _plugin: + title: "Vuoi davvero installare questo componente aggiuntivo?" + metaTitle: "Informazioni sul componente aggiuntivo" + _theme: + title: "Vuoi davvero installare questa variazione grafica?" + metaTitle: "Informazioni sulla variazione grafica" + _meta: + base: "Combinazione base di colori" + _vendorInfo: + title: "Informazioni sulla fonte" + endpoint: "Punto di riferimento della fonte" + hashVerify: "Codice di verifica della fonte" + _errors: + _invalidParams: + title: "Parametri non validi" + description: "Mancano alcuni parametri per il caricamento, per favore, verifica la URL." + _resourceTypeNotSupported: + title: "Questa risorsa esterna non è supportata" + description: "Il tipo di risorsa ottenuta da questo sito esterno non è supportato. Si prega di contattare la fonte di distribuizone." + _failedToFetch: + title: "Impossibile ottenere i dati" + fetchErrorDescription: "Si è verificato un errore di comunicazione con la fonte. Se riprovare di nuovo non aiuta, contattare la fonte di distribuzione." + parseErrorDescription: "Si è verificato un errore elaborando i dati ottenuti dalla fonte. Per favore contattare il distributore." + _hashUnmatched: + title: "Dati non verificabili, diversi da quelli della fonte" + description: "Si è verificato un errore durante la verifica di integrità dei dati ottenuti. Per sicurezza, l'installazione è stata interrotta. Contattare la fonte di distribuzione." + _pluginParseFailed: + title: "Errore AiScript" + description: "Sebbene i dati ottenuti siano validi, non è stato possibile interpretarli, perché si è verificato un errore durante l'analisi di AiScript. Si prega di contattare gli autori del componente aggiuntivo. Potresti controllare la console di Javascript per ottenere dettagli aggiuntivi." + _pluginInstallFailed: + title: "Impossibile installare il componente aggiuntivo" + description: "Si è verificato un impedimento durante l'installazione del componente aggiuntivo. Per favore riprova e consulta la console di Javascript per ottenere dettagli aggiuntivi." + _themeParseFailed: + title: "Impossibile interpretare la variazione grafica" + description: "Sebbene i dati siano stati ottenuti, non è stato possibile interpretarli, si è verificato un errore durante l'analisi della variazione grafica. Si prega di contattare gli autori. Potresti anche controllare la console di Javascript per ottenere dettagli aggiuntivi." + _themeInstallFailed: + title: "Impossibile installare la variazione grafica" + description: "Si è verificato un impedimento durante l'installazione della variazione grafica. Per favore riprova e consulta la console di Javascript per ottenere dettagli aggiuntivi." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 897e175d68..1bc06ee832 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1060,6 +1060,7 @@ assign: "アサイン" unassign: "アサインを解除" color: "色" manageCustomEmojis: "カスタム絵文字の管理" +manageAvatarDecorations: "アバターデコレーションの管理" youCannotCreateAnymore: "これ以上作成することはできません。" cannotPerformTemporary: "一時的に利用できません" cannotPerformTemporaryDescription: "操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。" @@ -1689,6 +1690,7 @@ _role: inviteLimitCycle: "招待コードの発行間隔" inviteExpirationTime: "招待コードの有効期限" canManageCustomEmojis: "カスタム絵文字の管理" + canManageAvatarDecorations: "アバターデコレーションの管理" driveCapacity: "ドライブ容量" alwaysMarkNsfw: "ファイルにNSFWを常に付与" pinMax: "ノートのピン留めの最大数" @@ -1819,13 +1821,14 @@ _registry: _aboutMisskey: about: "CherryPickは、Misskeyをベースに2021年から開発中のカスタマイズクライアントです。" - contributors: "主なコントリビューター" + contributors: "コントリビューター" allContributors: "全てのコントリビューター" source: "ソースコード" translation: "Misskeyを翻訳" donate: "Misskeyに寄付" morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰" patrons: "支援者" + projectMembers: "プロジェクトメンバー" _kokonect: serverStatus: "サーバ状態" donate: "ココネクトに寄付" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index ef61640e55..5ec2560eca 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -1146,6 +1146,7 @@ mutualFollow: "お互いフォローしてんで" fileAttachedOnly: "ファイル付きのみ" showRepliesToOthersInTimeline: "タイムラインに他の人への返信とかも含めんで" hideRepliesToOthersInTimeline: "タイムラインに他の人への返信とかは見ーへんで" +showRepliesToOthersInTimelineAll: "" externalServices: "他のサイトのサービス" impressum: "運営者の情報" impressumUrl: "運営者の情報URL" @@ -1153,6 +1154,8 @@ impressumDescription: "ドイツなどのほんま1部の国と地域ではな privacyPolicy: "プライバシーポリシー" privacyPolicyUrl: "プライバシーポリシーURL" tosAndPrivacyPolicy: "利用規約・プライバシーポリシー" +avatarDecorations: "アイコンデコレーション" +flip: "反転" _announcement: forExistingUsers: "もうおるユーザーのみ" forExistingUsersDescription: "有効にすると、このお知らせ作成時点でおるユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。" @@ -2234,6 +2237,9 @@ _moderationLogTypes: createAd: "広告を作んで" deleteAd: "広告ほかす" updateAd: "広告を更新" + createAvatarDecoration: "アイコンデコレーションを作成" + updateAvatarDecoration: "アイコンデコレーションを更新" + deleteAvatarDecoration: "アイコンデコレーションを削除" _fileViewer: title: "ファイルの詳しい情報" type: "ファイルの種類" @@ -2242,3 +2248,25 @@ _fileViewer: uploadedAt: "追加した日" attachedNotes: "ファイルがついてきてるノート" thisPageCanBeSeenFromTheAuthor: "このページはこのファイルをアップした人しか見れへんねん。" +_externalResourceInstaller: + title: "ほかのサイトからインストール" + checkVendorBeforeInstall: "配ってるとこが信頼できるか確認した上でインストールしてな。" + _plugin: + title: "このプラグイン、インストールする？" + metaTitle: "プラグイン情報" + _theme: + title: "このテーマインストールする？" + metaTitle: "テーマ情報" + _errors: + _pluginParseFailed: + title: "AiScriptエラー起こしてもうたねん" + description: "データは取得できたものの、AiScript解析時にエラーがあったから読み込めへんかってん。すまんが、プラグインを作った人に問い合わせてくれへん？ごめんな。エラーの詳細はJavaScriptコンソール読んでな。" + _pluginInstallFailed: + title: "プラグインのインストール失敗してもた" + description: "プラグインのインストール中に問題発生してもた、もう1度試してな。エラーの詳細はJavaScriptのコンソール見てや。" + _themeParseFailed: + title: "テーマ解析エラー" + description: "データは取得できたものの、テーマファイル解析時にエラーがあったから読み込めへんかってん。すまんが、テーマ作った人に問い合わせてくれへん？ごめんな。エラーの詳細はJavaScriptコンソール読んでな。" + _themeInstallFailed: + title: "テーマインストールに失敗してもた" + description: "テーマのインストール中に問題発生してもた、もう1度試してな。エラーの詳細はJavaScriptのコンソール見てや。" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 35f29ab28e..82ca615a9a 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1211,6 +1211,7 @@ showRenotes: "리노트 표시" edited: "수정됨" notificationRecieveConfig: "알림 설정" mutualFollow: "맞팔로우" +flip: "플립" fileAttachedOnly: "파일이 포함된 노트만" releaseToRefresh: "놓아서 새로 고침" refreshing: "새로 고침 중" diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index a4fcb60067..31aa449877 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -887,6 +887,7 @@ youFollowing: "Śledzeni" icon: "Awatar" replies: "Odpowiedz" renotes: "Udostępnij" +flip: "Odwróć" _role: priority: "Priorytet" _priority: diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml index 24987221db..53444ccdd3 100644 --- a/locales/pt-PT.yml +++ b/locales/pt-PT.yml @@ -1011,6 +1011,7 @@ icon: "Avatar" replies: "Responder" renotes: "Repostar" keepScreenOn: "Manter a tela do dispositivo sempre ligada" +flip: "Inversão" _initialAccountSetting: followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo." _serverSettings: diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 2cb0ad091d..eb8eff814d 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1081,6 +1081,7 @@ doYouAgree: "Согласны?" icon: "Аватар" replies: "Ответить" renotes: "Репост" +flip: "Переворот" _initialAccountSetting: accountCreated: "Аккаунт успешно создан!" letsStartAccountSetup: "Давайте настроим вашу учётную запись." diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 1b5c04cab8..6a9ff5ad8e 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -935,6 +935,7 @@ youFollowing: "Sledované" icon: "Avatar" replies: "Odpovedať" renotes: "Preposlať" +flip: "Preklopiť" _role: priority: "Priorita" _priority: diff --git a/locales/th-TH.yml b/locales/th-TH.yml index aac08bbf5d..da761a1b42 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -1146,6 +1146,7 @@ impressumUrl: "URL อิมเพรสชั่น" privacyPolicy: "นโยบายความเป็นส่วนตัว" privacyPolicyUrl: "URL นโยบายความเป็นส่วนตัว" tosAndPrivacyPolicy: "เงื่อนไขในการให้บริการและนโยบายความเป็นส่วนตัว" +flip: "ย้อนกลับ" _announcement: forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น" forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน" diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index 47c45f4213..758ae934ca 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -921,6 +921,7 @@ youFollowing: "Підписки" icon: "Аватар" replies: "Відповісти" renotes: "Поширити" +flip: "Перевернути" _achievements: earnedAt: "Відкрито" _types: diff --git a/locales/uz-UZ.yml b/locales/uz-UZ.yml index eb04e2afaf..81be4f9b52 100644 --- a/locales/uz-UZ.yml +++ b/locales/uz-UZ.yml @@ -845,6 +845,7 @@ sensitiveWords: "Ta'sirchan so'zlar" icon: "Avatar" replies: "Javob berish" renotes: "Qayta qayd etish" +flip: "Teskari" _achievements: _types: _viewInstanceChart: diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 6c7690a56a..12d0700a7b 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1061,6 +1061,7 @@ loadReplies: "Hiển thị các trả lời" pinnedList: "Các mục đã được ghim" keepScreenOn: "Giữ màn hình luôn bật" verifiedLink: "Chúng tôi đã xác nhận bạn là chủ sở hữu của đường dẫn này" +flip: "Lật" _announcement: forExistingUsers: "Chỉ những người dùng đã tồn tại" forExistingUsersDescription: "Nếu được bật, thông báo này sẽ chỉ hiển thị với những người dùng đã tồn tại vào lúc thông báo được tạo. Nếu tắt đi, những tài khoản mới đăng ký sau khi thông báo được đăng lên cũng sẽ thấy nó." diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index a79d694397..1c02f7d266 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1145,6 +1145,7 @@ mutualFollow: "互相关注" fileAttachedOnly: "仅限媒体" showRepliesToOthersInTimeline: "在时间线上显示给其他人的回复" hideRepliesToOthersInTimeline: "在时间线上隐藏给其他人的回复" +flip: "翻转" _announcement: forExistingUsers: "仅限现有用户" forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index e77d3358a3..f47042cfdb 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1146,6 +1146,10 @@ mutualFollow: "互相追隨" fileAttachedOnly: "顯示包含附件的貼文" showRepliesToOthersInTimeline: "顯示給其他人的回覆" hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆" +showRepliesToOthersInTimelineAll: "在時間軸包含追隨中所有人的回覆" +hideRepliesToOthersInTimelineAll: "在時間軸不包含追隨中所有人的回覆" +confirmShowRepliesAll: "進行此操作後無法復原。您真的希望時間軸「包含」您目前追隨的所有人的回覆嗎？" +confirmHideRepliesAll: "進行此操作後無法復原。您真的希望時間軸「不包含」您目前追隨的所有人的回覆嗎？" externalServices: "外部服務" impressum: "營運者資訊" impressumUrl: "營運者資訊網址" @@ -1153,6 +1157,12 @@ impressumDescription: "在德國與部份地區必須要明確顯示營運者資 privacyPolicy: "隱私政策" privacyPolicyUrl: "隱私政策網址" tosAndPrivacyPolicy: "服務條款和隱私政策" +avatarDecorations: "頭像裝飾" +attach: "裝上" +detach: "取下" +angle: "角度" +flip: "翻轉" +showAvatarDecorations: "顯示頭像裝飾" _announcement: forExistingUsers: "僅限既有的使用者" forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。" @@ -1188,6 +1198,7 @@ _serverSettings: manifestJsonOverride: "覆寫 manifest.json" shortName: "簡稱" shortNameDescription: "如果伺服器的正式名稱很長，可用簡稱或通稱代替。" + fanoutTimelineDescription: "如果啟用的話，檢索各個時間軸的性能會顯著提昇，資料庫的負荷也會減少。不過，Redis 的記憶體使用量會增加。如果伺服器的記憶體容量比較少或者運行不穩定，可以停用。" _accountMigration: moveFrom: "從其他帳戶遷移到這個帳戶" moveFromSub: "為另一個帳戶建立別名" @@ -2235,6 +2246,9 @@ _moderationLogTypes: createAd: "建立廣告" deleteAd: "刪除廣告" updateAd: "更新廣告" + createAvatarDecoration: "建立頭像裝飾" + updateAvatarDecoration: "更新頭像裝飾" + deleteAvatarDecoration: "刪除頭像裝飾" _fileViewer: title: "檔案詳細資訊" type: "檔案類型 " @@ -2243,3 +2257,44 @@ _fileViewer: uploadedAt: "加入日期" attachedNotes: "含有附件的貼文" thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。" +_externalResourceInstaller: + title: "從外部網站安裝" + checkVendorBeforeInstall: "安裝前請確認提供者是可信賴的。" + _plugin: + title: "要安裝此外掛嘛？" + metaTitle: "外掛資訊" + _theme: + title: "要安裝此外觀主題嘛？" + metaTitle: "外觀主題資訊" + _meta: + base: "基本配色方案" + _vendorInfo: + title: "提供者資訊" + endpoint: "引用端點" + hashVerify: "確認檔案的完整性" + _errors: + _invalidParams: + title: "缺少參數" + description: "缺少從外部網站取得資料的必要資訊。請檢查 URL 是否正確。" + _resourceTypeNotSupported: + title: "不支援此外部資源。" + description: "不支援從此外部網站取得的資源類型。請聯絡網站管理員。" + _failedToFetch: + title: "無法取得資料" + fetchErrorDescription: "與外部站點的通訊失敗。如果重試後問題仍然存在，請聯絡網站管理員。" + parseErrorDescription: "無法讀取從外部站點取得的資料。請聯絡網站管理員。" + _hashUnmatched: + title: "無法取得正確資料" + description: "所提供資料的完整性驗證失敗。出於安全原因，安裝無法繼續。請聯絡網站管理員。" + _pluginParseFailed: + title: "AiScript 錯誤" + description: "已取得資料但解析 AiScript 時發生錯誤，導致無法載入。請聯絡外掛作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。" + _pluginInstallFailed: + title: "外掛安裝失敗" + description: "安裝插件時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。" + _themeParseFailed: + title: "外觀主題解析錯誤" + description: "已取得資料但解析外觀主題時發生錯誤，導致無法載入。請聯絡主題作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。" + _themeInstallFailed: + title: "無法安裝外觀主題" + description: "安裝外觀主題時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。" diff --git a/package.json b/package.json index ed1b3b8047..1ffbec73bf 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "cherrypick", "version": "4.5.0-beta.2", - "basedMisskeyVersion": "2023.11.0-beta.3", + "basedMisskeyVersion": "2023.11.0-beta.6", "codename": "nasubi", "repository": { "type": "git", "url": "https://github.com/kokonect-link/cherrypick.git" }, - "packageManager": "pnpm@8.9.2", + "packageManager": "pnpm@8.10.0", "workspaces": [ "packages/frontend", "packages/backend", @@ -56,10 +56,10 @@ "typescript": "5.2.2" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "6.8.0", - "@typescript-eslint/parser": "6.8.0", + "@typescript-eslint/eslint-plugin": "6.9.0", + "@typescript-eslint/parser": "6.9.0", "cross-env": "7.0.3", - "cypress": "13.3.2", + "cypress": "13.3.3", "eslint": "8.52.0", "start-server-and-test": "2.0.1" }, diff --git a/packages/backend/package.json b/packages/backend/package.json index 482f499d71..ebbd4c3e1d 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -79,10 +79,10 @@ "@nestjs/core": "10.2.7", "@nestjs/testing": "10.2.7", "@peertube/http-signature": "1.7.0", - "@simplewebauthn/server": "8.3.2", + "@simplewebauthn/server": "8.3.4", "@sinonjs/fake-timers": "11.2.2", "@swc/cli": "0.1.62", - "@swc/core": "1.3.94", + "@swc/core": "1.3.95", "@vitalets/google-translate-api": "9.2.0", "accepts": "1.3.8", "ajv": "8.12.0", @@ -91,7 +91,7 @@ "bcryptjs": "2.4.3", "blurhash": "2.0.5", "body-parser": "1.20.2", - "bullmq": "4.12.5", + "bullmq": "4.12.6", "cacheable-lookup": "7.0.0", "cbor": "9.0.1", "chalk": "5.3.0", @@ -147,7 +147,7 @@ "qrcode": "1.5.3", "random-seed": "0.3.0", "ratelimiter": "3.4.1", - "re2": "1.20.4", + "re2": "1.20.5", "redis-lock": "0.1.4", "reflect-metadata": "0.1.13", "rename": "1.0.4", @@ -161,7 +161,7 @@ "stringz": "2.1.0", "strip-ansi": "^7.1.0", "summaly": "github:misskey-dev/summaly", - "systeminformation": "5.21.13", + "systeminformation": "5.21.15", "tinycolor2": "1.6.0", "tmp": "0.2.1", "tsc-alias": "1.8.8", @@ -177,7 +177,7 @@ }, "devDependencies": { "@jest/globals": "29.7.0", - "@simplewebauthn/typescript-types": "8.0.0", + "@simplewebauthn/typescript-types": "8.3.4", "@swc/jest": "0.2.29", "@types/accepts": "1.3.6", "@types/archiver": "5.3.4", @@ -195,7 +195,7 @@ "@types/jsrsasign": "10.5.11", "@types/mime-types": "2.1.3", "@types/ms": "0.7.33", - "@types/node": "20.8.7", + "@types/node": "20.8.9", "@types/node-fetch": "3.0.3", "@types/nodemailer": "6.4.13", "@types/oauth": "0.9.3", @@ -218,12 +218,12 @@ "@types/vary": "1.1.2", "@types/web-push": "3.6.2", "@types/ws": "8.5.8", - "@typescript-eslint/eslint-plugin": "6.8.0", - "@typescript-eslint/parser": "6.8.0", + "@typescript-eslint/eslint-plugin": "6.9.0", + "@typescript-eslint/parser": "6.9.0", "aws-sdk-client-mock": "3.0.0", "cross-env": "7.0.3", "eslint": "8.52.0", - "eslint-plugin-import": "2.28.1", + "eslint-plugin-import": "2.29.0", "execa": "8.0.1", "jest": "29.7.0", "jest-mock": "29.7.0", diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts index f30f636530..82fa1ddcc2 100644 --- a/packages/backend/src/core/CacheService.ts +++ b/packages/backend/src/core/CacheService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js'; +import type { BlockingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js'; import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js'; import type { MiLocalUser, MiUser } from '@/models/User.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,6 @@ export class CacheService implements OnApplicationShutdown { public userBlockedCache: RedisKVCache>; // NOTE: 「被」Blockキャッシュ public renoteMutingsCache: RedisKVCache>; public userFollowingsCache: RedisKVCache | undefined>>; - public userFollowingChannelsCache: RedisKVCache>; constructor( @Inject(DI.redis) @@ -55,9 +54,6 @@ export class CacheService implements OnApplicationShutdown { @Inject(DI.followingsRepository) private followingsRepository: FollowingsRepository, - @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: ChannelFollowingsRepository, - private userEntityService: UserEntityService, ) { //this.onMessage = this.onMessage.bind(this); @@ -152,13 +148,7 @@ export class CacheService implements OnApplicationShutdown { fromRedisConverter: (value) => JSON.parse(value), }); - this.userFollowingChannelsCache = new RedisKVCache>(this.redisClient, 'userFollowingChannels', { - lifetime: 1000 * 60 * 30, // 30m - memoryCacheLifetime: 1000 * 60, // 1m - fetcher: (key) => this.channelFollowingsRepository.find({ where: { followerId: key }, select: ['followeeId'] }).then(xs => new Set(xs.map(x => x.followeeId))), - toRedisConverter: (value) => JSON.stringify(Array.from(value)), - fromRedisConverter: (value) => new Set(JSON.parse(value)), - }); + // NOTE: チャンネルのフォロー状況キャッシュはChannelFollowingServiceで行っている this.flashAccessTokensCache = new RedisKVCache(this.redisClient, 'flashAccessTokens', { lifetime: 1000 * 60 * 30, // 30m @@ -230,7 +220,6 @@ export class CacheService implements OnApplicationShutdown { this.userBlockedCache.dispose(); this.renoteMutingsCache.dispose(); this.userFollowingsCache.dispose(); - this.userFollowingChannelsCache.dispose(); } @bindThis diff --git a/packages/backend/src/core/ChannelFollowingService.ts b/packages/backend/src/core/ChannelFollowingService.ts new file mode 100644 index 0000000000..75843b9773 --- /dev/null +++ b/packages/backend/src/core/ChannelFollowingService.ts @@ -0,0 +1,104 @@ +import { Inject, Injectable, OnModuleInit } from '@nestjs/common'; +import Redis from 'ioredis'; +import { DI } from '@/di-symbols.js'; +import type { ChannelFollowingsRepository } from '@/models/_.js'; +import { MiChannel } from '@/models/_.js'; +import { IdService } from '@/core/IdService.js'; +import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js'; +import { bindThis } from '@/decorators.js'; +import type { MiLocalUser } from '@/models/User.js'; +import { RedisKVCache } from '@/misc/cache.js'; + +@Injectable() +export class ChannelFollowingService implements OnModuleInit { + public userFollowingChannelsCache: RedisKVCache>; + + constructor( + @Inject(DI.redis) + private redisClient: Redis.Redis, + @Inject(DI.redisForSub) + private redisForSub: Redis.Redis, + @Inject(DI.channelFollowingsRepository) + private channelFollowingsRepository: ChannelFollowingsRepository, + private idService: IdService, + private globalEventService: GlobalEventService, + ) { + this.userFollowingChannelsCache = new RedisKVCache>(this.redisClient, 'userFollowingChannels', { + lifetime: 1000 * 60 * 30, // 30m + memoryCacheLifetime: 1000 * 60, // 1m + fetcher: (key) => this.channelFollowingsRepository.find({ + where: { followerId: key }, + select: ['followeeId'], + }).then(xs => new Set(xs.map(x => x.followeeId))), + toRedisConverter: (value) => JSON.stringify(Array.from(value)), + fromRedisConverter: (value) => new Set(JSON.parse(value)), + }); + + this.redisForSub.on('message', this.onMessage); + } + + onModuleInit() { + } + + @bindThis + public async follow( + requestUser: MiLocalUser, + targetChannel: MiChannel, + ): Promise { + await this.channelFollowingsRepository.insert({ + id: this.idService.gen(), + followerId: requestUser.id, + followeeId: targetChannel.id, + }); + + this.globalEventService.publishInternalEvent('followChannel', { + userId: requestUser.id, + channelId: targetChannel.id, + }); + } + + @bindThis + public async unfollow( + requestUser: MiLocalUser, + targetChannel: MiChannel, + ): Promise { + await this.channelFollowingsRepository.delete({ + followerId: requestUser.id, + followeeId: targetChannel.id, + }); + + this.globalEventService.publishInternalEvent('unfollowChannel', { + userId: requestUser.id, + channelId: targetChannel.id, + }); + } + + @bindThis + private async onMessage(_: string, data: string): Promise { + const obj = JSON.parse(data); + + if (obj.channel === 'internal') { + const { type, body } = obj.message as GlobalEvents['internal']['payload']; + switch (type) { + case 'followChannel': { + this.userFollowingChannelsCache.refresh(body.userId); + break; + } + case 'unfollowChannel': { + this.userFollowingChannelsCache.delete(body.userId); + break; + } + } + } + } + + @bindThis + public dispose(): void { + this.userFollowingChannelsCache.dispose(); + } + + @bindThis + public onApplicationShutdown(signal?: string | undefined): void { + this.dispose(); + } +} diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts index d6688f55b1..5210e12fc4 100644 --- a/packages/backend/src/core/CoreModule.ts +++ b/packages/backend/src/core/CoreModule.ts @@ -65,6 +65,7 @@ import { SearchService } from './SearchService.js'; import { ClipService } from './ClipService.js'; import { FeaturedService } from './FeaturedService.js'; import { FunoutTimelineService } from './FunoutTimelineService.js'; +import { ChannelFollowingService } from './ChannelFollowingService.js'; import { ChartLoggerService } from './chart/ChartLoggerService.js'; import FederationChart from './chart/charts/federation.js'; import NotesChart from './chart/charts/notes.js'; @@ -201,6 +202,7 @@ const $SearchService: Provider = { provide: 'SearchService', useExisting: Search const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService }; const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService }; const $FunoutTimelineService: Provider = { provide: 'FunoutTimelineService', useExisting: FunoutTimelineService }; +const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService }; const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService }; const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart }; @@ -341,6 +343,7 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv ClipService, FeaturedService, FunoutTimelineService, + ChannelFollowingService, ChartLoggerService, FederationChart, NotesChart, @@ -474,6 +477,7 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv $ClipService, $FeaturedService, $FunoutTimelineService, + $ChannelFollowingService, $ChartLoggerService, $FederationChart, $NotesChart, @@ -608,6 +612,7 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv ClipService, FeaturedService, FunoutTimelineService, + ChannelFollowingService, FederationChart, NotesChart, UsersChart, @@ -740,6 +745,7 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv $ClipService, $FeaturedService, $FunoutTimelineService, + $ChannelFollowingService, $FederationChart, $NotesChart, $UsersChart, diff --git a/packages/backend/src/core/FeaturedService.ts b/packages/backend/src/core/FeaturedService.ts index 5b9a412ddd..51715212bf 100644 --- a/packages/backend/src/core/FeaturedService.ts +++ b/packages/backend/src/core/FeaturedService.ts @@ -52,7 +52,7 @@ export class FeaturedService { `${name}:${currentWindow}`, 0, threshold, 'REV', 'WITHSCORES'); redisPipeline.zrange( `${name}:${previousWindow}`, 0, threshold, 'REV', 'WITHSCORES'); - const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => r[1] as string[]) : [[], []]); + const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => (r[1] ?? []) as string[]) : [[], []]); const ranking = new Map(); for (let i = 0; i < currentRankingResult.length; i += 2) { diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts index abe8e9ad00..04250894e2 100644 --- a/packages/backend/src/core/NoteDeleteService.ts +++ b/packages/backend/src/core/NoteDeleteService.ts @@ -24,6 +24,7 @@ import { bindThis } from '@/decorators.js'; import { MetaService } from '@/core/MetaService.js'; import { SearchService } from '@/core/SearchService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; +import { isPureRenote } from '@/misc/is-pure-renote.js'; @Injectable() export class NoteDeleteService { @@ -77,8 +78,8 @@ export class NoteDeleteService { if (this.userEntityService.isLocalUser(user) && !note.localOnly) { let renote: MiNote | null = null; - // if deletd note is renote - if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) { + // if deleted note is renote + if (isPureRenote(note)) { renote = await this.notesRepository.findOneBy({ id: note.renoteId, }); diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index 24486c1790..289e04aa05 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -34,6 +34,7 @@ export type RolePolicies = { inviteLimitCycle: number; inviteExpirationTime: number; canManageCustomEmojis: boolean; + canManageAvatarDecorations: boolean; canSearchNotes: boolean; canUseTranslator: boolean; canHideAds: boolean; @@ -61,6 +62,7 @@ export const DEFAULT_POLICIES: RolePolicies = { inviteLimitCycle: 60 * 24 * 7, inviteExpirationTime: 0, canManageCustomEmojis: false, + canManageAvatarDecorations: false, canSearchNotes: false, canUseTranslator: true, canHideAds: false, @@ -312,6 +314,7 @@ export class RoleService implements OnApplicationShutdown { inviteLimitCycle: calc('inviteLimitCycle', vs => Math.max(...vs)), inviteExpirationTime: calc('inviteExpirationTime', vs => Math.max(...vs)), canManageCustomEmojis: calc('canManageCustomEmojis', vs => vs.some(v => v === true)), + canManageAvatarDecorations: calc('canManageAvatarDecorations', vs => vs.some(v => v === true)), canSearchNotes: calc('canSearchNotes', vs => vs.some(v => v === true)), canUseTranslator: calc('canUseTranslator', vs => vs.some(v => v === true)), canHideAds: calc('canHideAds', vs => vs.some(v => v === true)), diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 05013e94fa..f9e5f7dda5 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -519,6 +519,7 @@ export class ApRendererService { preferredUsername: user.username, name: user.name, summary: profile.description ? this.mfmService.toHtml(mfm.parse(profile.description)) : null, + _misskey_summary: profile.description, icon: avatar ? this.renderImage(avatar) : null, image: banner ? this.renderImage(banner) : null, tag, @@ -677,6 +678,7 @@ export class ApRendererService { '_misskey_quote': 'misskey:_misskey_quote', '_misskey_reaction': 'misskey:_misskey_reaction', '_misskey_votes': 'misskey:_misskey_votes', + '_misskey_summary': 'misskey:_misskey_summary', '_misskey_talk': 'misskey:_misskey_talk', 'isCat': 'misskey:isCat', // vcard diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index 07a66ed19d..6651cb5a3d 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -403,9 +403,17 @@ export class ApPersonService implements OnModuleInit { emojis, })) as MiRemoteUser; + let _description: string | null = null; + + if (person._misskey_summary) { + _description = truncate(person._misskey_summary, summaryLength); + } else if (person.summary) { + _description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag); + } + await transactionalEntityManager.save(new MiUserProfile({ userId: user.id, - description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null, + description: _description, url, fields, birthday: bday?.[0] ?? null, @@ -640,10 +648,18 @@ export class ApPersonService implements OnModuleInit { }); } + let _description: string | null = null; + + if (person._misskey_summary) { + _description = truncate(person._misskey_summary, summaryLength); + } else if (person.summary) { + _description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag); + } + await this.userProfilesRepository.update({ userId: exist.id }, { url, fields, - description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null, + description: _description, birthday: bday?.[0] ?? null, location: person['vcard:Address'] ?? null, }); diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts index b7e8f4b398..fe8c2aa36a 100644 --- a/packages/backend/src/core/activitypub/type.ts +++ b/packages/backend/src/core/activitypub/type.ts @@ -12,6 +12,7 @@ export interface IObject { id?: string; name?: string | null; summary?: string; + _misskey_summary?: string; published?: string; updated?: string; cc?: ApObject; diff --git a/packages/backend/src/misc/is-pure-renote.ts b/packages/backend/src/misc/is-pure-renote.ts new file mode 100644 index 0000000000..994d981522 --- /dev/null +++ b/packages/backend/src/misc/is-pure-renote.ts @@ -0,0 +1,10 @@ +import type { MiNote } from '@/models/Note.js'; + +export function isPureRenote(note: MiNote): note is MiNote & { renoteId: NonNullable } { + if (!note.renoteId) return false; + + if (note.text) return false; // it's quoted with text + if (note.fileIds.length !== 0) return false; // it's quoted with files + if (note.hasPoll) return false; // it's quoted with poll + return true; +} diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts index 5c91d3ab85..cfc8576435 100644 --- a/packages/backend/src/server/ActivityPubServerService.ts +++ b/packages/backend/src/server/ActivityPubServerService.ts @@ -26,6 +26,7 @@ import { UtilityService } from '@/core/UtilityService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; import { IActivity } from '@/core/activitypub/type.js'; +import { isPureRenote } from '@/misc/is-pure-renote.js'; import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify'; import type { FindOptionsWhere } from 'typeorm'; @@ -88,7 +89,7 @@ export class ActivityPubServerService { */ @bindThis private async packActivity(note: MiNote): Promise { - if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) { + if (isPureRenote(note)) { const renote = await this.notesRepository.findOneByOrFail({ id: note.renoteId }); return this.apRendererService.renderAnnounce(renote.uri ? renote.uri : `${this.config.url}/notes/${renote.id}`, note); } diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts index 4009df0d66..bec3928493 100644 --- a/packages/backend/src/server/api/StreamingApiServerService.ts +++ b/packages/backend/src/server/api/StreamingApiServerService.ts @@ -15,6 +15,7 @@ import { bindThis } from '@/decorators.js'; import { CacheService } from '@/core/CacheService.js'; import { MiLocalUser } from '@/models/User.js'; import { UserService } from '@/core/UserService.js'; +import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; import { AuthenticateService, AuthenticationError } from './AuthenticateService.js'; import MainStreamConnection from './stream/Connection.js'; import { ChannelsService } from './stream/ChannelsService.js'; @@ -39,6 +40,7 @@ export class StreamingApiServerService { private channelsService: ChannelsService, private notificationService: NotificationService, private usersService: UserService, + private channelFollowingService: ChannelFollowingService, ) { } @@ -93,6 +95,7 @@ export class StreamingApiServerService { this.noteReadService, this.notificationService, this.cacheService, + this.channelFollowingService, user, app, ); diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts index dafb07df9a..e1f7bc060b 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts @@ -11,7 +11,7 @@ export const meta = { tags: ['admin'], requireCredential: true, - requireModerator: true, + requireRolePolicy: 'canManageAvatarDecorations', } as const; export const paramDef = { diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts index 4342554837..ba51fd9d3a 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts @@ -13,8 +13,7 @@ export const meta = { tags: ['admin'], requireCredential: true, - requireModerator: true, - + requireRolePolicy: 'canManageAvatarDecorations', errors: { }, } as const; diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts index 05c656401a..620501ecc3 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts @@ -16,7 +16,7 @@ export const meta = { tags: ['admin'], requireCredential: true, - requireModerator: true, + requireRolePolicy: 'canManageAvatarDecorations', res: { type: 'array', diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts index 245311d8d1..17e13588b5 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts @@ -13,7 +13,7 @@ export const meta = { tags: ['admin'], requireCredential: true, - requireModerator: true, + requireRolePolicy: 'canManageAvatarDecorations', errors: { }, diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts index 2d7727d811..3a38d1aa7b 100644 --- a/packages/backend/src/server/api/endpoints/channels/follow.ts +++ b/packages/backend/src/server/api/endpoints/channels/follow.ts @@ -5,9 +5,9 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/_.js'; -import { IdService } from '@/core/IdService.js'; +import type { ChannelsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; +import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; import { ApiError } from '../../error.js'; export const meta = { @@ -41,11 +41,7 @@ export default class extends Endpoint { // eslint- constructor( @Inject(DI.channelsRepository) private channelsRepository: ChannelsRepository, - - @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: ChannelFollowingsRepository, - - private idService: IdService, + private channelFollowingService: ChannelFollowingService, ) { super(meta, paramDef, async (ps, me) => { const channel = await this.channelsRepository.findOneBy({ @@ -56,11 +52,7 @@ export default class extends Endpoint { // eslint- throw new ApiError(meta.errors.noSuchChannel); } - await this.channelFollowingsRepository.insert({ - id: this.idService.gen(), - followerId: me.id, - followeeId: channel.id, - }); + await this.channelFollowingService.follow(me, channel); }); } } diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts index 16de089eef..b93219ff38 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts @@ -5,8 +5,9 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/_.js'; +import type { ChannelsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; +import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; import { ApiError } from '../../error.js'; export const meta = { @@ -40,9 +41,7 @@ export default class extends Endpoint { // eslint- constructor( @Inject(DI.channelsRepository) private channelsRepository: ChannelsRepository, - - @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: ChannelFollowingsRepository, + private channelFollowingService: ChannelFollowingService, ) { super(meta, paramDef, async (ps, me) => { const channel = await this.channelsRepository.findOneBy({ @@ -53,10 +52,7 @@ export default class extends Endpoint { // eslint- throw new ApiError(meta.errors.noSuchChannel); } - await this.channelFollowingsRepository.delete({ - followerId: me.id, - followeeId: channel.id, - }); + await this.channelFollowingService.unfollow(me, channel); }); } } diff --git a/packages/backend/src/server/api/endpoints/i/revoke-token.ts b/packages/backend/src/server/api/endpoints/i/revoke-token.ts index 86f56b929f..a5eb673df8 100644 --- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts +++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts @@ -18,8 +18,12 @@ export const paramDef = { type: 'object', properties: { tokenId: { type: 'string', format: 'misskey:id' }, + token: { type: 'string' }, }, - required: ['tokenId'], + anyOf: [ + { required: ['tokenId'] }, + { required: ['token'] }, + ], } as const; @Injectable() @@ -29,13 +33,24 @@ export default class extends Endpoint { // eslint- private accessTokensRepository: AccessTokensRepository, ) { super(meta, paramDef, async (ps, me) => { - const tokenExist = await this.accessTokensRepository.exist({ where: { id: ps.tokenId } }); + if (ps.tokenId) { + const tokenExist = await this.accessTokensRepository.exist({ where: { id: ps.tokenId } }); - if (tokenExist) { - await this.accessTokensRepository.delete({ - id: ps.tokenId, - userId: me.id, - }); + if (tokenExist) { + await this.accessTokensRepository.delete({ + id: ps.tokenId, + userId: me.id, + }); + } + } else if (ps.token) { + const tokenExist = await this.accessTokensRepository.exist({ where: { token: ps.token } }); + + if (tokenExist) { + await this.accessTokensRepository.delete({ + token: ps.token, + userId: me.id, + }); + } } }); } diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index 697e7e6e74..32e6510e28 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -17,6 +17,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { NoteCreateService } from '@/core/NoteCreateService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; +import { isPureRenote } from '@/misc/is-pure-renote.js'; export const meta = { tags: ['notes'], @@ -232,7 +233,7 @@ export default class extends Endpoint { // eslint- if (renote == null) { throw new ApiError(meta.errors.noSuchRenoteTarget); - } else if (renote.renoteId && !renote.text && !renote.fileIds && !renote.hasPoll) { + } else if (isPureRenote(renote)) { throw new ApiError(meta.errors.cannotReRenote); } @@ -265,7 +266,7 @@ export default class extends Endpoint { // eslint- if (reply == null) { throw new ApiError(meta.errors.noSuchReplyTarget); - } else if (reply.renoteId && !reply.text && !reply.fileIds && !reply.hasPoll) { + } else if (isPureRenote(reply)) { throw new ApiError(meta.errors.cannotReplyToPureRenote); } diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index e9ac981a5a..94d98a6912 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -245,7 +245,10 @@ export default class extends Endpoint { // eslint- if (followingChannels.length > 0) { const followingChannelIds = followingChannels.map(x => x.followeeId); - query.andWhere('note.channelId IN (:...followingChannelIds) OR note.channelId IS NULL', { followingChannelIds }); + query.andWhere(new Brackets(qb => { + qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds }); + qb.orWhere('note.channelId IS NULL'); + })); } else { query.andWhere('note.channelId IS NULL'); } diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 9a7bad1536..b70845cf38 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNote, NotesRepository } from '@/models/_.js'; +import type { MiNote, NotesRepository, ChannelFollowingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -59,6 +59,9 @@ export default class extends Endpoint { // eslint- @Inject(DI.notesRepository) private notesRepository: NotesRepository, + @Inject(DI.channelFollowingsRepository) + private channelFollowingsRepository: ChannelFollowingsRepository, + private noteEntityService: NoteEntityService, private activeUsersChart: ActiveUsersChart, private idService: IdService, @@ -167,22 +170,52 @@ export default class extends Endpoint { // eslint- private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; withCats: boolean; }, me: MiLocalUser) { const followees = await this.userFollowingService.getFollowees(me.id); + const followingChannels = await this.channelFollowingsRepository.find({ + where: { + followerId: me.id, + }, + }); //#region Construct query const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId) - .andWhere('note.channelId IS NULL') .innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('renote.user', 'renoteUser'); - if (followees.length > 0) { + if (followees.length > 0 && followingChannels.length > 0) { + // ユーザー・チャンネルともにフォローあり const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)]; - - query.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds }); + const followingChannelIds = followingChannels.map(x => x.followeeId); + query.andWhere(new Brackets(qb => { + qb + .where(new Brackets(qb2 => { + qb2 + .where('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds }) + .andWhere('note.channelId IS NULL'); + })) + .orWhere('note.channelId IN (:...followingChannelIds)', { followingChannelIds }); + })); + } else if (followees.length > 0) { + // ユーザーフォローのみ（チャンネルフォローなし） + const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)]; + query + .andWhere('note.channelId IS NULL') + .andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds }); + } else if (followingChannels.length > 0) { + // チャンネルフォローのみ（ユーザーフォローなし） + const followingChannelIds = followingChannels.map(x => x.followeeId); + query.andWhere(new Brackets(qb => { + qb + .where('note.channelId IN (:...followingChannelIds)', { followingChannelIds }) + .orWhere('note.userId = :meId', { meId: me.id }); + })); } else { - query.andWhere('note.userId = :meId', { meId: me.id }); + // フォローなし + query + .andWhere('note.channelId IS NULL') + .andWhere('note.userId = :meId', { meId: me.id }); } query.andWhere(new Brackets(qb => { diff --git a/packages/backend/src/server/api/stream/Connection.ts b/packages/backend/src/server/api/stream/Connection.ts index a50adaa438..7bd963d550 100644 --- a/packages/backend/src/server/api/stream/Connection.ts +++ b/packages/backend/src/server/api/stream/Connection.ts @@ -14,6 +14,7 @@ import { CacheService } from '@/core/CacheService.js'; import { MiFollowing, MiUserProfile } from '@/models/_.js'; import type { MiUserGroup } from '@/models/UserGroup.js'; import type { StreamEventEmitter, GlobalEvents } from '@/core/GlobalEventService.js'; +import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; import type { ChannelsService } from './ChannelsService.js'; import type { EventEmitter } from 'events'; import type Channel from './channel.js'; @@ -43,6 +44,7 @@ export default class Connection { private noteReadService: NoteReadService, private notificationService: NotificationService, private cacheService: CacheService, + private channelFollowingService: ChannelFollowingService, user: MiUser | null | undefined, token: MiAccessToken | null | undefined, @@ -57,7 +59,7 @@ export default class Connection { const [userProfile, following, followingChannels, userIdsWhoMeMuting, userIdsWhoBlockingMe, userIdsWhoMeMutingRenotes] = await Promise.all([ this.cacheService.userProfileCache.fetch(this.user.id), this.cacheService.userFollowingsCache.fetch(this.user.id), - this.cacheService.userFollowingChannelsCache.fetch(this.user.id), + this.channelFollowingService.userFollowingChannelsCache.fetch(this.user.id), this.cacheService.userMutingsCache.fetch(this.user.id), this.cacheService.userBlockedCache.fetch(this.user.id), this.cacheService.renoteMutingsCache.fetch(this.user.id), diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json index 38eb9baba3..05de8bb5a0 100644 --- a/packages/cherrypick-js/package.json +++ b/packages/cherrypick-js/package.json @@ -23,9 +23,9 @@ "@microsoft/api-extractor": "7.38.0", "@swc/jest": "0.2.29", "@types/jest": "29.5.6", - "@types/node": "20.8.7", - "@typescript-eslint/eslint-plugin": "6.8.0", - "@typescript-eslint/parser": "6.8.0", + "@types/node": "20.8.9", + "@typescript-eslint/eslint-plugin": "6.9.0", + "@typescript-eslint/parser": "6.9.0", "eslint": "8.52.0", "jest": "29.7.0", "jest-fetch-mock": "3.0.3", @@ -39,7 +39,7 @@ ], "dependencies": { "@swc/cli": "0.1.62", - "@swc/core": "1.3.94", + "@swc/core": "1.3.95", "eventemitter3": "5.0.1", "reconnecting-websocket": "4.4.0" } diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 99049e4df6..79b240b011 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -27,10 +27,11 @@ "@tabler/icons-webfont": "2.37.0", "@vitejs/plugin-vue": "4.4.0", "@vue-macros/reactivity-transform": "0.3.23", - "@vue/compiler-sfc": "3.3.6", + "@vue/compiler-sfc": "3.3.7", "astring": "1.8.6", "autosize": "6.0.1", - "broadcast-channel": "5.5.0", + "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.5", + "broadcast-channel": "5.5.1", "browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3", "buraha": "0.0.1", "canvas-confetti": "1.6.1", @@ -41,7 +42,7 @@ "chartjs-plugin-zoom": "2.0.1", "cherrypick-js": "workspace:*", "cherrypick-mfm-js": "github:kokonect-link/mfm.js", - "chromatic": "7.4.0", + "chromatic": "7.5.4", "compare-versions": "6.1.0", "cropperjs": "2.0.0-beta.4", "date-fns": "2.30.0", @@ -62,11 +63,12 @@ "querystring": "0.2.1", "rollup": "4.1.4", "sanitize-html": "2.11.0", - "sass": "1.69.4", + "shiki": "^0.14.5", + "sass": "1.69.5", "strict-event-emitter-types": "2.0.0", "temml": "0.10.13", "textarea-caret": "3.1.0", - "three": "0.157.0", + "three": "0.158.0", "throttle-debounce": "5.0.0", "tinycolor2": "1.6.0", "tsc-alias": "1.8.8", @@ -77,7 +79,7 @@ "v-code-diff": "1.7.1", "vanilla-tilt": "1.8.1", "vite": "4.5.0", - "vue": "3.3.6", + "vue": "3.3.7", "vue-prism-editor": "2.0.0-alpha.2", "vuedraggable": "next" }, @@ -106,7 +108,7 @@ "@types/estree": "1.0.3", "@types/matter-js": "0.19.2", "@types/micromatch": "4.0.4", - "@types/node": "20.8.7", + "@types/node": "20.8.9", "@types/prismjs": "^1.26.0", "@types/punycode": "2.1.1", "@types/sanitize-html": "2.9.3", @@ -115,22 +117,22 @@ "@types/uuid": "9.0.6", "@types/websocket": "1.0.8", "@types/ws": "8.5.8", - "@typescript-eslint/eslint-plugin": "6.8.0", - "@typescript-eslint/parser": "6.8.0", + "@typescript-eslint/eslint-plugin": "6.9.0", + "@typescript-eslint/parser": "6.9.0", "@vitest/coverage-v8": "0.34.6", - "@vue/runtime-core": "3.3.6", - "acorn": "8.10.0", + "@vue/runtime-core": "3.3.7", + "acorn": "8.11.2", "cross-env": "7.0.3", - "cypress": "13.3.2", + "cypress": "13.3.3", "eslint": "8.52.0", - "eslint-plugin-import": "2.28.1", + "eslint-plugin-import": "2.29.0", "eslint-plugin-storybook": "^0.6.13", - "eslint-plugin-vue": "9.17.0", + "eslint-plugin-vue": "9.18.1", "fast-glob": "3.3.1", "happy-dom": "10.0.3", "micromatch": "4.0.5", "msw": "1.3.2", - "msw-storybook-addon": "1.9.0", + "msw-storybook-addon": "1.10.0", "nodemon": "3.0.1", "prettier": "3.0.3", "react": "18.2.0", @@ -143,6 +145,6 @@ "vitest": "0.34.6", "vitest-fetch-mock": "0.2.2", "vue-eslint-parser": "9.3.2", - "vue-tsc": "1.8.19" + "vue-tsc": "1.8.22" } } diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index 9bb11d7db8..6adca0bc1c 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -5,21 +5,90 @@ SPDX-License-Identifier: AGPL-3.0-only + + diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue index a52b4fd41b..54537d8024 100644 --- a/packages/frontend/src/components/MkCode.vue +++ b/packages/frontend/src/components/MkCode.vue @@ -4,11 +4,18 @@ SPDX-License-Identifier: AGPL-3.0-only --> + + diff --git a/packages/frontend/src/components/MkCodeEditor.vue b/packages/frontend/src/components/MkCodeEditor.vue new file mode 100644 index 0000000000..98a009ecc0 --- /dev/null +++ b/packages/frontend/src/components/MkCodeEditor.vue @@ -0,0 +1,166 @@ + + + + + + + diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue index f8184317cd..bed00859c4 100644 --- a/packages/frontend/src/components/MkDateSeparatedList.vue +++ b/packages/frontend/src/components/MkDateSeparatedList.vue @@ -47,6 +47,7 @@ export default defineComponent({ setup(props, { slots, expose }) { const $style = useCssModule(); // カスタムレンダラなので使っても大丈夫 + function getDateText(time: string) { const date = new Date(time).getDate(); const month = new Date(time).getMonth() + 1; @@ -128,6 +129,7 @@ export default defineComponent({ el.style.top = `${el.offsetTop}px`; el.style.left = `${el.offsetLeft}px`; } + function onLeaveCanceled(el: HTMLElement) { el.style.top = ''; el.style.left = ''; diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue index 09efe161b9..7173a1392d 100644 --- a/packages/frontend/src/components/MkDialog.vue +++ b/packages/frontend/src/components/MkDialog.vue @@ -162,6 +162,7 @@ async function ok() { function cancel() { done(true); } + /* function onBgClick() { if (props.cancelableByBgClick) cancel(); diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue index cbd7bb79c8..510888d58d 100644 --- a/packages/frontend/src/components/MkDrive.vue +++ b/packages/frontend/src/components/MkDrive.vue @@ -505,6 +505,7 @@ function appendFile(file: Misskey.entities.DriveFile) { function appendFolder(folderToAppend: Misskey.entities.DriveFolder) { addFolder(folderToAppend); } + /* function prependFile(file: Misskey.entities.DriveFile) { addFile(file, true); diff --git a/packages/frontend/src/components/MkFoldableSection.vue b/packages/frontend/src/components/MkFoldableSection.vue index 8230acbc57..7301877731 100644 --- a/packages/frontend/src/components/MkFoldableSection.vue +++ b/packages/frontend/src/components/MkFoldableSection.vue @@ -96,6 +96,7 @@ onMounted(() => { return getParentBg(el.parentElement); } } + const rawBg = getParentBg(el.value); const _bg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg); _bg.setAlpha(0.85); diff --git a/packages/frontend/src/components/MkGoogle.vue b/packages/frontend/src/components/MkGoogle.vue index d0e52e9a04..04afbdbab2 100644 --- a/packages/frontend/src/components/MkGoogle.vue +++ b/packages/frontend/src/components/MkGoogle.vue @@ -21,7 +21,9 @@ const props = defineProps<{ const query = ref(props.q); const search = () => { - window.open(`https://www.google.com/search?q=${query.value}`, '_blank'); + const sp = new URLSearchParams(); + sp.append('q', query.value); + window.open(`https://www.google.com/search?${sp.toString()}`, '_blank'); }; diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue index 6bfe725c73..7ca10e0bc7 100644 --- a/packages/frontend/src/components/MkMediaImage.vue +++ b/packages/frontend/src/components/MkMediaImage.vue @@ -85,7 +85,7 @@ if (defaultStore.state.showingAnimatedImages === 'interaction') playAnimation = let playAnimationTimer = setTimeout(() => playAnimation = false, 5000); const url = $computed(() => (props.raw || defaultStore.state.loadRawImages) ? props.image.url - : defaultStore.state.disableShowingAnimatedImages || (['interaction', 'inactive'].includes(defaultStore.state.showingAnimatedImages) && !playAnimation) + : (defaultStore.state.disableShowingAnimatedImages || defaultStore.state.enableDataSaverMode) || (['interaction', 'inactive'].includes(defaultStore.state.showingAnimatedImages) && !playAnimation) ? getStaticImageUrl(props.image.url) : props.image.thumbnailUrl, ); diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue index 548465e9a6..60cbb2b1c9 100644 --- a/packages/frontend/src/components/MkMention.vue +++ b/packages/frontend/src/components/MkMention.vue @@ -51,7 +51,7 @@ const bgCss = bg.toRgbString(); let playAnimation = $ref(true); if (defaultStore.state.showingAnimatedImages === 'interaction') playAnimation = false; let playAnimationTimer = setTimeout(() => playAnimation = false, 5000); -const avatarUrl = $computed(() => defaultStore.state.disableShowingAnimatedImages || (['interaction', 'inactive'].includes(defaultStore.state.showingAnimatedImages) && !playAnimation) +const avatarUrl = $computed(() => (defaultStore.state.disableShowingAnimatedImages || defaultStore.state.enableDataSaverMode) || (['interaction', 'inactive'].includes(defaultStore.state.showingAnimatedImages) && !playAnimation) ? getStaticImageUrl(`/avatar/@${props.username}@${props.host}`) : `/avatar/@${props.username}@${props.host}`, ); diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 09c3d953ec..96b418eda9 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -146,11 +146,13 @@ const onGlobalMousedown = (event: MouseEvent) => { }; let childCloseTimer: null | number = null; + function onItemMouseEnter(item) { childCloseTimer = window.setTimeout(() => { closeChild(); }, 300); } + function onItemMouseLeave(item) { if (childCloseTimer) window.clearTimeout(childCloseTimer); } diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 9db00c8a77..31bc104f1a 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -56,7 +56,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -69,14 +69,14 @@ SPDX-License-Identifier: AGPL-3.0-only

- +

({{ i18n.ts._ffVisibility.private }}) - +
@@ -85,7 +85,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}:
- +
@@ -234,9 +234,11 @@ let note = $ref(deepClone(props.note)); // plugin if (noteViewInterruptors.length > 0) { onMounted(async () => { - let result = deepClone(note); + let result:Misskey.entities.Note | null = deepClone(note); for (const interruptor of noteViewInterruptors) { result = await interruptor.handler(result); + + if (result === null) return isDeleted.value = true; } note = result; }); diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index c177230c55..5428ac0ba1 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -89,13 +89,13 @@ SPDX-License-Identifier: AGPL-3.0-only

- +

({{ i18n.ts._ffVisibility.private }}) - + RN:
@@ -105,7 +105,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}:
- +
@@ -313,9 +313,11 @@ let note = $ref(deepClone(props.note)); // plugin if (noteViewInterruptors.length > 0) { onMounted(async () => { - let result = deepClone(note); + let result:Misskey.entities.Note | null = deepClone(note); for (const interruptor of noteViewInterruptors) { result = await interruptor.handler(result); + + if (result === null) return isDeleted.value = true; } note = result; }); @@ -716,6 +718,7 @@ function loadRepliesSimple() { } const repliesLoaded = ref(false); + function loadReplies() { repliesLoaded.value = true; os.api('notes/children', { @@ -727,6 +730,7 @@ function loadReplies() { } const conversationLoaded = ref(false); + function loadConversation() { conversationLoaded.value = true; os.api('notes/conversation', { diff --git a/packages/frontend/src/components/MkNotePreview.vue b/packages/frontend/src/components/MkNotePreview.vue index c81cf0f5bc..3e3d8311fe 100644 --- a/packages/frontend/src/components/MkNotePreview.vue +++ b/packages/frontend/src/components/MkNotePreview.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue index cfc9563695..e9bdf08a70 100644 --- a/packages/frontend/src/components/MkNoteSimple.vue +++ b/packages/frontend/src/components/MkNoteSimple.vue @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only

- +

diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index e5f1e3abf2..c09f3790fb 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only

- +

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue index 294b316c5c..d90f2451fa 100644 --- a/packages/frontend/src/components/MkPagination.vue +++ b/packages/frontend/src/components/MkPagination.vue @@ -86,6 +86,7 @@ function arrayToEntries(entities: MisskeyEntity[]): [string, MisskeyEntity][] { function concatMapWithArray(map: MisskeyEntityMap, entities: MisskeyEntity[]): MisskeyEntityMap { return new Map([...map, ...arrayToEntries(entities)]); } +