Merge e5ff3d2226 into 872cefcfb8

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

.github/workflows/release-with-dispatch.yml

@@ -86,6 +86,7 @@ jobs:
       draft_prerelease_channel: alpha
       ready_start_prerelease_channel: beta
       prerelease_channel: ${{ inputs.start-rc && 'rc' || '' }}
+      reset_number_on_channel_change: true
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}

.github/workflows/release-with-ready.yml

@@ -41,6 +41,7 @@ jobs:
       indent: ${{ vars.INDENT }}
       draft_prerelease_channel: alpha
       ready_start_prerelease_channel: beta
+      reset_number_on_channel_change: true
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}

CHANGELOG.md

@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.11.0
 
 ### Note
@@ -67,6 +79,8 @@
 - Fix: User Webhookテスト機能のMock Payloadを修正  
 - Fix: アカウント削除のモデレーションログが動作していないのを修正 (#14996)  
 - Fix: リノートミュートが新規投稿通知に対して作用していなかった問題を修正
+- Fix: Inboxの処理で生じるエラーを誤ってActivityとして処理することがある問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/730)
 - Fix: セキュリティに関する修正
 
 ### Misskey.js

locales/zh-CN.yml

@@ -143,8 +143,8 @@ unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "输入文件名"
 mute: "屏蔽"
 unmute: "解除静音"
-renoteMute: "屏蔽转帖"
-renoteUnmute: "解除屏蔽转帖"
+renoteMute: "隐藏转帖"
+renoteUnmute: "解除隐藏转帖"
 block: "拉黑"
 unblock: "取消拉黑"
 suspend: "冻结"
@@ -213,7 +213,7 @@ charts: "图表"
 perHour: "每小时"
 perDay: "每天"
 stopActivityDelivery: "停止发送活动"
-blockThisInstance: "封锁此服务器"
+blockThisInstance: "屏蔽此服务器"
 silenceThisInstance: "静音此服务器"
 mediaSilenceThisInstance: "隐藏此服务器的媒体文件"
 operations: "操作"
@@ -233,17 +233,17 @@ clearQueueConfirmTitle: "确定清除队列？"
 clearQueueConfirmText: "未送达的帖子将不会被投递。 通常无需执行此操作。"
 clearCachedFiles: "清除缓存"
 clearCachedFilesConfirm: "确定要清除所有缓存的远程文件？"
-blockedInstances: "被封锁的服务器"
-blockedInstancesDescription: "设定要封锁的服务器，以换行分隔。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
+blockedInstances: "被屏蔽的服务器"
+blockedInstancesDescription: "设定要屏蔽的服务器，以换行分隔。被屏蔽的服务器将无法与本服务器进行交换通讯。子域名也同样会被屏蔽。"
 silencedInstances: "被静音的服务器"
 silencedInstancesDescription: "设置要静音的服务器，以换行分隔。被静音的服务器内所有的账户将默认处于「静音」状态，仅能发送关注请求，并且在未关注状态下无法提及本地账户。被阻止的实例不受影响。"
 mediaSilencedInstances: "已隐藏媒体文件的服务器"
 mediaSilencedInstancesDescription: "设置要隐藏媒体文件的服务器，以换行分隔。被设置为隐藏媒体文件服务器内所有账号的文件均按照「敏感内容」处理，且将无法使用自定义表情符号。被阻止的实例不受影响。"
 federationAllowedHosts: "允许联合的服务器"
 federationAllowedHostsDescription: "设定允许联合的服务器，以换行分隔。"
-muteAndBlock: "静音/拉黑"
-mutedUsers: "已静音用户"
-blockedUsers: "已拉黑的用户"
+muteAndBlock: "隐藏和屏蔽"
+mutedUsers: "已隐藏用户"
+blockedUsers: "已屏蔽的用户"
 noUsers: "无用户"
 editProfile: "编辑资料"
 noteDeleteConfirm: "要删除该帖子吗？"
@@ -683,11 +683,11 @@ emptyToDisableSmtpAuth: "用户名和密码留空可以禁用 SMTP 验证"
 smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
 smtpSecureInfo: "使用 STARTTLS 时关闭。"
 testEmail: "邮件发送测试"
-wordMute: "文字屏蔽"
+wordMute: "隐藏文字"
 hardWordMute: "屏蔽关键词"
 regexpError: "正则表达式错误"
 regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
-instanceMute: "被屏蔽的服务器"
+instanceMute: "已隐藏的服务器"
 userSaysSomething: "{name} 说了什么,但是被屏蔽词过滤了"
 makeActive: "启用"
 display: "显示"
@@ -915,8 +915,8 @@ manageAccounts: "管理账户"
 makeReactionsPublic: "将回应设置为公开"
 makeReactionsPublicDescription: "将您发表过的回应设置成公开可见。"
 classic: "经典"
-muteThread: "屏蔽帖子列表"
-unmuteThread: "取消屏蔽帖子列表"
+muteThread: "隐藏帖子列表"
+unmuteThread: "取消隐藏帖子列表"
 followingVisibility: "关注的人的公开范围"
 followersVisibility: "关注者的公开范围"
 continueThread: "查看更多帖子"
@@ -939,7 +939,7 @@ searchByGoogle: "Google"
 instanceDefaultLightTheme: "服务器默认浅色主题"
 instanceDefaultDarkTheme: "服务器默认深色主题"
 instanceDefaultThemeDescription: "以对象格式输入主题代码"
-mutePeriod: "屏蔽期限"
+mutePeriod: "隐藏期限"
 period: "截止时间"
 indefinitely: "永久"
 tenMinutes: "10 分钟"
@@ -1779,7 +1779,7 @@ _role:
     canUpdateBioMedia: "可以更新头像和横幅"
     pinMax: "帖子置顶数量限制"
     antennaMax: "可创建的最大天线数量"
-    wordMuteMax: "屏蔽词的字数限制"
+    wordMuteMax: "隐藏词的字数限制"
     webhookMax: "Webhook 创建数量限制"
     clipMax: "便签创建数量限制"
     noteEachClipsMax: "单个便签内的贴文数量限制"
@@ -1792,7 +1792,7 @@ _role:
     canUseTranslator: "使用翻译功能"
     avatarDecorationLimit: "可添加头像挂件的最大个数"
     canImportAntennas: "允许导入天线"
-    canImportBlocking: "允许导入拉黑列表"
+    canImportBlocking: "允许导入屏蔽列表"
     canImportFollowing: "允许导入关注列表"
     canImportMuting: "允许导入屏蔽列表"
     canImportUserLists: "允许导入用户列表"
@@ -1942,14 +1942,14 @@ _menuDisplay:
   top: "顶部"
   hide: "隐藏"
 _wordMute:
-  muteWords: "禁用词"
+  muteWords: "要隐藏的词"
   muteWordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
   muteWordsDescription2: "正则表达式用斜线包裹"
 _instanceMute:
-  instanceMuteDescription: "屏蔽服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
+  instanceMuteDescription: "隐藏服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
   instanceMuteDescription2: "一行一个"
   title: "隐藏服务器已设置的帖子。"
-  heading: "屏蔽服务器"
+  heading: "已隐藏的服务器"
 _theme:
   explore: "寻找主题"
   install: "安装主题"
@@ -2089,8 +2089,8 @@ _2fa:
 _permissions:
   "read:account": "查看账户信息"
   "write:account": "更改帐户信息"
-  "read:blocks": "查看黑名单"
-  "write:blocks": "编辑黑名单"
+  "read:blocks": "查看屏蔽列表"
+  "write:blocks": "编辑屏蔽列表"
   "read:drive": "查看网盘"
   "write:drive": "管理网盘文件"
   "read:favorites": "查看收藏夹"
@@ -2099,8 +2099,8 @@ _permissions:
   "write:following": "关注/取消关注"
   "read:messaging": "查看消息"
   "write:messaging": "撰写或删除消息"
-  "read:mutes": "查看屏蔽列表"
-  "write:mutes": "编辑屏蔽列表"
+  "read:mutes": "查看隐藏列表"
+  "write:mutes": "编辑隐藏列表"
   "write:notes": "撰写或删除帖子"
   "read:notifications": "查看通知"
   "write:notifications": "管理通知"
@@ -2300,8 +2300,8 @@ _exportOrImport:
   favoritedNotes: "收藏的帖子"
   clips: "便签"
   followingList: "关注中"
-  muteList: "屏蔽"
-  blockingList: "拉黑"
+  muteList: "隐藏"
+  blockingList: "屏蔽"
   userLists: "列表"
   excludeMutingUsers: "排除屏蔽用户"
   excludeInactiveUsers: "排除不活跃用户"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-beta.4",
+	"version": "2024.11.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -28,6 +28,7 @@ import { bindThis } from '@/decorators.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { AbuseReportService } from '@/core/AbuseReportService.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
 import { ApNoteService } from './models/ApNoteService.js';
 import { ApLoggerService } from './ApLoggerService.js';
@@ -201,13 +202,16 @@ export class ApInboxService {
 
 		await this.apNoteService.extractEmojis(activity.tag ?? [], actor.host).catch(() => null);
 
-		return await this.reactionService.create(actor, note, activity._misskey_reaction ?? activity.content ?? activity.name).catch(err => {
-			if (err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') {
+		try {
+			await this.reactionService.create(actor, note, activity._misskey_reaction ?? activity.content ?? activity.name);
+			return 'ok';
+		} catch (err) {
+			if (err instanceof IdentifiableError && err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') {
 				return 'skip: already reacted';
 			} else {
 				throw err;
 			}
-		}).then(() => 'ok');
+		}
 	}
 
 	@bindThis
@@ -288,7 +292,7 @@ export class ApInboxService {
 
 		const target = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
-			return e;
+			throw e;
 		});
 
 		if (isPost(target)) return await this.announceNote(actor, activity, target);
@@ -649,7 +653,7 @@ export class ApInboxService {
 
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
-			return e;
+			throw e;
 		});
 
 		// don't queue because the sender may attempt again when timeout

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0-beta.4",
+	"version": "2024.11.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",