aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFChannel <>2021-08-02 16:37:07 -0700
committerFChannel <>2021-08-02 16:37:07 -0700
commitcfc9beb959c588644feb4f1eea4c7cd860e5005f (patch)
tree92132909ad046c17f6636e09bb18b1bfd4f01386
parent9e7491390f94d7b6ce6aac58df50380bffc7bec4 (diff)
parent149f71db2d6e1b704ff2712393da5276a622d4dd (diff)
Merge branch 'development'
-rw-r--r--main.go2
-rw-r--r--outboxPost.go3
2 files changed, 3 insertions, 2 deletions
diff --git a/main.go b/main.go
index dd9b9d0..5eed9ef 100644
--- a/main.go
+++ b/main.go
@@ -69,7 +69,7 @@ func main() {
FollowingBoards = GetActorFollowingDB(db, Domain)
- StartupArchive(db)
+ go StartupArchive(db)
go CheckInactive(db)
diff --git a/outboxPost.go b/outboxPost.go
index d54dd8e..0292e4f 100644
--- a/outboxPost.go
+++ b/outboxPost.go
@@ -550,13 +550,14 @@ func ParseInboxRequest(w http.ResponseWriter, r *http.Request, db *sql.DB) {
case "Delete":
for _, e := range activity.To {
actor := GetActorFromDB(db, e)
- if actor.Id != "" {
+ if actor.Id != "" && actor.Id != Domain {
if activity.Object.Replies != nil {
for _, k := range activity.Object.Replies.OrderedItems {
TombstoneObject(db, k.Id)
}
}
TombstoneObject(db, activity.Object.Id)
+ UnArchiveLast(db, actor.Id)
break
}
}