1.0.0 #253

Merged
edraft merged 262 commits from 1.0.0 into master 2023-03-27 09:30:50 +02:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit f404287cc1 - Show all commits

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

View File

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