mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-01 07:35:57 +09:00
Code

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 4b33c42da7
commit b16c3798a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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'] }) => ({
type: 'Undo',
actor: `${config.url}/users/${user.id}`,
object
});
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