From e6417d911c9800d0b7939aa1f88fcb551f1595af Mon Sep 17 00:00:00 2001 From: Donald Feury Date: Wed, 27 Jan 2021 19:39:46 -0500 Subject: [PATCH 1/2] Stop private and protected blogs from federating Fixes #403 --- activitypub.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/activitypub.go b/activitypub.go index 0e69075..18307de 100644 --- a/activitypub.go +++ b/activitypub.go @@ -631,6 +631,17 @@ func federatePost(app *App, p *PublicPost, collID int64, isUpdate bool) error { log.Info("Federating new post!") } } + + // If app is private, do not federate + if app.cfg.App.Private { + return nil + } + + // Do not federate posts from private or protected blogs + if p.Collection.Visibility == CollPrivate || p.Collection.Visibility == CollProtected { + return nil + } + actor := p.Collection.PersonObject(collID) na := p.ActivityObject(app) From 68297acb74d0ac987f6253c2edccc46147b39654 Mon Sep 17 00:00:00 2001 From: Donald Feury Date: Wed, 7 Apr 2021 11:27:25 -0400 Subject: [PATCH 2/2] Moved guard clauses to stop federation before debug logging --- activitypub.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/activitypub.go b/activitypub.go index 18307de..2b91ce0 100644 --- a/activitypub.go +++ b/activitypub.go @@ -624,14 +624,6 @@ func deleteFederatedPost(app *App, p *PublicPost, collID int64) error { } func federatePost(app *App, p *PublicPost, collID int64, isUpdate bool) error { - if debugging { - if isUpdate { - log.Info("Federating updated post!") - } else { - log.Info("Federating new post!") - } - } - // If app is private, do not federate if app.cfg.App.Private { return nil @@ -642,6 +634,14 @@ func federatePost(app *App, p *PublicPost, collID int64, isUpdate bool) error { return nil } + if debugging { + if isUpdate { + log.Info("Federating updated post!") + } else { + log.Info("Federating new post!") + } + } + actor := p.Collection.PersonObject(collID) na := p.ActivityObject(app)