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

expand rid to full when we save the reply

This commit is contained in:
Ted Unangst 2019-04-25 13:10:26 -04:00
parent 49d1574575
commit 02f1ae8221
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fun.go
View File

@ -38,9 +38,6 @@ func reverbolate(honks []*Honk) {
} else { } else {
h.URL = h.XID h.URL = h.XID
} }
if h.RID != "" && strings.IndexByte(h.RID, '/') == -1 {
h.RID = h.Honker + "/h/" + h.RID
}
h.Noise = mentionize(h.Noise) h.Noise = mentionize(h.Noise)
} else { } else {
idx := strings.LastIndexByte(h.Honker, '/') idx := strings.LastIndexByte(h.Honker, '/')

5
honk.go
View File

@ -813,7 +813,6 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
Username: userinfo.Username, Username: userinfo.Username,
What: "honk", What: "honk",
XID: xid, XID: xid,
RID: rid,
Date: dt, Date: dt,
} }
if noise[0] == '@' { if noise[0] == '@' {
@ -825,6 +824,9 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
if rid != "" { if rid != "" {
xonk := getxonk("", rid) xonk := getxonk("", rid)
if xonk != nil { if xonk != nil {
if xonk.Honker == "" {
rid = "https://" + serverName + "/u/" + xonk.Username + "/h/" + rid
}
honk.Audience = append(honk.Audience, xonk.Audience...) honk.Audience = append(honk.Audience, xonk.Audience...)
convoy = xonk.Convoy convoy = xonk.Convoy
} else { } else {
@ -832,6 +834,7 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
honk.Audience = append(honk.Audience, xonkaud...) honk.Audience = append(honk.Audience, xonkaud...)
convoy = c convoy = c
} }
honk.RID = rid
} }
if convoy == "" { if convoy == "" {
convoy = "data:,electrichonkytonk-" + xfiltrate() convoy = "data:,electrichonkytonk-" + xfiltrate()