Writefreely
/
writefreely
mirror of https://github.com/writeas/writefreely
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix more missing hostNames 

This fixes places, especially around federation, where the Collection's
`hostName` wasn't set.
This commit is contained in:
Matt Baer 2019-06-20 21:08:30 -04:00
parent 161f7a8de2
commit 86a128483b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activitypub.go
View File

@ -522,6 +522,7 @@ func deleteFederatedPost(app *App, p *PublicPost, collID int64) error {
if debugging { if debugging {
log.Info("Deleting federated post!") log.Info("Deleting federated post!")
} }
p.Collection.hostName = app.cfg.App.Host
actor := p.Collection.PersonObject(collID) actor := p.Collection.PersonObject(collID)
na := p.ActivityObject() na := p.ActivityObject()

3
posts.go
View File

@ -564,6 +564,7 @@ func newPost(app *App, w http.ResponseWriter, r *http.Request) error {
if err != nil { if err != nil {
return err return err
} }
coll.hostName = app.cfg.App.Host
if coll.OwnerID != u.ID { if coll.OwnerID != u.ID {
return ErrForbiddenCollection return ErrForbiddenCollection
} }
@ -687,6 +688,7 @@ func existingPost(app *App, w http.ResponseWriter, r *http.Request) error {
if pRes.CollectionID.Valid { if pRes.CollectionID.Valid {
coll, err := app.db.GetCollectionBy("id = ?", pRes.CollectionID.Int64) coll, err := app.db.GetCollectionBy("id = ?", pRes.CollectionID.Int64)
if err == nil && app.cfg.App.Federation { if err == nil && app.cfg.App.Federation {
coll.hostName = app.cfg.App.Host
pRes.Collection = &CollectionObj{Collection: *coll} pRes.Collection = &CollectionObj{Collection: *coll}
go federatePost(app, pRes, pRes.Collection.ID, true) go federatePost(app, pRes, pRes.Collection.ID, true)
} }
@ -876,6 +878,7 @@ func addPost(app *App, w http.ResponseWriter, r *http.Request) error {
continue continue
} }
if !pRes.Post.Created.After(time.Now()) { if !pRes.Post.Created.After(time.Now()) {
pRes.Post.Collection.hostName = app.cfg.App.Host
go federatePost(app, pRes.Post, pRes.Post.Collection.ID, false) go federatePost(app, pRes.Post, pRes.Post.Collection.ID, false)
} }
} }