diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2020-02-06 17:07:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 17:07:37 +0900 |
| commit | 988ac80087a116173ab36043a7a9dd2228d2986c (patch) | |
| tree | 6b336163f728769d0c1852a78d68d5cb45122930 /src/services/note | |
| parent | Fix #5838 (diff) | |
| download | misskey-988ac80087a116173ab36043a7a9dd2228d2986c.tar.gz misskey-988ac80087a116173ab36043a7a9dd2228d2986c.tar.bz2 misskey-988ac80087a116173ab36043a7a9dd2228d2986c.zip | |
Correct Like id generation (#5852)
Diffstat (limited to 'src/services/note')
| -rw-r--r-- | src/services/note/reaction/create.ts | 6 | ||||
| -rw-r--r-- | src/services/note/reaction/delete.ts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index aee31813af..166c4e1f81 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -1,6 +1,6 @@ import { publishNoteStream } from '../../stream'; import watch from '../watch'; -import renderLike from '../../../remote/activitypub/renderer/like'; +import { renderLike } from '../../../remote/activitypub/renderer/like'; import DeliverManager from '../../../remote/activitypub/deliver-manager'; import { renderActivity } from '../../../remote/activitypub/renderer'; import { IdentifiableError } from '../../../misc/identifiable-error'; @@ -38,7 +38,7 @@ export default async (user: User, note: Note, reaction?: string) => { } // Create reaction - await NoteReactions.save({ + const inserted = await NoteReactions.save({ id: genId(), createdAt: new Date(), noteId: note.id, @@ -94,7 +94,7 @@ export default async (user: User, note: Note, reaction?: string) => { //#region 配信 if (Users.isLocalUser(user) && !note.localOnly) { - const content = renderActivity(renderLike(user, note, reaction)); + const content = renderActivity(renderLike(inserted, note)); const dm = new DeliverManager(user, content); if (note.userHost !== null) { const reactee = await Users.findOne(note.userId) diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts index 533c3b4062..620856c2d5 100644 --- a/src/services/note/reaction/delete.ts +++ b/src/services/note/reaction/delete.ts @@ -1,5 +1,5 @@ import { publishNoteStream } from '../../stream'; -import renderLike from '../../../remote/activitypub/renderer/like'; +import { renderLike } from '../../../remote/activitypub/renderer/like'; import renderUndo from '../../../remote/activitypub/renderer/undo'; import { renderActivity } from '../../../remote/activitypub/renderer'; import DeliverManager from '../../../remote/activitypub/deliver-manager'; @@ -40,7 +40,7 @@ export default async (user: User, note: Note) => { //#region 配信 if (Users.isLocalUser(user) && !note.localOnly) { - const content = renderActivity(renderUndo(renderLike(user, note, exist.reaction), user)); + const content = renderActivity(renderUndo(renderLike(exist, note), user)); const dm = new DeliverManager(user, content); if (note.userHost !== null) { const reactee = await Users.findOne(note.userId) |