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

Compare commits

base: idanoo:10e94c8257c303684e98c52313b7197da8e7812e
Branches Tags
idanoo:main
..
compare: idanoo:215b30b41fb126b481d1ba157d45fd8a0eaa0bd7
Branches Tags
idanoo:main

2 commits
10e94c8257 ... 215b30b41f

Author SHA1 Message Date
Daniel Mason
215b30b41f
Update 2025-06-23 22:14:08 +12:00
Daniel Mason
cd248dcaef
Add command 2025-06-23 22:03:00 +12:00
5 changed files with 70 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -15,3 +15,4 @@ Discord bot to measure emoji usage
/show-top-emojis
# Shows top 5 emojis and their 3 biggest users
```

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

@ -67,9 +67,9 @@ var (
}
commandHandlers = map[string]func(s *discordgo.Session, i *discordgo.InteractionCreate){
"show-top-emojis": showTopEmojis,
"show-top-users": showTopUsers,
"purge-emojis": purgeRecentEmojis,
"show-top-emojis": showTopEmojis,
"show-top-users": showTopUsers,
"purge-recent-emojis": purgeRecentEmojis,
}
)
@ -137,7 +137,12 @@ func showTopEmojis(s *discordgo.Session, i *discordgo.InteractionCreate) {
sort.Ints(subkeys)
users := []string{}
msg += fmt.Sprintf("%s: %d", top[v].EmojiID, top[v].Count)
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)
}
for _, sv := range subkeys {
users = append(users, fmt.Sprintf("<@%s>: %d", topUsers[sv].EmojiID, topUsers[sv].Count))
}
@ -197,7 +202,12 @@ func showTopUsers(s *discordgo.Session, i *discordgo.InteractionCreate) {
users := []string{}
msg += fmt.Sprintf("<@%s>: %d", top[v].EmojiID, top[v].Count)
for _, sv := range subkeys {
users = append(users, fmt.Sprintf("%s: %d", topUsers[sv].EmojiID, topUsers[sv].Count))
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))
}
}
msg += " (" + strings.Join(users, ", ") + ")\n"
}
@ -235,9 +245,24 @@ func purgeRecentEmojis(s *discordgo.Session, i *discordgo.InteractionCreate) {
return
}
emojis, err := b.Db.GetRecentEmojisForUser(i.GuildID, user.ID, 1)
hours := int64(24)
if opt, ok := optionMap["hours"]; ok {
hours = opt.IntValue()
} else {
slog.Error("Invalid hours option provided")
s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "No hours specified",
AllowedMentions: &discordgo.MessageAllowedMentions{},
},
})
return
}
emojis, err := b.Db.GetRecentEmojisForUser(i.GuildID, user.ID, hours)
if err != nil {
slog.Error("Error getting top users", "err", err)
slog.Error("Error getting recent emojis for user", "err", err)
return
}

4
src/internal/bot/main.go
View file

@ -88,7 +88,7 @@ func (bot *Bot) HandleAddReaction(discord *discordgo.Session, reaction *discordg
return
}
err := bot.Db.LogEmojiUsage(reaction.GuildID, reaction.ChannelID, reaction.MessageID, reaction.UserID, reaction.Emoji.Name)
err := bot.Db.LogEmojiUsage(reaction.GuildID, reaction.ChannelID, reaction.MessageID, reaction.UserID, reaction.Emoji.ID, reaction.Emoji.Name)
if err != nil {
slog.Error("Failed to log emoji usage", "err", err)
}
@ -101,7 +101,7 @@ func (bot *Bot) HandleRemoveReaction(discord *discordgo.Session, reaction *disco
return
}
err := bot.Db.DeleteEmojiUsage(reaction.GuildID, reaction.ChannelID, reaction.MessageID, reaction.UserID, reaction.Emoji.Name)
err := bot.Db.DeleteEmojiUsage(reaction.GuildID, reaction.ChannelID, reaction.MessageID, reaction.UserID, reaction.Emoji.ID)
if err != nil {
slog.Error("Failed to delete single emoji usage", "err", err)
}

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

@ -44,6 +44,7 @@ func (db *Database) runMigrations() (*Database, error) {
"`message_id` TEXT, " +
"`user_id` TEXT, " +
"`emoji_id` TEXT, " +
"`emoji_name` TEXT, " +
"`timestamp` DATETIME" +
")")
if err != nil {
@ -60,9 +61,21 @@ func (db *Database) runMigrations() (*Database, error) {
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

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

@ -1,8 +1,11 @@
package db
import "fmt"
type EmojiMap struct {
EmojiID string
Count int64
EmojiID string
EmojiName string
Count int64
}
type EmojiUsage struct {
@ -15,10 +18,10 @@ type EmojiUsage struct {
}
// LogEmojiUsage - Log usage
func (db *Database) LogEmojiUsage(guildID, channelID, messageID, userID, emojiID string) error {
func (db *Database) LogEmojiUsage(guildID, channelID, messageID, userID, emojiID, emojiName string) error {
_, err := db.db.Exec(
"INSERT INTO `emoji_usage` (`guild_id`, `channel_id`, `message_id`, `user_id`, `emoji_id`, `timestamp`) VALUES (?,?,?,?,?, datetime())",
guildID, channelID, messageID, userID, emojiID,
"INSERT INTO `emoji_usage` (`guild_id`, `channel_id`, `message_id`, `user_id`, `emoji_id`, `emoji_name`, `timestamp`) VALUES (?,?,?,?,?,?, datetime())",
guildID, channelID, messageID, userID, emojiID, emojiName,
)
return err
@ -100,7 +103,7 @@ func (db *Database) GetTopUsersForGuildEmoji(guildID string, emojiID string, num
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 ?",
"SELECT emoji_name, emoji_id, count(*) FROM `emoji_usage` WHERE `guild_id` = ? GROUP BY emoji_id ORDER BY count(*) DESC LIMIT ?",
guildID,
num,
)
@ -112,10 +115,11 @@ func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[int]Emo
defer row.Close()
i := 0
for row.Next() {
var emoji string
var emojiName string
var emojiID string
var count int64
row.Scan(&emoji, &count)
data[i] = EmojiMap{EmojiID: emoji, Count: count}
row.Scan(&emojiName, &emojiID, &count)
data[i] = EmojiMap{EmojiID: emojiID, EmojiName: emojiName, Count: count}
i++
}
@ -126,7 +130,7 @@ func (db *Database) GetTopEmojisForGuild(guildID string, num int64) (map[int]Emo
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 ?",
"SELECT emoji_name, emoji_id, count(*) FROM `emoji_usage` WHERE `guild_id` = ? AND `user_id` = ? GROUP BY emoji_name ORDER BY count(*) DESC LIMIT ?",
guildID,
userID,
num,
@ -139,10 +143,11 @@ func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num
defer row.Close()
i := 0
for row.Next() {
var emoji string
var emojiName string
var emojiID string
var count int64
row.Scan(&emoji, &count)
data[i] = EmojiMap{EmojiID: emoji, Count: count}
row.Scan(&emojiName, &emojiID, &count)
data[i] = EmojiMap{EmojiID: emojiID, EmojiName: emojiName, Count: count}
i++
}
@ -153,12 +158,11 @@ func (db *Database) GetTopEmojisForGuildUser(guildID string, userID string, num
func (db *Database) GetRecentEmojisForUser(guildID string, userID string, hours int64) ([]EmojiUsage, error) {
var data []EmojiUsage
row, err := db.db.Query(
"SELECT emoji_id, channel_id, message_id, user_id, emoji_id, timestamp "+
"FROM `emoji_usage` WHERE `guild_id` = ? AND `user_id` = ? AND timestamp >= NOW() - INTERVAL ? HOUR "+
"SELECT guild_id, channel_id, message_id, user_id, emoji_id, timestamp "+
"FROM `emoji_usage` WHERE `guild_id` = ? AND `user_id` = ? AND timestamp >= datetime('now', '-"+fmt.Sprintf("%d", hours)+" hours') "+
"ORDER BY timestamp DESC",
guildID,
userID,
hours,
)
if err != nil {