mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-16 19:43:29 +01:00
Add user_guild_settings support (#1365)
* user guild settings
* Use direct collection
* I'm a goof
* double goof
* Structure properties
* Forgot to register listener
* wrong class names
* No more get in docs
* avoid waterfalls, bot checks
* trycatch
wow i thought i already did this :notlikecat:
* 👀
* Update ClientUser.js
* Update ClientUserGuildSettings.js
* Update UserGuildSettingsUpdate.js
* Update ClientUserChannelOverride.js
* Update ClientUserGuildSettings.js
This commit is contained in:
@@ -39,6 +39,7 @@ class WebSocketPacketManager {
|
|||||||
this.register(Constants.WSEvents.USER_UPDATE, require('./handlers/UserUpdate'));
|
this.register(Constants.WSEvents.USER_UPDATE, require('./handlers/UserUpdate'));
|
||||||
this.register(Constants.WSEvents.USER_NOTE_UPDATE, require('./handlers/UserNoteUpdate'));
|
this.register(Constants.WSEvents.USER_NOTE_UPDATE, require('./handlers/UserNoteUpdate'));
|
||||||
this.register(Constants.WSEvents.USER_SETTINGS_UPDATE, require('./handlers/UserSettingsUpdate'));
|
this.register(Constants.WSEvents.USER_SETTINGS_UPDATE, require('./handlers/UserSettingsUpdate'));
|
||||||
|
this.register(Constants.WSEvents.USER_GUILD_SETTINGS_UPDATE, require('./handlers/UserGuildSettingsUpdate'));
|
||||||
this.register(Constants.WSEvents.VOICE_STATE_UPDATE, require('./handlers/VoiceStateUpdate'));
|
this.register(Constants.WSEvents.VOICE_STATE_UPDATE, require('./handlers/VoiceStateUpdate'));
|
||||||
this.register(Constants.WSEvents.TYPING_START, require('./handlers/TypingStart'));
|
this.register(Constants.WSEvents.TYPING_START, require('./handlers/TypingStart'));
|
||||||
this.register(Constants.WSEvents.MESSAGE_CREATE, require('./handlers/MessageCreate'));
|
this.register(Constants.WSEvents.MESSAGE_CREATE, require('./handlers/MessageCreate'));
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ class ReadyHandler extends AbstractHandler {
|
|||||||
client.ws.heartbeat();
|
client.ws.heartbeat();
|
||||||
|
|
||||||
data.user.user_settings = data.user_settings;
|
data.user.user_settings = data.user_settings;
|
||||||
|
data.user.user_guild_settings = data.user_guild_settings;
|
||||||
|
|
||||||
const clientUser = new ClientUser(client, data.user);
|
const clientUser = new ClientUser(client, data.user);
|
||||||
client.user = clientUser;
|
client.user = clientUser;
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
const AbstractHandler = require('./AbstractHandler');
|
||||||
|
const Constants = require('../../../../util/Constants');
|
||||||
|
|
||||||
|
class UserGuildSettingsUpdateHandler extends AbstractHandler {
|
||||||
|
handle(packet) {
|
||||||
|
const client = this.packetManager.client;
|
||||||
|
client.user.guildSettings.get(packet.d.guild_id).patch(packet.d);
|
||||||
|
client.emit(Constants.Events.USER_GUILD_SETTINGS_UPDATE, client.user.guildSettings.get(packet.d.guild_id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emitted whenever the client user's settings update.
|
||||||
|
* @event Client#clientUserGuildSettingsUpdate
|
||||||
|
* @param {ClientUserGuildSettings} clientUserGuildSettings The new client user guild settings
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = UserGuildSettingsUpdateHandler;
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
const User = require('./User');
|
const User = require('./User');
|
||||||
const Collection = require('../util/Collection');
|
const Collection = require('../util/Collection');
|
||||||
const ClientUserSettings = require('./ClientUserSettings');
|
const ClientUserSettings = require('./ClientUserSettings');
|
||||||
|
const ClientUserGuildSettings = require('./ClientUserGuildSettings');
|
||||||
const Constants = require('../util/Constants');
|
const Constants = require('../util/Constants');
|
||||||
const Util = require('../util/Util');
|
const Util = require('../util/Util');
|
||||||
const Guild = require('./Guild');
|
const Guild = require('./Guild');
|
||||||
@@ -78,6 +79,19 @@ class ClientUser extends User {
|
|||||||
* @type {?ClientUserSettings}
|
* @type {?ClientUserSettings}
|
||||||
*/
|
*/
|
||||||
if (data.user_settings) this.settings = new ClientUserSettings(this, data.user_settings);
|
if (data.user_settings) this.settings = new ClientUserSettings(this, data.user_settings);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* All of the user's guild settings
|
||||||
|
* @type {Collection<Snowflake, ClientUserGuildSettings>}
|
||||||
|
* <warn>This is only filled when using a user account</warn>
|
||||||
|
*/
|
||||||
|
this.guildSettings = new Collection();
|
||||||
|
if (data.user_guild_settings) {
|
||||||
|
for (const settings of data.user_guild_settings) {
|
||||||
|
const guild = this.client.guilds.get(settings.guild_id);
|
||||||
|
this.guildSettings.set(guild.id, new ClientUserGuildSettings(settings, guild));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
edit(data, password) {
|
edit(data, password) {
|
||||||
|
|||||||
29
src/structures/ClientUserChannelOverride.js
Normal file
29
src/structures/ClientUserChannelOverride.js
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
const Constants = require('../util/Constants');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A wrapper around the ClientUser's channel overrides.
|
||||||
|
*/
|
||||||
|
class ClientUserChannelOverride {
|
||||||
|
constructor(user, data) {
|
||||||
|
this.user = user;
|
||||||
|
this.patch(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Patch the data contained in this class with new partial data.
|
||||||
|
* @param {Object} data Data to patch this with
|
||||||
|
*/
|
||||||
|
patch(data) {
|
||||||
|
for (const key of Object.keys(Constants.UserChannelOverrideMap)) {
|
||||||
|
const value = Constants.UserChannelOverrideMap[key];
|
||||||
|
if (!data.hasOwnProperty(key)) continue;
|
||||||
|
if (typeof value === 'function') {
|
||||||
|
this[value.name] = value(data[key]);
|
||||||
|
} else {
|
||||||
|
this[value] = data[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = ClientUserChannelOverride;
|
||||||
47
src/structures/ClientUserGuildSettings.js
Normal file
47
src/structures/ClientUserGuildSettings.js
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
const Constants = require('../util/Constants');
|
||||||
|
const Collection = require('../util/Collection');
|
||||||
|
const ClientUserChannelOverride = require('./ClientUserChannelOverride');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A wrapper around the ClientUser's guild settings.
|
||||||
|
*/
|
||||||
|
class ClientUserGuildSettings {
|
||||||
|
constructor(data, guild) {
|
||||||
|
this.guild = guild;
|
||||||
|
this.channelOverrides = new Collection();
|
||||||
|
this.patch(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Patch the data contained in this class with new partial data.
|
||||||
|
* @param {Object} data Data to patch this with
|
||||||
|
*/
|
||||||
|
patch(data) {
|
||||||
|
for (const key of Object.keys(Constants.UserGuildSettingsMap)) {
|
||||||
|
const value = Constants.UserGuildSettingsMap[key];
|
||||||
|
if (!data.hasOwnProperty(key)) continue;
|
||||||
|
if (key === 'channel_overrides') {
|
||||||
|
for (const channel of data[key]) {
|
||||||
|
this.channelOverrides.set(channel.channel_id,
|
||||||
|
new ClientUserChannelOverride(this.guild.client.user, channel));
|
||||||
|
}
|
||||||
|
} else if (typeof value === 'function') {
|
||||||
|
this[value.name] = value(data[key]);
|
||||||
|
} else {
|
||||||
|
this[value] = data[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a specific property of the guild settings.
|
||||||
|
* @param {string} name Name of property
|
||||||
|
* @param {value} value Value to patch
|
||||||
|
* @returns {Promise<Object>}
|
||||||
|
*/
|
||||||
|
update(name, value) {
|
||||||
|
return this.guild.client.api.guilds(this.guild.id).settings.patch({ data: { [name]: value } });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = ClientUserGuildSettings;
|
||||||
@@ -333,6 +333,62 @@ class Guild {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Whether the guild is muted
|
||||||
|
* <warn>This is only available when using a user account.</warn>
|
||||||
|
* @type {?boolean}
|
||||||
|
*/
|
||||||
|
get muted() {
|
||||||
|
if (this.client.user.bot) return null;
|
||||||
|
try {
|
||||||
|
return this.client.user.guildSettings.get(this.id).muted;
|
||||||
|
} catch (err) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type of message that should notify you
|
||||||
|
* one of `EVERYTHING`, `MENTIONS`, `NOTHING`
|
||||||
|
* <warn>This is only available when using a user account.</warn>
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
get messageNotifications() {
|
||||||
|
if (this.client.user.bot) return null;
|
||||||
|
try {
|
||||||
|
return this.client.user.guildSettings.get(this.id).messageNotifications;
|
||||||
|
} catch (err) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether to receive mobile push notifications
|
||||||
|
* <warn>This is only available when using a user account.</warn>
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
get mobilePush() {
|
||||||
|
if (this.client.user.bot) return null;
|
||||||
|
try {
|
||||||
|
return this.client.user.guildSettings.get(this.id).mobilePush;
|
||||||
|
} catch (err) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether to suppress everyone messages
|
||||||
|
* <warn>This is only available when using a user account.</warn>
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
get suppressEveryone() {
|
||||||
|
try {
|
||||||
|
return this.client.user.guildSettings.get(this.id).suppressEveryone;
|
||||||
|
} catch (err) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
* The `@everyone` role of the guild
|
* The `@everyone` role of the guild
|
||||||
* @type {Role}
|
* @type {Role}
|
||||||
* @readonly
|
* @readonly
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ const Invite = require('./Invite');
|
|||||||
const PermissionOverwrites = require('./PermissionOverwrites');
|
const PermissionOverwrites = require('./PermissionOverwrites');
|
||||||
const Permissions = require('../util/Permissions');
|
const Permissions = require('../util/Permissions');
|
||||||
const Collection = require('../util/Collection');
|
const Collection = require('../util/Collection');
|
||||||
|
const Constants = require('../util/Constants');
|
||||||
const { TypeError } = require('../errors');
|
const { TypeError } = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -363,6 +364,35 @@ class GuildChannel extends Channel {
|
|||||||
return this.client.api.channels(this.id).delete({ reason }).then(() => this);
|
return this.client.api.channels(this.id).delete({ reason }).then(() => this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the channel is muted
|
||||||
|
* <warn>This is only available when using a user account.</warn>
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
get muted() {
|
||||||
|
if (this.client.user.bot) return null;
|
||||||
|
try {
|
||||||
|
return this.client.user.guildSettings.get(this.guild.id).channelOverrides.get(this.id).muted;
|
||||||
|
} catch (err) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type of message that should notify you
|
||||||
|
* one of `EVERYTHING`, `MENTIONS`, `NOTHING`, `INHERIT`
|
||||||
|
* <warn>This is only available when using a user account.</warn>
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
get messageNotifications() {
|
||||||
|
if (this.client.user.bot) return null;
|
||||||
|
try {
|
||||||
|
return this.client.user.guildSettings.get(this.guild.id).channelOverrides.get(this.id).messageNotifications;
|
||||||
|
} catch (err) {
|
||||||
|
return Constants.MessageNotificationTypes[3];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* When concatenated with a string, this automatically returns the channel's mention instead of the Channel object.
|
* When concatenated with a string, this automatically returns the channel's mention instead of the Channel object.
|
||||||
* @returns {string}
|
* @returns {string}
|
||||||
|
|||||||
@@ -231,6 +231,7 @@ exports.Events = {
|
|||||||
USER_UPDATE: 'userUpdate',
|
USER_UPDATE: 'userUpdate',
|
||||||
USER_NOTE_UPDATE: 'userNoteUpdate',
|
USER_NOTE_UPDATE: 'userNoteUpdate',
|
||||||
USER_SETTINGS_UPDATE: 'clientUserSettingsUpdate',
|
USER_SETTINGS_UPDATE: 'clientUserSettingsUpdate',
|
||||||
|
USER_GUILD_SETTINGS_UPDATE: 'clientUserGuildSettingsUpdate',
|
||||||
PRESENCE_UPDATE: 'presenceUpdate',
|
PRESENCE_UPDATE: 'presenceUpdate',
|
||||||
VOICE_STATE_UPDATE: 'voiceStateUpdate',
|
VOICE_STATE_UPDATE: 'voiceStateUpdate',
|
||||||
TYPING_START: 'typingStart',
|
TYPING_START: 'typingStart',
|
||||||
@@ -312,6 +313,7 @@ exports.WSEvents = {
|
|||||||
USER_UPDATE: 'USER_UPDATE',
|
USER_UPDATE: 'USER_UPDATE',
|
||||||
USER_NOTE_UPDATE: 'USER_NOTE_UPDATE',
|
USER_NOTE_UPDATE: 'USER_NOTE_UPDATE',
|
||||||
USER_SETTINGS_UPDATE: 'USER_SETTINGS_UPDATE',
|
USER_SETTINGS_UPDATE: 'USER_SETTINGS_UPDATE',
|
||||||
|
USER_GUILD_SETTINGS_UPDATE: 'USER_GUILD_SETTINGS_UPDATE',
|
||||||
PRESENCE_UPDATE: 'PRESENCE_UPDATE',
|
PRESENCE_UPDATE: 'PRESENCE_UPDATE',
|
||||||
VOICE_STATE_UPDATE: 'VOICE_STATE_UPDATE',
|
VOICE_STATE_UPDATE: 'VOICE_STATE_UPDATE',
|
||||||
TYPING_START: 'TYPING_START',
|
TYPING_START: 'TYPING_START',
|
||||||
@@ -349,6 +351,13 @@ exports.ExplicitContentFilterTypes = [
|
|||||||
'FRIENDS_AND_NON_FRIENDS',
|
'FRIENDS_AND_NON_FRIENDS',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
exports.MessageNotificationTypes = [
|
||||||
|
'EVERYTHING',
|
||||||
|
'MENTIONS',
|
||||||
|
'NOTHING',
|
||||||
|
'INHERIT',
|
||||||
|
];
|
||||||
|
|
||||||
exports.UserSettingsMap = {
|
exports.UserSettingsMap = {
|
||||||
/**
|
/**
|
||||||
* Automatically convert emoticons in your messages to emoji
|
* Automatically convert emoticons in your messages to emoji
|
||||||
@@ -482,6 +491,60 @@ exports.UserSettingsMap = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
exports.UserGuildSettingsMap = {
|
||||||
|
message_notifications: function messageNotifications(type) { // eslint-disable-line func-name-matching
|
||||||
|
/**
|
||||||
|
* The type of message that should notify you
|
||||||
|
* one of `EVERYTHING`, `MENTIONS`, `NOTHING`
|
||||||
|
* @name ClientUserGuildSettings#messageNotifications
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
return exports.MessageNotificationTypes[type];
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Whether to receive mobile push notifications
|
||||||
|
* @name ClientUserGuildSettings#mobilePush
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
mobile_push: 'mobilePush',
|
||||||
|
/**
|
||||||
|
* Whether the guild is muted or not
|
||||||
|
* @name ClientUserGuildSettings#muted
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
muted: 'muted',
|
||||||
|
/**
|
||||||
|
* Whether to suppress everyone messages
|
||||||
|
* @name ClientUserGuildSettings#suppressEveryone
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
suppress_everyone: 'suppressEveryone',
|
||||||
|
/**
|
||||||
|
* A collection containing all the channel overrides
|
||||||
|
* @name ClientUserGuildSettings#channelOverrides
|
||||||
|
* @type {Collection<ClientUserChannelOverride>}
|
||||||
|
*/
|
||||||
|
channel_overrides: 'channelOverrides',
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.UserChannelOverrideMap = {
|
||||||
|
message_notifications: function messageNotifications(type) { // eslint-disable-line func-name-matching
|
||||||
|
/**
|
||||||
|
* The type of message that should notify you
|
||||||
|
* one of `EVERYTHING`, `MENTIONS`, `NOTHING`, `INHERIT`
|
||||||
|
* @name ClientUserChannelOverrides#messageNotifications
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
return exports.MessageNotificationTypes[type];
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Whether the guild is muted or not
|
||||||
|
* @name ClientUserChannelOverrides#muted
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
muted: 'muted',
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All flags users can have:
|
* All flags users can have:
|
||||||
* - STAFF
|
* - STAFF
|
||||||
|
|||||||
Reference in New Issue
Block a user