バグ修正

Type4ny-Project · Nov 5, 2024 · 379621e · 379621e
1 parent ba02555
commit 379621e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -148,10 +148,6 @@ export class ApInboxService {
 		const rules = await this.inboxRuleRepository.find();
 		for (const rule of rules) {
 			const result = await this.inboxRuleService.evalCond(activity, actor, rule.condFormula);
-			console.log('result');
-			console.log(result);
-			console.log(rule.action.type);
-			console.log('result END');
 			if (result && rule.action.type === 'reject') {
 				await this.moderationLogService.log(actor, 'inboxRejected', {
 					activity,

diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -103,7 +103,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			if (!isRequest) {
-				await this.customEmojiService.update(emojiId, {
+				await this.customEmojiService.update({
+					id: emojiId,
 					driveFile,
 					name: ps.name,
 					category: ps.category,

diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkButton @click="setCategoryBulk">Set Category</MkButton>
 		<MkButton @click="deletes">Delete</MkButton>
 		<div class="_gaps">
-			<MkFolder v-for="avatarDecoration in avatarDecorations" :key="avatarDecoration.id ?? avatarDecoration._id" :defaultOpen="avatarDecoration.id == null">
+			<MkFolder v-for="avatarDecoration in avatarDecorations" :key="avatarDecoration.id" :defaultOpen="avatarDecoration.id == null">
 				<template #label>{{ avatarDecoration.name }}</template>
 				<template #caption>{{ avatarDecoration.description }}</template>
 
@@ -59,7 +59,6 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
-import XDecoration from '@/pages/settings/avatar-decoration.decoration.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 
 const avatarDecorations = ref<Misskey.entities.AdminAvatarDecorationsListResponse>([]);
@@ -68,6 +67,15 @@ const selectItemsId = ref<string[]>([]);
 
 const $i = signinRequired();
 
+async function save(avatarDecoration) {
+	if (avatarDecoration.id == null) {
+		await os.apiWithDialog('admin/avatar-decorations/create', avatarDecoration);
+		load();
+	} else {
+		os.apiWithDialog('admin/avatar-decorations/update', avatarDecoration);
+	}
+}
+
 function add() {
 	avatarDecorations.value.unshift({
 		_id: Math.random().toString(36),