diff --git a/activity.go b/activity.go index 83a8507..ce9942b 100644 --- a/activity.go +++ b/activity.go @@ -1290,7 +1290,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) { if len(atts) > 0 { jo["attachment"] = atts } - jo["summary"] = html.EscapeString(h.Precis) + jo["summary"] = h.Precis jo["content"] = h.Noise j["object"] = jo case "bonk": diff --git a/fun.go b/fun.go index 27848c5..99b2b37 100644 --- a/fun.go +++ b/fun.go @@ -289,10 +289,7 @@ func imaginate(honk *Honk) { var re_dangerous = regexp.MustCompile("^[a-zA-Z]{2}:") -func translate(honk *Honk) { - if honk.Format == "html" { - return - } +func precipitate(honk *Honk) { noise := honk.Noise if re_dangerous.MatchString(noise) { idx := strings.Index(noise, "\n") @@ -305,6 +302,14 @@ func translate(honk *Honk) { } } honk.Precis = markitzero(strings.TrimSpace(honk.Precis)) + honk.Noise = noise +} + +func translate(honk *Honk) { + if honk.Format == "html" { + return + } + noise := honk.Noise var marker mz.Marker marker.HashLinker = ontoreplacer diff --git a/web.go b/web.go index 9c00847..c83e492 100644 --- a/web.go +++ b/web.go @@ -1620,6 +1620,8 @@ func submithonk(w http.ResponseWriter, r *http.Request) *Honk { noise = quickrename(noise, userinfo.UserID) noise = hooterize(noise) honk.Noise = noise + precipitate(honk) + noise = honk.Noise translate(honk) var convoy string