graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 21:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2020-01-30 11:10:48 +09:00
commit a7f337e8e4
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/remote/activitypub/kernel/like.ts
View file

@ -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);
};

1
src/remote/activitypub/kernel/undo/index.ts
View file

@ -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':

4
src/remote/activitypub/type.ts
View file

@ -171,7 +171,7 @@ export interface IRemove extends IActivity {
}
export interface ILike extends IActivity {
type: 'Like';
type: 'Like' | 'EmojiReaction';
_misskey_reaction?: string;
}
@ -193,6 +193,6 @@ export const isAccept = (object: IObject): object is IAccept => object.type ===
export const isReject = (object: IObject): object is IReject => object.type === 'Reject';
export const isAdd = (object: IObject): object is IAdd => object.type === 'Add';
export const isRemove = (object: IObject): object is IRemove => object.type === 'Remove';
export const isLike = (object: IObject): object is ILike => object.type === 'Like';
export const isLike = (object: IObject): object is ILike => object.type === 'Like' || object.type === 'EmojiReaction';
export const isAnnounce = (object: IObject): object is IAnnounce => object.type === 'Announce';
export const isBlock = (object: IObject): object is IBlock => object.type === 'Block';