From 857fd4c4ad11207cc10659d3d08e88a917ceb292 Mon Sep 17 00:00:00 2001 From: A-Trash-Coder Date: Wed, 20 May 2020 21:45:46 -0400 Subject: [PATCH 1/3] Add a __eq__ and __ne__ to models Guild and User --- flask_discord/models/guild.py | 6 ++++++ flask_discord/models/user.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/flask_discord/models/guild.py b/flask_discord/models/guild.py index 6069baf..fe4318b 100644 --- a/flask_discord/models/guild.py +++ b/flask_discord/models/guild.py @@ -35,6 +35,12 @@ class Guild(DiscordModelsBase): def __str__(self): return self.name + def __eq__(self, guild): + return isinstance(guild, Guild) and guild.id == self.id + + def __ne__(self, guild): + return not self.__eq__(guild) + @property def icon_url(self): """A property returning direct URL to the guild's icon. Returns None if guild has no icon set.""" diff --git a/flask_discord/models/user.py b/flask_discord/models/user.py index 0d67362..8878b38 100644 --- a/flask_discord/models/user.py +++ b/flask_discord/models/user.py @@ -78,6 +78,12 @@ class User(DiscordModelsBase): def __str__(self): return f"{self.name}#{self.discriminator}" + def __eq__(self, user): + return isinstance(user, User) and user.id == self.id + + def __ne__(self, user): + return not self.__eq__(user) + @property def name(self): """An alias to the username attribute.""" From eda1e4c1f259f8b03597b494b46cc5ff27445559 Mon Sep 17 00:00:00 2001 From: A-Trash-Coder Date: Wed, 20 May 2020 23:55:15 -0400 Subject: [PATCH 2/3] Add operations to the docstrings of guild and user --- flask_discord/models/user.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/flask_discord/models/user.py b/flask_discord/models/user.py index 8878b38..34def4f 100644 --- a/flask_discord/models/user.py +++ b/flask_discord/models/user.py @@ -9,6 +9,16 @@ from .connections import UserConnection class User(DiscordModelsBase): """Class representing Discord User. + + Operations + ---------- + x == y + Checks if two user's are the same. + x != y + Checks if two user's are not the same. + str(x) + Returns the user's name with discriminator. + Attributes ---------- id : int From 2417e9dda0508293416674d8f42c2e9cf142ffc4 Mon Sep 17 00:00:00 2001 From: A-Trash-Coder Date: Wed, 20 May 2020 23:56:00 -0400 Subject: [PATCH 3/3] Add operations to the docstrings of guild and user --- flask_discord/models/guild.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/flask_discord/models/guild.py b/flask_discord/models/guild.py index fe4318b..2ba5b21 100644 --- a/flask_discord/models/guild.py +++ b/flask_discord/models/guild.py @@ -6,6 +6,15 @@ from .. import configs class Guild(DiscordModelsBase): """Class representing discord Guild the user is part of. + Operations + ---------- + x == y + Checks if two guild's are the same. + x != y + Checks if two guild's are not the same. + str(x) + Returns the guild's name. + Attributes ---------- id : int