mitchell/go-discord-bot
1
0
Fork 0
mirror of https://github.com/mgerb/go-discord-bot synced 2026-01-11 01:22:48 +00:00
Code Issues Releases Wiki Activity

feat: add user event log to admin page

Browse Source
This commit is contained in:
Mitchell
2019-08-24 12:47:53 -05:00
parent 72ba1e5621
commit 55a4bb73af
18 changed files with 230 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/bothandlers/sounds.go
View File

@@ -10,6 +10,9 @@ import (
"sync"
"time"
"github.com/mgerb/go-discord-bot/server/db"
"github.com/mgerb/go-discord-bot/server/webserver/model"
"github.com/bwmarrin/discordgo"
"github.com/mgerb/go-discord-bot/server/config"
"github.com/mgerb/go-discord-bot/server/util"
@@ -104,10 +107,10 @@ func (conn *AudioConnection) handleMessage(m *discordgo.MessageCreate) {
conn.clipAudio(m)
case "random":
conn.PlayRandomAudio(m)
conn.PlayRandomAudio(m, nil)
default:
conn.PlayAudio(command, m)
conn.PlayAudio(command, m, nil)
}
}
}
@@ -167,20 +170,20 @@ func (conn *AudioConnection) summon(m *discordgo.MessageCreate) {
}
// play a random sound clip
func (conn *AudioConnection) PlayRandomAudio(m *discordgo.MessageCreate) {
func (conn *AudioConnection) PlayRandomAudio(m *discordgo.MessageCreate, userID *string) {
files, _ := ioutil.ReadDir(config.Config.SoundsPath)
if len(files) > 0 {
randomIndex := rand.Intn(len(files))
arr := strings.Split(files[randomIndex].Name(), ".")
if len(arr) > 0 && arr[0] != "" {
conn.PlayAudio(arr[0], m)
conn.PlayAudio(arr[0], m, userID)
}
}
}
// PlayAudio - play audio in channel that user is in
// if MessageCreate is null play in current channel
func (conn *AudioConnection) PlayAudio(soundName string, m *discordgo.MessageCreate) {
func (conn *AudioConnection) PlayAudio(soundName string, m *discordgo.MessageCreate, userID *string) {
// summon bot to channel if new message passed in
if m != nil {
@@ -204,6 +207,24 @@ func (conn *AudioConnection) PlayAudio(soundName string, m *discordgo.MessageCre
select {
case conn.SoundQueue <- soundName:
var newUserID string
fromWebUI := false
// from discord
if m != nil && m.Author != nil {
newUserID = m.Author.ID
} else {
fromWebUI = true
newUserID = *userID
}
// log event when user plays sound clip
err := model.LogSoundPlayedEvent(db.GetConn(), newUserID, soundName, fromWebUI)
if err != nil {
log.Error(err)
}
default:
break
}