M activity.go → activity.go

@@ -579,6 +579,11 @@ rid, _ = robj.GetString("id")
 					}
 				}
 				convoy, _ = obj.GetString("context")
+				if strings.HasSuffix(convoy, "#context") &&
+					originate(convoy) != originate(xid) {
+					// friendica...
+					convoy = ""
+				}
 				if convoy == "" {
 					convoy, _ = obj.GetString("conversation")
 				}
@@ -731,6 +736,12 @@ if needxonk(user, &xonk) {
 			if rid != "" {
 				if needxonkid(user, rid) {
 					saveoneup(rid)
+				}
+				if convoy == "" {
+					xx := getxonk(user.ID, rid)
+					if xx != nil {
+						convoy = xx.Convoy
+					}
 				}
 			}
 			if convoy == "" {