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

Fixing bug where some feed objects were not displayed.

This commit is contained in:
Nick Gerakines 2020-04-06 15:01:43 -04:00
parent 4d7da52a1b
commit 392af77364
No known key found for this signature in database
GPG Key ID: 33D43D854F96B2E4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/handler_feed.go
View File

@ -64,6 +64,7 @@ func (h handler) displayObjectFeed(c *gin.Context, requireUser bool, vars map[st
foundActorIDs := common.NewUniqueStrings()
feedIDs := common.NewUniqueStrings()
boosters := make(common.StringsMultiMap)
chains := make(common.UUIDsMultiMap)
for _, feedPayload := range feedPayloads {
feedIDs.Add(storage.CollectJSONDeepStrings(feedPayload, []string{"id"})...)
@ -77,7 +78,6 @@ func (h handler) displayObjectFeed(c *gin.Context, requireUser bool, vars map[st
foundActorIDs.Add(storage.CollectJSONDeepStrings(feedPayload, []string{"actor"}, []string{"object", "attributedTo"}, []string{"attributedTo"})...)
// feedPayloadID, _ := storage.JSONString(feedPayload, "id")
feedPayloadType, hasFeedPayloadType := storage.JSONString(feedPayload, "type")
if hasFeedPayloadType && feedPayloadType == "Announce" {
feedPayloadActor, hasFeedPayloadActor := storage.JSONString(feedPayload, "actor")
@ -113,17 +113,24 @@ func (h handler) displayObjectFeed(c *gin.Context, requireUser bool, vars map[st
h.logger.Debug("queried object refs", zap.Int("count", len(refs)))
hasParents := map[uuid.UUID]bool{}
chains := make(common.UUIDsMultiMap)
for refRowID, _ := range refs {
hasParents[refRowID] = false
}
for _, feedPayload := range feedPayloads {
objectID := storage.FirstJSONDeepStrings(feedPayload, []string{"object"}, []string{"object", "id"})
if rowID, hasRowID := objectRowIDs[objectID]; hasRowID {
chains.Add(rowID)
}
}
for refRowID, ref := range refs {
inReplyTo, hasInReplyTo := storage.JSONString(ref, "inReplyTo")
if hasInReplyTo {
if rowID, hasRowID := objectRowIDs[inReplyTo]; hasRowID {
chains.Add(rowID, refRowID)
chains.Add(refRowID)
hasParents[refRowID] = true
}
hasParents[refRowID] = true
} else {
chains.Add(refRowID)
}