From 9f525876f45beeaac15a7e50785c3355f15d0e74 Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Mon, 8 Mar 2021 13:02:59 -0500 Subject: [PATCH] Fix instance-wide actor webfinger lookup This skips the silenced-user check. Ref T820 --- webfinger.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/webfinger.go b/webfinger.go index 76a9b66..581d940 100644 --- a/webfinger.go +++ b/webfinger.go @@ -43,15 +43,18 @@ func (wfr wfResolver) FindUser(username string, host, requestHost string, r []we log.Error("Unable to get blog: %v", err) return nil, err } - silenced, err := wfr.db.IsUserSilenced(c.OwnerID) - if err != nil { - log.Error("webfinger find user: check is silenced: %v", err) - return nil, err - } - if silenced { - return nil, wfUserNotFoundErr - } c.hostName = wfr.cfg.App.Host + + if !c.IsInstanceColl() { + silenced, err := wfr.db.IsUserSilenced(c.OwnerID) + if err != nil { + log.Error("webfinger find user: check is silenced: %v", err) + return nil, err + } + if silenced { + return nil, wfUserNotFoundErr + } + } if wfr.cfg.App.SingleUser { // Ensure handle matches user-chosen one on single-user blogs if username != c.Alias {