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

the deletegroup command is fully translatable

This commit is contained in:
Dawid Wysokiński 2020-07-19 13:50:01 +02:00 committed by Kichiyaki
parent de1e78459a
commit 7e53a6f745
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
discord/admin_commands.go
View File

@ -78,7 +78,7 @@ func (s *Session) handleAddGroupCommand(ctx commandCtx, m *discordgo.MessageCrea
}, },
})) }))
} }
func (s *Session) handleDeleteGroupCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleDeleteGroupCommand(ctx commandCtx, m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -89,16 +89,27 @@ func (s *Session) handleDeleteGroupCommand(m *discordgo.MessageCreate, args ...s
return return
} else if argsLength < 1 { } else if argsLength < 1 {
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
fmt.Sprintf("%s %s [id grupy]", m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
m.Author.Mention(), MessageID: "help.deletegroup",
DeleteGroupCommand.WithPrefix(s.cfg.CommandPrefix))) DefaultMessage: message.FallbackMsg("help.deletegroup", "**{{.Command}}** [group id from {{.GroupsCommand}}] - deletes an observation group."),
TemplateData: map[string]interface{}{
"Command": DeleteGroupCommand.WithPrefix(s.cfg.CommandPrefix),
"GroupsCommand": GroupsCommand.WithPrefix(s.cfg.CommandPrefix),
},
}))
return return
} }
groupID, err := strconv.Atoi(args[0]) groupID, err := strconv.Atoi(args[0])
if err != nil { if err != nil {
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
fmt.Sprintf("%s Niepoprawne ID grupy (powinna to być liczba całkowita większa od 1).", m.Author.Mention())) ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "deleteGroup.invalidID",
DefaultMessage: message.FallbackMsg("deleteGroup.invalidID", "{{.Mention}} The group ID must be a number greater than 0."),
TemplateData: map[string]interface{}{
"Mention": m.Author.Mention(),
},
}))
return return
} }
@ -108,11 +119,16 @@ func (s *Session) handleDeleteGroupCommand(m *discordgo.MessageCreate, args ...s
}) })
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
fmt.Sprintf("%s Usunięto grupę.", m.Author.Mention())) ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "deleteGroup.success",
DefaultMessage: message.FallbackMsg("deleteGroup.success", "{{.Mention}} The group has been deleted."),
TemplateData: map[string]interface{}{
"Mention": m.Author.Mention(),
},
}))
} }
func (s *Session) handleGroupsCommand(m *discordgo.MessageCreate) { func (s *Session) handleGroupsCommand(m *discordgo.MessageCreate) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -142,7 +158,6 @@ func (s *Session) handleGroupsCommand(m *discordgo.MessageCreate) {
} }
func (s *Session) handleConqueredVillagesCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleConqueredVillagesCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -184,7 +199,6 @@ func (s *Session) handleConqueredVillagesCommand(m *discordgo.MessageCreate, arg
} }
func (s *Session) handleUnObserveConqueredVillagesCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleUnObserveConqueredVillagesCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -227,7 +241,6 @@ func (s *Session) handleUnObserveConqueredVillagesCommand(m *discordgo.MessageCr
} }
func (s *Session) handleLostVillagesCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleLostVillagesCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -270,7 +283,6 @@ func (s *Session) handleLostVillagesCommand(m *discordgo.MessageCreate, args ...
} }
func (s *Session) handleUnObserveLostVillagesCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleUnObserveLostVillagesCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -316,7 +328,6 @@ func (s *Session) handleUnObserveLostVillagesCommand(m *discordgo.MessageCreate,
} }
func (s *Session) handleObserveCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleObserveCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -391,7 +402,6 @@ func (s *Session) handleObserveCommand(m *discordgo.MessageCreate, args ...strin
} }
func (s *Session) handleUnObserveCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleUnObserveCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -438,7 +448,6 @@ func (s *Session) handleUnObserveCommand(m *discordgo.MessageCreate, args ...str
} }
func (s *Session) handleObservationsCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleObservationsCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }
@ -537,7 +546,6 @@ func (s *Session) handleObservationsCommand(m *discordgo.MessageCreate, args ...
} }
func (s *Session) handleShowEnnobledBarbariansCommand(m *discordgo.MessageCreate, args ...string) { func (s *Session) handleShowEnnobledBarbariansCommand(m *discordgo.MessageCreate, args ...string) {
if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has { if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
return return
} }

2
discord/discord.go
View File

@ -111,7 +111,7 @@ func (s *Session) handleNewMessage(_ *discordgo.Session, m *discordgo.MessageCre
case AddGroupCommand.WithPrefix(s.cfg.CommandPrefix): case AddGroupCommand.WithPrefix(s.cfg.CommandPrefix):
s.handleAddGroupCommand(ctx, m) s.handleAddGroupCommand(ctx, m)
case DeleteGroupCommand.WithPrefix(s.cfg.CommandPrefix): case DeleteGroupCommand.WithPrefix(s.cfg.CommandPrefix):
s.handleDeleteGroupCommand(m, args...) s.handleDeleteGroupCommand(ctx, m, args...)
case GroupsCommand.WithPrefix(s.cfg.CommandPrefix): case GroupsCommand.WithPrefix(s.cfg.CommandPrefix):
s.handleGroupsCommand(m) s.handleGroupsCommand(m)

3
message/translations/active.en.json
View File

@ -36,6 +36,9 @@
"addGroup.groupLimitHasBeenReached": "{{.Mention}} The group limit has been reached ({{.Total}}/{{.Limit}}).", "addGroup.groupLimitHasBeenReached": "{{.Mention}} The group limit has been reached ({{.Total}}/{{.Limit}}).",
"addGroup.success": "{{.Mention}} A new group has been created (ID: {{.ID}}).", "addGroup.success": "{{.Mention}} A new group has been created (ID: {{.ID}}).",
"deleteGroup.invalidID": "{{.Mention}} The group ID must be a number greater than 0.",
"deleteGroup.success": "{{.Mention}} The group has been deleted.",
"api.defaultError": "{{.Mention}} There was an error fetching data from the API, please try again later.", "api.defaultError": "{{.Mention}} There was an error fetching data from the API, please try again later.",
"pagination.labelDisplayedPage": "Page: {{.Page}} from {{.MaxPage}}", "pagination.labelDisplayedPage": "Page: {{.Page}} from {{.MaxPage}}",