fediverse
/
tavern
mirror of https://gitlab.com/ngerakines/tavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc. bug hunting debugging.

This commit is contained in:
Nick Gerakines 2020-04-13 18:54:09 -04:00
parent 011e01e264
commit fe83e774bd
No known key found for this signature in database
GPG Key ID: 33D43D854F96B2E4
1 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
web/handler_network.go
View File

@ -46,61 +46,65 @@ func (h handler) dashboardNetwork(c *gin.Context) {
data["user"] = user
data["authenticated"] = true
var totalFollowers int
var followers []string
var pendingFollowers []string
{
var totalFollowers int
var followers []string
var pendingFollowers []string
err = storage.TransactionalStorage(ctx, h.storage, func(txStorage storage.Storage) error {
totalFollowers, err = txStorage.CountFollowers(ctx, user.ID)
followers, err = txStorage.ListAcceptedFollowers(ctx, user.ID, totalFollowers+1, 0)
err = storage.TransactionalStorage(ctx, h.storage, func(txStorage storage.Storage) error {
totalFollowers, err = txStorage.CountFollowers(ctx, user.ID)
followers, err = txStorage.ListAcceptedFollowers(ctx, user.ID, totalFollowers+1, 0)
if err != nil {
return err
}
pendingFollowers, err = txStorage.ListPendingFollowers(ctx, user.ID, totalFollowers+1, 0)
if err != nil {
return err
}
return nil
})
if err != nil {
return err
h.hardFail(c, err)
return
}
pendingFollowers, err = txStorage.ListPendingFollowers(ctx, user.ID, totalFollowers+1, 0)
data["followers"] = followers
data["pending_followers"] = pendingFollowers
}
{
totalFollowing, err := h.storage.CountFollowing(ctx, user.ID)
if err != nil {
return err
h.hardFail(c, err)
return
}
return nil
})
if err != nil {
h.hardFail(c, err)
return
following, err := h.storage.ListAcceptedFollowing(ctx, user.ID, totalFollowing+1, 0)
if err != nil {
h.hardFail(c, err)
return
}
pendingFollowing, err := h.storage.ListPendingFollowing(ctx, user.ID, totalFollowing+1, 0)
if err != nil {
h.hardFail(c, err)
return
}
groups, err := h.storage.FilterGroupsByActorID(ctx, append(following, pendingFollowing...))
if err != nil {
h.hardFail(c, err)
return
}
followingActors := common.FilterStrings(following, common.StringsExcludeFF(groups))
pendingFollowingActors := common.FilterStrings(pendingFollowing, common.StringsExcludeFF(groups))
data["following"] = followingActors
data["pending_following"] = pendingFollowingActors
data["groups"] = common.FilterStrings(groups, common.StringsIncludeFF(following))
data["pending_groups"] = common.FilterStrings(groups, common.StringsIncludeFF(pendingFollowing))
}
data["followers"] = followers
data["pending_followers"] = pendingFollowers
totalFollowing, err := h.storage.CountFollowing(ctx, user.ID)
if err != nil {
h.hardFail(c, err)
return
}
following, err := h.storage.ListAcceptedFollowing(ctx, user.ID, totalFollowing+1, 0)
if err != nil {
h.hardFail(c, err)
return
}
pendingFollowing, err := h.storage.ListPendingFollowing(ctx, user.ID, totalFollowing+1, 0)
if err != nil {
h.hardFail(c, err)
return
}
groups, err := h.storage.FilterGroupsByActorID(ctx, append(following, pendingFollowing...))
if err != nil {
h.hardFail(c, err)
return
}
followingActors := common.FilterStrings(following, common.StringsExcludeFF(groups))
pendingFollowingActors := common.FilterStrings(pendingFollowing, common.StringsExcludeFF(groups))
data["following"] = followingActors
data["pending_following"] = pendingFollowingActors
data["groups"] = common.FilterStrings(groups, common.StringsIncludeFF(following))
data["pending_groups"] = common.FilterStrings(groups, common.StringsIncludeFF(pendingFollowing))
c.HTML(http.StatusOK, "network", data)
}
@ -301,6 +305,12 @@ func (h handler) networkAccept(c *gin.Context) {
return
}
err = h.storage.UpdateFollowerApproved(ctx, user.ID, followerActor.ID)
if err != nil {
h.flashErrorOrFail(c, h.url("network"), err)
return
}
response := storage.EmptyPayload()
acceptActivityID := storage.NewV4()
response["@context"] = "https://www.w3.org/ns/activitystreams"
@ -322,12 +332,6 @@ func (h handler) networkAccept(c *gin.Context) {
return
}
err = h.storage.UpdateFollowerApproved(ctx, user.ID, followerActor.ID)
if err != nil {
h.flashErrorOrFail(c, h.url("network"), err)
return
}
c.Redirect(http.StatusFound, h.url("network"))
}