idanoo/GoDiscMoji
1
0
Fork 0
mirror of https://github.com/idanoo/GoDiscMoji synced 2025-07-01 10:22:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "updates""

Browse source 
This reverts commit e53abac47c.
This commit is contained in:
Daniel Mason 2025-02-11 21:33:43 +13:00
parent d65e031ff5
commit 4454b0ad1b
Signed by: idanoo
GPG key ID: 387387CDBC02F132
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,15 +93,15 @@ func showTopEmojis(s *discordgo.Session, i *discordgo.InteractionCreate) {
}
msg := "Most used emojis:\n"
for k, v := range top {
topUsers, err := b.Db.GetTopUsersForGuildEmoji(i.GuildID, k, 3)
for _, v := range top {
topUsers, err := b.Db.GetTopUsersForGuildEmoji(i.GuildID, v.EmojiID, 3)
if err != nil {
slog.Error("Error getting top users for guild emoji", "err", err)
continue
}
users := []string{}
msg += fmt.Sprintf("%s: %d", k, v)
msg += fmt.Sprintf("%s: %d", v.EmojiID, v.Count)
for sk, sv := range topUsers {
users = append(users, fmt.Sprintf("<@%s>: %d", sk, sv))
}
@ -148,8 +148,8 @@ func showTopUsers(s *discordgo.Session, i *discordgo.InteractionCreate) {
users := []string{}
msg += fmt.Sprintf("<@%s>: %d", k, v)
for sk, sv := range topUsers {
users = append(users, fmt.Sprintf("%s: %d", sk, sv))
for _, sv := range topUsers {
users = append(users, fmt.Sprintf("%s: %d", sv.EmojiID, sv.Count))
}
msg += " (" + strings.Join(users, ", ") + ")\n"
}

10
src/internal/bot/common.go Normal file
View file

@ -0,0 +1,10 @@
package bot
func orderMap(m map[string]int64) []string {
keys := make([]string, 0, len(m))
for k := range m {
keys = append(keys, k)
}
return keys
}

21
src/internal/db/emoji_usage.go
View file

@ -2,6 +2,11 @@ package db
import "log/slog"
type EmojiMap struct {
EmojiID string
Count int64
}
// LogEmojiUsage - Log usage
func (db *Database) LogEmojiUsage(guildID, channelID, userID, emojiID string) error {
_, err := db.db.Exec(
@ -63,8 +68,8 @@ func (db *Database) GetTopUsersForGuildEmoji(guildID string, emojiID string, num
}
// GetTopEmojisForGuild - Report usage
func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[string]int64, error) {
data := make(map[string]int64)
func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[int]EmojiMap, error) {
data := make(map[int]EmojiMap)
row, err := db.db.Query(
"SELECT emoji_id, count(*) FROM `emoji_usage` WHERE `guild_id` = ? GROUP BY emoji_id ORDER BY count(*) DESC LIMIT ?",
guildID,
@ -76,19 +81,21 @@ func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[string]
}
defer row.Close()
i := 0
for row.Next() {
var emoji string
var count int64
row.Scan(&emoji, &count)
data[emoji] = count
data[i] = EmojiMap{EmojiID: emoji, Count: count}
i++
}
return data, nil
}
// GetTopEmojisForGuildUser - Report usage
func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num int) (map[string]int64, error) {
data := make(map[string]int64)
func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num int) (map[int]EmojiMap, error) {
data := make(map[int]EmojiMap)
row, err := db.db.Query(
"SELECT emoji_id, count(*) FROM `emoji_usage` WHERE `guild_id` = ? AND `user_id` = ? GROUP BY emoji_id ORDER BY count(*) DESC LIMIT ?",
guildID,
@ -101,11 +108,13 @@ func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num
}
defer row.Close()
i := 0
for row.Next() {
var emoji string
var count int64
row.Scan(&emoji, &count)
data[emoji] = count
data[i] = EmojiMap{EmojiID: emoji, Count: count}
i++
}
return data, nil