mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-22 18:07:31 -07:00
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
ca90da9d4d
3 changed files with 4 additions and 3 deletions
|
@ -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);
|
||||
};
|
||||
|
|
|
@ -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':
|
||||
|
|
|
@ -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';
|
||||
|
|
Loading…
Reference in a new issue