idanoo/GoDiscMoji
1
0
Fork 0
mirror of https://github.com/idanoo/GoDiscMoji synced 2025-07-03 03:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update

Browse source
This commit is contained in:
Daniel Mason 2025-06-23 22:09:14 +12:00
parent cd248dcaef
commit 215b30b41f
Signed by: idanoo
GPG key ID: 387387CDBC02F132
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/internal/bot/commands.go
View file

@ -137,7 +137,12 @@ func showTopEmojis(s *discordgo.Session, i *discordgo.InteractionCreate) {
sort.Ints(subkeys) sort.Ints(subkeys)
users := []string{} users := []string{}
if top[v].EmojiID == top[v].EmojiName {
// Handle bad data with stock emojis
msg += fmt.Sprintf(":%s: %d", top[v].EmojiName, top[v].Count)
} else {
msg += fmt.Sprintf("<:%s:%s> %d", top[v].EmojiName, top[v].EmojiID, top[v].Count) msg += fmt.Sprintf("<:%s:%s> %d", top[v].EmojiName, top[v].EmojiID, top[v].Count)
}
for _, sv := range subkeys { for _, sv := range subkeys {
users = append(users, fmt.Sprintf("<@%s>: %d", topUsers[sv].EmojiID, topUsers[sv].Count)) users = append(users, fmt.Sprintf("<@%s>: %d", topUsers[sv].EmojiID, topUsers[sv].Count))
} }
@ -197,8 +202,13 @@ func showTopUsers(s *discordgo.Session, i *discordgo.InteractionCreate) {
users := []string{} users := []string{}
msg += fmt.Sprintf("<@%s>: %d", top[v].EmojiID, top[v].Count) msg += fmt.Sprintf("<@%s>: %d", top[v].EmojiID, top[v].Count)
for _, sv := range subkeys { for _, sv := range subkeys {
if topUsers[sv].EmojiID == topUsers[sv].EmojiName {
// Handle bad data with stock emojis
users = append(users, fmt.Sprintf(":%s: %d", topUsers[sv].EmojiName, topUsers[sv].Count))
} else {
users = append(users, fmt.Sprintf("<:%s:%s> %d", topUsers[sv].EmojiName, topUsers[sv].EmojiID, topUsers[sv].Count)) users = append(users, fmt.Sprintf("<:%s:%s> %d", topUsers[sv].EmojiName, topUsers[sv].EmojiID, topUsers[sv].Count))
} }
}
msg += " (" + strings.Join(users, ", ") + ")\n" msg += " (" + strings.Join(users, ", ") + ")\n"
} }

16
src/internal/db/database.go
View file

@ -61,9 +61,21 @@ func (db *Database) runMigrations() (*Database, error) {
return db, err return db, err
} }
_, err = db.db.Exec("CREATE INDEX IF NOT EXISTS `idx_emoji_usage_emoji_id,guild_id` ON `emoji_usage` (`guild_id`, `emoji_id`)") // emojitest := map[string]string{
// "pepe_analyze": "579431592624390147",
// "kekw": "1317987954102112347",
// "pepe_kek": "1300985103182336010",
// "KEKW": "649918246119669770",
// }
return db, err // for name, id := range emojitest {
// _, err = db.db.Exec("UPDATE `emoji_usage` SET `emoji_id` = '" + id + "' WHERE `emoji_name` = '" + name + "'")
// if err != nil {
// return db, err
// }
// }
return db, nil
} }
// CloseDbConn - Closes DB connection // CloseDbConn - Closes DB connection