From bc22196695afa8ee5e0ce9e8b4610de61cea6a45 Mon Sep 17 00:00:00 2001 From: thec0sm0s Date: Mon, 11 May 2020 21:28:14 +0530 Subject: [PATCH] Use _request shorthand method --- flask_discord/models/base.py | 9 +++++++++ flask_discord/models/user.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/flask_discord/models/base.py b/flask_discord/models/base.py index c40689e..58b0e7a 100644 --- a/flask_discord/models/base.py +++ b/flask_discord/models/base.py @@ -1,8 +1,17 @@ +from flask import current_app from abc import ABC class DiscordModelsBase(ABC): + @staticmethod + def _request(*args, **kwargs): + """A shorthand to :py:func:flask_discord.request`. It uses Flask current_app local proxy to get the + Flask-Discord client. + + """ + return current_app.discord.request(*args, **kwargs) + def to_json(self): """A utility method which returns raw payload object as it was received from discord. diff --git a/flask_discord/models/user.py b/flask_discord/models/user.py index a35a87c..c09d8ba 100644 --- a/flask_discord/models/user.py +++ b/flask_discord/models/user.py @@ -92,7 +92,7 @@ class User(DiscordModelsBase): """ data = {"access_token": session["DISCORD_OAUTH2_TOKEN"]["access_token"]} headers = {"Authorization": f"Bot {current_app.config['DISCORD_BOT_TOKEN']}"} - return current_app.discord.request( + return self._request( f"/guilds/{guild_id}/members/{self.id}", method="PUT", oauth=False, json=data, headers=headers ) or dict()