diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts index 7e968a2a5d..b6f06a1b61 100644 --- a/packages/backend/src/server/api/stream/types.ts +++ b/packages/backend/src/server/api/stream/types.ts @@ -125,6 +125,7 @@ export interface NoteStreamTypes { reacted: { reaction: string; emoji?: { + id: string; name: string; url: string; } | null; diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts index 4cf1fd0941..6110858d29 100644 --- a/packages/backend/src/services/note/reaction/create.ts +++ b/packages/backend/src/services/note/reaction/create.ts @@ -1,26 +1,19 @@ -import { publishNoteStream } from "@/services/stream.js"; -import { renderLike } from "@/remote/activitypub/renderer/like.js"; +import {publishNoteStream} from "@/services/stream.js"; +import {renderLike} from "@/remote/activitypub/renderer/like.js"; import DeliverManager from "@/remote/activitypub/deliver-manager.js"; -import { renderActivity } from "@/remote/activitypub/renderer/index.js"; -import { toDbReaction, decodeReaction } from "@/misc/reaction-lib.js"; -import type { User, IRemoteUser } from "@/models/entities/user.js"; -import type { Note } from "@/models/entities/note.js"; -import { - NoteReactions, - Users, - NoteWatchings, - Notes, - Emojis, - Blockings, -} from "@/models/index.js"; -import { IsNull, Not } from "typeorm"; -import { perUserReactionsChart } from "@/services/chart/index.js"; -import { genId } from "@/misc/gen-id.js"; -import { createNotification } from "../../create-notification.js"; +import {renderActivity} from "@/remote/activitypub/renderer/index.js"; +import {decodeReaction, toDbReaction} from "@/misc/reaction-lib.js"; +import type {IRemoteUser, User} from "@/models/entities/user.js"; +import type {Note} from "@/models/entities/note.js"; +import {Blockings, Emojis, NoteReactions, Notes, NoteWatchings, Users,} from "@/models/index.js"; +import {IsNull, Not} from "typeorm"; +import {perUserReactionsChart} from "@/services/chart/index.js"; +import {genId} from "@/misc/gen-id.js"; +import {createNotification} from "../../create-notification.js"; import deleteReaction from "./delete.js"; -import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js"; -import type { NoteReaction } from "@/models/entities/note-reaction.js"; -import { IdentifiableError } from "@/misc/identifiable-error.js"; +import {isDuplicateKeyValueError} from "@/misc/is-duplicate-key-value-error.js"; +import type {NoteReaction} from "@/models/entities/note-reaction.js"; +import {IdentifiableError} from "@/misc/identifiable-error.js"; export default async ( user: { id: User["id"]; host: User["host"] }, @@ -109,6 +102,7 @@ export default async ( emoji: emoji != null ? { + id: emoji.id, name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`,