M fun.go → fun.go

@@ -123,6 +123,11 @@ }
 		h.Precis = demoji(h.Precis)
 		h.Noise = demoji(h.Noise)
 		h.Open = "open"
+		for _, m := range h.Mentions {
+			if !strings.Contains(h.Noise, m.Nick()) {
+				h.Noise = "(" + m.Who + ")" + h.Noise
+			}
+		}
 
 		zap := make(map[string]bool)
 		{

M honk.go → honk.go

@@ -23,6 +23,7 @@ golog "log"
 	"log/syslog"
 	notrand "math/rand"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -133,6 +134,15 @@
 type Mention struct {
 	Who   string
 	Where string
+}
+
+var re_firstname = regexp.MustCompile("@[[:alnum:]]+")
+
+func (mention *Mention) Nick() string {
+	if m := re_firstname.FindString(mention.Who); m != "" {
+		return m
+	}
+	return mention.Who
 }
 
 type OldRevision struct {