dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefer the activitypub context name for conversation

This commit is contained in:
Ted Unangst 2019-04-19 12:48:44 -04:00
parent b95824e191
commit d75cbe1c3d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activity.go
View File

@ -360,7 +360,10 @@ func whosthere(xid string) ([]string, string) {
log.Printf("error getting remote xonk: %s", err) log.Printf("error getting remote xonk: %s", err)
return nil, "" return nil, ""
} }
convoy, _ := jsongetstring(obj, "conversation") convoy, _ := jsongetstring(obj, "context")
if convoy == "" {
convoy, _ = jsongetstring(obj, "conversation")
}
return newphone(nil, obj), convoy return newphone(nil, obj), convoy
} }
@ -425,7 +428,10 @@ func xonkxonk(item interface{}) *Honk {
content = "<p>summary: " + summary + content content = "<p>summary: " + summary + content
} }
rid, _ = jsongetstring(obj, "inReplyTo") rid, _ = jsongetstring(obj, "inReplyTo")
convoy, _ = jsongetstring(obj, "conversation") convoy, _ = jsongetstring(obj, "context")
if convoy == "" {
convoy, _ = jsongetstring(obj, "conversation")
}
if what == "honk" && rid != "" { if what == "honk" && rid != "" {
what = "tonk" what = "tonk"
} }
@ -571,6 +577,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (map[string]interface{}, map[string]inte
jo["inReplyTo"] = h.RID jo["inReplyTo"] = h.RID
} }
if h.Convoy != "" { if h.Convoy != "" {
jo["context"] = h.Convoy
jo["conversation"] = h.Convoy jo["conversation"] = h.Convoy
} }
jo["to"] = h.Audience[0] jo["to"] = h.Audience[0]