twhelp
/
dcbot-old
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

the discord package - commands shouldn't be exported

This commit is contained in:
Dawid Wysokiński 2021-07-18 12:21:02 +02:00
parent 9da466d526
commit c3eb4b42d1
7 changed files with 122 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
discord/admin_commands.go
View File

@ -9,7 +9,7 @@ import (
) )
const ( const (
ChangeLanguageCommand Command = "changelanguage" cmdChangeLanguage command = "changelanguage"
) )
type hndlrChangeLanguage struct { type hndlrChangeLanguage struct {
@ -18,8 +18,8 @@ type hndlrChangeLanguage struct {
var _ commandHandler = &hndlrChangeLanguage{} var _ commandHandler = &hndlrChangeLanguage{}
func (hndlr *hndlrChangeLanguage) cmd() Command { func (hndlr *hndlrChangeLanguage) cmd() command {
return ChangeLanguageCommand return cmdChangeLanguage
} }
func (hndlr *hndlrChangeLanguage) requireAdmPermissions() bool { func (hndlr *hndlrChangeLanguage) requireAdmPermissions() bool {

8
discord/command.go
View File

@ -7,13 +7,13 @@ import (
"github.com/tribalwarshelp/dcbot/model" "github.com/tribalwarshelp/dcbot/model"
) )
type Command string type command string
func (cmd Command) String() string { func (cmd command) String() string {
return string(cmd) return string(cmd)
} }
func (cmd Command) WithPrefix(prefix string) string { func (cmd command) WithPrefix(prefix string) string {
return prefix + cmd.String() return prefix + cmd.String()
} }
@ -23,7 +23,7 @@ type commandCtx struct {
} }
type commandHandler interface { type commandHandler interface {
cmd() Command cmd() command
requireAdmPermissions() bool requireAdmPermissions() bool
execute(ctx *commandCtx, m *discordgo.MessageCreate, args ...string) execute(ctx *commandCtx, m *discordgo.MessageCreate, args ...string)
} }

14
discord/coords_translation.go
View File

@ -15,9 +15,9 @@ import (
) )
const ( const (
coordsLimit = 20 coordsLimit = 20
CoordsTranslationCommand Command = "coordstranslation" cmdCoordsTranslation command = "coordstranslation"
DisableCoordsTranslationCommand Command = "disablecoordstranslation" cmdDisableCoordsTranslation command = "disablecoordstranslation"
) )
var coordsRegex = regexp.MustCompile(`(\d+)\|(\d+)`) var coordsRegex = regexp.MustCompile(`(\d+)\|(\d+)`)
@ -28,8 +28,8 @@ type hndlrCoordsTranslation struct {
var _ commandHandler = &hndlrCoordsTranslation{} var _ commandHandler = &hndlrCoordsTranslation{}
func (hndlr *hndlrCoordsTranslation) cmd() Command { func (hndlr *hndlrCoordsTranslation) cmd() command {
return CoordsTranslationCommand return cmdCoordsTranslation
} }
func (hndlr *hndlrCoordsTranslation) requireAdmPermissions() bool { func (hndlr *hndlrCoordsTranslation) requireAdmPermissions() bool {
@ -84,8 +84,8 @@ type hndlrDisableCoordsTranslation struct {
var _ commandHandler = &hndlrDisableCoordsTranslation{} var _ commandHandler = &hndlrDisableCoordsTranslation{}
func (hndlr *hndlrDisableCoordsTranslation) cmd() Command { func (hndlr *hndlrDisableCoordsTranslation) cmd() command {
return DisableCoordsTranslationCommand return cmdDisableCoordsTranslation
} }
func (hndlr *hndlrDisableCoordsTranslation) requireAdmPermissions() bool { func (hndlr *hndlrDisableCoordsTranslation) requireAdmPermissions() bool {

98
discord/observations.go
View File

@ -24,18 +24,18 @@ const (
) )
const ( const (
AddGroupCommand Command = "addgroup" cmdAddGroup command = "addgroup"
DeleteGroupCommand Command = "deletegroup" cmdDeleteGroup command = "deletegroup"
GroupsCommand Command = "groups" cmdGroups command = "groups"
ShowEnnobledBarbariansCommand Command = "showennobledbarbs" cmdShowEnnobledBarbarians command = "showennobledbarbs"
ObserveCommand Command = "observe" cmdObserve command = "observe"
ObservationsCommand Command = "observations" cmdObservations command = "observations"
DeleteObservationCommand Command = "deleteobservation" cmdDeleteObservation command = "deleteobservation"
LostVillagesCommand Command = "lostvillages" cmdLostVillages command = "lostvillages"
DisableLostVillagesCommand Command = "disablelostvillages" cmdDisableLostVillages command = "disablelostvillages"
ConqueredVillagesCommand Command = "conqueredvillages" cmdConqueredVillages command = "conqueredvillages"
DisableConqueredVillagesCommand Command = "disableconqueredvillages" cmdDisableConqueredVillages command = "disableconqueredvillages"
ShowInternalsCommand Command = "showinternals" cmdShowInternals command = "showinternals"
) )
type hndlrAddGroup struct { type hndlrAddGroup struct {
@ -44,8 +44,8 @@ type hndlrAddGroup struct {
var _ commandHandler = &hndlrAddGroup{} var _ commandHandler = &hndlrAddGroup{}
func (hndlr *hndlrAddGroup) cmd() Command { func (hndlr *hndlrAddGroup) cmd() command {
return AddGroupCommand return cmdAddGroup
} }
func (hndlr *hndlrAddGroup) requireAdmPermissions() bool { func (hndlr *hndlrAddGroup) requireAdmPermissions() bool {
@ -98,8 +98,8 @@ type hndlrDeleteGroup struct {
var _ commandHandler = &hndlrDeleteGroup{} var _ commandHandler = &hndlrDeleteGroup{}
func (hndlr *hndlrDeleteGroup) cmd() Command { func (hndlr *hndlrDeleteGroup) cmd() command {
return DeleteGroupCommand return cmdDeleteGroup
} }
func (hndlr *hndlrDeleteGroup) requireAdmPermissions() bool { func (hndlr *hndlrDeleteGroup) requireAdmPermissions() bool {
@ -113,8 +113,8 @@ func (hndlr *hndlrDeleteGroup) execute(ctx *commandCtx, m *discordgo.MessageCrea
m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpDeleteGroup, MessageID: message.HelpDeleteGroup,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": DeleteGroupCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdDeleteGroup.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -152,8 +152,8 @@ type hndlrGroups struct {
var _ commandHandler = &hndlrGroups{} var _ commandHandler = &hndlrGroups{}
func (hndlr *hndlrGroups) cmd() Command { func (hndlr *hndlrGroups) cmd() command {
return GroupsCommand return cmdGroups
} }
func (hndlr *hndlrGroups) requireAdmPermissions() bool { func (hndlr *hndlrGroups) requireAdmPermissions() bool {
@ -203,8 +203,8 @@ type hndlrConqueredVillages struct {
var _ commandHandler = &hndlrConqueredVillages{} var _ commandHandler = &hndlrConqueredVillages{}
func (hndlr *hndlrConqueredVillages) cmd() Command { func (hndlr *hndlrConqueredVillages) cmd() command {
return ConqueredVillagesCommand return cmdConqueredVillages
} }
func (hndlr *hndlrConqueredVillages) requireAdmPermissions() bool { func (hndlr *hndlrConqueredVillages) requireAdmPermissions() bool {
@ -219,7 +219,7 @@ func (hndlr *hndlrConqueredVillages) execute(ctx *commandCtx, m *discordgo.Messa
MessageID: message.HelpConqueredVillages, MessageID: message.HelpConqueredVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -269,8 +269,8 @@ type hndlrDisableConqueredVillages struct {
var _ commandHandler = &hndlrDisableConqueredVillages{} var _ commandHandler = &hndlrDisableConqueredVillages{}
func (hndlr *hndlrDisableConqueredVillages) cmd() Command { func (hndlr *hndlrDisableConqueredVillages) cmd() command {
return DisableConqueredVillagesCommand return cmdDisableConqueredVillages
} }
func (hndlr *hndlrDisableConqueredVillages) requireAdmPermissions() bool { func (hndlr *hndlrDisableConqueredVillages) requireAdmPermissions() bool {
@ -285,7 +285,7 @@ func (hndlr *hndlrDisableConqueredVillages) execute(ctx *commandCtx, m *discordg
MessageID: message.HelpDisableConqueredVillages, MessageID: message.HelpDisableConqueredVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -337,8 +337,8 @@ type hndlrLostVillages struct {
var _ commandHandler = &hndlrLostVillages{} var _ commandHandler = &hndlrLostVillages{}
func (hndlr *hndlrLostVillages) cmd() Command { func (hndlr *hndlrLostVillages) cmd() command {
return LostVillagesCommand return cmdLostVillages
} }
func (hndlr *hndlrLostVillages) requireAdmPermissions() bool { func (hndlr *hndlrLostVillages) requireAdmPermissions() bool {
@ -353,7 +353,7 @@ func (hndlr *hndlrLostVillages) execute(ctx *commandCtx, m *discordgo.MessageCre
MessageID: message.HelpLostVillages, MessageID: message.HelpLostVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -404,8 +404,8 @@ type hndlrDisableLostVillages struct {
var _ commandHandler = &hndlrDisableLostVillages{} var _ commandHandler = &hndlrDisableLostVillages{}
func (hndlr *hndlrDisableLostVillages) cmd() Command { func (hndlr *hndlrDisableLostVillages) cmd() command {
return DisableLostVillagesCommand return cmdDisableLostVillages
} }
func (hndlr *hndlrDisableLostVillages) requireAdmPermissions() bool { func (hndlr *hndlrDisableLostVillages) requireAdmPermissions() bool {
@ -420,7 +420,7 @@ func (hndlr *hndlrDisableLostVillages) execute(ctx *commandCtx, m *discordgo.Mes
MessageID: message.HelpDisableLostVillages, MessageID: message.HelpDisableLostVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -473,8 +473,8 @@ type hndlrObserve struct {
var _ commandHandler = &hndlrObserve{} var _ commandHandler = &hndlrObserve{}
func (hndlr *hndlrObserve) cmd() Command { func (hndlr *hndlrObserve) cmd() command {
return ObserveCommand return cmdObserve
} }
func (hndlr *hndlrObserve) requireAdmPermissions() bool { func (hndlr *hndlrObserve) requireAdmPermissions() bool {
@ -489,7 +489,7 @@ func (hndlr *hndlrObserve) execute(ctx *commandCtx, m *discordgo.MessageCreate,
MessageID: message.HelpObserve, MessageID: message.HelpObserve,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -610,8 +610,8 @@ type hndlrDeleteObservation struct {
var _ commandHandler = &hndlrDeleteObservation{} var _ commandHandler = &hndlrDeleteObservation{}
func (hndlr *hndlrDeleteObservation) cmd() Command { func (hndlr *hndlrDeleteObservation) cmd() command {
return DeleteObservationCommand return cmdDeleteObservation
} }
func (hndlr *hndlrDeleteObservation) requireAdmPermissions() bool { func (hndlr *hndlrDeleteObservation) requireAdmPermissions() bool {
@ -626,8 +626,8 @@ func (hndlr *hndlrDeleteObservation) execute(ctx *commandCtx, m *discordgo.Messa
MessageID: message.HelpDeleteObservation, MessageID: message.HelpDeleteObservation,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"ObservationsCommand": ObservationsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "ObservationsCommand": cmdObservations.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -687,8 +687,8 @@ type hndlrObservations struct {
var _ commandHandler = &hndlrObservations{} var _ commandHandler = &hndlrObservations{}
func (hndlr *hndlrObservations) cmd() Command { func (hndlr *hndlrObservations) cmd() command {
return ObservationsCommand return cmdObservations
} }
func (hndlr *hndlrObservations) requireAdmPermissions() bool { func (hndlr *hndlrObservations) requireAdmPermissions() bool {
@ -703,7 +703,7 @@ func (hndlr *hndlrObservations) execute(ctx *commandCtx, m *discordgo.MessageCre
MessageID: message.HelpObservations, MessageID: message.HelpObservations,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -823,8 +823,8 @@ type hndlrShowEnnobledBarbarians struct {
var _ commandHandler = &hndlrShowEnnobledBarbarians{} var _ commandHandler = &hndlrShowEnnobledBarbarians{}
func (hndlr *hndlrShowEnnobledBarbarians) cmd() Command { func (hndlr *hndlrShowEnnobledBarbarians) cmd() command {
return ShowEnnobledBarbariansCommand return cmdShowEnnobledBarbarians
} }
func (hndlr *hndlrShowEnnobledBarbarians) requireAdmPermissions() bool { func (hndlr *hndlrShowEnnobledBarbarians) requireAdmPermissions() bool {
@ -838,8 +838,8 @@ func (hndlr *hndlrShowEnnobledBarbarians) execute(ctx *commandCtx, m *discordgo.
m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpShowEnnobledBarbs, MessageID: message.HelpShowEnnobledBarbs,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ShowEnnobledBarbariansCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdShowEnnobledBarbarians.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return
@ -906,8 +906,8 @@ type hndlrShowInternals struct {
var _ commandHandler = &hndlrShowInternals{} var _ commandHandler = &hndlrShowInternals{}
func (hndlr *hndlrShowInternals) cmd() Command { func (hndlr *hndlrShowInternals) cmd() command {
return ShowInternalsCommand return cmdShowInternals
} }
func (hndlr *hndlrShowInternals) requireAdmPermissions() bool { func (hndlr *hndlrShowInternals) requireAdmPermissions() bool {
@ -922,7 +922,7 @@ func (hndlr *hndlrShowInternals) execute(ctx *commandCtx, m *discordgo.MessageCr
MessageID: message.HelpShowInternals, MessageID: message.HelpShowInternals,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix), "Command": hndlr.cmd().WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
})) }))
return return

114
discord/public_commands.go
View File

@ -18,14 +18,14 @@ import (
) )
const ( const (
HelpCommand Command = "help" cmdHelp command = "help"
TribeCommand Command = "tribe" cmdTribe command = "tribe"
TopODACommand Command = "topoda" cmdTopODA command = "topoda"
TopODDCommand Command = "topodd" cmdTopODD command = "topodd"
TopODSCommand Command = "topods" cmdTopODS command = "topods"
TopODCommand Command = "topod" cmdTopOD command = "topod"
TopPointsCommand Command = "toppoints" cmdTopPoints command = "toppoints"
AuthorCommand Command = "author" cmdAuthor command = "author"
) )
type hndlrHelp struct { type hndlrHelp struct {
@ -34,8 +34,8 @@ type hndlrHelp struct {
var _ commandHandler = &hndlrHelp{} var _ commandHandler = &hndlrHelp{}
func (hndlr *hndlrHelp) cmd() Command { func (hndlr *hndlrHelp) cmd() command {
return HelpCommand return cmdHelp
} }
func (hndlr *hndlrHelp) requireAdmPermissions() bool { func (hndlr *hndlrHelp) requireAdmPermissions() bool {
@ -54,37 +54,37 @@ func (hndlr *hndlrHelp) execute(ctx *commandCtx, m *discordgo.MessageCreate, arg
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpTribeTopODA, MessageID: message.HelpTribeTopODA,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": TribeCommand.WithPrefix(hndlr.cfg.CommandPrefix) + " " + TopODACommand.String(), "Command": cmdTribe.WithPrefix(hndlr.cfg.CommandPrefix) + " " + cmdTopODA.String(),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpTribeTopODD, MessageID: message.HelpTribeTopODD,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": TribeCommand.WithPrefix(hndlr.cfg.CommandPrefix) + " " + TopODDCommand.String(), "Command": cmdTribe.WithPrefix(hndlr.cfg.CommandPrefix) + " " + cmdTopODD.String(),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpTribeTopODS, MessageID: message.HelpTribeTopODS,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": TribeCommand.WithPrefix(hndlr.cfg.CommandPrefix) + " " + TopODSCommand.String(), "Command": cmdTribe.WithPrefix(hndlr.cfg.CommandPrefix) + " " + cmdTopODS.String(),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpTribeTopOD, MessageID: message.HelpTribeTopOD,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": TribeCommand.WithPrefix(hndlr.cfg.CommandPrefix) + " " + TopODCommand.String(), "Command": cmdTribe.WithPrefix(hndlr.cfg.CommandPrefix) + " " + cmdTopOD.String(),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpTribeTopPoints, MessageID: message.HelpTribeTopPoints,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": TribeCommand.WithPrefix(hndlr.cfg.CommandPrefix) + " " + TopPointsCommand.String(), "Command": cmdTribe.WithPrefix(hndlr.cfg.CommandPrefix) + " " + cmdTopPoints.String(),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpAuthor, MessageID: message.HelpAuthor,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": AuthorCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdAuthor.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
) )
@ -103,63 +103,63 @@ func (hndlr *hndlrHelp) execute(ctx *commandCtx, m *discordgo.MessageCreate, arg
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpAddGroup, MessageID: message.HelpAddGroup,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": AddGroupCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdAddGroup.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpGroups, MessageID: message.HelpGroups,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpDeleteGroup, MessageID: message.HelpDeleteGroup,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": DeleteGroupCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdDeleteGroup.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpShowEnnobledBarbs, MessageID: message.HelpShowEnnobledBarbs,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ShowEnnobledBarbariansCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdShowEnnobledBarbarians.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpObserve, MessageID: message.HelpObserve,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ObserveCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdObserve.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpGroups, MessageID: message.HelpGroups,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ObservationsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdObservations.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpDeleteObservation, MessageID: message.HelpDeleteObservation,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": DeleteObservationCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdDeleteObservation.WithPrefix(hndlr.cfg.CommandPrefix),
"ObservationsCommand": ObservationsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "ObservationsCommand": cmdObservations.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpConqueredVillages, MessageID: message.HelpConqueredVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ConqueredVillagesCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdConqueredVillages.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpDisableConqueredVillages, MessageID: message.HelpDisableConqueredVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": DisableConqueredVillagesCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdDisableConqueredVillages.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
) )
@ -175,41 +175,41 @@ func (hndlr *hndlrHelp) execute(ctx *commandCtx, m *discordgo.MessageCreate, arg
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpLostVillages, MessageID: message.HelpLostVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": LostVillagesCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdLostVillages.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpDisableLostVillages, MessageID: message.HelpDisableLostVillages,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": DisableLostVillagesCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdDisableLostVillages.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpShowInternals, MessageID: message.HelpShowInternals,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ShowInternalsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdShowInternals.WithPrefix(hndlr.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(hndlr.cfg.CommandPrefix), "GroupsCommand": cmdGroups.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpChangageLanguage, MessageID: message.HelpChangageLanguage,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": ChangeLanguageCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdChangeLanguage.WithPrefix(hndlr.cfg.CommandPrefix),
"Languages": getAvailableLanguages(), "Languages": getAvailableLanguages(),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpCoordsTranslation, MessageID: message.HelpCoordsTranslation,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": CoordsTranslationCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdCoordsTranslation.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.HelpDisableCoordsTranslation, MessageID: message.HelpDisableCoordsTranslation,
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Command": DisableCoordsTranslationCommand.WithPrefix(hndlr.cfg.CommandPrefix), "Command": cmdDisableCoordsTranslation.WithPrefix(hndlr.cfg.CommandPrefix),
}, },
}), }),
) )
@ -239,8 +239,8 @@ type hndlrAuthor struct {
var _ commandHandler = &hndlrAuthor{} var _ commandHandler = &hndlrAuthor{}
func (hndlr *hndlrAuthor) cmd() Command { func (hndlr *hndlrAuthor) cmd() command {
return AuthorCommand return cmdAuthor
} }
func (hndlr *hndlrAuthor) requireAdmPermissions() bool { func (hndlr *hndlrAuthor) requireAdmPermissions() bool {
@ -259,8 +259,8 @@ type hndlrTribe struct {
var _ commandHandler = &hndlrTribe{} var _ commandHandler = &hndlrTribe{}
func (hndlr *hndlrTribe) cmd() Command { func (hndlr *hndlrTribe) cmd() command {
return TribeCommand return cmdTribe
} }
func (hndlr *hndlrTribe) requireAdmPermissions() bool { func (hndlr *hndlrTribe) requireAdmPermissions() bool {
@ -273,7 +273,7 @@ func (hndlr *hndlrTribe) execute(ctx *commandCtx, m *discordgo.MessageCreate, ar
return return
} }
command := Command(args[0]) command := command(args[0])
server := args[1] server := args[1]
page, err := strconv.Atoi(args[2]) page, err := strconv.Atoi(args[2])
if err != nil || page <= 0 { if err != nil || page <= 0 {
@ -324,31 +324,31 @@ func (hndlr *hndlrTribe) execute(ctx *commandCtx, m *discordgo.MessageCreate, ar
title := "" title := ""
sort := "" sort := ""
switch command { switch command {
case TopODACommand: case cmdTopODA:
filter.RankAttGTE = 1 filter.RankAttGTE = 1
sort = "rankAtt ASC" sort = "rankAtt ASC"
title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.TribeTitleOrderedByODA, MessageID: message.TribeTitleOrderedByODA,
}) })
case TopODDCommand: case cmdTopODD:
filter.RankDefGTE = 1 filter.RankDefGTE = 1
sort = "rankDef ASC" sort = "rankDef ASC"
title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.TribeTitleOrderedByODD, MessageID: message.TribeTitleOrderedByODD,
}) })
case TopODSCommand: case cmdTopODS:
filter.RankSupGTE = 1 filter.RankSupGTE = 1
sort = "rankSup ASC" sort = "rankSup ASC"
title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.TribeTitleOrderedByODS, MessageID: message.TribeTitleOrderedByODS,
}) })
case TopODCommand: case cmdTopOD:
filter.RankTotalGTE = 1 filter.RankTotalGTE = 1
sort = "rankTotal ASC" sort = "rankTotal ASC"
title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.TribeTitleOrderedByOD, MessageID: message.TribeTitleOrderedByOD,
}) })
case TopPointsCommand: case cmdTopPoints:
sort = "rank ASC" sort = "rank ASC"
title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.TribeTitleOrderedByPoints, MessageID: message.TribeTitleOrderedByPoints,
@ -419,19 +419,19 @@ func (hndlr *hndlrTribe) execute(ctx *commandCtx, m *discordgo.MessageCreate, ar
rank := 0 rank := 0
score := 0 score := 0
switch command { switch command {
case TopODACommand: case cmdTopODA:
rank = player.RankAtt rank = player.RankAtt
score = player.ScoreAtt score = player.ScoreAtt
case TopODDCommand: case cmdTopODD:
rank = player.RankDef rank = player.RankDef
score = player.ScoreDef score = player.ScoreDef
case TopODSCommand: case cmdTopODS:
rank = player.RankSup rank = player.RankSup
score = player.ScoreSup score = player.ScoreSup
case TopODCommand: case cmdTopOD:
rank = player.RankTotal rank = player.RankTotal
score = player.ScoreTotal score = player.ScoreTotal
case TopPointsCommand: case cmdTopPoints:
rank = player.Rank rank = player.Rank
score = player.Points score = player.Points
} }

5
discord/session.go
View File

@ -157,10 +157,7 @@ func (s *Session) handleNewMessage(_ *discordgo.Session, m *discordgo.MessageCre
h := s.handlers.find(s.cfg.CommandPrefix, parts[0]) h := s.handlers.find(s.cfg.CommandPrefix, parts[0])
if h != nil { if h != nil {
if h.requireAdmPermissions() { if h.requireAdmPermissions() && m.GuildID != "" {
if m.GuildID == "" {
return
}
has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator) has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator)
if err != nil || !has { if err != nil || !has {
return return

3
main.go
View File

@ -27,10 +27,9 @@ import (
const ( const (
commandPrefix = "tw!" commandPrefix = "tw!"
status = "tribalwarshelp.com | tw!help"
) )
var status = "tribalwarshelp.com | " + discord.HelpCommand.WithPrefix(commandPrefix)
func init() { func init() {
os.Setenv("TZ", "UTC") os.Setenv("TZ", "UTC")