M activity.go → activity.go

@@ -584,7 +584,7 @@ jo["to"] = h.Audience[0]
 		if len(h.Audience) > 1 {
 			jo["cc"] = h.Audience[1:]
 		}
-		jo["content"] = h.Noise
+		jo["content"] = mentionize(h.Noise)
 		jo["summary"] = nil
 		var tags []interface{}
 		g := bunchofgrapes(h.Noise)

M fun.go → fun.go

@@ -40,6 +40,7 @@ }
 			if h.RID != "" && strings.IndexByte(h.RID, '/') == -1 {
 				h.RID = h.Honker + "/h/" + h.RID
 			}
+			h.Noise = mentionize(h.Noise)
 		} else {
 			idx := strings.LastIndexByte(h.Honker, '/')
 			if idx != -1 {
@@ -177,6 +178,10 @@ }
 	s = re_link.ReplaceAllStringFunc(s, linkfn)
 
 	s = strings.Replace(s, "\n", "<br>", -1)
+	return s
+}
+
+func mentionize(s string) string {
 	s = re_mentions.ReplaceAllStringFunc(s, func(m string) string {
 		where := gofish(m)
 		if where == "" {