Fix typing indicator glitching out

diamondburned · Mar 9, 2024 · f6f5962 · f6f5962
1 parent d0512a6
commit f6f5962
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/internal/gtkcord/state.go b/internal/gtkcord/state.go
@@ -336,13 +336,13 @@ func (s *State) UserMarkup(gID discord.GuildID, u *discord.User, mods ...author.
 func (s *State) UserIDMarkup(chID discord.ChannelID, uID discord.UserID, mods ...author.MarkupMod) string {
 	chs, err := s.Cabinet.Channel(chID)
 	if err != nil {
-		return uID.Mention()
+		return html.EscapeString(uID.Mention())
 	}
 
 	if chs.GuildID.IsValid() {
 		member, err := s.Cabinet.Member(chs.GuildID, uID)
 		if err != nil {
-			return uID.Mention()
+			return html.EscapeString(uID.Mention())
 		}
 
 		return s.MemberMarkup(chs.GuildID, &discord.GuildUser{
@@ -357,7 +357,7 @@ func (s *State) UserIDMarkup(chID discord.ChannelID, uID discord.UserID, mods ..
 		}
 	}
 
-	return uID.Mention()
+	return html.EscapeString(uID.Mention())
 }
 
 var overrideMemberColors = prefs.NewBool(false, prefs.PropMeta{

diff --git a/internal/messages/typingindicator.go b/internal/messages/typingindicator.go
@@ -90,7 +90,7 @@ func NewTypingIndicator(ctx context.Context, chID discord.ChannelID) *TypingIndi
 			if ev.ChannelID != chID {
 				return
 			}
-			t.AddTyper(ev.UserID, ev.Timestamp)
+			t.AddTyperMember(ev.UserID, ev.Timestamp, ev.Member)
 		},
 		func(ev *gateway.MessageCreateEvent) {
 			if ev.ChannelID != chID {