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

more control over reaction in web backend

This commit is contained in:
Ted Unangst 2020-04-26 14:36:11 -04:00
parent cf82493771
commit 12183bb0f7
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activity.go
View File

@ -1145,7 +1145,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
if h.Convoy != "" { if h.Convoy != "" {
j["context"] = h.Convoy j["context"] = h.Convoy
} }
j["content"] = user.Options.Reaction j["content"] = h.Noise
case "deack": case "deack":
b := junk.New() b := junk.New()
b["id"] = user.URL + "/" + "ack" + "/" + shortxid(h.XID) b["id"] = user.URL + "/" + "ack" + "/" + shortxid(h.XID)

19
web.go
View File

@ -1233,12 +1233,13 @@ func submitbonk(w http.ResponseWriter, r *http.Request) {
} }
} }
func sendzonkofsorts(xonk *Honk, user *WhatAbout, what string) { func sendzonkofsorts(xonk *Honk, user *WhatAbout, what string, aux string) {
zonk := &Honk{ zonk := &Honk{
What: what, What: what,
XID: xonk.XID, XID: xonk.XID,
Date: time.Now().UTC(), Date: time.Now().UTC(),
Audience: oneofakind(xonk.Audience), Audience: oneofakind(xonk.Audience),
Noise: aux,
} }
zonk.Public = loudandproud(zonk.Audience) zonk.Public = loudandproud(zonk.Audience)
@ -1275,7 +1276,11 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
} }
if wherefore == "react" { if wherefore == "react" {
if user.Options.Reaction == "none" { reaction := user.Options.Reaction
if r2 := r.FormValue("reaction"); r2 != "" {
reaction = r2
}
if reaction == "none" {
return return
} }
xonk := getxonk(userinfo.UserID, what) xonk := getxonk(userinfo.UserID, what)
@ -1284,7 +1289,7 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Printf("error saving: %s", err) log.Printf("error saving: %s", err)
} }
sendzonkofsorts(xonk, user, "react") sendzonkofsorts(xonk, user, "react", reaction)
} }
return return
} }
@ -1299,7 +1304,7 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Printf("error acking: %s", err) log.Printf("error acking: %s", err)
} }
sendzonkofsorts(xonk, user, "ack") sendzonkofsorts(xonk, user, "ack", "")
} }
return return
} }
@ -1311,7 +1316,7 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Printf("error deacking: %s", err) log.Printf("error deacking: %s", err)
} }
sendzonkofsorts(xonk, user, "deack") sendzonkofsorts(xonk, user, "deack", "")
} }
return return
} }
@ -1325,7 +1330,7 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Printf("error unbonking: %s", err) log.Printf("error unbonking: %s", err)
} }
sendzonkofsorts(xonk, user, "unbonk") sendzonkofsorts(xonk, user, "unbonk", "")
} }
return return
} }
@ -1351,7 +1356,7 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
if xonk != nil { if xonk != nil {
deletehonk(xonk.ID) deletehonk(xonk.ID)
if xonk.Whofore == 2 || xonk.Whofore == 3 { if xonk.Whofore == 2 || xonk.Whofore == 3 {
sendzonkofsorts(xonk, user, "zonk") sendzonkofsorts(xonk, user, "zonk", "")
} }
} }
} }