From 05fed1756a6b120353749c6e5856b9049278a8d5 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sun, 31 May 2020 13:34:24 +0200 Subject: [PATCH] guild owner should be able to use bot commands without admin group --- discord/discord.go | 8 ++++++++ tribalwars/helpers.go | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/discord/discord.go b/discord/discord.go index e87e872..751f2ba 100644 --- a/discord/discord.go +++ b/discord/discord.go @@ -212,6 +212,14 @@ func (s *Session) Close() error { } func (s *Session) memberHasPermission(guildID string, userID string, permission int) (bool, error) { + guild, err := s.dg.State.Guild(guildID) + if err != nil { + return false, err + } + if guild.OwnerID == userID { + return true, nil + } + member, err := s.dg.State.Member(guildID, userID) if err != nil { if member, err = s.dg.GuildMember(guildID, userID); err != nil { diff --git a/tribalwars/helpers.go b/tribalwars/helpers.go index b0f6ba1..fbf3caa 100644 --- a/tribalwars/helpers.go +++ b/tribalwars/helpers.go @@ -1,15 +1,5 @@ package tribalwars -var ( - GuestEndpoints = map[string]map[string]string{ - "pl": map[string]string{ - "tribe_info": "https://%s.plemiona.pl/guest.php?screen=info_ally&id=%d", - "player_info": "https://%s.plemiona.pl/guest.php?screen=info_player&id=%d", - "village_info": "https://%s.plemiona.pl/guest.php?screen=info_village&id=%d", - }, - } -) - func LanguageCodeFromWorldName(world string) string { if len(world) < 2 { return ""