M fun.go → fun.go

@@ -124,8 +124,11 @@ }
 			}
 		}
 		if user != nil {
+			hset := []string{}
+			if h.Honker != user.URL {
+				hset = append(hset, "@"+h.Handle)
+			}
 			if user.Options.MentionAll {
-				hset := []string{"@" + h.Handle}
 				for _, a := range h.Audience {
 					if a == h.Honker || a == user.URL {
 						continue
@@ -136,10 +139,8 @@ hand = "@" + hand
 						hset = append(hset, hand)
 					}
 				}
-				h.Handles = strings.Join(hset, " ")
-			} else if h.Honker != user.URL {
-				h.Handles = "@" + h.Handle
 			}
+			h.Handles = strings.Join(hset, " ")
 		}
 		if h.URL == "" {
 			h.URL = h.XID

M go.mod → go.mod

@@ -10,5 +10,5 @@ github.com/mattn/go-runewidth v0.0.13
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
 	humungus.tedunangst.com/r/go-sqlite3 v1.1.3
-	humungus.tedunangst.com/r/webs v0.6.56
+	humungus.tedunangst.com/r/webs v0.6.57
 )

M go.sum → go.sum

@@ -27,5 +27,5 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 humungus.tedunangst.com/r/go-sqlite3 v1.1.3 h1:G2N4wzDS0NbuvrZtQJhh4F+3X+s7BF8b9ga8k38geUI=
 humungus.tedunangst.com/r/go-sqlite3 v1.1.3/go.mod h1:FtEEmQM7U2Ey1TuEEOyY1BmphTZnmiEjPsNLEAkpf/M=
-humungus.tedunangst.com/r/webs v0.6.56 h1:knrLMQ8vwcHjkPo//zXUm5IuRFMfYcnJgMuWuqy8BOA=
-humungus.tedunangst.com/r/webs v0.6.56/go.mod h1:03R0N9BcT49HB4TDd1YmarpbiPvPzVDm74Mk4h1hYPc=
+humungus.tedunangst.com/r/webs v0.6.57 h1:HzYgzknJTL54KJKeRUwVvyYAsUSCHl+ImcMI0lIzan4=
+humungus.tedunangst.com/r/webs v0.6.57/go.mod h1:03R0N9BcT49HB4TDd1YmarpbiPvPzVDm74Mk4h1hYPc=