Merge branch 'staging' into dev

Merge branch 'master' into staging
Fixed base on member join
2023-11-19 14:42:42 +01:00 · 2023-11-07 20:37:03 +01:00 · 2023-11-07 20:36:29 +01:00 · 2023-11-07 18:21:58 +01:00
1 changed files with 1 additions and 1 deletions
--- a/bot/src/modules/base/events/base_on_member_join_event.py
+++ b/bot/src/modules/base/events/base_on_member_join_event.py
@ -82,7 +82,7 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
                return

            self._logger.debug(__name__, f"Add user: {member.id}")
-            self._users.add_user(User(member.id, 0, 0, 0, server))
+            self._users.add_user(User(member.id, 0, 0, 0, None, server))
            self._db.save_changes()
            user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
            self._user_joins.add_user_joined_server(UserJoinedServer(user, datetime.now()))
Author	SHA1	Message	Date
Sven Heidemann	2dc60acaa6	Merge branch 'staging' into dev All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 4m45s Details	2023-11-19 14:42:42 +01:00
Sven Heidemann	e99e272029	Merge branch 'master' into staging All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 3m12s Details	2023-11-07 20:37:03 +01:00
Sven Heidemann	650f612a6b	Fixed base on member join All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 4m19s Details	2023-11-07 20:36:29 +01:00
Sven Heidemann	d2c37a0098	Merge pull request 'staging' (#434 ) from staging into master All checks were successful Deploy prod on push / on-push-deploy_sh-edraft (push) Successful in 3m15s Details Reviewed-on: #434	2023-11-07 18:21:58 +01:00