From a3fd51d6e0dc5d89f88efe881cebf35b36417575 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Thu, 16 Nov 2023 23:47:44 +0100 Subject: [PATCH] upd: change the way likes get handled --- .../backend/src/server/api/EndpointsModule.ts | 4 ++ packages/backend/src/server/api/endpoints.ts | 2 + .../src/server/api/endpoints/notes/like.ts | 66 +++++++++++++++++++ packages/frontend/src/components/MkNote.vue | 13 ++-- .../src/components/MkNoteDetailed.vue | 24 +++---- .../frontend/src/components/MkNoteSub.vue | 11 ++-- packages/frontend/src/components/MkNotes.vue | 10 +-- packages/misskey-js/src/api.types.ts | 1 + 8 files changed, 94 insertions(+), 37 deletions(-) create mode 100644 packages/backend/src/server/api/endpoints/notes/like.ts diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts index 77048ec013..c2de4a7665 100644 --- a/packages/backend/src/server/api/EndpointsModule.ts +++ b/packages/backend/src/server/api/EndpointsModule.ts @@ -284,6 +284,7 @@ import * as ep___notes_polls_vote from './endpoints/notes/polls/vote.js'; import * as ep___notes_reactions from './endpoints/notes/reactions.js'; import * as ep___notes_reactions_create from './endpoints/notes/reactions/create.js'; import * as ep___notes_reactions_delete from './endpoints/notes/reactions/delete.js'; +import * as ep___notes_like from './endpoints/notes/like.js'; import * as ep___notes_renotes from './endpoints/notes/renotes.js'; import * as ep___notes_replies from './endpoints/notes/replies.js'; import * as ep___notes_edit from './endpoints/notes/edit.js'; @@ -653,6 +654,7 @@ const $notes_polls_vote: Provider = { provide: 'ep:notes/polls/vote', useClass: const $notes_reactions: Provider = { provide: 'ep:notes/reactions', useClass: ep___notes_reactions.default }; const $notes_reactions_create: Provider = { provide: 'ep:notes/reactions/create', useClass: ep___notes_reactions_create.default }; const $notes_reactions_delete: Provider = { provide: 'ep:notes/reactions/delete', useClass: ep___notes_reactions_delete.default }; +const $notes_like: Provider = { provide: 'ep:notes/like', useClass: ep___notes_like.default }; const $notes_renotes: Provider = { provide: 'ep:notes/renotes', useClass: ep___notes_renotes.default }; const $notes_replies: Provider = { provide: 'ep:notes/replies', useClass: ep___notes_replies.default }; const $notes_searchByTag: Provider = { provide: 'ep:notes/search-by-tag', useClass: ep___notes_searchByTag.default }; @@ -1026,6 +1028,7 @@ const $sponsors: Provider = { provide: 'ep:sponsors', useClass: ep___sponsors.de $notes_reactions, $notes_reactions_create, $notes_reactions_delete, + $notes_like, $notes_renotes, $notes_replies, $notes_searchByTag, @@ -1393,6 +1396,7 @@ const $sponsors: Provider = { provide: 'ep:sponsors', useClass: ep___sponsors.de $notes_reactions, $notes_reactions_create, $notes_reactions_delete, + $notes_like, $notes_renotes, $notes_replies, $notes_searchByTag, diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index 18a0bff840..7b17dc138f 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -284,6 +284,7 @@ import * as ep___notes_polls_vote from './endpoints/notes/polls/vote.js'; import * as ep___notes_reactions from './endpoints/notes/reactions.js'; import * as ep___notes_reactions_create from './endpoints/notes/reactions/create.js'; import * as ep___notes_reactions_delete from './endpoints/notes/reactions/delete.js'; +import * as ep___notes_like from './endpoints/notes/like.js'; import * as ep___notes_renotes from './endpoints/notes/renotes.js'; import * as ep___notes_replies from './endpoints/notes/replies.js'; import * as ep___notes_searchByTag from './endpoints/notes/search-by-tag.js'; @@ -651,6 +652,7 @@ const eps = [ ['notes/reactions', ep___notes_reactions], ['notes/reactions/create', ep___notes_reactions_create], ['notes/reactions/delete', ep___notes_reactions_delete], + ['notes/like', ep___notes_like], ['notes/renotes', ep___notes_renotes], ['notes/replies', ep___notes_replies], ['notes/search-by-tag', ep___notes_searchByTag], diff --git a/packages/backend/src/server/api/endpoints/notes/like.ts b/packages/backend/src/server/api/endpoints/notes/like.ts new file mode 100644 index 0000000000..17ee937360 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/notes/like.ts @@ -0,0 +1,66 @@ +import { Injectable } from '@nestjs/common'; +import { Endpoint } from '@/server/api/endpoint-base.js'; +import { GetterService } from '@/server/api/GetterService.js'; +import { ReactionService } from '@/core/ReactionService.js'; +import { MetaService } from '@/core/MetaService.js'; +import { ApiError } from '../../error.js'; + +export const meta = { + tags: ['notes'], + + requireCredential: true, + + prohibitMoved: true, + + kind: 'write:reactions', + + errors: { + noSuchNote: { + message: 'No such note.', + code: 'NO_SUCH_NOTE', + id: '033d0620-5bfe-4027-965d-980b0c85a3ea', + }, + + youHaveBeenBlocked: { + message: 'You cannot like this note because you have been blocked by this user.', + code: 'YOU_HAVE_BEEN_BLOCKED', + id: '20ef5475-9f38-4e4c-bd33-de6d979498ec', + }, + }, +} as const; + +export const paramDef = { + type: 'object', + properties: { + noteId: { type: 'string', format: 'misskey:id' }, + override: { type: 'string', nullable: true }, + }, + required: ['noteId'], +} as const; + +@Injectable() +export default class extends Endpoint { // eslint-disable-line import/no-default-export + constructor( + private getterService: GetterService, + private reactionService: ReactionService, + private metaService: MetaService, + ) { + super(meta, paramDef, async (ps, me) => { + const instance = await this.metaService.fetch(); + const like = ps.override ?? instance.defaultLike; + const note = await this.getterService.getNote(ps.noteId).catch(err => { + if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); + throw err; + }); + await this.reactionService.create(me, note, like).catch(async err => { + if (err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') { + await this.reactionService.delete(me, note); + return; + } + if (err.id === 'e70412a4-7197-4726-8e74-f3e0deb92aa7') throw new ApiError(meta.errors.youHaveBeenBlocked); + throw err; + }); + return; + }); + } +} diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 8b412f79b8..89201063d1 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,7 +207,6 @@ const props = withDefaults(defineProps<{ note: Misskey.entities.Note; pinned?: boolean; mock?: boolean; - meta: Misskey.entities.LiteInstanceMetadata; }>(), { mock: false, }); @@ -280,7 +279,7 @@ const translating = ref(false); const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || (appearNote.visibility === 'followers' && appearNote.userId === $i.id)); let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId || $i.id === appearNote.userId)) || (appearNote.myReaction != null))); -const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : props.meta.defaultLike); +const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : null); const keymap = { 'r': () => reply(true), @@ -512,9 +511,9 @@ function like(): void { if (props.mock) { return; } - os.api('notes/reactions/create', { + os.api('notes/like', { noteId: appearNote.id, - reaction: defaultLike.value, + override: defaultLike.value, }); const el = likeButton.value as HTMLElement | null | undefined; if (el) { @@ -533,9 +532,9 @@ function react(viaKeyboard = false): void { return; } - os.api('notes/reactions/create', { + os.api('notes/like', { noteId: appearNote.id, - reaction: defaultLike.value, + override: defaultLike.value, }); const el = reactButton.value as HTMLElement | null | undefined; if (el) { diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 66eeb962f3..b2594dec23 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,12 +263,6 @@ 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)); @@ -323,7 +317,7 @@ const conversation = ref([]); const replies = ref([]); const quotes = ref([]); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || appearNote.userId === $i.id); -const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : meta.defaultLike); +const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : null); watch(() => props.expandAllCws, (expandAllCws) => { if (expandAllCws !== showContent.value) showContent.value = expandAllCws; @@ -557,9 +551,9 @@ function react(viaKeyboard = false): void { pleaseLogin(); showMovedDialog(); if (appearNote.reactionAcceptance === 'likeOnly') { - os.api('notes/reactions/create', { + os.api('notes/like', { noteId: appearNote.id, - reaction: defaultLike.value, + override: defaultLike.value, }); const el = reactButton.value as HTMLElement | null | undefined; if (el) { @@ -587,9 +581,9 @@ function react(viaKeyboard = false): void { function like(): void { pleaseLogin(); showMovedDialog(); - os.api('notes/reactions/create', { + os.api('notes/like', { noteId: appearNote.id, - reaction: defaultLike.value, + override: defaultLike.value, }); const el = likeButton.value as HTMLElement | null | undefined; if (el) { diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index 85d1203831..94f52b7f5d 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -110,7 +110,6 @@ 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; @@ -134,7 +133,7 @@ const menuButton = shallowRef(); const likeButton = shallowRef(); let appearNote = $computed(() => isRenote ? props.note.renote as Misskey.entities.Note : props.note); -const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : props.meta.defaultLike); +const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : null); const isRenote = ( props.note.renote != null && @@ -188,9 +187,9 @@ function react(viaKeyboard = false): void { pleaseLogin(); showMovedDialog(); if (props.note.reactionAcceptance === 'likeOnly') { - os.api('notes/reactions/create', { + os.api('notes/like', { noteId: props.note.id, - reaction: defaultLike.value, + override: defaultLike.value, }); const el = reactButton.value as HTMLElement | null | undefined; if (el) { @@ -218,9 +217,9 @@ function react(viaKeyboard = false): void { function like(): void { pleaseLogin(); showMovedDialog(); - os.api('notes/reactions/create', { + os.api('notes/like', { noteId: props.note.id, - reaction: defaultLike.value, + override: defaultLike.value, }); 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 926c99143d..76587ce141 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,13 +33,11 @@ SPDX-License-Identifier: AGPL-3.0-only