From ba1de67dfc5aa5dc6481be154b92942a96173dce Mon Sep 17 00:00:00 2001
From: Qais Patankar <qaisjp@gmail.com>
Date: Sun, 9 Feb 2020 12:54:43 +0000
Subject: [PATCH] remote_avatar: clarify something

---
 bridge/discord/discord.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 300d68c7..e37208b7 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -381,16 +381,16 @@ func (b *Bdiscord) webhookSend(msg *config.Message, webhookID, token string) (*d
 		err error
 	)
 
-	// If avatar is unset, maybe we need to set the local avatar
+	// If avatar is unset, check if UseLocalAvatar contains the message's
+	// account or protocol, and if so, try to find a local avatar
 	if msg.Avatar == "" {
 		for _, val := range b.GetStringSlice("UseLocalAvatar") {
-			if msg.Protocol != val && msg.Account != val {
-				continue
+			if msg.Protocol == val || msg.Account == val {
+				if avatar := b.findAvatar(msg); avatar != "" {
+					msg.Avatar = avatar
+				}
+				break
 			}
-			if avatar, ok := b.findAvatar(msg); ok {
-				msg.Avatar = avatar
-			}
-			break
 		}
 	}
 
@@ -444,10 +444,10 @@ func (b *Bdiscord) webhookSend(msg *config.Message, webhookID, token string) (*d
 	return res, err
 }
 
-func (b *Bdiscord) findAvatar(m *config.Message) (string, bool) {
+func (b *Bdiscord) findAvatar(m *config.Message) string {
 	member, err := b.getGuildMemberByNick(m.Username)
 	if err != nil {
-		return "", false
+		return ""
 	}
-	return member.User.AvatarURL(""), true
+	return member.User.AvatarURL("")
 }