limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-13 13:37:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Announce/Delete AP deliver (#7517)

Browse source 
* Fix Announce/Delete AP deliver

* Revert "Fix Announce/Delete AP deliver"

This reverts commit 0292c5196df48f67bb7914e925560ba69e2b2980.

* localOnlyのDeleteをdeliverしないように

* null Activityに対するUndoはdeliverしないように
This commit is contained in:
MeiMei 2021-05-19 16:15:01 +09:00 committed by GitHub
parent 634f4eeb16
commit 8d709351bd
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/remote/activitypub/renderer/undo.ts
View file

@ -1,8 +1,12 @@
import config from '@/config';
import { ILocalUser, User } from '../../../models/entities/user';
export default (object: any, user: { id: User['id'] }) => ({
export default (object: any, user: { id: User['id'] }) => {
if (object == null) return null;
return {
type: 'Undo',
actor: `${config.url}/users/${user.id}`,
object
});
};
};

2
src/services/note/delete.ts
View file

@ -35,7 +35,7 @@ export default async function(user: User, note: Note, quiet = false) {
});
//#region ローカルの投稿なら削除アクティビティを配送
if (Users.isLocalUser(user)) {
if (Users.isLocalUser(user) && !note.localOnly) {
let renote: Note | undefined;
// if deletd note is renote