diff --git a/flask_discord/client.py b/flask_discord/client.py index 6e505d5..e4d6ff8 100644 --- a/flask_discord/client.py +++ b/flask_discord/client.py @@ -63,8 +63,7 @@ class DiscordOAuth2Session(_http.DiscordOAuth2HttpClient): """ - user_id = session.get("DISCORD_USER_ID") - self.users_cache.pop(user_id, None) + self.users_cache.pop(self.user_id, None) for session_key in self.SESSION_KEYS: try: diff --git a/flask_discord/models/connections.py b/flask_discord/models/connections.py index f67d3ba..9182ce1 100644 --- a/flask_discord/models/connections.py +++ b/flask_discord/models/connections.py @@ -1,6 +1,7 @@ +from flask import current_app + from .base import DiscordModelsBase from .integration import Integration -from flask import current_app, session class UserConnection(DiscordModelsBase): @@ -76,7 +77,7 @@ class UserConnection(DiscordModelsBase): connections = super().fetch_from_api() if cache: - user = current_app.discord.users_cache.get(session.get("DISCORD_USER_ID")) + user = current_app.discord.users_cache.get(current_app.discord.user_id) try: user.connections = connections except AttributeError: diff --git a/flask_discord/models/guild.py b/flask_discord/models/guild.py index 5c4c38b..6069baf 100644 --- a/flask_discord/models/guild.py +++ b/flask_discord/models/guild.py @@ -1,6 +1,5 @@ -from flask import current_app, session from .base import DiscordModelsBase - +from flask import current_app from .. import configs @@ -63,7 +62,7 @@ class Guild(DiscordModelsBase): guilds = super().fetch_from_api() if cache: - user = current_app.discord.users_cache.get(session.get("DISCORD_USER_ID")) + user = current_app.discord.users_cache.get(current_app.discord.user_id) try: user.guilds = {guild.id: guild for guild in guilds} except AttributeError: diff --git a/flask_discord/models/user.py b/flask_discord/models/user.py index 5e015da..e310954 100644 --- a/flask_discord/models/user.py +++ b/flask_discord/models/user.py @@ -136,7 +136,7 @@ class User(DiscordModelsBase): If the current doesn't exists in internal cache. """ - return current_app.discord.users_cache.get(session.get("DISCORD_USER_ID")) + return current_app.discord.users_cache.get(current_app.discord.user_id) def add_to_guild(self, guild_id) -> dict: """Method to add user to the guild, provided OAuth2 session has already been created with ``guilds.join`` scope.