mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-16 19:43:29 +01:00
Merge branch 'indev' of https://github.com/hydrabolt/discord.js into indev
This commit is contained in:
@@ -8,6 +8,7 @@ const GuildMember = requireStructure('GuildMember');
|
|||||||
const Role = requireStructure('Role');
|
const Role = requireStructure('Role');
|
||||||
const Invite = requireStructure('Invite');
|
const Invite = requireStructure('Invite');
|
||||||
const Webhook = requireStructure('Webhook');
|
const Webhook = requireStructure('Webhook');
|
||||||
|
const UserProfile = requireStructure('UserProfile');
|
||||||
|
|
||||||
class RESTMethods {
|
class RESTMethods {
|
||||||
constructor(restManager) {
|
constructor(restManager) {
|
||||||
@@ -680,6 +681,15 @@ class RESTMethods {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fetchUserProfile(user) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
this.rest.makeRequest('get', Constants.Endpoints.userProfile(user.id), true)
|
||||||
|
.then(data => {
|
||||||
|
resolve(new UserProfile(user, data));
|
||||||
|
}).catch(reject);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
blockUser(user) {
|
blockUser(user) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.rest.makeRequest('put', `${Constants.Endpoints.relationships('@me')}/${user.id}`, true, { type: 2 })
|
this.rest.makeRequest('put', `${Constants.Endpoints.relationships('@me')}/${user.id}`, true, { type: 2 })
|
||||||
|
|||||||
@@ -167,6 +167,14 @@ class User {
|
|||||||
return this.client.rest.methods.unblockUser(this);
|
return this.client.rest.methods.unblockUser(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the profile of the user
|
||||||
|
* @returns {Promise<UserProfile>}
|
||||||
|
*/
|
||||||
|
fetchProfile() {
|
||||||
|
return this.client.rest.methods.fetchUserProfile(this);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the user is equal to another. It compares username, ID, discriminator, status and the game being played.
|
* Checks if the user is equal to another. It compares username, ID, discriminator, status and the game being played.
|
||||||
* It is recommended to compare equality by using `user.id === user2.id` unless you want to compare all properties.
|
* It is recommended to compare equality by using `user.id === user2.id` unless you want to compare all properties.
|
||||||
|
|||||||
48
src/structures/UserConnection.js
Normal file
48
src/structures/UserConnection.js
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
/**
|
||||||
|
* Represents a User Connection object (or "platform identity")
|
||||||
|
*/
|
||||||
|
class UserConnection {
|
||||||
|
constructor(user, data) {
|
||||||
|
/**
|
||||||
|
* The user that owns the Connection
|
||||||
|
* @type {User}
|
||||||
|
*/
|
||||||
|
this.user = user;
|
||||||
|
|
||||||
|
this.setup(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
setup(data) {
|
||||||
|
/**
|
||||||
|
* The type of the Connection
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
this.type = data.type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The username of the connection account
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
this.name = data.name;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The id of the connection account
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
this.id = data.id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the connection is revoked
|
||||||
|
* @type {Boolean}
|
||||||
|
*/
|
||||||
|
this.revoked = data.revoked;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* an array of partial server integrations (not yet implemented in this lib)
|
||||||
|
* @type {Object[]}
|
||||||
|
*/
|
||||||
|
this.integrations = data.integrations;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = UserConnection;
|
||||||
49
src/structures/UserProfile.js
Normal file
49
src/structures/UserProfile.js
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
const Collection = require('../util/Collection');
|
||||||
|
const UserConnection = require('./UserConnection');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a user's profile on Discord.
|
||||||
|
*/
|
||||||
|
class UserProfile {
|
||||||
|
constructor(user, data) {
|
||||||
|
/**
|
||||||
|
* The owner of the profile
|
||||||
|
* @type {User}
|
||||||
|
*/
|
||||||
|
this.user = user;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Client that created the instance of the the User.
|
||||||
|
* @type {Client}
|
||||||
|
*/
|
||||||
|
this.client = this.user.client;
|
||||||
|
Object.defineProperty(this, 'client', { enumerable: false, configurable: false });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Guilds that the ClientUser and the User share
|
||||||
|
* @type {Collection<Guild>}
|
||||||
|
*/
|
||||||
|
this.mutualGuilds = new Collection();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The user's connections
|
||||||
|
* @type {Collection<UserConnection>}
|
||||||
|
*/
|
||||||
|
this.connections = new Collection();
|
||||||
|
|
||||||
|
this.setup(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
setup(data) {
|
||||||
|
for (const guild of data.mutual_guilds) {
|
||||||
|
if (this.client.guilds.has(guild.id)) {
|
||||||
|
this.mutualGuilds.set(guild.id, this.client.guilds.get(guild.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const connection of data.connected_accounts) {
|
||||||
|
this.connections.set(connection.id, new UserConnection(this.user, connection));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = UserProfile;
|
||||||
@@ -82,6 +82,7 @@ const Endpoints = exports.Endpoints = {
|
|||||||
// users
|
// users
|
||||||
user: (userID) => `${API}/users/${userID}`,
|
user: (userID) => `${API}/users/${userID}`,
|
||||||
userChannels: (userID) => `${Endpoints.user(userID)}/channels`,
|
userChannels: (userID) => `${Endpoints.user(userID)}/channels`,
|
||||||
|
userProfile: (userID) => `${Endpoints.user(userID)}/profile`,
|
||||||
avatar: (userID, avatar) => userID === '1' ? avatar : `${Endpoints.user(userID)}/avatars/${avatar}.jpg`,
|
avatar: (userID, avatar) => userID === '1' ? avatar : `${Endpoints.user(userID)}/avatars/${avatar}.jpg`,
|
||||||
me: `${API}/users/@me`,
|
me: `${API}/users/@me`,
|
||||||
meGuild: (guildID) => `${Endpoints.me}/guilds/${guildID}`,
|
meGuild: (guildID) => `${Endpoints.me}/guilds/${guildID}`,
|
||||||
|
|||||||
Reference in New Issue
Block a user