Merge tag '10.102.692-m544' into custom/atsuchan

10.102.692-m544

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "mei23 <[email protected]>",
-	"version": "10.102.691-m544",
+	"version": "10.102.692-m544",
 	"codename": "m544",
 	"repository": {
 		"type": "git",

src/client/app/admin/views/federation.vue

@@ -307,6 +307,11 @@ export default defineComponent({
 			this.$root.api('admin/delete-instance-users', {
 				host: this.instance.host,
 				limit: 1000,
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
 			}).catch((e: any) => {
 				this.$root.dialog({
 					type: 'error',

src/client/app/common/views/components/settings/mute-and-block.vue

@@ -68,7 +68,10 @@ export default Vue.extend({
 	computed: {
 		_mutedWords: {
 			get() { return this.$store.state.settings.mutedWords; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'mutedWords', value }); }
+			set(value) {
+				this.$store.dispatch('settings/set', { key: 'mutedWords', value });
+				this.$root.dialog({ type: 'success', splash: true });
+			}
 		},
 	},
 

src/queue/processors/inbox.ts

@@ -40,7 +40,6 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
 	const activity = data.activity;
 
 	const resolver = ctx?.resolver || new Resolver();
-	const dbResolver = ctx?.dbResolver || new DbResolver();
 
 	//#region Log
 	logger.debug(inspect(signature));
@@ -58,19 +57,14 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
 	//#region resolve http-signature signer
 	let user: IRemoteUser | null;
 
-	// keyIdを元にDBから取得
-	user = await dbResolver.getRemoteUserFromKeyId(signature.keyId);
-
-	// || activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
-	if (user == null) {
-		try {
-			user = await resolvePerson(getApId(activity.actor), undefined, resolver, isDelete(activity) || isUndo(activity)) as IRemoteUser;
-		} catch (e) {
-			if (e instanceof StatusError && e.isPermanentError) {
-				return `skip: Ignored actor ${activity.actor} - ${e.statusCode}`;
-			}
-			throw `Error in actor ${activity.actor} - ${e.statusCode || e}`;
+	// activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
+	try {
+		user = await resolvePerson(getApId(activity.actor), undefined, resolver, isDelete(activity) || isUndo(activity)) as IRemoteUser;
+	} catch (e) {
+		if (e instanceof StatusError && e.isPermanentError) {
+			return `skip: Ignored actor ${activity.actor} - ${e.statusCode}`;
 		}
+		throw `Error in actor ${activity.actor} - ${e.statusCode || e}`;
 	}
 
 	// http-signature signer がわからなければ終了
@@ -95,20 +89,13 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
 	// また、http-signatureのsignerは、activity.actorと一致する必要がある
 	if (!httpSignatureValidated || user.uri !== activity.actor) {
 		// でもLD-Signatureがありそうならそっちも見る
-		if (!config.ignoreApForwarded && activity.signature) {
+		if (!config.ignoreApForwarded && activity.signature?.creator) {
 			if (activity.signature.type !== 'RsaSignature2017') {
 				return `skip: unsupported LD-signature type ${activity.signature.type}`;
 			}
 
-			// activity.signature.creator: https://example.oom/users/user#main-key
-			// みたいになっててUserを引っ張れば公開キーも入ることを期待する
-			if (activity.signature.creator) {
-				const candicate = activity.signature.creator.replace(/#.*/, '');
-				await resolvePerson(candicate).catch(() => null);
-			}
+			user = await resolvePerson(activity.signature.creator.replace(/#.*/, '')).catch(() => null) as IRemoteUser | null;
 
-			// keyIdからLD-Signatureのユーザーを取得
-			user = await dbResolver.getRemoteUserFromKeyId(activity.signature.creator);
 			if (user == null) {
 				return `skip: LD-Signatureのユーザーが取得できませんでした`;
 			}

src/remote/activitypub/db-resolver.ts

@@ -5,6 +5,7 @@ import Note, { INote } from '../../models/note';
 import { IObject, getApId } from './type';
 import * as escapeRegexp from 'escape-regexp';
 import MessagingMessage, { IMessagingMessage } from '../../models/messaging-message';
+import { toDbHost } from '../../misc/convert-host';
 
 export default class DbResolver {
 	constructor() {
@@ -54,8 +55,15 @@ export default class DbResolver {
 	}
 
 	public async getRemoteUserFromKeyId(keyId: string): Promise<IRemoteUser | null> {
+		let u: URL | null = null;
+		try {
+			u = new URL(keyId);
+		} catch {
+			return null;
+		}
+
 		const user = await User.findOne({
-			host: { $ne: null },
+			host: toDbHost(u.hostname),
 			'publicKey.id': keyId,
 			deletedAt: { $exists: false }
 		}) as IRemoteUser;

src/server/api/endpoints/blocking/create.ts

@@ -6,7 +6,7 @@ import Blocking from '../../../../models/blocking';
 import create from '../../../../services/blocking/create';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 import deleteFollowing from '../../../../services/following/delete';
 
 export const meta = {
@@ -70,7 +70,7 @@ export default define(meta, async (ps, user) => {
 
 	// Get blockee
 	const blockee = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/blocking/delete.ts

@@ -6,7 +6,7 @@ import Blocking from '../../../../models/blocking';
 import deleteBlocking from '../../../../services/blocking/delete';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 
 export const meta = {
 	stability: 'stable',
@@ -79,7 +79,7 @@ export default define(meta, async (ps, user) => {
 
 	// Get blockee
 	const blockee = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') {
+		if (e instanceof GetterError && e.type === 'noSuchUser') {
 			return null;
 		}
 		throw e;

src/server/api/endpoints/following/create.ts

@@ -6,8 +6,9 @@ import Following from '../../../../models/following';
 import create from '../../../../services/following/create';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 import config from '../../../../config';
+import { FollowingError } from '../../../../services/following/following-error';
 
 export const meta = {
 	stability: 'stable',
@@ -88,7 +89,7 @@ export default define(meta, async (ps, user) => {
 
 	// Get followee
 	const followee = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 
@@ -115,8 +116,11 @@ export default define(meta, async (ps, user) => {
 	try {
 		await create(follower, followee);
 	} catch (e) {
-		if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') throw new ApiError(meta.errors.blocking);
-		if (e.id === '3338392a-f764-498d-8855-db939dcf8c48') throw new ApiError(meta.errors.blocked);
+		if (e instanceof FollowingError) {
+			if (e.type === 'blocking') throw new ApiError(meta.errors.blocking);
+			if (e.type === 'blocked') throw new ApiError(meta.errors.blocked);
+
+		}
 		throw e;
 	}
 

src/server/api/endpoints/following/delete.ts

@@ -6,7 +6,7 @@ import Following from '../../../../models/following';
 import deleteFollowing from '../../../../services/following/delete';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 
 export const meta = {
 	stability: 'stable',
@@ -69,7 +69,7 @@ export default define(meta, async (ps, user) => {
 
 	// Get followee
 	const followee = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/following/invalidate.ts

@@ -6,7 +6,7 @@ import Following from '../../../../models/following';
 import deleteFollowing from '../../../../services/following/delete';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 
 export const meta = {
 	stability: 'stable',
@@ -69,7 +69,7 @@ export default define(meta, async (ps, user) => {
 
 	// Get follower
 	const follower = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/following/requests/cancel.ts

@@ -4,7 +4,8 @@ import cancelFollowRequest from '../../../../../services/following/requests/canc
 import { pack } from '../../../../../models/user';
 import define from '../../../define';
 import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
+import { GetterError, getUser } from '../../../common/getters';
+import { FollowingError } from '../../../../../services/following/following-error';
 
 export const meta = {
 	desc: {
@@ -47,14 +48,16 @@ export const meta = {
 export default define(meta, async (ps, user) => {
 	// Fetch followee
 	const followee = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 
 	try {
 		await cancelFollowRequest(followee, user);
 	} catch (e) {
-		if (e.id === '17447091-ce07-46dd-b331-c1fd4f15b1e7') throw new ApiError(meta.errors.followRequestNotFound);
+		if (e instanceof FollowingError) {
+			if (e.type === 'followRequestNotFound') throw new ApiError(meta.errors.followRequestNotFound);
+		}
 		throw e;
 	}
 

src/server/api/endpoints/following/requests/reject.ts

@@ -3,7 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
 import rejectFollowRequest from '../../../../../services/following/requests/reject';
 import define from '../../../define';
 import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
+import { GetterError, getUser } from '../../../common/getters';
 
 export const meta = {
 	desc: {
@@ -40,8 +40,7 @@ export const meta = {
 export default define(meta, async (ps, user) => {
 	// Fetch follower
 	const follower = await getUser(ps.userId!).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-		throw e;
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);		throw e;
 	});
 
 	await rejectFollowRequest(user, follower);

src/server/api/endpoints/games/reversi/match.ts

@@ -6,7 +6,7 @@ import { publishMainStream, publishReversiStream } from '../../../../../services
 import { eighteight } from '../../../../../games/reversi/maps';
 import define from '../../../define';
 import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
+import { GetterError, getUser } from '../../../common/getters';
 
 export const meta = {
 	tags: ['games'],
@@ -88,7 +88,7 @@ export default define(meta, async (ps, user) => {
 	} else {
 		// Fetch child
 		const child = await getUser(ps.userId).catch(e => {
-			if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+			if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 			throw e;
 		});
 

src/server/api/endpoints/i/unpin.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
 import User, { pack } from '../../../../models/user';
-import { removePinned } from '../../../../services/i/pin';
+import { PinError, removePinned } from '../../../../services/i/pin';
 import define from '../../define';
 import { ApiError } from '../../error';
 import { publishMainStream } from '../../../../services/stream';
@@ -41,7 +41,9 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	await removePinned(user, ps.noteId).catch(e => {
-		if (e.id === 'b302d4cf-c050-400a-bbb3-be208681f40c') throw new ApiError(meta.errors.noSuchNote);
+		if (e instanceof PinError) {
+			if (e.type === 'noSuchNote') throw new ApiError(meta.errors.noSuchNote);
+		}
 		throw e;
 	});
 

src/server/api/endpoints/messaging/messages.ts

@@ -5,7 +5,7 @@ import { pack } from '../../../../models/messaging-message';
 import read from '../../common/read-messaging-message';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 
 export const meta = {
 	desc: {
@@ -69,7 +69,7 @@ export const meta = {
 export default define(meta, async (ps, user) => {
 	// Fetch recipient
 	const recipient = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/messaging/messages/create.ts

@@ -4,7 +4,7 @@ import { isValidText } from '../../../../../models/messaging-message';
 import DriveFile from '../../../../../models/drive-file';
 import define from '../../../define';
 import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
+import { GetterError, getUser } from '../../../common/getters';
 import { createMessage } from '../../../../../services/messages/create';
 import { isRemoteUser, IUser } from '../../../../../models/user';
 
@@ -85,7 +85,7 @@ export default define(meta, async (ps, user) => {
 
 	// Fetch recipient
 	const recipient = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/mute/create.ts

@@ -3,7 +3,7 @@ import ID, { transform } from '../../../../misc/cafy-id';
 import Mute from '../../../../models/mute';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 import { publishMutingChanged } from '../../../../services/server-event';
 import { createExpireMuteJob } from '../../../../queue';
 
@@ -71,7 +71,7 @@ export default define(meta, async (ps, user) => {
 
 	// Get mutee
 	const mutee = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/user-filter/update.ts

@@ -2,7 +2,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 import UserFilter from '../../../../models/user-filter';
 import { publishFilterChanged } from '../../../../services/server-event';
 
@@ -59,7 +59,7 @@ export default define(meta, async (ps, me) => {
 
 	// get target
 	const target = await getUser(ps.targetId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});
 

src/server/api/endpoints/users/get-frequently-replied-users.ts

@@ -6,7 +6,7 @@ import define from '../../define';
 import { maximum } from '../../../../prelude/array';
 import { getHideUserIds } from '../../common/get-hide-users';
 import { ApiError } from '../../error';
-import { getUser } from '../../common/getters';
+import { GetterError, getUser } from '../../common/getters';
 
 export const meta = {
 	tags: ['users'],
@@ -50,7 +50,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	// Lookup user
 	const user = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		if (e instanceof GetterError && e.type === 'noSuchUser') throw new ApiError(meta.errors.noSuchUser);
 		throw e;
 	});