watteflausch/discord-flauschbot
1
0
Fork 0
forked from kageru/discord-selphybot
Code Issues 1 Pull Requests Releases Wiki Activity

reimplemented cooldowns on a per-user basis (fixes #1)

This commit is contained in:
kageru 2018-06-08 17:36:35 +02:00
parent 1e20ff9b45
commit eb89adc065
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
command.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/deckarep/golang-set"
"strings" "strings"
"time" "time"
"log" "log"
@ -41,7 +42,7 @@ type Command struct {
// for custom commands that go beyond prints and deletions // for custom commands that go beyond prints and deletions
Function func(*discordgo.Session, *discordgo.MessageCreate) Function func(*discordgo.Session, *discordgo.MessageCreate)
IsOnCooldown bool // don’t set this manually (it’s overwritten anyway) UsersOnCooldown mapset.Set // don’t set this manually (it’s overwritten anyway)
} }
@ -54,6 +55,7 @@ func registerCommand(command Command) {
if command.IgnoreCase { if command.IgnoreCase {
command.Trigger = strings.ToLower(command.Trigger) command.Trigger = strings.ToLower(command.Trigger)
} }
command.UsersOnCooldown = mapset.NewSet()
commands = append(commands, command) commands = append(commands, command)
} }
@ -108,14 +110,14 @@ func evaluateMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
Sets command cooldowns if necessary and also clears them again. Sets command cooldowns if necessary and also clears them again.
*/ */
func executeCommand(session *discordgo.Session, message *discordgo.MessageCreate, command Command, commandIndex int) { func executeCommand(session *discordgo.Session, message *discordgo.MessageCreate, command Command, commandIndex int) {
if (message.Author.ID == config.AdminID) || // no restrictions for admins if isAdmin(message.Author) || // no restrictions for admins
(!command.AdminOnly && !command.IsOnCooldown && (!command.AdminOnly && (isDM(session, message) || !commands[commandIndex].UsersOnCooldown.Contains(message.Author.ID)) &&
(!command.DMOnly || (getChannel(session.State, message.ChannelID).Type == discordgo.ChannelTypeDM))) { (!command.DMOnly || isDM(session, message))) {
log.Printf("Executed command %s triggered by user %s", command.Trigger, userToString(message.Author)) log.Printf("Executed command %s triggered by user %s", command.Trigger, userToString(message.Author))
if command.Cooldown > 0 { if command.Cooldown > 0 && !isDM(session, message) && !isAdmin(message.Author) {
commands[commandIndex].IsOnCooldown = true commands[commandIndex].UsersOnCooldown.Add(message.Author.ID)
go removeCooldown(commandIndex) go removeCooldown(commandIndex, message.Author.ID)
} }
if command.Function == nil { if command.Function == nil {
// simple reply // simple reply
@ -137,9 +139,11 @@ func executeCommand(session *discordgo.Session, message *discordgo.MessageCreate
} }
} }
func removeCooldown(commandIndex int) { func removeCooldown(commandIndex int, uid string) {
time.Sleep(time.Duration(commands[commandIndex].Cooldown) * time.Second) time.Sleep(time.Duration(commands[commandIndex].Cooldown) * time.Second)
commands[commandIndex].IsOnCooldown = false if commands[commandIndex].UsersOnCooldown.Contains(uid) {
commands[commandIndex].UsersOnCooldown.Remove(uid)
}
} }
func generateReply(message *discordgo.MessageCreate, command Command) string { func generateReply(message *discordgo.MessageCreate, command Command) string {

7
helpers.go
View File

@ -38,3 +38,10 @@ func getUser(s *discordgo.Session, uid string) *discordgo.User {
return user return user
} }
func isDM(s *discordgo.Session, m *discordgo.MessageCreate) bool {
return (getChannel(s.State, m.ChannelID).Type == discordgo.ChannelTypeDM)
}
func isAdmin(u *discordgo.User) bool {
return (u.ID == config.AdminID)
}