From c4d210fdfb6b378f6d477a788e1e994848ebba5b Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Wed, 25 Sep 2019 12:27:02 -0400 Subject: [PATCH] some fixups for the way friendica does context --- activity.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/activity.go b/activity.go index cbe453e..2796681 100644 --- a/activity.go +++ b/activity.go @@ -579,6 +579,11 @@ func xonkxonk(user *WhatAbout, item junk.Junk, origin string) *Honk { } } convoy, _ = obj.GetString("context") + if strings.HasSuffix(convoy, "#context") && + originate(convoy) != originate(xid) { + // friendica... + convoy = "" + } if convoy == "" { convoy, _ = obj.GetString("conversation") } @@ -732,6 +737,12 @@ func xonkxonk(user *WhatAbout, item junk.Junk, origin string) *Honk { if needxonkid(user, rid) { saveoneup(rid) } + if convoy == "" { + xx := getxonk(user.ID, rid) + if xx != nil { + convoy = xx.Convoy + } + } } if convoy == "" { convoy = currenttid