M activity.go → activity.go

@@ -664,11 +664,6 @@ 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")
 			}
@@ -884,6 +879,14 @@ updatehonk(prev)
 			}
 		}
 		if !isUpdate && needxonk(user, &xonk) {
+			if strings.HasSuffix(convoy, "#context") {
+				// friendica...
+				if rid != "" {
+					convoy = ""
+				} else {
+					convoy = url
+				}
+			}
 			if rid != "" {
 				if needxonkid(user, rid) {
 					goingup++