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
This commit is contained in:
Mar0xy 2023-11-12 22:16:47 +01:00
parent 1f8c12b984
commit 5c38e6b824
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
13 changed files with 97 additions and 12 deletions

View file

@ -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"`);
}
}

View file

@ -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<ILike> {
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(':')) {

View file

@ -533,4 +533,10 @@ export class MiMeta {
default: 0,
})
public notesPerOneAd: number;
@Column('varchar', {
length: 500,
nullable: true,
})
public defaultLike: string | null;
}

View file

@ -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));

View file

@ -386,6 +386,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
logoImageUrl: instance.logoImageUrl,
defaultLightTheme: instance.defaultLightTheme,
defaultDarkTheme: instance.defaultDarkTheme,
defaultLike: instance.defaultLike,
enableEmail: instance.enableEmail,
enableServiceWorker: instance.enableServiceWorker,
translatorAvailable: instance.deeplAuthKey != null,

View file

@ -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<typeof meta, typeof paramDef> { // eslint-
set.defaultDarkTheme = ps.defaultDarkTheme;
}
if (ps.defaultLike !== undefined) {
set.defaultLike = ps.defaultLike;
}
if (ps.cacheRemoteFiles !== undefined) {
set.cacheRemoteFiles = ps.cacheRemoteFiles;
}

View file

@ -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<typeof meta, typeof paramDef> { // 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,

View file

@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover }]"
:tabindex="!isDeleted ? '-1' : undefined"
>
<MkNoteSub v-if="appearNote.reply && !renoteCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
<MkNoteSub v-if="appearNote.reply && !renoteCollapsed" :meta="props.meta" :note="appearNote.reply" :class="$style.replyTo"/>
<div v-if="pinned" :class="$style.tip"><i class="ph-push-pin ph-bold ph-lg"></i> {{ i18n.ts.pinnedNote }}</div>
<!--<div v-if="appearNote._prId_" class="tip"><i class="ph-megaphone ph-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>-->
<!--<div v-if="appearNote._featuredId_" class="tip"><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts.featured }}</div>-->
@ -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) {

View file

@ -15,9 +15,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="!conversationLoaded" style="padding: 16px">
<MkButton style="margin: 0 auto;" primary rounded @click="loadConversation">{{ i18n.ts.loadConversation }}</MkButton>
</div>
<MkNoteSub v-for="note in conversation" :key="note.id" :class="$style.replyToMore" :note="note" :expandAllCws="props.expandAllCws"/>
<MkNoteSub v-for="note in conversation" :meta="meta" :key="note.id" :class="$style.replyToMore" :note="note" :expandAllCws="props.expandAllCws"/>
</div>
<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" :class="$style.replyTo" :expandAllCws="props.expandAllCws"/>
<MkNoteSub v-if="appearNote.reply" :meta="meta" :note="appearNote.reply" :class="$style.replyTo" :expandAllCws="props.expandAllCws"/>
<div v-if="isRenote" :class="$style.renote">
<MkAvatar :class="$style.renoteAvatar" :user="note.user" link preview/>
<i class="ph-rocket-launch ph-bold ph-lg" style="margin-right: 4px;"></i>
@ -171,7 +171,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="!repliesLoaded" style="padding: 16px">
<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
</div>
<MkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
<MkNoteSub v-for="note in replies" :key="note.id" :meta="meta" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
</div>
<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
@ -188,7 +188,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="!quotesLoaded" style="padding: 16px">
<MkButton style="margin: 0 auto;" primary rounded @click="loadQuotes">{{ i18n.ts.loadReplies }}</MkButton>
</div>
<MkNoteSub v-for="note in quotes" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
<MkNoteSub v-for="note in quotes" :key="note.id" :meta="meta" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
</div>
<div v-else-if="tab === 'reactions'" :class="$style.tab_reactions">
<div :class="$style.reactionTabs">
@ -263,6 +263,12 @@ const props = defineProps<{
expandAllCws?: boolean;
}>();
let meta = $ref<Misskey.entities.LiteInstanceMetadata>() 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));

View file

@ -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) {

View file

@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:ad="true"
:class="$style.notes"
>
<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
<MkNote :key="note._featuredId_ || note._prId_ || note.id" :meta="meta" :class="$style.note" :note="note"/>
</MkDateSeparatedList>
</div>
</template>
@ -33,11 +33,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { shallowRef } from 'vue';
import * as Misskey from 'misskey-js';
import MkNote from '@/components/MkNote.vue';
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import { i18n } from '@/i18n.js';
import { infoImageUrl } from '@/instance.js';
import * as os from '@/os.js';
const props = defineProps<{
pagination: Paging;
@ -45,6 +47,12 @@ const props = defineProps<{
disableAutoLoad?: boolean;
}>();
let meta = $ref<Misskey.entities.LiteInstanceMetadata>() as Misskey.entities.LiteInstanceMetadata;
os.api('meta', { detail: false }).then(res => {
meta = res as unknown as Misskey.entities.LiteInstanceMetadata;
});
const pagingComponent = shallowRef<InstanceType<typeof MkPagination>>();
defineExpose({

View file

@ -47,6 +47,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
</MkInput>
<FromSlot>
<template #label>Default like emoji</template>
<MkCustomEmoji v-if="defaultLike.startsWith(':')" style="max-height: 3em; font-size: 1.1em;" :useOriginalSize="false" :class="$style.reaction" :name="defaultLike" :normal="true" :noStyle="true"/>
<MkEmoji v-else :emoji="defaultLike" style="max-height: 3em; font-size: 1.1em;" :normal="true" :noStyle="true"/>
<MkButton rounded :small="true" @click="chooseNewLike"><i class="ph-smiley ph-bold ph-lg"></i> Change</MkButton>
</FromSlot>
<MkInput v-model="notFoundImageUrl" type="url">
<template #prefix><i class="ph-link ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts.notFoundDescription }}</template>
@ -102,6 +109,7 @@ import MkInput from '@/components/MkInput.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import FormSection from '@/components/form/section.vue';
import FormSplit from '@/components/form/split.vue';
import FromSlot from '@/components/form/slot.vue';
import FormSuspense from '@/components/form/suspense.vue';
import * as os from '@/os.js';
import { instance, fetchInstance } from '@/instance.js';
@ -119,6 +127,7 @@ let backgroundImageUrl: string | null = $ref(null);
let themeColor: any = $ref(null);
let defaultLightTheme: any = $ref(null);
let defaultDarkTheme: any = $ref(null);
let defaultLike: any = $ref(null);
let serverErrorImageUrl: string | null = $ref(null);
let infoImageUrl: string | null = $ref(null);
let notFoundImageUrl: string | null = $ref(null);
@ -134,6 +143,7 @@ async function init() {
themeColor = meta.themeColor;
defaultLightTheme = meta.defaultLightTheme;
defaultDarkTheme = meta.defaultDarkTheme;
defaultLike = meta.defaultLike;
serverErrorImageUrl = meta.serverErrorImageUrl;
infoImageUrl = meta.infoImageUrl;
notFoundImageUrl = meta.notFoundImageUrl;
@ -159,6 +169,19 @@ function save() {
});
}
function chooseNewLike(ev: MouseEvent) {
os.pickEmoji(ev.currentTarget ?? ev.target, {
showPinned: false,
}).then(emoji => {
os.apiWithDialog('admin/update-meta', {
defaultLike: emoji,
}).then(() => {
fetchInstance();
defaultLike = emoji;
});
});
}
const headerTabs = $computed(() => []);
definePageMetadata({

View file

@ -401,6 +401,7 @@ export type LiteInstanceMetadata = {
notesPerOneAd: number;
translatorAvailable: boolean;
serverRules: string[];
defaultLike: string;
};
export type DetailedInstanceMetadata = LiteInstanceMetadata & {