From 2f4cb5f246c47ae81dc22166a52ed752fcb9a4f5 Mon Sep 17 00:00:00 2001
From: diamondburned <datutbrus@gmail.com>
Date: Thu, 16 Jul 2020 23:39:09 -0700
Subject: [PATCH] Fixed dangling pings and read states

---
 channel.go | 6 +-----
 message.go | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/channel.go b/channel.go
index d48cc22..82be0e8 100644
--- a/channel.go
+++ b/channel.go
@@ -257,11 +257,7 @@ func (ch *Channel) JoinServer(ctx context.Context, ct cchat.MessagesContainer) (
 		ch.session.AddHandler(func(m *gateway.MessageCreateEvent) {
 			if m.ChannelID == ch.id {
 				ct.CreateMessage(NewMessageCreate(m, ch.session))
-				// Mark as read if the message is not ours. This handler will
-				// stay here as long as the client is seeing the channel.
-				if m.Author.ID != ch.session.userID {
-					ch.session.ReadState.MarkRead(ch.id, m.ID)
-				}
+				ch.session.ReadState.MarkRead(ch.id, m.ID)
 			}
 		}),
 		ch.session.AddHandler(func(m *gateway.MessageUpdateEvent) {
diff --git a/message.go b/message.go
index 6e6d18b..212e148 100644
--- a/message.go
+++ b/message.go
@@ -104,9 +104,9 @@ func RenderMemberName(m discord.Member, g discord.Guild) text.Rich {
 
 	// Update the color.
 	if c := discord.MemberColor(g, m); c > 0 {
-		name.Segments = []text.Segment{
+		name.Segments = append(name.Segments,
 			segments.NewColored(len(name.Content), c.Uint32()),
-		}
+		)
 	}
 
 	// Append the bot prefix if the user is a bot.