Mirrors/writefreely
2
0
Fork 0
mirror of https://github.com/writefreely/writefreely synced 2024-11-28 03:20:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix instance-wide actor lookup

Browse source 
This skips the silenced-user check.

Ref T820
This commit is contained in:
Matt Baer 2021-03-08 12:54:50 -05:00
parent 9aeeb52bdb
commit 9b336dee8c
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
activitypub.go
View file

@ -17,7 +17,6 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/writeas/writefreely/config"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
@ -109,16 +108,19 @@ func handleFetchCollectionActivities(app *App, w http.ResponseWriter, r *http.Re
if err != nil { if err != nil {
return err return err
} }
silenced, err := app.db.IsUserSilenced(c.OwnerID)
if err != nil {
log.Error("fetch collection activities: %v", err)
return ErrInternalGeneral
}
if silenced {
return ErrCollectionNotFound
}
c.hostName = app.cfg.App.Host c.hostName = app.cfg.App.Host
if !c.IsInstanceColl() {
silenced, err := app.db.IsUserSilenced(c.OwnerID)
if err != nil {
log.Error("fetch collection activities: %v", err)
return ErrInternalGeneral
}
if silenced {
return ErrCollectionNotFound
}
}
p := c.PersonObject() p := c.PersonObject()
setCacheControl(w, apCacheTime) setCacheControl(w, apCacheTime)

7
collections.go
View file

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -180,6 +180,11 @@ func (c *Collection) NewFormat() *CollectionFormat {
return cf return cf
} }
func (c *Collection) IsInstanceColl() bool {
ur, _ := url.Parse(c.hostName)
return c.Alias == ur.Host
}
func (c *Collection) IsUnlisted() bool { func (c *Collection) IsUnlisted() bool {
return c.Visibility == 0 return c.Visibility == 0
} }