some fixups for the way friendica does context

This commit is contained in:
Ted Unangst 2019-09-25 12:27:02 -04:00
parent b1d19f7eaf
commit c4d210fdfb
1 changed files with 11 additions and 0 deletions

View File

@ -579,6 +579,11 @@ func xonkxonk(user *WhatAbout, item junk.Junk, origin string) *Honk {
} }
} }
convoy, _ = obj.GetString("context") convoy, _ = obj.GetString("context")
if strings.HasSuffix(convoy, "#context") &&
originate(convoy) != originate(xid) {
// friendica...
convoy = ""
}
if convoy == "" { if convoy == "" {
convoy, _ = obj.GetString("conversation") convoy, _ = obj.GetString("conversation")
} }
@ -732,6 +737,12 @@ func xonkxonk(user *WhatAbout, item junk.Junk, origin string) *Honk {
if needxonkid(user, rid) { if needxonkid(user, rid) {
saveoneup(rid) saveoneup(rid)
} }
if convoy == "" {
xx := getxonk(user.ID, rid)
if xx != nil {
convoy = xx.Convoy
}
}
} }
if convoy == "" { if convoy == "" {
convoy = currenttid convoy = currenttid