Fix post deletion on Pleroma

thebaer · thebaer · commit fe82cbb96e3d · 2020-02-08T15:19:06.000-05:00
See: https://git.pleroma.social/pleroma/pleroma/issues/1481 Fixes #223
diff --git a/activitypub.go b/activitypub.go
@@ -600,7 +600,12 @@ func deleteFederatedPost(app *App, p *PublicPost, collID int64) error {
 			na.CC = append(na.CC, f)
 		}
 
-		err = makeActivityPost(app.cfg.App.Host, actor, si, activitystreams.NewDeleteActivity(na))
+		da := activitystreams.NewDeleteActivity(na)
+		// Make the ID unique to ensure it works in Pleroma
+		// See: https://git.pleroma.social/pleroma/pleroma/issues/1481
+		da.ID += "#Delete"
+
+		err = makeActivityPost(app.cfg.App.Host, actor, si, da)
 		if err != nil {
 			log.Error("Couldn't delete post! %v", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,12 @@ func deleteFederatedPost(app App, p PublicPost, collID int64) error {`
`600`	`600`	`na.CC = append(na.CC, f)`
`601`	`601`	`}`
`602`	`602`
`603`		`- err = makeActivityPost(app.cfg.App.Host, actor, si, activitystreams.NewDeleteActivity(na))`
	`603`	`+ da := activitystreams.NewDeleteActivity(na)`
	`604`	`+ // Make the ID unique to ensure it works in Pleroma`
	`605`	`+ // See: https://git.pleroma.social/pleroma/pleroma/issues/1481`
	`606`	`+ da.ID += "#Delete"`
	`607`	`+`
	`608`	`+ err = makeActivityPost(app.cfg.App.Host, actor, si, da)`
`604`	`609`	`if err != nil {`
`605`	`610`	`log.Error("Couldn't delete post! %v", err)`
`606`	`611`	`}`