mirror of
https://github.com/idanoo/GoDiscMoji
synced 2025-07-01 10:22:14 +00:00
parent
5a5071cb44
commit
e53abac47c
3 changed files with 11 additions and 30 deletions
|
@ -93,15 +93,15 @@ func showTopEmojis(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||
}
|
||||
|
||||
msg := "Most used emojis:\n"
|
||||
for _, v := range top {
|
||||
topUsers, err := b.Db.GetTopUsersForGuildEmoji(i.GuildID, v.EmojiID, 3)
|
||||
for k, v := range top {
|
||||
topUsers, err := b.Db.GetTopUsersForGuildEmoji(i.GuildID, k, 3)
|
||||
if err != nil {
|
||||
slog.Error("Error getting top users for guild emoji", "err", err)
|
||||
continue
|
||||
}
|
||||
|
||||
users := []string{}
|
||||
msg += fmt.Sprintf("%s: %d", v.EmojiID, v.Count)
|
||||
msg += fmt.Sprintf("%s: %d", k, v)
|
||||
for sk, sv := range topUsers {
|
||||
users = append(users, fmt.Sprintf("<@%s>: %d", sk, sv))
|
||||
}
|
||||
|
@ -147,8 +147,8 @@ func showTopUsers(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||
|
||||
users := []string{}
|
||||
msg += fmt.Sprintf("<@%s>: %d", k, v)
|
||||
for _, sv := range topUsers {
|
||||
users = append(users, fmt.Sprintf("%s: %d", sv.EmojiID, sv.Count))
|
||||
for sk, sv := range topUsers {
|
||||
users = append(users, fmt.Sprintf("%s: %d", sk, sv))
|
||||
}
|
||||
msg += " (" + strings.Join(users, ", ") + ")\n"
|
||||
}
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
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
|
||||
}
|
|
@ -1,10 +1,5 @@
|
|||
package db
|
||||
|
||||
type EmojiMap struct {
|
||||
EmojiID string
|
||||
Count int64
|
||||
}
|
||||
|
||||
// LogEmojiUsage - Log usage
|
||||
func (db *Database) LogEmojiUsage(guildID, channelID, userID, emojiID string) error {
|
||||
_, err := db.db.Exec(
|
||||
|
@ -65,8 +60,8 @@ func (db *Database) GetTopUsersForGuildEmoji(guildID string, emojiID string, num
|
|||
}
|
||||
|
||||
// GetTopEmojisForGuild - Report usage
|
||||
func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[int]EmojiMap, error) {
|
||||
data := make(map[int]EmojiMap)
|
||||
func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[string]int64, error) {
|
||||
data := make(map[string]int64)
|
||||
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,
|
||||
|
@ -78,21 +73,19 @@ func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[int]Emo
|
|||
}
|
||||
|
||||
defer row.Close()
|
||||
i := 0
|
||||
for row.Next() {
|
||||
var emoji string
|
||||
var count int64
|
||||
row.Scan(&emoji, &count)
|
||||
data[i] = EmojiMap{EmojiID: emoji, Count: count}
|
||||
i++
|
||||
data[emoji] = count
|
||||
}
|
||||
|
||||
return data, nil
|
||||
}
|
||||
|
||||
// GetTopEmojisForGuildUser - Report usage
|
||||
func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num int) (map[int]EmojiMap, error) {
|
||||
data := make(map[int]EmojiMap)
|
||||
func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num int) (map[string]int64, error) {
|
||||
data := make(map[string]int64)
|
||||
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,
|
||||
|
@ -105,13 +98,11 @@ 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[i] = EmojiMap{EmojiID: emoji, Count: count}
|
||||
i++
|
||||
data[emoji] = count
|
||||
}
|
||||
|
||||
return data, nil
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue