CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle the ints for user objects in Modlog appropriately (#3784)

Browse Source
This commit is contained in:
jack1142 2020-04-24 04:08:08 +02:00 committed by GitHub
parent 06930ebe2c
commit e595f1859a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
redbot/core/modlog.py
View File

@ -208,12 +208,12 @@ class Case:
created_at: int, created_at: int,
action_type: str, action_type: str,
user: Union[discord.User, int], user: Union[discord.User, int],
moderator: discord.User, moderator: Optional[Union[discord.User, int]],
case_number: int, case_number: int,
reason: str = None, reason: str = None,
until: int = None, until: int = None,
channel: Optional[Union[discord.TextChannel, discord.VoiceChannel, int]] = None, channel: Optional[Union[discord.TextChannel, discord.VoiceChannel, int]] = None,
amended_by: Optional[discord.User] = None, amended_by: Optional[Union[discord.User, int]] = None,
modified_at: Optional[int] = None, modified_at: Optional[int] = None,
message: Optional[discord.Message] = None, message: Optional[discord.Message] = None,
last_known_username: Optional[str] = None, last_known_username: Optional[str] = None,
@ -294,10 +294,12 @@ class Case:
else: else:
reason = _("**Reason:** Use the `reason` command to add it") reason = _("**Reason:** Use the `reason` command to add it")
if self.moderator is not None: if self.moderator is None:
moderator = escape_spoilers(f"{self.moderator} ({self.moderator.id})")
else:
moderator = _("Unknown") moderator = _("Unknown")
elif isinstance(self.moderator, int):
moderator = f"[Unknown or Deleted User] ({self.moderator})"
else:
moderator = escape_spoilers(f"{self.moderator} ({self.moderator.id})")
until = None until = None
duration = None duration = None
if self.until: if self.until:
@ -309,13 +311,12 @@ class Case:
until = end_fmt until = end_fmt
duration = dur_fmt duration = dur_fmt
amended_by = None
if self.amended_by: if self.amended_by:
amended_by = escape_spoilers( amended_by = None
"{}#{} ({})".format( elif isinstance(self.amended_by, int):
self.amended_by.name, self.amended_by.discriminator, self.amended_by.id amended_by = f"[Unknown or Deleted User] ({self.amended_by})"
) else:
) amended_by = escape_spoilers(f"{self.amended_by} ({self.amended_by.id})")
last_modified = None last_modified = None
if self.modified_at: if self.modified_at:
@ -383,10 +384,14 @@ class Case:
The case in the form of a dict The case in the form of a dict
""" """
if self.moderator is not None: if self.moderator is None or isinstance(self.moderator, int):
mod = self.moderator.id mod = self.moderator
else: else:
mod = None mod = self.moderator.id
if self.amended_by is None or isinstance(self.amended_by, int):
amended_by = self.amended_by
else:
amended_by = self.amended_by.id
if isinstance(self.user, int): if isinstance(self.user, int):
user_id = self.user user_id = self.user
else: else:
@ -402,7 +407,7 @@ class Case:
"reason": self.reason, "reason": self.reason,
"until": self.until, "until": self.until,
"channel": self.channel.id if hasattr(self.channel, "id") else None, "channel": self.channel.id if hasattr(self.channel, "id") else None,
"amended_by": self.amended_by.id if hasattr(self.amended_by, "id") else None, "amended_by": amended_by,
"modified_at": self.modified_at, "modified_at": self.modified_at,
"message": self.message.id if hasattr(self.message, "id") else None, "message": self.message.id if hasattr(self.message, "id") else None,
} }