Compare commits

..

No commits in common. "f404287cc1a29abee0f31602bb7d21cc6a8598e6" and "bc92dc453607e2eb7a8021c333a129a29077aa8b" have entirely different histories.

2 changed files with 5 additions and 6 deletions

@ -1 +1 @@
Subproject commit 781aa3f6ab861343d1635005ec7dc1814065b3c7
Subproject commit 6e2ec8f2f88cca5355624da9c83c034949d12ae3

View File

@ -1,6 +1,6 @@
import discord
from cpl_core.configuration import ConfigurationABC
from cpl_core.logging import LoggerABC
from cpl_core.configuration import ConfigurationABC
from cpl_discord.service import DiscordBotServiceABC
from bot_core.configuration.bot_settings import BotSettings
@ -126,15 +126,14 @@ class PermissionService(PermissionServiceABC):
return self._technicians
def is_member_admin(self, member: discord.Member) -> bool:
return member is not None and member.guild.id in self._admins and member in self._admins[member.guild.id]
return member.guild.id in self._admins and member in self._admins[member.guild.id]
def is_member_moderator(self, member: discord.Member) -> bool:
return (
member is not None
and member.guild.id in self._moderators
member.guild.id in self._moderators
and member in self._moderators[member.guild.id]
or self.is_member_admin(member)
)
def is_member_technician(self, member: discord.Member) -> bool:
return member is not None and member in self._technicians
return member in self._technicians