From defeb9b3b19f73d7c09f472721a12d1a1526e02a Mon Sep 17 00:00:00 2001 From: Chris Sexton Date: Thu, 18 Feb 2021 17:59:05 -0500 Subject: [PATCH] meme: maybe fix discord maybe not --- connectors/discord/discord.go | 1 + plugins/meme/meme.go | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/connectors/discord/discord.go b/connectors/discord/discord.go index 7a8e232..a1b75dc 100644 --- a/connectors/discord/discord.go +++ b/connectors/discord/discord.go @@ -170,6 +170,7 @@ func (d *Discord) convertUser(u *discordgo.User) *user.User { ID: u.ID, Name: u.Username, Admin: false, + Icon: d.client.State.User.AvatarURL("64"), IconImg: img, } } diff --git a/plugins/meme/meme.go b/plugins/meme/meme.go index d939e1d..223c702 100644 --- a/plugins/meme/meme.go +++ b/plugins/meme/meme.go @@ -207,8 +207,7 @@ func (p *MemePlugin) sendMeme(c bot.Connector, channel, channelName, msgID strin encodedSpec, _ := json.Marshal(spec) w, h, err := p.checkMeme(imgURL) - _, _, err2 := p.checkMeme(stampURL) - if err != nil || err2 != nil { + if err != nil { msg := fmt.Sprintf("Hey %v, I couldn't download that image you asked for.", from.Name) p.bot.Send(c, bot.Ephemeral, channel, from.ID, msg) return