M fun.go → fun.go

@@ -295,13 +295,18 @@ }
 	return s
 }
 
-func grapeape(s string) []Mention {
+func grapeape(userid int64, s string) []Mention {
 	var mentions []Mention
 	for _, m := range strings.Split(s, " ") {
-		if m ==  "" {
+		if m == "" {
 			continue
 		}
-		where := gofish(m)
+		var where string
+		if name := fullname(m, userid); name != "" {
+			where = name
+		} else {
+			where = gofish(m)
+		}
 		if where != "" {
 			mentions = append(mentions, Mention{Who: m, Where: where})
 		}

M web.go → web.go

@@ -1481,7 +1481,7 @@
 	noise = strings.Replace(noise, "\r", "", -1)
 	noise = quickrename(noise, userinfo.UserID)
 	noise = hooterize(noise)
-	honk.Mentions = append(grapeape(mentions), bunchofgrapes(noise)...)
+	honk.Mentions = append(grapeape(userinfo.UserID, mentions), bunchofgrapes(noise)...)
 	honk.Noise = noise
 	translate(honk)