From 26845416932ecf0ce035240ce934d2afb77bf550 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Mon, 18 Mar 2019 00:03:57 +0900 Subject: Custom reaction (#4517) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Custom reaction * increase limit of reactions/delete * リアクションの場合は OS標準の絵文字を使用 を迂回する * カスタムリアクションを無効にする設定 * fix * disableCustomReaction --> enableEmojiReaction * Avoid MFM rendering * :art: * :art: * Auto accept * custom emoji reaction * Improve usability * Extract emojiRegex * Fix * Clean up * :art: * :art: * toDbReaction で reaction は必須に あとフォールバックは like に * Clean up * Make required * https://github.com/syuilo/misskey/pull/4517/commits/3eb08748feeaab9ee5c5b505c870f97d7edbeb0d#r266241728 * Refactor * Allow null --- src/services/note/reaction/create.ts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/services/note') diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 5897df2c97..4fdaf92ac6 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -10,6 +10,8 @@ import { deliver } from '../../../queue'; import { renderActivity } from '../../../remote/activitypub/renderer'; import perUserReactionsChart from '../../../services/chart/per-user-reactions'; import { IdentifiableError } from '../../../misc/identifiable-error'; +import { toDbReaction } from '../../../misc/reaction-lib'; +import fetchMeta from '../../../misc/fetch-meta'; export default async (user: IUser, note: INote, reaction: string) => { // Myself @@ -17,6 +19,9 @@ export default async (user: IUser, note: INote, reaction: string) => { throw new IdentifiableError('2d8e7297-1873-4c00-8404-792c68d7bef0', 'cannot react to my note'); } + const meta = await fetchMeta(); + reaction = await toDbReaction(reaction, meta.enableEmojiReaction); + // Create reaction await NoteReaction.insert({ createdAt: new Date(), -- cgit v1.2.3-freya