mirror of
https://github.com/Rapptz/discord.py.git
synced 2025-09-05 17:36:15 +00:00
Fix typing issues and improve typing completeness across the library
Co-authored-by: Danny <Rapptz@users.noreply.github.com> Co-authored-by: Josh <josh.ja.butt@gmail.com>
This commit is contained in:
@ -50,12 +50,12 @@ if TYPE_CHECKING:
|
||||
from .member import Member
|
||||
from .role import Role
|
||||
from .scheduled_event import ScheduledEvent
|
||||
from .state import ConnectionState
|
||||
from .types.audit_log import (
|
||||
AuditLogChange as AuditLogChangePayload,
|
||||
AuditLogEntry as AuditLogEntryPayload,
|
||||
)
|
||||
from .types.channel import (
|
||||
PartialChannel as PartialChannelPayload,
|
||||
PermissionOverwrite as PermissionOverwritePayload,
|
||||
)
|
||||
from .types.invite import Invite as InvitePayload
|
||||
@ -242,8 +242,8 @@ class AuditLogChanges:
|
||||
# fmt: on
|
||||
|
||||
def __init__(self, entry: AuditLogEntry, data: List[AuditLogChangePayload]):
|
||||
self.before = AuditLogDiff()
|
||||
self.after = AuditLogDiff()
|
||||
self.before: AuditLogDiff = AuditLogDiff()
|
||||
self.after: AuditLogDiff = AuditLogDiff()
|
||||
|
||||
for elem in data:
|
||||
attr = elem['key']
|
||||
@ -390,17 +390,17 @@ class AuditLogEntry(Hashable):
|
||||
"""
|
||||
|
||||
def __init__(self, *, users: Dict[int, User], data: AuditLogEntryPayload, guild: Guild):
|
||||
self._state = guild._state
|
||||
self.guild = guild
|
||||
self._users = users
|
||||
self._state: ConnectionState = guild._state
|
||||
self.guild: Guild = guild
|
||||
self._users: Dict[int, User] = users
|
||||
self._from_data(data)
|
||||
|
||||
def _from_data(self, data: AuditLogEntryPayload) -> None:
|
||||
self.action = enums.try_enum(enums.AuditLogAction, data['action_type'])
|
||||
self.id = int(data['id'])
|
||||
self.action: enums.AuditLogAction = enums.try_enum(enums.AuditLogAction, data['action_type'])
|
||||
self.id: int = int(data['id'])
|
||||
|
||||
# this key is technically not usually present
|
||||
self.reason = data.get('reason')
|
||||
self.reason: Optional[str] = data.get('reason')
|
||||
extra = data.get('options')
|
||||
|
||||
# fmt: off
|
||||
@ -464,10 +464,13 @@ class AuditLogEntry(Hashable):
|
||||
self._changes = data.get('changes', [])
|
||||
|
||||
user_id = utils._get_as_snowflake(data, 'user_id')
|
||||
self.user = user_id and self._get_member(user_id)
|
||||
self.user: Optional[Union[User, Member]] = self._get_member(user_id)
|
||||
self._target_id = utils._get_as_snowflake(data, 'target_id')
|
||||
|
||||
def _get_member(self, user_id: int) -> Union[Member, User, None]:
|
||||
def _get_member(self, user_id: Optional[int]) -> Union[Member, User, None]:
|
||||
if user_id is None:
|
||||
return None
|
||||
|
||||
return self.guild.get_member(user_id) or self._users.get(user_id)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
|
Reference in New Issue
Block a user