cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

meme: maybe fix discord maybe not

This commit is contained in:
Chris Sexton 2021-02-18 17:59:05 -05:00 committed by Chris Sexton
parent 91ac29d085
commit defeb9b3b1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connectors/discord/discord.go
View File

@ -170,6 +170,7 @@ func (d *Discord) convertUser(u *discordgo.User) *user.User {
ID: u.ID, ID: u.ID,
Name: u.Username, Name: u.Username,
Admin: false, Admin: false,
Icon: d.client.State.User.AvatarURL("64"),
IconImg: img, IconImg: img,
} }
} }

3
plugins/meme/meme.go
View File

@ -207,8 +207,7 @@ func (p *MemePlugin) sendMeme(c bot.Connector, channel, channelName, msgID strin
encodedSpec, _ := json.Marshal(spec) encodedSpec, _ := json.Marshal(spec)
w, h, err := p.checkMeme(imgURL) w, h, err := p.checkMeme(imgURL)
_, _, err2 := p.checkMeme(stampURL) if err != nil {
if err != nil || err2 != nil {
msg := fmt.Sprintf("Hey %v, I couldn't download that image you asked for.", from.Name) 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) p.bot.Send(c, bot.Ephemeral, channel, from.ID, msg)
return return