Skip to content

Commit

Permalink
style(event): rename all TypedEvent
Browse files Browse the repository at this point in the history
  • Loading branch information
@DancingSnow0517
DancingSnow0517 committed Nov 15, 2023
1 parent 090e93c commit 68902c9
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 73 deletions.
78 changes: 39 additions & 39 deletions khl/event/event.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


class TypedEvent:
class ChannelEvent:
class Channel:
class _AbstractReactionEvent(AbstractEvent, ABC):
def __init__(self, raw: dict):
super().__init__(raw)
Expand All @@ -16,13 +16,13 @@ def __init__(self, raw: dict):
self.channel_id: str = raw.get('channel_id')
self.emoji: dict = raw.get('emoji')

class AddedReactionEvent(_AbstractReactionEvent):
class AddedReaction(_AbstractReactionEvent):
pass

class DeletedReactionEvent(_AbstractReactionEvent):
class DeletedReaction(_AbstractReactionEvent):
pass

class UpdatedMessageEvent(AbstractEvent):
class UpdatedMessage(AbstractEvent):
def __init__(self, raw: dict):
super().__init__(raw)
self.msg_id: str = raw.get('msg_id')
Expand All @@ -34,20 +34,20 @@ def __init__(self, raw: dict):
self.mention_roles: List[int] = raw.get('mention_roles')
self.updated_at: int = raw.get('updated_at')

class DeletedMessageEvent(AbstractEvent):
class DeletedMessage(AbstractEvent):

def __init__(self, raw: dict):
super().__init__(raw)
self.msg_id: str = raw.get('msg_id')
self.channel_id: str = raw.get('channel_id')

class AddedChannelEvent(AbstractEvent):
class AddedChannel(AbstractEvent):

def __init__(self, raw: dict):
super().__init__(raw)
self.channel: dict = raw

class DeletedChannelEvent(AbstractEvent):
class DeletedChannel(AbstractEvent):

def __init__(self, raw: dict):
super().__init__(raw)
Expand All @@ -62,13 +62,13 @@ def __init__(self, raw: dict):
self.operator_id: str = raw.get('operator_id')
self.msg_id: str = raw.get('msg_id')

class PinnedMessageEvent(_AbstractPinEvent):
class PinnedMessage(_AbstractPinEvent):
pass

class UnpinnedMessageEvent(_AbstractPinEvent):
class UnpinnedMessage(_AbstractPinEvent):
pass

class GuildEvent:
class Guild:
class _AbstractGuildEvent(AbstractEvent, ABC):
def __init__(self, raw: dict):
super().__init__(raw)
Expand All @@ -83,10 +83,10 @@ def __init__(self, raw: dict):
self.default_channel_id: str = raw.get('default_channel_id')
self.welcome_channel_id: str = raw.get('welcome_channel_id')

class UpdateGuildEvent(_AbstractGuildEvent):
class UpdateGuild(_AbstractGuildEvent):
pass

class DeleteGuildEvent(_AbstractGuildEvent):
class DeleteGuild(_AbstractGuildEvent):
pass

class _AbstractBlockListEvent(AbstractEvent, ABC):
Expand All @@ -96,12 +96,12 @@ def __init__(self, raw: dict):
self.operator_id: str = raw.get('operator_id')
self.user_id: List[str] = raw.get('user_id')

class AddedBlockListEvent(_AbstractBlockListEvent):
class AddedBlockList(_AbstractBlockListEvent):
def __init__(self, raw: dict):
super().__init__(raw)
self.remark: str = raw.get('remark')

class DeleteBlockListEvent(_AbstractBlockListEvent):
class DeleteBlockList(_AbstractBlockListEvent):
pass

class _AbstractEmojiEvent(AbstractEvent, ABC):
Expand All @@ -111,44 +111,44 @@ def __init__(self, raw: dict):
self.id: str = raw.get('id')
self.name: str = raw.get('name')

class AddedEmojiEvent(_AbstractEmojiEvent):
class AddedEmoji(_AbstractEmojiEvent):
pass

class DeletedEmojiEvent(_AbstractEmojiEvent):
class DeletedEmoji(_AbstractEmojiEvent):
pass

class UpdateEmojiEvent(_AbstractEmojiEvent):
class UpdateEmoji(_AbstractEmojiEvent):
pass

class GuildRoleEvent:
class GuildRole:
class _AbstractRoleEvent(AbstractEvent, ABC):
def __init__(self, raw: dict):
super().__init__(raw)
self.role = Role(**raw)

class AddedRoleEvent(_AbstractRoleEvent):
class AddedRole(_AbstractRoleEvent):
pass

class DeleteRoleEvent(_AbstractRoleEvent):
class DeleteRole(_AbstractRoleEvent):
pass

class UpdateRoleEvent(_AbstractRoleEvent):
class UpdateRole(_AbstractRoleEvent):
pass

class GuildUserEvent:
class JoinedGuildEvent(AbstractEvent):
class GuildUser:
class JoinedGuild(AbstractEvent):
def __init__(self, raw: dict):
super().__init__(raw)
self.user_id: str = raw.get('user_id')
self.joined_at: int = raw.get('joined_at')

class ExitedGuildEvent(AbstractEvent):
class ExitedGuild(AbstractEvent):
def __init__(self, raw: dict):
super().__init__(raw)
self.user_id: str = raw.get('user_id')
self.exited_at: int = raw.get('exited_at')

class UpdatedGuildMemberEvent(AbstractEvent):
class UpdatedGuildMember(AbstractEvent):

def __init__(self, raw: dict):
super().__init__(raw)
Expand All @@ -163,13 +163,13 @@ def __init__(self, raw: dict):
self.event_time: int = raw.get('event_time')
self.guilds: List[str] = raw.get('guilds')

class GuildMemberOnlineEvent(_AbstractGuildMemberEvent):
class GuildMemberOnline(_AbstractGuildMemberEvent):
pass

class GuildMemberOfflineEvent(_AbstractGuildMemberEvent):
class GuildMemberOffline(_AbstractGuildMemberEvent):
pass

class PrivateMessageEvent:
class PrivateMessage:
class _AbstractPrivateMessageEvent(AbstractEvent, ABC):
def __init__(self, raw: dict):
super().__init__(raw)
Expand All @@ -178,14 +178,14 @@ def __init__(self, raw: dict):
self.target_id: str = raw.get('target_id')
self.chat_code: str = raw.get('chat_code')

class UpdatePrivateMessageEvent(_AbstractPrivateMessageEvent):
class UpdatePrivateMessage(_AbstractPrivateMessageEvent):

def __init__(self, raw: dict):
super().__init__(raw)
self.content: str = raw.get('content')
self.updated_at: int = raw.get('updated_at')

class DeletedPrivateMessageEvent(_AbstractPrivateMessageEvent):
class DeletedPrivateMessage(_AbstractPrivateMessageEvent):
def __init__(self, raw: dict):
super().__init__(raw)
self.deleted_at: int = raw.get('deleted_at')
Expand All @@ -200,31 +200,31 @@ def __init__(self, raw: dict):
self.emoji: dict = raw.get('emoji')
self.chat_code: str = raw.get('chat_code')

class PrivateAddedReactionEvent(_AbstractPrivateReactionEvent):
class PrivateAddedReaction(_AbstractPrivateReactionEvent):
pass

class PrivateDeletedReactionEvent(_AbstractPrivateReactionEvent):
class PrivateDeletedReaction(_AbstractPrivateReactionEvent):
pass

class UserEvent:
class User:
class _AbstractChannelEvent(AbstractEvent, ABC):
def __init__(self, raw: dict):
super().__init__(raw)
self.user_id: str = raw.get('user_id')
self.channel_id: str = raw.get('channel_id')

class JoinedChannelEvent(_AbstractChannelEvent):
class JoinedChannel(_AbstractChannelEvent):

def __init__(self, raw: dict):
super().__init__(raw)
self.joined_at: int = raw.get('joined_at')

class ExitedChannelEvent(_AbstractChannelEvent):
class ExitedChannel(_AbstractChannelEvent):
def __init__(self, raw: dict):
super().__init__(raw)
self.exited_at: int = raw.get('exited_at')

class UserUpdatedEvent(AbstractEvent):
class UserUpdated(AbstractEvent):

def __init__(self, raw: dict):
super().__init__(raw)
Expand All @@ -238,13 +238,13 @@ def __init__(self, raw: dict):
super().__init__(raw)
self.guild_id: str = raw.get('guild_id')

class SelfJoinedGuildEvent(_AbstractSelfGuildEvent):
class SelfJoinedGuild(_AbstractSelfGuildEvent):
pass

class SelfExitedGuildEvent(_AbstractSelfGuildEvent):
class SelfExitedGuild(_AbstractSelfGuildEvent):
pass

class MessageButtonClickEvent(AbstractEvent):
class MessageButtonClick(AbstractEvent):

def __init__(self, raw: dict):
super().__init__(raw)
Expand Down
68 changes: 34 additions & 34 deletions khl/event/manager.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,40 @@
EVENT_HANDLE_TYPE = Callable[[AbstractEvent], Coroutine[Any, Any, None]]

_EVENT_MAP = {
EventTypes.ADDED_REACTION: TypedEvent.ChannelEvent.AddedReactionEvent,
EventTypes.DELETED_REACTION: TypedEvent.ChannelEvent.DeletedReactionEvent,
EventTypes.UPDATED_MESSAGE: TypedEvent.ChannelEvent.UpdatedMessageEvent,
EventTypes.MESSAGE_UPDATED: TypedEvent.ChannelEvent.UpdatedMessageEvent,
EventTypes.DELETED_MESSAGE: TypedEvent.ChannelEvent.DeletedMessageEvent,
EventTypes.ADDED_CHANNEL: TypedEvent.ChannelEvent.AddedChannelEvent,
EventTypes.DELETED_CHANNEL: TypedEvent.ChannelEvent.DeletedChannelEvent,
EventTypes.PINNED_MESSAGE: TypedEvent.ChannelEvent.PinnedMessageEvent,
EventTypes.UNPINNED_MESSAGE: TypedEvent.ChannelEvent.UnpinnedMessageEvent,
EventTypes.UPDATED_PRIVATE_MESSAGE: TypedEvent.PrivateMessageEvent.UpdatePrivateMessageEvent,
EventTypes.DELETED_PRIVATE_MESSAGE: TypedEvent.PrivateMessageEvent.DeletedPrivateMessageEvent,
EventTypes.PRIVATE_ADDED_REACTION: TypedEvent.PrivateMessageEvent.PrivateAddedReactionEvent,
EventTypes.PRIVATE_DELETED_REACTION: TypedEvent.PrivateMessageEvent.PrivateDeletedReactionEvent,
EventTypes.JOINED_GUILD: TypedEvent.GuildUserEvent.JoinedGuildEvent,
EventTypes.EXITED_GUILD: TypedEvent.GuildUserEvent.ExitedGuildEvent,
EventTypes.UPDATED_GUILD_MEMBER: TypedEvent.GuildUserEvent.UpdatedGuildMemberEvent,
EventTypes.GUILD_MEMBER_ONLINE: TypedEvent.GuildUserEvent.GuildMemberOnlineEvent,
EventTypes.GUILD_MEMBER_OFFLINE: TypedEvent.GuildUserEvent.GuildMemberOfflineEvent,
EventTypes.ADDED_ROLE: TypedEvent.GuildRoleEvent.AddedRoleEvent,
EventTypes.DELETED_ROLE: TypedEvent.GuildRoleEvent.DeleteRoleEvent,
EventTypes.UPDATED_ROLE: TypedEvent.GuildRoleEvent.UpdateRoleEvent,
EventTypes.UPDATED_GUILD: TypedEvent.GuildEvent.UpdateGuildEvent,
EventTypes.DELETED_GUILD: TypedEvent.GuildEvent.DeleteGuildEvent,
EventTypes.ADDED_BLOCK_LIST: TypedEvent.GuildEvent.AddedBlockListEvent,
EventTypes.DELETED_BLOCK_LIST: TypedEvent.GuildEvent.DeleteBlockListEvent,
EventTypes.ADDED_EMOJI: TypedEvent.GuildEvent.AddedEmojiEvent,
EventTypes.DELETED_EMOJI: TypedEvent.GuildEvent.DeletedEmojiEvent,
EventTypes.UPDATED_EMOJI: TypedEvent.GuildEvent.UpdateEmojiEvent,
EventTypes.JOINED_CHANNEL: TypedEvent.UserEvent.JoinedChannelEvent,
EventTypes.EXITED_CHANNEL: TypedEvent.UserEvent.ExitedChannelEvent,
EventTypes.USER_UPDATED: TypedEvent.UserEvent.UserUpdatedEvent,
EventTypes.SELF_JOINED_GUILD: TypedEvent.UserEvent.SelfJoinedGuildEvent,
EventTypes.SELF_EXITED_GUILD: TypedEvent.UserEvent.SelfExitedGuildEvent,
EventTypes.MESSAGE_BTN_CLICK: TypedEvent.UserEvent.MessageButtonClickEvent
EventTypes.ADDED_REACTION: TypedEvent.Channel.AddedReaction,
EventTypes.DELETED_REACTION: TypedEvent.Channel.DeletedReaction,
EventTypes.UPDATED_MESSAGE: TypedEvent.Channel.UpdatedMessage,
EventTypes.MESSAGE_UPDATED: TypedEvent.Channel.UpdatedMessage,
EventTypes.DELETED_MESSAGE: TypedEvent.Channel.DeletedMessage,
EventTypes.ADDED_CHANNEL: TypedEvent.Channel.AddedChannel,
EventTypes.DELETED_CHANNEL: TypedEvent.Channel.DeletedChannel,
EventTypes.PINNED_MESSAGE: TypedEvent.Channel.PinnedMessage,
EventTypes.UNPINNED_MESSAGE: TypedEvent.Channel.UnpinnedMessage,
EventTypes.UPDATED_PRIVATE_MESSAGE: TypedEvent.PrivateMessage.UpdatePrivateMessage,
EventTypes.DELETED_PRIVATE_MESSAGE: TypedEvent.PrivateMessage.DeletedPrivateMessage,
EventTypes.PRIVATE_ADDED_REACTION: TypedEvent.PrivateMessage.PrivateAddedReaction,
EventTypes.PRIVATE_DELETED_REACTION: TypedEvent.PrivateMessage.PrivateDeletedReaction,
EventTypes.JOINED_GUILD: TypedEvent.GuildUser.JoinedGuild,
EventTypes.EXITED_GUILD: TypedEvent.GuildUser.ExitedGuild,
EventTypes.UPDATED_GUILD_MEMBER: TypedEvent.GuildUser.UpdatedGuildMember,
EventTypes.GUILD_MEMBER_ONLINE: TypedEvent.GuildUser.GuildMemberOnline,
EventTypes.GUILD_MEMBER_OFFLINE: TypedEvent.GuildUser.GuildMemberOffline,
EventTypes.ADDED_ROLE: TypedEvent.GuildRole.AddedRole,
EventTypes.DELETED_ROLE: TypedEvent.GuildRole.DeleteRole,
EventTypes.UPDATED_ROLE: TypedEvent.GuildRole.UpdateRole,
EventTypes.UPDATED_GUILD: TypedEvent.Guild.UpdateGuild,
EventTypes.DELETED_GUILD: TypedEvent.Guild.DeleteGuild,
EventTypes.ADDED_BLOCK_LIST: TypedEvent.Guild.AddedBlockList,
EventTypes.DELETED_BLOCK_LIST: TypedEvent.Guild.DeleteBlockList,
EventTypes.ADDED_EMOJI: TypedEvent.Guild.AddedEmoji,
EventTypes.DELETED_EMOJI: TypedEvent.Guild.DeletedEmoji,
EventTypes.UPDATED_EMOJI: TypedEvent.Guild.UpdateEmoji,
EventTypes.JOINED_CHANNEL: TypedEvent.User.JoinedChannel,
EventTypes.EXITED_CHANNEL: TypedEvent.User.ExitedChannel,
EventTypes.USER_UPDATED: TypedEvent.User.UserUpdated,
EventTypes.SELF_JOINED_GUILD: TypedEvent.User.SelfJoinedGuild,
EventTypes.SELF_EXITED_GUILD: TypedEvent.User.SelfExitedGuild,
EventTypes.MESSAGE_BTN_CLICK: TypedEvent.User.MessageButtonClick
}


Expand Down

0 comments on commit 68902c9

Please sign in to comment.