Merge branch 'develop' into external-resources

.github/workflows/api-misskey-js.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - run: corepack enable
 

.github/workflows/check_copyright_year.yml

@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
     - run: |
         if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
           echo "Please change copyright year!"

.github/workflows/docker-develop.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/dockle.yml

@@ -14,7 +14,7 @@ jobs:
     env:
       DOCKER_CONTENT_TRUST: 1
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
           sudo dpkg -i dockle.deb

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
   pnpm_install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
         submodules: true
@@ -38,7 +38,7 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
         submodules: true
@@ -64,7 +64,7 @@ jobs:
         - backend
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
         submodules: true

.github/workflows/pr-preview-deploy.yml

@@ -53,7 +53,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 

.github/workflows/test-backend.yml

@@ -29,7 +29,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         submodules: true
     - name: Install pnpm

.github/workflows/test-frontend.yml

@@ -16,7 +16,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         submodules: true
     - name: Install pnpm
@@ -68,7 +68,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150

.github/workflows/test-misskey-js.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - run: corepack enable
 

.github/workflows/test-production.yml

@@ -19,7 +19,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
       with:
         submodules: true
     - name: Install pnpm

CHANGELOG.md

@@ -18,7 +18,7 @@
 - Feat: アンテナでローカルの投稿のみ収集できるようになりました
 - Feat: サーバーサイレンス機能が追加されました
 - Enhance: 新規にフォローした人の返信をデフォルトでTLに追加できるオプションを追加
-- Enhance: HTLとLTLを2023.10.0アップデート以前まで遡れるように
+- Enhance: HTL/LTL/STLを2023.10.0アップデート以前まで遡れるように
 - Enhance: フォロー/フォロー解除したときに過去分のHTLにも含まれる投稿が反映されるように
 - Enhance: ローカリゼーションの更新
 - Enhance: 依存関係の更新

cypress/e2e/widgets.cy.js

@@ -1,3 +1,4 @@
+/* flaky
 describe('After user signed in', () => {
 	beforeEach(() => {
 		cy.resetState();
@@ -67,3 +68,4 @@ describe('After user signed in', () => {
 	buildWidgetTest('aiscript');
 	buildWidgetTest('aichan');
 });
+*/

locales/en-US.yml

@@ -593,7 +593,7 @@ poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
 disablePlayer: "Close video player"
-expandTweet: "Expand tweet"
+expandTweet: "Expand post"
 themeEditor: "Theme editor"
 description: "Description"
 describeFile: "Add caption"

locales/fr-FR.yml

@@ -387,7 +387,7 @@ antennaSource: "Source de l’antenne"
 antennaKeywords: "Mots clés à recevoir"
 antennaExcludeKeywords: "Mots clés à exclure"
 antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
-notifyAntenna: "Je souhaite recevoir les notifications des nouvelles notes"
+notifyAntenna: "Me notifier pour les nouvelles notes"
 withFileAntenna: "Notes ayant des attachements uniquement"
 enableServiceworker: "Activer ServiceWorker"
 antennaUsersDescription: "Saisissez un seul nom d’utilisateur·rice par ligne"
@@ -985,11 +985,13 @@ internalServerError: "Erreur interne du serveur"
 copyErrorInfo: "Copier les détails de l’erreur"
 exploreOtherServers: "Trouver une autre instance"
 disableFederationOk: "Désactiver"
+postToTheChannel: "Publier au canal"
 likeOnly: "Les favoris uniquement"
 sensitiveWords: "Mots sensibles"
 notesSearchNotAvailable: "La recherche de notes n'est pas disponible."
 license: "Licence"
 myClips: "Mes clips"
+retryAllQueuesConfirmText: "Cela peut augmenter temporairement la charge du serveur."
 showClipButtonInNoteFooter: "Ajouter « Clip » au menu d'action de la note"
 noteIdOrUrl: "Identifiant de la note ou URL"
 video: "Vidéo"
@@ -1013,21 +1015,30 @@ vertical: "Vertical"
 horizontal: "Latéral"
 position: "Position"
 serverRules: "Règles du serveur"
-preservedUsernames: "Nom d'utilisateur·rice réservé"
+pleaseAgreeAllToContinue: "Pour continuer, veuillez accepter tous les champs ci-dessus."
+continue: "Continuer"
+preservedUsernames: "Noms d'utilisateur·rice réservés"
 archive: "Archive"
 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"
 options: "Options"
 later: "Plus tard"
 goToMisskey: "Retour vers Misskey"
 expirationDate: "Date d’expiration"
+waitingForMailAuth: "En attente de la vérification de l'adresse courriel"
 usedAt: "Utilisé le"
 unused: "Non-utilisé"
 used: "Utilisé"
 expired: "Expiré"
 doYouAgree: "Êtes-vous d’accord ?"
+beSureToReadThisAsItIsImportant: "Assurez-vous de le lire ; c'est important."
+dialog: "Dialogue"
 icon: "Avatar"
 forYou: "Pour vous"
+currentAnnouncements: "Annonces actuelles"
+pastAnnouncements: "Annonces passées"
 replies: "Répondre"
 renotes: "Renoter"
 loadReplies: "Inclure les réponses"

locales/it-IT.yml

@@ -110,7 +110,7 @@ unrenote: "Elimina la Rinota"
 renoted: "Rinotato!"
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
-quote: "Cita"
+quote: "Citazione"
 inChannelRenote: "Rinota nel canale"
 inChannelQuote: "Cita nel canale"
 pinnedNote: "Nota in primo piano"
@@ -534,6 +534,7 @@ serverLogs: "Log del server"
 deleteAll: "Cancella cronologia"
 showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
 showFixedPostFormInChannel: "Per i canali, mostra il modulo di pubblicazione in cima alla timeline"
+withRepliesByDefaultForNewlyFollowed: "Quando segui nuovi profili, includi le risposte in TL come impostazione predefinita"
 newNoteRecived: "Nuove note da leggere"
 sounds: "Impostazioni suoni"
 sound: "Suono"
@@ -1924,6 +1925,7 @@ _exportOrImport:
   userLists: "Liste"
   excludeMutingUsers: "Escludere gli utenti silenziati"
   excludeInactiveUsers: "Escludere i profili inutilizzati"
+  withReplies: "Includere le risposte da profili importati nella Timeline"
 _charts:
   federation: "Federazione"
   apRequest: "Richieste"
@@ -2088,7 +2090,7 @@ _deck:
     list: "Liste"
     channel: "Canale"
     mentions: "Menzioni"
-    direct: "Diretta"
+    direct: "Note Dirette"
     roleTimeline: "Timeline Ruolo"
 _dialog:
   charactersExceeded: "Hai superato il limite di {max} caratteri! ({corrente})"

locales/ja-KS.yml

@@ -586,7 +586,7 @@ poll: "アンケート"
 useCw: "内容を隠す"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ツイートを展開する"
+expandTweet: "ポストを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 describeFile: "キャプションを付ける"

locales/ko-KR.yml

@@ -589,7 +589,7 @@ poll: "투표"
 useCw: "내용 숨기기"
 enablePlayer: "플레이어 열기"
 disablePlayer: "플레이어 닫기"
-expandTweet: "트윗 확장하기"
+expandTweet: "게시물 확장하기"
 themeEditor: "테마 에디터"
 description: "설명"
 describeFile: "캡션 추가"

locales/th-TH.yml

@@ -1747,8 +1747,8 @@ _2fa:
   renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
   renewTOTPCancel: "ไม่เป็นไร"
   backupCodes: "รหัสสำรองข้อมูล"
-  backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีกต่อไป"
+  backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีก"
-  backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้วถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
+  backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้ว ถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะยังไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
 _permissions:
   "read:account": "ดูข้อมูลบัญชีของคุณ"
   "write:account": "แก้ไขข้อมูลบัญชีของคุณ"

locales/zh-TW.yml

@@ -195,6 +195,7 @@ perHour: "每小時"
 perDay: "每日"
 stopActivityDelivery: "停止發送活動"
 blockThisInstance: "封鎖此伺服器"
+silenceThisInstance: "禁言此伺服器"
 operations: "操作"
 software: "軟體"
 version: "版本"
@@ -214,6 +215,8 @@ clearCachedFiles: "清除快取資料"
 clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
 blockedInstances: "已封鎖的伺服器"
 blockedInstancesDescription: "請逐行輸入需要封鎖的伺服器。已封鎖的伺服器將無法與本伺服器進行通訊。"
+silencedInstances: "被禁言的伺服器"
+silencedInstancesDescription: "設定要禁言的伺服器主機名稱，以換行分隔。隸屬於禁言伺服器的所有帳戶都將被視為「禁言帳戶」，只能發出「追隨請求」，而且無法提及未追隨的本地帳戶。這不會影響已封鎖的實例。"
 muteAndBlock: "靜音和封鎖"
 mutedUsers: "被靜音的使用者"
 blockedUsers: "被封鎖的使用者"
@@ -531,6 +534,7 @@ serverLogs: "伺服器日誌"
 deleteAll: "刪除所有記錄"
 showFixedPostForm: "於時間軸頁頂顯示「發送貼文」方框"
 showFixedPostFormInChannel: "於時間軸頁頂顯示「發送貼文」方框（頻道）"
+withRepliesByDefaultForNewlyFollowed: "在追隨其他人後，預設在時間軸納入回覆的貼文"
 newNoteRecived: "發現新貼文"
 sounds: "音效"
 sound: "音效"
@@ -1921,6 +1925,7 @@ _exportOrImport:
   userLists: "清單"
   excludeMutingUsers: "排除被靜音的使用者"
   excludeInactiveUsers: "排除不活躍帳戶"
+  withReplies: "將被匯入的追隨中清單的貼文回覆包含在時間軸"
 _charts:
   federation: "聯邦宇宙"
   apRequest: "請求"

package.json

@@ -47,14 +47,14 @@
 		"cssnano": "6.0.1",
 		"js-yaml": "4.1.0",
 		"postcss": "8.4.31",
-		"terser": "5.21.0",
+		"terser": "5.22.0",
 		"typescript": "5.2.2"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.1",
+		"cypress": "13.3.2",
 		"eslint": "8.51.0",
 		"start-server-and-test": "2.0.1"
 	},

packages/backend/package.json

@@ -76,7 +76,7 @@
 		"@nestjs/testing": "10.2.7",
 		"@peertube/http-signature": "1.7.0",
 		"@simplewebauthn/server": "8.3.2",
-		"@sinonjs/fake-timers": "11.1.0",
+		"@sinonjs/fake-timers": "11.2.1",
 		"@swc/cli": "0.1.62",
 		"@swc/core": "1.3.93",
 		"accepts": "1.3.8",
@@ -86,7 +86,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.12.4",
+		"bullmq": "4.12.5",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -97,7 +97,7 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.24.2",
+		"fastify": "4.24.3",
 		"feed": "4.2.2",
 		"file-type": "18.5.0",
 		"fluent-ffmpeg": "2.1.2",
@@ -180,38 +180,38 @@
 		"@types/cbor": "6.0.0",
 		"@types/color-convert": "2.0.2",
 		"@types/content-disposition": "0.5.7",
-		"@types/fluent-ffmpeg": "2.1.22",
+		"@types/fluent-ffmpeg": "2.1.23",
-		"@types/http-link-header": "1.0.3",
+		"@types/http-link-header": "1.0.4",
-		"@types/jest": "29.5.5",
+		"@types/jest": "29.5.6",
-		"@types/js-yaml": "4.0.7",
+		"@types/js-yaml": "4.0.8",
-		"@types/jsdom": "21.1.3",
+		"@types/jsdom": "21.1.4",
-		"@types/jsonld": "1.5.10",
+		"@types/jsonld": "1.5.11",
-		"@types/jsrsasign": "10.5.9",
+		"@types/jsrsasign": "10.5.10",
-		"@types/mime-types": "2.1.2",
+		"@types/mime-types": "2.1.3",
-		"@types/ms": "0.7.32",
+		"@types/ms": "0.7.33",
-		"@types/node": "20.8.6",
+		"@types/node": "20.8.7",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.11",
+		"@types/nodemailer": "6.4.13",
-		"@types/oauth": "0.9.2",
+		"@types/oauth": "0.9.3",
-		"@types/oauth2orize": "1.11.1",
+		"@types/oauth2orize": "1.11.2",
-		"@types/oauth2orize-pkce": "0.1.0",
+		"@types/oauth2orize-pkce": "0.1.1",
-		"@types/pg": "8.10.5",
+		"@types/pg": "8.10.7",
-		"@types/pug": "2.0.7",
+		"@types/pug": "2.0.8",
-		"@types/punycode": "2.1.0",
+		"@types/punycode": "2.1.1",
-		"@types/qrcode": "1.5.2",
+		"@types/qrcode": "1.5.4",
-		"@types/random-seed": "0.3.3",
+		"@types/random-seed": "0.3.4",
-		"@types/ratelimiter": "3.4.4",
+		"@types/ratelimiter": "3.4.5",
-		"@types/rename": "1.0.5",
+		"@types/rename": "1.0.6",
-		"@types/sanitize-html": "2.9.2",
+		"@types/sanitize-html": "2.9.3",
-		"@types/semver": "7.5.3",
+		"@types/semver": "7.5.4",
 		"@types/sharp": "0.32.0",
-		"@types/simple-oauth2": "5.0.5",
+		"@types/simple-oauth2": "5.0.6",
-		"@types/sinonjs__fake-timers": "8.1.3",
+		"@types/sinonjs__fake-timers": "8.1.4",
-		"@types/tinycolor2": "1.4.4",
+		"@types/tinycolor2": "1.4.5",
-		"@types/tmp": "0.2.4",
+		"@types/tmp": "0.2.5",
-		"@types/vary": "1.1.1",
+		"@types/vary": "1.1.2",
-		"@types/web-push": "3.6.1",
+		"@types/web-push": "3.6.2",
-		"@types/ws": "8.5.7",
+		"@types/ws": "8.5.8",
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
 		"aws-sdk-client-mock": "3.0.0",

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -182,15 +182,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					.leftJoinAndSelect('reply.user', 'replyUser')
 					.leftJoinAndSelect('renote.user', 'renoteUser');
 
-				query.andWhere(new Brackets(qb => {
+				if (!ps.withReplies) {
-					qb
+					query.andWhere(new Brackets(qb => {
-						.where('note.replyId IS NULL') // 返信ではない
+						qb
-						.orWhere(new Brackets(qb => {
+							.where('note.replyId IS NULL') // 返信ではない
-							qb // 返信だけど投稿者自身への返信
+							.orWhere(new Brackets(qb => {
-								.where('note.replyId IS NOT NULL')
+								qb // 返信だけど投稿者自身への返信
-								.andWhere('note.replyUserId = note.userId');
+									.where('note.replyId IS NOT NULL')
-						}));
+									.andWhere('note.replyUserId = note.userId');
-				}));
+							}));
+					}));
+				}
 
 				this.queryService.generateVisibilityQuery(query, me);
 				this.queryService.generateMutedUserQuery(query, me);

packages/frontend/package.json

@@ -29,7 +29,7 @@
 		"@vue/compiler-sfc": "3.3.4",
 		"astring": "1.8.6",
 		"autosize": "6.0.1",
-		"broadcast-channel": "5.4.0",
+		"broadcast-channel": "5.5.0",
 		"browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
 		"buraha": "0.0.1",
 		"canvas-confetti": "1.6.1",
@@ -59,7 +59,7 @@
 		"querystring": "0.2.1",
 		"rollup": "4.1.4",
 		"sanitize-html": "2.11.0",
-		"sass": "1.69.3",
+		"sass": "1.69.4",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
 		"three": "0.157.0",
@@ -72,7 +72,7 @@
 		"uuid": "9.0.1",
 		"v-code-diff": "1.7.1",
 		"vanilla-tilt": "1.8.1",
-		"vite": "4.4.11",
+		"vite": "4.5.0",
 		"vue": "3.3.4",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "next"
@@ -97,25 +97,25 @@
 		"@storybook/vue3": "7.5.0",
 		"@storybook/vue3-vite": "7.5.0",
 		"@testing-library/vue": "7.0.0",
-		"@types/escape-regexp": "0.0.1",
+		"@types/escape-regexp": "0.0.2",
-		"@types/estree": "1.0.2",
+		"@types/estree": "1.0.3",
-		"@types/matter-js": "0.19.1",
+		"@types/matter-js": "0.19.2",
-		"@types/micromatch": "4.0.3",
+		"@types/micromatch": "4.0.4",
-		"@types/node": "20.8.6",
+		"@types/node": "20.8.7",
-		"@types/punycode": "2.1.0",
+		"@types/punycode": "2.1.1",
-		"@types/sanitize-html": "2.9.2",
+		"@types/sanitize-html": "2.9.3",
-		"@types/throttle-debounce": "5.0.0",
+		"@types/throttle-debounce": "5.0.1",
-		"@types/tinycolor2": "1.4.4",
+		"@types/tinycolor2": "1.4.5",
-		"@types/uuid": "9.0.5",
+		"@types/uuid": "9.0.6",
-		"@types/websocket": "1.0.7",
+		"@types/websocket": "1.0.8",
-		"@types/ws": "8.5.7",
+		"@types/ws": "8.5.8",
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
 		"@vitest/coverage-v8": "0.34.6",
 		"@vue/runtime-core": "3.3.4",
 		"acorn": "8.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.1",
+		"cypress": "13.3.2",
 		"eslint": "8.51.0",
 		"eslint-plugin-import": "2.28.1",
 		"eslint-plugin-vue": "9.17.0",

packages/frontend/src/components/MkNote.vue

@@ -232,6 +232,7 @@ const keymap = {
 useNoteCapture({
 	rootEl: el,
 	note: $$(appearNote),
+	pureNote: $$(note),
 	isDeletedRef: isDeleted,
 });
 

packages/frontend/src/components/MkNoteDetailed.vue

@@ -296,6 +296,7 @@ const reactionsPagination = $computed(() => ({
 useNoteCapture({
 	rootEl: el,
 	note: $$(appearNote),
+	pureNote: $$(note),
 	isDeletedRef: isDeleted,
 });
 

packages/frontend/src/scripts/use-note-capture.ts

@@ -11,15 +11,17 @@ import { $i } from '@/account.js';
 export function useNoteCapture(props: {
 	rootEl: Ref<HTMLElement>;
 	note: Ref<Misskey.entities.Note>;
+	pureNote: Ref<Misskey.entities.Note>;
 	isDeletedRef: Ref<boolean>;
 }) {
 	const note = props.note;
+	const pureNote = props.pureNote;
 	const connection = $i ? useStream() : null;
 
 	function onStreamNoteUpdated(noteData): void {
 		const { type, id, body } = noteData;
 
-		if (id !== note.value.id) return;
+		if ((id !== note.value.id) && (id !== pureNote.value.id)) return;
 
 		switch (type) {
 			case 'reacted': {
@@ -82,6 +84,7 @@ export function useNoteCapture(props: {
 		if (connection) {
 			// TODO: このノートがストリーミング経由で流れてきた場合のみ sr する
 			connection.send(document.body.contains(props.rootEl.value) ? 'sr' : 's', { id: note.value.id });
+			if (pureNote.value.id !== note.value.id) connection.send('s', { id: pureNote.value.id });
 			if (withHandler) connection.on('noteUpdated', onStreamNoteUpdated);
 		}
 	}
@@ -91,6 +94,11 @@ export function useNoteCapture(props: {
 			connection.send('un', {
 				id: note.value.id,
 			});
+			if (pureNote.value.id !== note.value.id) {
+				connection.send('un', {
+					id: pureNote.value.id,
+				});
+			}
 			if (withHandler) connection.off('noteUpdated', onStreamNoteUpdated);
 		}
 	}

packages/misskey-js/etc/misskey-js.api.md

@@ -2977,7 +2977,7 @@ type UserLite = {
     id: ID;
     username: string;
     host: string | null;
-    name: string;
+    name: string | null;
     onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
     avatarUrl: string;
     avatarBlurhash: string;

packages/misskey-js/package.json

@@ -22,8 +22,8 @@
 	"devDependencies": {
 		"@microsoft/api-extractor": "7.38.0",
 		"@swc/jest": "0.2.29",
-		"@types/jest": "29.5.5",
+		"@types/jest": "29.5.6",
-		"@types/node": "20.8.6",
+		"@types/node": "20.8.7",
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
 		"eslint": "8.51.0",

packages/misskey-js/src/entities.ts

@@ -12,7 +12,7 @@ export type UserLite = {
 	id: ID;
 	username: string;
 	host: string | null;
-	name: string;
+	name: string | null;
 	onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
 	avatarUrl: string;
 	avatarBlurhash: string;

packages/sw/package.json

@@ -9,7 +9,7 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"esbuild": "0.19.4",
+		"esbuild": "0.19.5",
 		"idb-keyval": "6.2.1",
 		"misskey-js": "workspace:*"
 	},