From 5c38e6b824053a9d94e025f3836557acf8bbebad Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sun, 12 Nov 2023 22:16:47 +0100 Subject: [PATCH] add: custom like emoji per instance, fix like This fixes the fact that likes on mastodon didn't get federated properly and let's instance admins choose a custom emoji --- .../migration/1699819257000-defaultLike.js | 11 +++++++++ .../src/core/activitypub/ApRendererService.ts | 23 ++++++++++++++++--- packages/backend/src/models/Meta.ts | 6 +++++ .../processors/ImportNotesProcessorService.ts | 2 +- .../src/server/api/endpoints/admin/meta.ts | 1 + .../server/api/endpoints/admin/update-meta.ts | 5 ++++ .../backend/src/server/api/endpoints/meta.ts | 5 ++++ packages/frontend/src/components/MkNote.vue | 5 ++-- .../src/components/MkNoteDetailed.vue | 14 +++++++---- .../frontend/src/components/MkNoteSub.vue | 3 ++- packages/frontend/src/components/MkNotes.vue | 10 +++++++- .../frontend/src/pages/admin/branding.vue | 23 +++++++++++++++++++ packages/misskey-js/src/entities.ts | 1 + 13 files changed, 97 insertions(+), 12 deletions(-) create mode 100644 packages/backend/migration/1699819257000-defaultLike.js diff --git a/packages/backend/migration/1699819257000-defaultLike.js b/packages/backend/migration/1699819257000-defaultLike.js new file mode 100644 index 0000000000..45492fa6c6 --- /dev/null +++ b/packages/backend/migration/1699819257000-defaultLike.js @@ -0,0 +1,11 @@ +export class instanceDefaultLike1699819257000 { + name = 'instanceDefaultLike1699819257000' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "defaultLike" character varying(500) DEFAULT '❤️'`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "defaultLike"`); + } +} diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index fb32eab203..cc550d517a 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -23,7 +23,7 @@ import { MfmService } from '@/core/MfmService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import type { MiUserKeypair } from '@/models/UserKeypair.js'; -import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository } from '@/models/_.js'; +import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository, InstancesRepository } from '@/models/_.js'; import { bindThis } from '@/decorators.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { isNotNull } from '@/misc/is-not-null.js'; @@ -31,6 +31,7 @@ import { IdService } from '@/core/IdService.js'; import { LdSignatureService } from './LdSignatureService.js'; import { ApMfmService } from './ApMfmService.js'; import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js'; +import { MetaService } from '../MetaService.js'; @Injectable() export class ApRendererService { @@ -53,6 +54,9 @@ export class ApRendererService { @Inject(DI.pollsRepository) private pollsRepository: PollsRepository, + @Inject(DI.instancesRepository) + private instancesRepository: InstancesRepository, + private customEmojiService: CustomEmojiService, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService, @@ -61,6 +65,7 @@ export class ApRendererService { private apMfmService: ApMfmService, private mfmService: MfmService, private idService: IdService, + private metaService: MetaService, ) { } @@ -265,14 +270,26 @@ export class ApRendererService { @bindThis public async renderLike(noteReaction: MiNoteReaction, note: { uri: string | null }): Promise { const reaction = noteReaction.reaction; + const meta = await this.metaService.fetch(true); + let isMastodon = false; + if (meta.defaultLike && reaction.replaceAll(':', '') === meta.defaultLike.replaceAll(':', '')) { + const note = await this.notesRepository.findOneBy({ id: noteReaction.noteId }); + + if (note && note.userHost) { + const instance = await this.instancesRepository.findOneBy({ host: note.userHost }); + + if (instance && instance.softwareName === 'mastodon') isMastodon = true; + } + } + const object: ILike = { type: 'Like', id: `${this.config.url}/likes/${noteReaction.id}`, actor: `${this.config.url}/users/${noteReaction.userId}`, object: note.uri ? note.uri : `${this.config.url}/notes/${noteReaction.noteId}`, - content: reaction, - _misskey_reaction: reaction, + content: isMastodon ? undefined : reaction, + _misskey_reaction: isMastodon ? undefined : reaction, }; if (reaction.startsWith(':')) { diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts index bb713c458c..3ec9a69810 100644 --- a/packages/backend/src/models/Meta.ts +++ b/packages/backend/src/models/Meta.ts @@ -533,4 +533,10 @@ export class MiMeta { default: 0, }) public notesPerOneAd: number; + + @Column('varchar', { + length: 500, + nullable: true, + }) + public defaultLike: string | null; } diff --git a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts index 607d4d19a5..a9159a3980 100644 --- a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts @@ -364,7 +364,7 @@ export class ImportNotesProcessorService { let title; const files: MiDriveFile[] = []; - function decodeIGString(str: any) { + function decodeIGString(str: string) { const arr = []; for (let i = 0; i < str.length; i++) { arr.push(str.charCodeAt(i)); diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index f737a75972..63491638c8 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -386,6 +386,7 @@ export default class extends Endpoint { // eslint- logoImageUrl: instance.logoImageUrl, defaultLightTheme: instance.defaultLightTheme, defaultDarkTheme: instance.defaultDarkTheme, + defaultLike: instance.defaultLike, enableEmail: instance.enableEmail, enableServiceWorker: instance.enableServiceWorker, translatorAvailable: instance.deeplAuthKey != null, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index efb6695d35..e58123f2bf 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -56,6 +56,7 @@ export const paramDef = { description: { type: 'string', nullable: true }, defaultLightTheme: { type: 'string', nullable: true }, defaultDarkTheme: { type: 'string', nullable: true }, + defaultLike: { type: 'string', nullable: true }, cacheRemoteFiles: { type: 'boolean' }, cacheRemoteSensitiveFiles: { type: 'boolean' }, emailRequiredForSignup: { type: 'boolean' }, @@ -240,6 +241,10 @@ export default class extends Endpoint { // eslint- set.defaultDarkTheme = ps.defaultDarkTheme; } + if (ps.defaultLike !== undefined) { + set.defaultLike = ps.defaultLike; + } + if (ps.cacheRemoteFiles !== undefined) { set.cacheRemoteFiles = ps.cacheRemoteFiles; } diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index dbd72763bf..8c8fdde066 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -84,6 +84,10 @@ export const meta = { type: 'string', optional: false, nullable: true, }, + defaultLike: { + type: 'string', + optional: false, nullable: true, + }, disableRegistration: { type: 'boolean', optional: false, nullable: false, @@ -334,6 +338,7 @@ export default class extends Endpoint { // eslint- // クライアントの手間を減らすためあらかじめJSONに変換しておく defaultLightTheme: instance.defaultLightTheme ? JSON.stringify(JSON5.parse(instance.defaultLightTheme)) : null, defaultDarkTheme: instance.defaultDarkTheme ? JSON.stringify(JSON5.parse(instance.defaultDarkTheme)) : null, + defaultLike: instance.defaultLike, ads: ads.map(ad => ({ id: ad.id, url: ad.url, diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 2967a753b0..eebbd44bcd 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only :class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover }]" :tabindex="!isDeleted ? '-1' : undefined" > - +
{{ i18n.ts.pinnedNote }}
@@ -207,6 +207,7 @@ const props = withDefaults(defineProps<{ note: Misskey.entities.Note; pinned?: boolean; mock?: boolean; + meta: Misskey.entities.LiteInstanceMetadata; }>(), { mock: false, }); @@ -512,7 +513,7 @@ function like(): void { } os.api('notes/reactions/create', { noteId: appearNote.id, - reaction: '❤️', + reaction: props.meta.defaultLike, }); const el = likeButton.value as HTMLElement | null | undefined; if (el) { diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 0a603dc327..6deda63352 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -15,9 +15,9 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.loadConversation }}
- + - +
@@ -171,7 +171,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.loadReplies }}
- +
@@ -188,7 +188,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.loadReplies }}
- +
@@ -263,6 +263,12 @@ const props = defineProps<{ expandAllCws?: boolean; }>(); +let meta = $ref() as Misskey.entities.LiteInstanceMetadata; + +os.api('meta', { detail: false }).then(res => { + meta = res as unknown as Misskey.entities.LiteInstanceMetadata; +}); + const inChannel = inject('inChannel', null); let note = $ref(deepClone(props.note)); diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index a679d70b85..4cc35f49c6 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -110,6 +110,7 @@ const canRenote = computed(() => ['public', 'home'].includes(props.note.visibili const props = withDefaults(defineProps<{ note: Misskey.entities.Note; + meta: Misskey.entities.LiteInstanceMetadata; detail?: boolean; expandAllCws?: boolean; @@ -218,7 +219,7 @@ function like(): void { showMovedDialog(); os.api('notes/reactions/create', { noteId: props.note.id, - reaction: '❤️', + reaction: props.meta.defaultLike, }); const el = reactButton.value as HTMLElement | null | undefined; if (el) { diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue index 76587ce141..926c99143d 100644 --- a/packages/frontend/src/components/MkNotes.vue +++ b/packages/frontend/src/components/MkNotes.vue @@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only :ad="true" :class="$style.notes" > - +
@@ -33,11 +33,13 @@ SPDX-License-Identifier: AGPL-3.0-only