Fix suspension check in fetchPost()
Previously, this check would return a "user not found" error when retrieving a collection post by its post ID, e.g. /api/posts/abc123 instead of /api/collections/demo/posts/my-slug -- this happens particularly when `Announce`ing a post in the fediverse. This change fixes that.
This commit is contained in:
parent
bd99044e9c
commit
8d8e671a07
4
posts.go
4
posts.go
|
@ -1039,7 +1039,6 @@ func pinPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
|
|
||||||
func fetchPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
func fetchPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
var collID int64
|
var collID int64
|
||||||
var ownerID int64
|
|
||||||
var coll *Collection
|
var coll *Collection
|
||||||
var err error
|
var err error
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
|
@ -1055,14 +1054,13 @@ func fetchPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
collID = coll.ID
|
collID = coll.ID
|
||||||
ownerID = coll.OwnerID
|
|
||||||
}
|
}
|
||||||
|
|
||||||
p, err := app.db.GetPost(vars["post"], collID)
|
p, err := app.db.GetPost(vars["post"], collID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
suspended, err := app.db.IsUserSuspended(ownerID)
|
suspended, err := app.db.IsUserSuspended(p.OwnerID.Int64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("fetch post: %v", err)
|
log.Error("fetch post: %v", err)
|
||||||
return ErrInternalGeneral
|
return ErrInternalGeneral
|
||||||
|
|
Loading…
Reference in New Issue