Skip to content
This repository was archived by the owner on Sep 3, 2022. It is now read-only.

Commit 312eca3

Browse files
committed
Small cleanups
1 parent 25fbd2f commit 312eca3

1 file changed

Lines changed: 14 additions & 15 deletions

File tree

msgEmoji.go

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,26 @@ func msgEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string
4444

4545
s.ChannelFileSend(m.ChannelID, "emoji.png", resp.Body)
4646
s.ChannelMessageDelete(m.ChannelID, m.ID)
47-
} else {
48-
emoji := emojiFile(msglist[0])
49-
if emoji != "" {
50-
file, err := os.Open(fmt.Sprintf("emoji/%s.png", emoji))
51-
if err != nil {
52-
errorLog.Println("Twemoji emoji err:", err.Error())
53-
return
54-
}
55-
defer file.Close()
47+
return
48+
}
49+
50+
emoji := emojiFile(msglist[0])
51+
if emoji != "" {
52+
file, err := os.Open(fmt.Sprintf("emoji/%s.png", emoji))
53+
if err != nil {
54+
errorLog.Println("Twemoji emoji err:", err.Error())
55+
return
56+
}
57+
defer file.Close()
5658

57-
s.ChannelFileSend(m.ChannelID, "emoji.png", file)
59+
s.ChannelFileSend(m.ChannelID, "emoji.png", file)
5860

59-
s.ChannelMessageDelete(m.ChannelID, m.ID)
60-
}
61+
s.ChannelMessageDelete(m.ChannelID, m.ID)
6162
}
62-
return
6363
}
6464

6565
func msgFindEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []string) {
6666
var emojiName string
67-
content := "​"
6867
submatch := emojiRegex.FindStringSubmatch(strings.Join(msglist, " "))
6968

7069
if len(submatch) < 2 {
@@ -76,7 +75,7 @@ func msgFindEmoji(s *discordgo.Session, m *discordgo.MessageCreate, msglist []st
7675
emojis := []string{}
7776
lenEmojiNames := 0
7877
lenEmoji := 0
79-
done := false
78+
done := false
8079
for _, guild := range s.State.Guilds {
8180
for _, emoji := range guild.Emojis {
8281
if strings.Contains(strings.ToLower(emoji.Name), strings.ToLower(emojiName)) {

0 commit comments

Comments
 (0)