From 5ec2584509db96020ccab51633465126e1303975 Mon Sep 17 00:00:00 2001
From: diamondburned <datutbrus@gmail.com>
Date: Thu, 16 Jul 2020 18:14:12 -0700
Subject: [PATCH] Minor tweaks and bug fixes regarding typing and embeds

---
 channel.go        | 22 +++++++++-------------
 segments/embed.go | 10 ++++++++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/channel.go b/channel.go
index e962f4f..c9e91dc 100644
--- a/channel.go
+++ b/channel.go
@@ -24,16 +24,10 @@ func chGuildCheck(chType discord.ChannelType) bool {
 }
 
 func filterAccessible(s *Session, chs []discord.Channel) []discord.Channel {
-	u, err := s.Me()
-	if err != nil {
-		// Shouldn't happen.
-		return chs
-	}
-
 	filtered := chs[:0]
 
 	for _, ch := range chs {
-		p, err := s.Permissions(ch.ID, u.ID)
+		p, err := s.Permissions(ch.ID, s.userID)
 		// Treat error as non-fatal and add the channel anyway.
 		if err != nil || p.Has(discord.PermissionViewChannel) {
 			filtered = append(filtered, ch)
@@ -460,17 +454,19 @@ func (ch *Channel) Typing() error {
 	return ch.session.Typing(ch.id)
 }
 
-// TypingTimeout returns 8 seconds.
+// TypingTimeout returns 10 seconds.
 func (ch *Channel) TypingTimeout() time.Duration {
-	return 8 * time.Second
+	return 10 * time.Second
 }
 
 func (ch *Channel) TypingSubscribe(ti cchat.TypingIndicator) (func(), error) {
 	return ch.session.AddHandler(func(t *gateway.TypingStartEvent) {
-		if t.ChannelID == ch.id {
-			if typer, err := NewTyper(ch.session.Store, t); err == nil {
-				ti.AddTyper(typer)
-			}
+		// Ignore channel mismatch or if the typing event is ours.
+		if t.ChannelID != ch.id || t.UserID == ch.session.userID {
+			return
+		}
+		if typer, err := NewTyper(ch.session.Store, t); err == nil {
+			ti.AddTyper(typer)
 		}
 	}), nil
 }
diff --git a/segments/embed.go b/segments/embed.go
index 4a1ae23..24fae7f 100644
--- a/segments/embed.go
+++ b/segments/embed.go
@@ -14,16 +14,22 @@ import (
 
 var imageExts = []string{".jpg", ".jpeg", ".png", ".webp", ".gif"}
 
+func (r *TextRenderer) writeEmbedSep(embedColor discord.Color) {
+	if start, end := r.writeString("---"); embedColor > 0 {
+		r.append(NewColoredSegment(start, end, embedColor.Uint32()))
+	}
+}
+
 func (r *TextRenderer) renderEmbeds(embeds []discord.Embed, m *discord.Message, s state.Store) {
 	for _, embed := range embeds {
 		r.startBlock()
-		r.buf.WriteString("---")
+		r.writeEmbedSep(embed.Color)
 		r.ensureBreak()
 
 		r.renderEmbed(embed, m, s)
 
 		r.ensureBreak()
-		r.buf.WriteString("---") // render prepends newline already
+		r.writeEmbedSep(embed.Color) // render prepends newline already
 		r.endBlock()
 	}
 }