From 0ec190612b4dbd39fc3c2b5a6ef9d92d6810dbe7 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Thu, 8 Feb 2018 00:03:39 +0200 Subject: [PATCH] add socket event structs --- client/src/modules/eventhook.js | 10 ++-- client/src/structs/socketstructs/channel.js | 23 ++++++--- client/src/structs/socketstructs/generic.js | 23 --------- client/src/structs/socketstructs/guild.js | 31 +++++++++--- client/src/structs/socketstructs/user.js | 56 +++++++++++++++++++++ 5 files changed, 101 insertions(+), 42 deletions(-) create mode 100644 client/src/structs/socketstructs/user.js diff --git a/client/src/modules/eventhook.js b/client/src/modules/eventhook.js index 47df759a..7b5f8ca8 100644 --- a/client/src/modules/eventhook.js +++ b/client/src/modules/eventhook.js @@ -13,8 +13,8 @@ import { Utils } from 'common'; import Events from './events'; import { - MESSAGE_CREATE - } from '../structs/socketstructs'; + MESSAGE_CREATE +} from '../structs/socketstructs'; export default class extends EventListener { @@ -30,7 +30,7 @@ export default class extends EventListener { } hook() { - + } get eventsModule() { @@ -38,7 +38,7 @@ export default class extends EventListener { } emit(e, action, data) { - switch(e) { + switch (e) { case 'dispatch': return this.dispatch(action, data); } @@ -139,5 +139,5 @@ export default class extends EventListener { BRAINTREE_POPUP_BRIDGE_CALLBACK: 'BRAINTREE_POPUP_BRIDGE_CALLBACK' // What } } - + } diff --git a/client/src/structs/socketstructs/channel.js b/client/src/structs/socketstructs/channel.js index 899b3a71..472622c6 100644 --- a/client/src/structs/socketstructs/channel.js +++ b/client/src/structs/socketstructs/channel.js @@ -15,14 +15,23 @@ export class CHANNEL_PINS_UPDATE extends DiscordEvent { get lastPinTimestamp() { return this.args.lastPinTimestamp } } -// TODO -export class CHANNEL_CREATE extends DiscordEvent {} - -export class CHANNEL_DELETE extends DiscordEvent {} - -export class CHANNEL_UPDATE extends DiscordEvent {} - export class CHANNEL_PINS_ACK { get channelId() { return this.args.channelId } get timestamp() { return this.args.timestamp } } + +export class CHANNEL_CREATE extends DiscordEvent { + get guildId() { return this.args.guildId } + get id() { return this.args.id } + get lastMessageId() { return this.args.lastMessageId } + get name() { return this.args.name } + get nsfw() { return this.args.nsfw } + get parentId() { return this.args.parentId } + get permissionOverwrites() { return this.args.permissionOverwrites } + get position() { return this.args.position } + get topic() { return this.args.topic } + get type() { return this.args.type } +} + +export class CHANNEL_UPDATE extends CHANNEL_CREATE { } +export class CHANNEL_DELETE extends CHANNEL_CREATE {} diff --git a/client/src/structs/socketstructs/generic.js b/client/src/structs/socketstructs/generic.js index a85d2401..88c9fc1c 100644 --- a/client/src/structs/socketstructs/generic.js +++ b/client/src/structs/socketstructs/generic.js @@ -10,21 +10,6 @@ import DiscordEvent from './discordevent'; -export class TYPING_START extends DiscordEvent { - get channelId() { return this.args.channelId } - get userId() { return this.args.userId } -} - -export class PRESENCE_UPDATE extends DiscordEvent { - get game() { return this.args.game } - get guildId() { return this.args.guildId } - get nick() { return this.args.nick } - get roles() { return this.args.roles } - get status() { return this.args.status } - get user() { return this.args.user } - get lastModified() { return this.args.lastModified } -} - export class VOICE_STATE_UPDATE extends DiscordEvent { get channelId() { return this.args.channelId } get deaf() { return this.args.deaf } @@ -38,12 +23,4 @@ export class VOICE_STATE_UPDATE extends DiscordEvent { get userId() { return this.args.userId } } -// Doesn't have everything -export class USER_SETTINGS_UPDATE extends DiscordEvent { - get status() { return this.args.status } - get messageDisplayCompact() { return this.args.messageDisplayCompact } - get theme() { return this.args.theme } -} - -export class USER_GUILD_SETTINGS_UPDATE extends DiscordEvent { } export class ACTIVITY_START extends DiscordEvent {} diff --git a/client/src/structs/socketstructs/guild.js b/client/src/structs/socketstructs/guild.js index 8da5ac50..8574661c 100644 --- a/client/src/structs/socketstructs/guild.js +++ b/client/src/structs/socketstructs/guild.js @@ -52,9 +52,12 @@ export class GUILD_SYNC extends DiscordEvent { export class GUILD_MEMBERS_CHUNK extends DiscordEvent {} -export class GUILD_BAN_ADD extends DiscordEvent {} +export class GUILD_BAN_ADD extends DiscordEvent { + get guildId() { return this.args.guildId } + get user() { return this.args.suer } +} -export class GUILD_BAN_REMOVE extends DiscordEvent {} +export class GUILD_BAN_REMOVE extends GUILD_BAN_ADD {} export class GUILD_MEMBER_ADD extends DiscordEvent { get guildId() { return this.args.guildId } @@ -65,19 +68,33 @@ export class GUILD_MEMBER_ADD extends DiscordEvent { get user() { return this.args.user } } -export class GUILD_MEMBER_UPDATE extends DiscordEvent {} +export class GUILD_MEMBER_UPDATE extends DiscordEvent { + get guildId() { return this.args.guildId } + get nick() { return this.args.nick } + get roles() { return this.args.roles } + get user() { return this.args.user } +} export class GUILD_MEMBER_REMOVE extends DiscordEvent { get guildId() { return this.args.guildId } get user() { return this.args.user } } -export class GUILD_ROLE_CREATE extends DiscordEvent {} +export class GUILD_ROLE_CREATE extends DiscordEvent { + get guildId() { return this.args.guildId } + get role() { return this.args.role } +} -export class GUILD_ROLE_UPDATE extends DiscordEvent {} +export class GUILD_ROLE_UPDATE extends GUILD_ROLE_CREATE {} -export class GUILD_ROLE_DELETE extends DiscordEvent {} +export class GUILD_ROLE_DELETE extends DiscordEvent { + get guildId() { return this.args.guildId } + get roleId() { return this.args.roleId } +} -export class GUILD_EMOJIS_UPDATE extends DiscordEvent {} +export class GUILD_EMOJIS_UPDATE extends DiscordEvent { + get guildId() { return this.args.guildId } + get emojis() { return this.args.emojis } +} export class GUILD_INTEGRATIONS_UPDATE extends DiscordEvent {} diff --git a/client/src/structs/socketstructs/user.js b/client/src/structs/socketstructs/user.js new file mode 100644 index 00000000..c659e39b --- /dev/null +++ b/client/src/structs/socketstructs/user.js @@ -0,0 +1,56 @@ +/** + * BetterDiscord User Event Structs + * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks + * All rights reserved. + * https://betterdiscord.net + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. +*/ + +import DiscordEvent from './discordevent'; + +export class RELATIONSHIP_ADD extends DiscordEvent { + get id() { return this.args.id } + get type() { return this.args.type } + // 1 = friend added, 2 = blocked, 3 = friend request received, 4 = friend request sent + get user() { return this.args.user } +} + +export class RELATIONSHIP_REMOVE extends DiscordEvent { + get id() { return this.args.id } + // 1 = friend removed, 2 = unblocked + get type() { return this.args.type } +} + +export class TYPING_START extends DiscordEvent { + get channelId() { return this.args.channelId } + get userId() { return this.args.userId } +} + +export class PRESENCE_UPDATE extends DiscordEvent { + get game() { return this.args.game } + get guildId() { return this.args.guildId } + get nick() { return this.args.nick } + get roles() { return this.args.roles } + get status() { return this.args.status } + get user() { return this.args.user } + get lastModified() { return this.args.lastModified } +} + +// Doesn't have everything and not everything is always set +export class USER_SETTINGS_UPDATE extends DiscordEvent { + get status() { return this.args.status } + get messageDisplayCompact() { return this.args.messageDisplayCompact } + get theme() { return this.args.theme } + get restrictedGuilds() { return this.args.restrictedGuilds } +} + +export class USER_GUILD_SETTINGS_UPDATE extends DiscordEvent { + get channelOverrides() { return this.args.channelOverrides } + get guildId() { return this.args.guildId } + get messageNotifications() { return this.args.messageNotifications } + get mobilePush() { return this.args.mobilePush } + get muted() { return this.args.muted } + get suppressEveryone() { return this.args.suppressEveryone } +}