Fixed loop and model handling

This commit is contained in:
2021-12-07 15:16:39 +01:00
parent 22b0c3ca6a
commit d5de1991eb
3 changed files with 28 additions and 27 deletions

View File

@@ -64,17 +64,17 @@ class Database(ModuleABC, OnReadyABC):
return
def _check_known_users(self):
self._logger.debug(__name__, f'Start checking KnownUsers table')
self._logger.debug(__name__, f'Start checking KnownUsers table, {len(self._bot.users)}')
for u in self._bot.users:
u: discord.User = u
try:
if u.bot:
self._logger.trace(__name__, f'User {u.id} is ignored, because its a bot')
break
continue
user = self._known_users.find_user_by_discord_id(u.id)
if user is not None:
break
continue
self._logger.warn(__name__, f'Unknown user: {u.id}')
self._logger.debug(__name__, f'Add user: {u.id}')
@@ -88,10 +88,6 @@ class Database(ModuleABC, OnReadyABC):
self._logger.debug(__name__, f'Added user: {u.id}')
except Exception as e:
self._logger.error(__name__, f'Cannot get user', e)
results = self._servers.get_servers()
if results is None or len(results) == 0:
self._logger.error(__name__, f'Table Servers is empty!')
def _check_servers(self):
self._logger.debug(__name__, f'Start checking Servers table')
@@ -100,7 +96,7 @@ class Database(ModuleABC, OnReadyABC):
try:
server = self._servers.find_server_by_discord_id(g.id)
if server is not None:
break
continue
self._logger.warn(__name__, f'Server not found in database: {g.id}')
self._logger.debug(__name__, f'Add server: {g.id}')
@@ -130,7 +126,7 @@ class Database(ModuleABC, OnReadyABC):
client = self._clients.find_client_by_server_id(server.server_id)
if client is not None:
break
continue
self._logger.warn(__name__, f'Client for server {g.id} not found in database: {self._bot.user.id}')
self._logger.debug(__name__, f'Add client: {self._bot.user.id}')
@@ -163,11 +159,11 @@ class Database(ModuleABC, OnReadyABC):
u: discord.Member = u
if u.bot:
self._logger.trace(__name__, f'User {u.id} is ignored, because its a bot')
break
continue
user = self._users.find_user_by_discord_id(u.id)
if user is not None:
break
continue
self._logger.warn(__name__, f'User not found in database: {u.id}')
self._logger.debug(__name__, f'Add user: {u.id}')