summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/kernel
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-01-30 08:03:50 +0900
committerGitHub <noreply@github.com>2020-01-30 08:03:50 +0900
commite97bfe569603557473605c8ef3c8484016be78df (patch)
tree28be51ca920141077914c79853e7e21621f5bc66 /src/remote/activitypub/kernel
parent:v: (diff)
downloadsharkey-e97bfe569603557473605c8ef3c8484016be78df.tar.gz
sharkey-e97bfe569603557473605c8ef3c8484016be78df.tar.bz2
sharkey-e97bfe569603557473605c8ef3c8484016be78df.zip
Handle EmojiReaction activitiy (#5492)
* Handle some additional reaction activities * Revert "Handle some additional reaction activities" This reverts commit 1462ff12de08e8810023658e8ff7b5ee8bd7965b. * EmojiReaction
Diffstat (limited to 'src/remote/activitypub/kernel')
-rw-r--r--src/remote/activitypub/kernel/like.ts2
-rw-r--r--src/remote/activitypub/kernel/undo/index.ts1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/remote/activitypub/kernel/like.ts b/src/remote/activitypub/kernel/like.ts
index 23b4aedd15..fa8983b38d 100644
--- a/src/remote/activitypub/kernel/like.ts
+++ b/src/remote/activitypub/kernel/like.ts
@@ -19,5 +19,5 @@ export default async (actor: IRemoteUser, activity: ILike) => {
return;
}
- await create(actor, note, activity._misskey_reaction);
+ await create(actor, note, activity._misskey_reaction || activity.content || activity.name);
};
diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts
index 4b23533058..81decd1256 100644
--- a/src/remote/activitypub/kernel/undo/index.ts
+++ b/src/remote/activitypub/kernel/undo/index.ts
@@ -33,6 +33,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
unblock(actor, object as IBlock);
break;
case 'Like':
+ case 'EmojiReaction':
undoLike(actor, object as ILike);
break;
case 'Announce':