mirror of
https://github.com/danbulant/discord.js
synced 2026-06-24 17:21:59 +00:00
Compare commits
No commits in common. "master" and "12.5.0" have entirely different histories.
53 changed files with 259 additions and 843 deletions
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
"root": true,
|
||||
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
|
||||
"plugins": ["import"],
|
||||
"parserOptions": {
|
||||
|
|
|
|||
8
.github/workflows/deploy.yml
vendored
8
.github/workflows/deploy.yml
vendored
|
|
@ -15,10 +15,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -35,10 +35,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
|
|||
16
.github/workflows/test-cron.yml
vendored
16
.github/workflows/test-cron.yml
vendored
|
|
@ -10,10 +10,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v1
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -28,10 +28,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v1
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -46,10 +46,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -67,10 +67,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v1
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
|
|||
16
.github/workflows/test.yml
vendored
16
.github/workflows/test.yml
vendored
|
|
@ -8,10 +8,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -26,10 +26,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -44,10 +44,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
@ -65,10 +65,10 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install Node v14
|
||||
- name: Install Node v12
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 14
|
||||
node-version: 12
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
## Table of contents
|
||||
|
||||
- [Changes](#changes)
|
||||
- [About](#about)
|
||||
- [Installation](#installation)
|
||||
- [Audio engines](#audio-engines)
|
||||
|
|
@ -30,10 +29,6 @@
|
|||
- [Contributing](#contributing)
|
||||
- [Help](#help)
|
||||
|
||||
## Changes
|
||||
|
||||
This fork has the inline replies and slash commands for **testing** purposes.
|
||||
|
||||
## About
|
||||
|
||||
discord.js is a powerful [Node.js](https://nodejs.org) module that allows you to easily interact with the
|
||||
|
|
@ -46,7 +41,7 @@ discord.js is a powerful [Node.js](https://nodejs.org) module that allows you to
|
|||
|
||||
## Installation
|
||||
|
||||
**Node.js 14.0.0 or newer is required.**
|
||||
**Node.js 12.0.0 or newer is required.**
|
||||
Ignore any warnings about unmet peer dependencies, as they're all optional.
|
||||
|
||||
Without voice support: `npm install discord.js`
|
||||
|
|
@ -81,7 +76,7 @@ client.on('ready', () => {
|
|||
|
||||
client.on('message', msg => {
|
||||
if (msg.content === 'ping') {
|
||||
msg.channel.send('pong');
|
||||
msg.reply('pong');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ client.on('message', message => {
|
|||
// If the message is "what is my avatar"
|
||||
if (message.content === 'what is my avatar') {
|
||||
// Send the user's avatar URL
|
||||
message.channel.send(message.author.displayAvatarURL());
|
||||
message.reply(message.author.displayAvatarURL());
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ client.on('message', message => {
|
|||
// If we have a user mentioned
|
||||
if (user) {
|
||||
// Now we get the member from the user
|
||||
const member = message.guild.members.resolve(user);
|
||||
const member = message.guild.member(user);
|
||||
// If the member is in the guild
|
||||
if (member) {
|
||||
/**
|
||||
|
|
@ -45,23 +45,23 @@ client.on('message', message => {
|
|||
.kick('Optional reason that will display in the audit logs')
|
||||
.then(() => {
|
||||
// We let the message author know we were able to kick the person
|
||||
message.channel.send(`Successfully kicked ${user.tag}`);
|
||||
message.reply(`Successfully kicked ${user.tag}`);
|
||||
})
|
||||
.catch(err => {
|
||||
// An error happened
|
||||
// This is generally due to the bot not being able to kick the member,
|
||||
// either due to missing permissions or role hierarchy
|
||||
message.channel.send('I was unable to kick the member');
|
||||
message.reply('I was unable to kick the member');
|
||||
// Log the error
|
||||
console.error(err);
|
||||
});
|
||||
} else {
|
||||
// The mentioned user isn't in this guild
|
||||
message.channel.send("That user isn't in this guild!");
|
||||
message.reply("That user isn't in this guild!");
|
||||
}
|
||||
// Otherwise, if no user was mentioned
|
||||
} else {
|
||||
message.channel.send("You didn't mention the user to kick!");
|
||||
message.reply("You didn't mention the user to kick!");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -105,7 +105,7 @@ client.on('message', message => {
|
|||
// If we have a user mentioned
|
||||
if (user) {
|
||||
// Now we get the member from the user
|
||||
const member = message.guild.members.resolve(user);
|
||||
const member = message.guild.member(user);
|
||||
// If the member is in the guild
|
||||
if (member) {
|
||||
/**
|
||||
|
|
@ -121,23 +121,23 @@ client.on('message', message => {
|
|||
})
|
||||
.then(() => {
|
||||
// We let the message author know we were able to ban the person
|
||||
message.channel.send(`Successfully banned ${user.tag}`);
|
||||
message.reply(`Successfully banned ${user.tag}`);
|
||||
})
|
||||
.catch(err => {
|
||||
// An error happened
|
||||
// This is generally due to the bot not being able to ban the member,
|
||||
// either due to missing permissions or role hierarchy
|
||||
message.channel.send('I was unable to ban the member');
|
||||
message.reply('I was unable to ban the member');
|
||||
// Log the error
|
||||
console.error(err);
|
||||
});
|
||||
} else {
|
||||
// The mentioned user isn't in this guild
|
||||
message.channel.send("That user isn't in this guild!");
|
||||
message.reply("That user isn't in this guild!");
|
||||
}
|
||||
} else {
|
||||
// Otherwise, if no user was mentioned
|
||||
message.channel.send("You didn't mention the user to ban!");
|
||||
message.reply("You didn't mention the user to ban!");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ These questions are some of the most frequently asked.
|
|||
|
||||
## No matter what, I get `SyntaxError: Block-scoped declarations (let, const, function, class) not yet supported outside strict mode`‽
|
||||
|
||||
Update to Node.js 14.0.0 or newer.
|
||||
Update to Node.js 12.0.0 or newer.
|
||||
|
||||
## How do I get voice working?
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ discord.js is a powerful [Node.js](https://nodejs.org) module that allows you to
|
|||
|
||||
## Installation
|
||||
|
||||
**Node.js 14.0.0 or newer is required.**
|
||||
**Node.js 12.0.0 or newer is required.**
|
||||
Ignore any warnings about unmet peer dependencies, as they're all optional.
|
||||
|
||||
Without voice support: `npm install discord.js`
|
||||
|
|
@ -68,7 +68,7 @@ client.on('ready', () => {
|
|||
|
||||
client.on('message', msg => {
|
||||
if (msg.content === 'ping') {
|
||||
msg.channel.send('pong');
|
||||
msg.reply('pong');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ client.on('message', async message => {
|
|||
if (message.member.voice.channel) {
|
||||
const connection = await message.member.voice.channel.join();
|
||||
} else {
|
||||
message.channel.send('You need to join a voice channel first!');
|
||||
message.reply('You need to join a voice channel first!');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ export const {
|
|||
UserFlags,
|
||||
Util,
|
||||
version,
|
||||
BaseGuildEmojiManager,
|
||||
ChannelManager,
|
||||
GuildChannelManager,
|
||||
GuildEmojiManager,
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
"webpack-cli": "^3.3.12"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
"node": ">=12.0.0"
|
||||
},
|
||||
"browser": {
|
||||
"@discordjs/opus": false,
|
||||
|
|
@ -110,9 +110,9 @@
|
|||
"src/client/voice/receiver/PacketHandler.js": false,
|
||||
"src/client/voice/receiver/Receiver.js": false,
|
||||
"src/client/voice/util/PlayInterface.js": false,
|
||||
"src/client/voice/util/Secretbox.js": false,
|
||||
"src/client/voice/util/Silence.js": false,
|
||||
"src/client/voice/util/VolumeInterface.js": false,
|
||||
"src/util/Sodium.js": false
|
||||
"src/client/voice/util/VolumeInterface.js": false
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
const BaseClient = require('./BaseClient');
|
||||
const InteractionClient = require('./InteractionClient');
|
||||
const ActionsManager = require('./actions/ActionsManager');
|
||||
const ClientVoiceManager = require('./voice/ClientVoiceManager');
|
||||
const WebSocketManager = require('./websocket/WebSocketManager');
|
||||
const { Error, TypeError, RangeError } = require('../errors');
|
||||
const BaseGuildEmojiManager = require('../managers/BaseGuildEmojiManager');
|
||||
const ChannelManager = require('../managers/ChannelManager');
|
||||
const GuildEmojiManager = require('../managers/GuildEmojiManager');
|
||||
const GuildManager = require('../managers/GuildManager');
|
||||
const UserManager = require('../managers/UserManager');
|
||||
const ShardClientUtil = require('../sharding/ShardClientUtil');
|
||||
|
|
@ -104,12 +103,6 @@ class Client extends BaseClient {
|
|||
? ShardClientUtil.singleton(this, process.env.SHARDING_MANAGER_MODE)
|
||||
: null;
|
||||
|
||||
/**
|
||||
* The interaction client.
|
||||
* @type {InteractionClient}
|
||||
*/
|
||||
this.interactionClient = new InteractionClient(options, this);
|
||||
|
||||
/**
|
||||
* All of the {@link User} objects that have been cached at any point, mapped by their IDs
|
||||
* @type {UserManager}
|
||||
|
|
@ -173,11 +166,11 @@ class Client extends BaseClient {
|
|||
|
||||
/**
|
||||
* All custom emojis that the client has access to, mapped by their IDs
|
||||
* @type {BaseGuildEmojiManager}
|
||||
* @type {GuildEmojiManager}
|
||||
* @readonly
|
||||
*/
|
||||
get emojis() {
|
||||
const emojis = new BaseGuildEmojiManager(this);
|
||||
const emojis = new GuildEmojiManager({ client: this });
|
||||
for (const guild of this.guilds.cache.values()) {
|
||||
if (guild.available) for (const emoji of guild.emojis.cache.values()) emojis.cache.set(emoji.id, emoji);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,207 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
const BaseClient = require('./BaseClient');
|
||||
const ApplicationCommand = require('../structures/ApplicationCommand');
|
||||
const Interaction = require('../structures/Interaction');
|
||||
const { Events, ApplicationCommandOptionType, InteractionType, InteractionResponseType } = require('../util/Constants');
|
||||
|
||||
let sodium;
|
||||
|
||||
/**
|
||||
* Interaction client is used for interactions.
|
||||
*
|
||||
* @example
|
||||
* const client = new InteractionClient({
|
||||
* token: ABC,
|
||||
* publicKey: XYZ,
|
||||
* });
|
||||
*
|
||||
* client.on('interactionCreate', () => {
|
||||
* // automatically handles long responses
|
||||
* if (will take a long time) {
|
||||
* doSomethingLong.then((d) => {
|
||||
* interaction.reply({
|
||||
* content: 'wow that took long',
|
||||
* });
|
||||
* });
|
||||
* } else {
|
||||
* interaction.reply('hi!');
|
||||
* }
|
||||
* });
|
||||
* ```
|
||||
*/
|
||||
class InteractionClient extends BaseClient {
|
||||
/**
|
||||
* @param {Options} options Options for the client.
|
||||
* @param {undefined} client For internal use.
|
||||
*/
|
||||
constructor(options, client) {
|
||||
super(options);
|
||||
|
||||
Object.defineProperty(this, 'token', {
|
||||
value: options.token,
|
||||
writable: true,
|
||||
});
|
||||
|
||||
Object.defineProperty(this, 'clientID', {
|
||||
value: options.clientID,
|
||||
writable: true,
|
||||
});
|
||||
|
||||
Object.defineProperty(this, 'publicKey', {
|
||||
value: options.publicKey ? Buffer.from(options.publicKey, 'hex') : undefined,
|
||||
writable: true,
|
||||
});
|
||||
|
||||
// Compat for direct usage
|
||||
this.client = client || this;
|
||||
this.interactionClient = this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get registered slash commands.
|
||||
* @param {Snowflake} [guildID] Optional guild ID.
|
||||
* @returns {Command[]}
|
||||
*/
|
||||
async getCommands(guildID) {
|
||||
let path = this.client.api.applications('@me');
|
||||
if (guildID) {
|
||||
path = path.guilds(guildID);
|
||||
}
|
||||
const commands = await path.commands.get();
|
||||
return commands.map(c => new ApplicationCommand(this, c, guildID));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a command.
|
||||
* @param {Object} command The command description.
|
||||
* @param {Snowflake?} guildID Optional guild ID.
|
||||
* @returns {Promise<ApplicationCommand>} The created command.
|
||||
*/
|
||||
async createCommand(command, guildID) {
|
||||
let path = this.client.api.applications(this.client.user.id);
|
||||
if (guildID) {
|
||||
path = path.guilds(guildID);
|
||||
}
|
||||
const c = await path.commands.post({
|
||||
data: {
|
||||
name: command.name,
|
||||
description: command.description,
|
||||
options: command.options.map(function m(o) {
|
||||
return {
|
||||
type: ApplicationCommandOptionType[o.type],
|
||||
name: o.name,
|
||||
description: o.description,
|
||||
default: o.default,
|
||||
required: o.required,
|
||||
choices: o.choices,
|
||||
options: o.options ? o.options.map(m) : undefined,
|
||||
};
|
||||
}),
|
||||
},
|
||||
});
|
||||
return new ApplicationCommand(this, c, guildID);
|
||||
}
|
||||
|
||||
handle(data) {
|
||||
switch (data.type) {
|
||||
case InteractionType.PING:
|
||||
return {
|
||||
type: InteractionResponseType.PONG,
|
||||
};
|
||||
case InteractionType.APPLICATION_COMMAND: {
|
||||
let timedOut = false;
|
||||
let resolve;
|
||||
const directPromise = new Promise(r => {
|
||||
resolve = r;
|
||||
this.client.setTimeout(() => {
|
||||
timedOut = true;
|
||||
r({
|
||||
type: InteractionResponseType.ACKNOWLEDGE_WITH_SOURCE,
|
||||
});
|
||||
}, 250);
|
||||
});
|
||||
|
||||
const syncHandle = {
|
||||
acknowledge() {
|
||||
if (!timedOut) {
|
||||
resolve({
|
||||
type: InteractionResponseType.ACKNOWLEDGE_WITH_SOURCE,
|
||||
});
|
||||
}
|
||||
},
|
||||
reply(resolved) {
|
||||
if (timedOut) {
|
||||
return false;
|
||||
}
|
||||
resolve({
|
||||
type: InteractionResponseType.CHANNEL_MESSAGE_WITH_SOURCE,
|
||||
data: resolved.data,
|
||||
});
|
||||
return true;
|
||||
},
|
||||
};
|
||||
|
||||
const interaction = new Interaction(this.client, data, syncHandle);
|
||||
|
||||
/**
|
||||
* Emitted when an interaction is created.
|
||||
* @event Client#interactionCreate
|
||||
* @param {Interaction} interaction The interaction which was created.
|
||||
*/
|
||||
this.client.emit(Events.INTERACTION_CREATE, interaction);
|
||||
|
||||
return directPromise;
|
||||
}
|
||||
default:
|
||||
throw new RangeError('Invalid interaction data');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An express-like middleware factory which can be used
|
||||
* with webhook interactions.
|
||||
* @returns {Function} The middleware function.
|
||||
*/
|
||||
middleware() {
|
||||
return async (req, res) => {
|
||||
const timestamp = req.get('x-signature-timestamp');
|
||||
const signature = req.get('x-signature-ed25519');
|
||||
|
||||
const chunks = [];
|
||||
for await (const chunk of req) {
|
||||
chunks.push(chunk);
|
||||
}
|
||||
const body = Buffer.concat(chunks);
|
||||
|
||||
if (sodium === undefined) {
|
||||
sodium = require('../util/Sodium');
|
||||
}
|
||||
if (
|
||||
!sodium.methods.verify(
|
||||
Buffer.from(signature, 'hex'),
|
||||
Buffer.concat([Buffer.from(timestamp), body]),
|
||||
this.publicKey,
|
||||
)
|
||||
) {
|
||||
res.status(403).end();
|
||||
return;
|
||||
}
|
||||
|
||||
const data = JSON.parse(body.toString());
|
||||
|
||||
const result = await this.handle(data);
|
||||
res.status(200).end(JSON.stringify(result));
|
||||
};
|
||||
}
|
||||
|
||||
async handleFromGateway(data) {
|
||||
const result = await this.handle(data);
|
||||
|
||||
await this.client.api.interactions(data.id, data.token).callback.post({
|
||||
data: result,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = InteractionClient;
|
||||
|
|
@ -37,7 +37,6 @@ class ActionsManager {
|
|||
this.register(require('./GuildIntegrationsUpdate'));
|
||||
this.register(require('./WebhooksUpdate'));
|
||||
this.register(require('./TypingStart'));
|
||||
this.register(require('./InteractionCreate'));
|
||||
}
|
||||
|
||||
register(Action) {
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
const Action = require('./Action');
|
||||
|
||||
class InteractionCreateAction extends Action {
|
||||
handle(data) {
|
||||
this.client.interactionClient.handleFromGateway(data).catch(e => {
|
||||
this.client.emit('error', e);
|
||||
});
|
||||
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = InteractionCreateAction;
|
||||
|
|
@ -473,11 +473,7 @@ class VoiceConnection extends EventEmitter {
|
|||
}
|
||||
|
||||
onStartSpeaking({ user_id, ssrc, speaking }) {
|
||||
this.ssrcMap.set(+ssrc, {
|
||||
...(this.ssrcMap.get(+ssrc) || {}),
|
||||
userID: user_id,
|
||||
speaking: speaking,
|
||||
});
|
||||
this.ssrcMap.set(+ssrc, { userID: user_id, speaking: speaking });
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -505,7 +501,7 @@ class VoiceConnection extends EventEmitter {
|
|||
}
|
||||
|
||||
if (guild && user && !speaking.equals(old)) {
|
||||
const member = guild.members.resolve(user);
|
||||
const member = guild.member(user);
|
||||
if (member) {
|
||||
/**
|
||||
* Emitted once a guild member changes speaking state.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
'use strict';
|
||||
|
||||
const { Writable } = require('stream');
|
||||
const secretbox = require('../../../util/Sodium');
|
||||
const secretbox = require('../util/Secretbox');
|
||||
const Silence = require('../util/Silence');
|
||||
const VolumeInterface = require('../util/VolumeInterface');
|
||||
|
||||
|
|
|
|||
|
|
@ -189,11 +189,7 @@ class VoiceWebSocket extends EventEmitter {
|
|||
this.emit('sessionDescription', packet.d);
|
||||
break;
|
||||
case VoiceOPCodes.CLIENT_CONNECT:
|
||||
this.connection.ssrcMap.set(+packet.d.audio_ssrc, {
|
||||
userID: packet.d.user_id,
|
||||
speaking: 0,
|
||||
hasVideo: Boolean(packet.d.video_ssrc),
|
||||
});
|
||||
this.connection.ssrcMap.set(+packet.d.audio_ssrc, { userID: packet.d.user_id, speaking: 0 });
|
||||
break;
|
||||
case VoiceOPCodes.CLIENT_DISCONNECT:
|
||||
const streamInfo = this.connection.receiver && this.connection.receiver.packets.streams.get(packet.d.user_id);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
'use strict';
|
||||
|
||||
const EventEmitter = require('events');
|
||||
const sodium = require('../../../util/Sodium');
|
||||
const Speaking = require('../../../util/Speaking');
|
||||
const { SILENCE_FRAME } = require('../util/Silence');
|
||||
const secretbox = require('../util/Secretbox');
|
||||
|
||||
// The delay between packets when a user is considered to have stopped speaking
|
||||
// https://github.com/discordjs/discord.js/issues/3524#issuecomment-540373200
|
||||
|
|
@ -58,7 +56,7 @@ class PacketHandler extends EventEmitter {
|
|||
}
|
||||
|
||||
// Open packet
|
||||
let packet = sodium.methods.open(buffer.slice(12, end), this.nonce, secret_key);
|
||||
let packet = secretbox.methods.open(buffer.slice(12, end), this.nonce, secret_key);
|
||||
if (!packet) return new Error('Failed to decrypt voice packet');
|
||||
packet = Buffer.from(packet);
|
||||
|
||||
|
|
@ -86,30 +84,12 @@ class PacketHandler extends EventEmitter {
|
|||
const userStat = this.connection.ssrcMap.get(ssrc);
|
||||
if (!userStat) return;
|
||||
|
||||
let opusPacket;
|
||||
const streamInfo = this.streams.get(userStat.userID);
|
||||
// If the user is in video, we need to check if the packet is just silence
|
||||
if (userStat.hasVideo) {
|
||||
opusPacket = this.parseBuffer(buffer);
|
||||
if (opusPacket instanceof Error) {
|
||||
// Only emit an error if we were actively receiving packets from this user
|
||||
if (streamInfo) {
|
||||
this.emit('error', opusPacket);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (SILENCE_FRAME.equals(opusPacket)) {
|
||||
// If this is a silence frame, pretend we never received it
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
let speakingTimeout = this.speakingTimeouts.get(ssrc);
|
||||
if (typeof speakingTimeout === 'undefined') {
|
||||
// Ensure at least the speaking bit is set.
|
||||
// As the object is by reference, it's only needed once per client re-connect.
|
||||
if (userStat.speaking === 0) {
|
||||
userStat.speaking = Speaking.FLAGS.SPEAKING;
|
||||
userStat.speaking = 1;
|
||||
}
|
||||
this.connection.onSpeaking({ user_id: userStat.userID, ssrc: ssrc, speaking: userStat.speaking });
|
||||
speakingTimeout = this.receiver.connection.client.setTimeout(() => {
|
||||
|
|
@ -126,17 +106,15 @@ class PacketHandler extends EventEmitter {
|
|||
speakingTimeout.refresh();
|
||||
}
|
||||
|
||||
if (streamInfo) {
|
||||
const { stream } = streamInfo;
|
||||
if (!opusPacket) {
|
||||
opusPacket = this.parseBuffer(buffer);
|
||||
if (opusPacket instanceof Error) {
|
||||
this.emit('error', opusPacket);
|
||||
return;
|
||||
}
|
||||
}
|
||||
stream.push(opusPacket);
|
||||
let stream = this.streams.get(userStat.userID);
|
||||
if (!stream) return;
|
||||
stream = stream.stream;
|
||||
const opusPacket = this.parseBuffer(buffer);
|
||||
if (opusPacket instanceof Error) {
|
||||
this.emit('error', opusPacket);
|
||||
return;
|
||||
}
|
||||
stream.push(opusPacket);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,19 +5,16 @@ const libs = {
|
|||
open: sodium.api.crypto_secretbox_open_easy,
|
||||
close: sodium.api.crypto_secretbox_easy,
|
||||
random: n => sodium.randombytes_buf(n),
|
||||
verify: sodium.api.crypto_sign_verify_detached,
|
||||
}),
|
||||
'libsodium-wrappers': sodium => ({
|
||||
open: sodium.crypto_secretbox_open_easy,
|
||||
close: sodium.crypto_secretbox_easy,
|
||||
random: n => sodium.randombytes_buf(n),
|
||||
verify: sodium.crypto_sign_verify_detached,
|
||||
}),
|
||||
tweetnacl: tweetnacl => ({
|
||||
open: tweetnacl.secretbox.open,
|
||||
close: tweetnacl.secretbox,
|
||||
random: n => tweetnacl.randomBytes(n),
|
||||
verify: (s, d, p) => tweetnacl.sign.detached.verify(d, s, p),
|
||||
}),
|
||||
};
|
||||
|
||||
|
|
@ -10,6 +10,4 @@ class Silence extends Readable {
|
|||
}
|
||||
}
|
||||
|
||||
Silence.SILENCE_FRAME = SILENCE_FRAME;
|
||||
|
||||
module.exports = Silence;
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class WebSocketManager extends EventEmitter {
|
|||
|
||||
/**
|
||||
* The current status of this WebSocketManager
|
||||
* @type {Status}
|
||||
* @type {number}
|
||||
*/
|
||||
this.status = Status.IDLE;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
module.exports = (client, packet) => {
|
||||
client.actions.InteractionCreate.handle(packet.d);
|
||||
};
|
||||
|
|
@ -71,7 +71,7 @@ const Messages = {
|
|||
IMAGE_SIZE: size => `Invalid image size: ${size}`,
|
||||
|
||||
MESSAGE_BULK_DELETE_TYPE: 'The messages must be an Array, Collection, or number.',
|
||||
MESSAGE_NONCE_TYPE: 'Message nonce must be an integer or a string.',
|
||||
MESSAGE_NONCE_TYPE: 'Message nonce must fit in an unsigned 64-bit integer.',
|
||||
|
||||
TYPING_COUNT: 'Count must be at least 1',
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ module.exports = {
|
|||
// "Root" classes (starting points)
|
||||
BaseClient: require('./client/BaseClient'),
|
||||
Client: require('./client/Client'),
|
||||
InteractionClient: require('./client/InteractionClient'),
|
||||
Shard: require('./sharding/Shard'),
|
||||
ShardClientUtil: require('./sharding/ShardClientUtil'),
|
||||
ShardingManager: require('./sharding/ShardingManager'),
|
||||
|
|
@ -34,7 +33,6 @@ module.exports = {
|
|||
version: require('../package.json').version,
|
||||
|
||||
// Managers
|
||||
BaseGuildEmojiManager: require('./managers/BaseGuildEmojiManager'),
|
||||
ChannelManager: require('./managers/ChannelManager'),
|
||||
GuildChannelManager: require('./managers/GuildChannelManager'),
|
||||
GuildEmojiManager: require('./managers/GuildEmojiManager'),
|
||||
|
|
@ -59,7 +57,6 @@ module.exports = {
|
|||
|
||||
// Structures
|
||||
Application: require('./structures/interfaces/Application'),
|
||||
ApplicationCommand: require('./structures/ApplicationCommand'),
|
||||
Base: require('./structures/Base'),
|
||||
Activity: require('./structures/Presence').Activity,
|
||||
APIMessage: require('./structures/APIMessage'),
|
||||
|
|
@ -82,7 +79,6 @@ module.exports = {
|
|||
GuildPreview: require('./structures/GuildPreview'),
|
||||
GuildTemplate: require('./structures/GuildTemplate'),
|
||||
Integration: require('./structures/Integration'),
|
||||
Interaction: require('./structures/Interaction'),
|
||||
Invite: require('./structures/Invite'),
|
||||
Message: require('./structures/Message'),
|
||||
MessageAttachment: require('./structures/MessageAttachment'),
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
const BaseManager = require('./BaseManager');
|
||||
const GuildEmoji = require('../structures/GuildEmoji');
|
||||
const ReactionEmoji = require('../structures/ReactionEmoji');
|
||||
const { parseEmoji } = require('../util/Util');
|
||||
|
||||
/**
|
||||
* Holds methods to resolve GuildEmojis and stores their cache.
|
||||
* @extends {BaseManager}
|
||||
*/
|
||||
class BaseGuildEmojiManager extends BaseManager {
|
||||
constructor(client, iterable) {
|
||||
super(client, iterable, GuildEmoji);
|
||||
}
|
||||
|
||||
/**
|
||||
* The cache of GuildEmojis
|
||||
* @type {Collection<Snowflake, GuildEmoji>}
|
||||
* @name BaseGuildEmojiManager#cache
|
||||
*/
|
||||
|
||||
/**
|
||||
* Data that can be resolved into a GuildEmoji object. This can be:
|
||||
* * A custom emoji ID
|
||||
* * A GuildEmoji object
|
||||
* * A ReactionEmoji object
|
||||
* @typedef {Snowflake|GuildEmoji|ReactionEmoji} EmojiResolvable
|
||||
*/
|
||||
|
||||
/**
|
||||
* Resolves an EmojiResolvable to an Emoji object.
|
||||
* @param {EmojiResolvable} emoji The Emoji resolvable to identify
|
||||
* @returns {?GuildEmoji}
|
||||
*/
|
||||
resolve(emoji) {
|
||||
if (emoji instanceof ReactionEmoji) return super.resolve(emoji.id);
|
||||
return super.resolve(emoji);
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves an EmojiResolvable to an Emoji ID string.
|
||||
* @param {EmojiResolvable} emoji The Emoji resolvable to identify
|
||||
* @returns {?Snowflake}
|
||||
*/
|
||||
resolveID(emoji) {
|
||||
if (emoji instanceof ReactionEmoji) return emoji.id;
|
||||
return super.resolveID(emoji);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data that can be resolved to give an emoji identifier. This can be:
|
||||
* * The unicode representation of an emoji
|
||||
* * The `<a:name:id>`, `<:name:id>`, `a:name:id` or `name:id` emoji identifier string of an emoji
|
||||
* * An EmojiResolvable
|
||||
* @typedef {string|EmojiResolvable} EmojiIdentifierResolvable
|
||||
*/
|
||||
|
||||
/**
|
||||
* Resolves an EmojiResolvable to an emoji identifier.
|
||||
* @param {EmojiIdentifierResolvable} emoji The emoji resolvable to resolve
|
||||
* @returns {?string}
|
||||
*/
|
||||
resolveIdentifier(emoji) {
|
||||
const emojiResolvable = this.resolve(emoji);
|
||||
if (emojiResolvable) return emojiResolvable.identifier;
|
||||
if (emoji instanceof ReactionEmoji) return emoji.identifier;
|
||||
if (typeof emoji === 'string') {
|
||||
const res = parseEmoji(emoji);
|
||||
if (res && res.name.length) {
|
||||
emoji = `${res.animated ? 'a:' : ''}${res.name}${res.id ? `:${res.id}` : ''}`;
|
||||
}
|
||||
if (!emoji.includes('%')) return encodeURIComponent(emoji);
|
||||
return emoji;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = BaseGuildEmojiManager;
|
||||
|
|
@ -1,18 +1,20 @@
|
|||
'use strict';
|
||||
|
||||
const BaseGuildEmojiManager = require('./BaseGuildEmojiManager');
|
||||
const BaseManager = require('./BaseManager');
|
||||
const { TypeError } = require('../errors');
|
||||
const GuildEmoji = require('../structures/GuildEmoji');
|
||||
const ReactionEmoji = require('../structures/ReactionEmoji');
|
||||
const Collection = require('../util/Collection');
|
||||
const DataResolver = require('../util/DataResolver');
|
||||
const { parseEmoji } = require('../util/Util');
|
||||
|
||||
/**
|
||||
* Manages API methods for GuildEmojis and stores their cache.
|
||||
* @extends {BaseGuildEmojiManager}
|
||||
* @extends {BaseManager}
|
||||
*/
|
||||
class GuildEmojiManager extends BaseGuildEmojiManager {
|
||||
class GuildEmojiManager extends BaseManager {
|
||||
constructor(guild, iterable) {
|
||||
super(guild.client, iterable);
|
||||
|
||||
super(guild.client, iterable, GuildEmoji);
|
||||
/**
|
||||
* The guild this manager belongs to
|
||||
* @type {Guild}
|
||||
|
|
@ -20,6 +22,12 @@ class GuildEmojiManager extends BaseGuildEmojiManager {
|
|||
this.guild = guild;
|
||||
}
|
||||
|
||||
/**
|
||||
* The cache of GuildEmojis
|
||||
* @type {Collection<Snowflake, GuildEmoji>}
|
||||
* @name GuildEmojiManager#cache
|
||||
*/
|
||||
|
||||
add(data, cache) {
|
||||
return super.add(data, cache, { extras: [this.guild] });
|
||||
}
|
||||
|
|
@ -66,6 +74,62 @@ class GuildEmojiManager extends BaseGuildEmojiManager {
|
|||
.emojis.post({ data, reason })
|
||||
.then(emoji => this.client.actions.GuildEmojiCreate.handle(this.guild, emoji).emoji);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data that can be resolved into an GuildEmoji object. This can be:
|
||||
* * A custom emoji ID
|
||||
* * A GuildEmoji object
|
||||
* * A ReactionEmoji object
|
||||
* @typedef {Snowflake|GuildEmoji|ReactionEmoji} EmojiResolvable
|
||||
*/
|
||||
|
||||
/**
|
||||
* Resolves an EmojiResolvable to an Emoji object.
|
||||
* @param {EmojiResolvable} emoji The Emoji resolvable to identify
|
||||
* @returns {?GuildEmoji}
|
||||
*/
|
||||
resolve(emoji) {
|
||||
if (emoji instanceof ReactionEmoji) return super.resolve(emoji.id);
|
||||
return super.resolve(emoji);
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves an EmojiResolvable to an Emoji ID string.
|
||||
* @param {EmojiResolvable} emoji The Emoji resolvable to identify
|
||||
* @returns {?Snowflake}
|
||||
*/
|
||||
resolveID(emoji) {
|
||||
if (emoji instanceof ReactionEmoji) return emoji.id;
|
||||
return super.resolveID(emoji);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data that can be resolved to give an emoji identifier. This can be:
|
||||
* * The unicode representation of an emoji
|
||||
* * The `<a:name:id>`, `<:name:id>`, `:name:id` or `a:name:id` emoji identifier string of an emoji
|
||||
* * An EmojiResolvable
|
||||
* @typedef {string|EmojiResolvable} EmojiIdentifierResolvable
|
||||
*/
|
||||
|
||||
/**
|
||||
* Resolves an EmojiResolvable to an emoji identifier.
|
||||
* @param {EmojiIdentifierResolvable} emoji The emoji resolvable to resolve
|
||||
* @returns {?string}
|
||||
*/
|
||||
resolveIdentifier(emoji) {
|
||||
const emojiResolvable = this.resolve(emoji);
|
||||
if (emojiResolvable) return emojiResolvable.identifier;
|
||||
if (emoji instanceof ReactionEmoji) return emoji.identifier;
|
||||
if (typeof emoji === 'string') {
|
||||
const res = parseEmoji(emoji);
|
||||
if (res && res.name.length) {
|
||||
emoji = `${res.animated ? 'a:' : ''}${res.name}${res.id ? `:${res.id}` : ''}`;
|
||||
}
|
||||
if (!emoji.includes('%')) return encodeURIComponent(emoji);
|
||||
else return emoji;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = GuildEmojiManager;
|
||||
|
|
|
|||
|
|
@ -210,7 +210,6 @@ class GuildMemberManager extends BaseManager {
|
|||
* .catch(console.error);
|
||||
*/
|
||||
ban(user, options = { days: 0 }) {
|
||||
if (typeof options !== 'object') return Promise.reject(new TypeError('INVALID_TYPE', 'options', 'object', true));
|
||||
if (options.days) options.delete_message_days = options.days;
|
||||
const id = this.client.users.resolveID(user);
|
||||
if (!id) return Promise.reject(new Error('BAN_RESOLVE_ID', true));
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
const BaseManager = require('./BaseManager');
|
||||
const Role = require('../structures/Role');
|
||||
const Collection = require('../util/Collection');
|
||||
const Permissions = require('../util/Permissions');
|
||||
const { resolveColor } = require('../util/Util');
|
||||
|
||||
|
|
@ -32,10 +31,10 @@ class RoleManager extends BaseManager {
|
|||
|
||||
/**
|
||||
* Obtains one or more roles from Discord, or the role cache if they're already available.
|
||||
* @param {Snowflake} [id] ID of the role to fetch
|
||||
* @param {boolean} [cache=true] Whether to cache the new role object(s) if they weren't already
|
||||
* @param {Snowflake} [id] ID or IDs of the role(s)
|
||||
* @param {boolean} [cache=true] Whether to cache the new roles objects if it weren't already
|
||||
* @param {boolean} [force=false] Whether to skip the cache check and request the API
|
||||
* @returns {Promise<?Role|Collection<Snowflake, Role>>}
|
||||
* @returns {Promise<Role|RoleManager>}
|
||||
* @example
|
||||
* // Fetch all roles from the guild
|
||||
* message.guild.roles.fetch()
|
||||
|
|
@ -54,10 +53,9 @@ class RoleManager extends BaseManager {
|
|||
}
|
||||
|
||||
// We cannot fetch a single role, as of this commit's date, Discord API throws with 405
|
||||
const data = await this.client.api.guilds(this.guild.id).roles.get();
|
||||
const roles = new Collection();
|
||||
for (const role of data) roles.set(role.id, this.add(role, cache));
|
||||
return id ? roles.get(id) || null : roles;
|
||||
const roles = await this.client.api.guilds(this.guild.id).roles.get();
|
||||
for (const role of roles) this.add(role, cache);
|
||||
return id ? this.cache.get(id) || null : this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -74,21 +74,13 @@ class APIMessage {
|
|||
return this.target instanceof Message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether or not the target is an interaction
|
||||
* @type {boolean}
|
||||
* @readonly
|
||||
*/
|
||||
get isInteraction() {
|
||||
const Interaction = require('./Interaction');
|
||||
return this.target instanceof Interaction;
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes the content of this message.
|
||||
* @returns {?(string|string[])}
|
||||
*/
|
||||
makeContent() {
|
||||
const GuildMember = require('./GuildMember');
|
||||
|
||||
let content;
|
||||
if (this.options.content === null) {
|
||||
content = '';
|
||||
|
|
@ -118,14 +110,25 @@ class APIMessage {
|
|||
const isCode = typeof this.options.code !== 'undefined' && this.options.code !== false;
|
||||
const splitOptions = isSplit ? { ...this.options.split } : undefined;
|
||||
|
||||
if (content) {
|
||||
let mentionPart = '';
|
||||
if (this.options.reply && !this.isUser && this.target.type !== 'dm') {
|
||||
const id = this.target.client.users.resolveID(this.options.reply);
|
||||
mentionPart = `<@${this.options.reply instanceof GuildMember && this.options.reply.nickname ? '!' : ''}${id}>, `;
|
||||
if (isSplit) {
|
||||
splitOptions.prepend = `${mentionPart}${splitOptions.prepend || ''}`;
|
||||
}
|
||||
}
|
||||
|
||||
if (content || mentionPart) {
|
||||
if (isCode) {
|
||||
const codeName = typeof this.options.code === 'string' ? this.options.code : '';
|
||||
content = `\`\`\`${codeName}\n${Util.cleanCodeBlockContent(content)}\n\`\`\``;
|
||||
content = `${mentionPart}\`\`\`${codeName}\n${Util.cleanCodeBlockContent(content)}\n\`\`\``;
|
||||
if (isSplit) {
|
||||
splitOptions.prepend = `${splitOptions.prepend || ''}\`\`\`${codeName}\n`;
|
||||
splitOptions.append = `\n\`\`\`${splitOptions.append || ''}`;
|
||||
}
|
||||
} else if (mentionPart) {
|
||||
content = `${mentionPart}${content}`;
|
||||
}
|
||||
|
||||
if (isSplit) {
|
||||
|
|
@ -148,11 +151,8 @@ class APIMessage {
|
|||
|
||||
let nonce;
|
||||
if (typeof this.options.nonce !== 'undefined') {
|
||||
nonce = this.options.nonce;
|
||||
// eslint-disable-next-line max-len
|
||||
if (typeof nonce === 'number' ? !Number.isInteger(nonce) : typeof nonce !== 'string') {
|
||||
throw new RangeError('MESSAGE_NONCE_TYPE');
|
||||
}
|
||||
nonce = parseInt(this.options.nonce);
|
||||
if (isNaN(nonce) || nonce < 0) throw new RangeError('MESSAGE_NONCE_TYPE');
|
||||
}
|
||||
|
||||
const embedLikes = [];
|
||||
|
|
@ -176,28 +176,25 @@ class APIMessage {
|
|||
if (this.isMessage) {
|
||||
// eslint-disable-next-line eqeqeq
|
||||
flags = this.options.flags != null ? new MessageFlags(this.options.flags).bitfield : this.target.flags.bitfield;
|
||||
} else if (this.isInteraction) {
|
||||
flags = this.options.ephemeral ? MessageFlags.EPHEMERAL : undefined;
|
||||
}
|
||||
|
||||
let allowedMentions =
|
||||
typeof this.options.allowedMentions === 'undefined'
|
||||
? this.target.client.options.allowedMentions
|
||||
: this.options.allowedMentions;
|
||||
|
||||
if (allowedMentions) {
|
||||
allowedMentions = Util.cloneObject(allowedMentions);
|
||||
allowedMentions.replied_user = allowedMentions.repliedUser;
|
||||
delete allowedMentions.repliedUser;
|
||||
}
|
||||
|
||||
let message_reference;
|
||||
if (typeof this.options.replyTo !== 'undefined') {
|
||||
const message_id = this.isMessage
|
||||
? this.target.channel.messages.resolveID(this.options.replyTo)
|
||||
: this.target.messages.resolveID(this.options.replyTo);
|
||||
if (message_id) {
|
||||
message_reference = { message_id };
|
||||
if (this.options.reply) {
|
||||
const id = this.target.client.users.resolveID(this.options.reply);
|
||||
if (allowedMentions) {
|
||||
// Clone the object as not to alter the ClientOptions object
|
||||
allowedMentions = Util.cloneObject(allowedMentions);
|
||||
const parsed = allowedMentions.parse && allowedMentions.parse.includes('users');
|
||||
// Check if the mention won't be parsed, and isn't supplied in `users`
|
||||
if (!parsed && !(allowedMentions.users && allowedMentions.users.includes(id))) {
|
||||
if (!allowedMentions.users) allowedMentions.users = [];
|
||||
allowedMentions.users.push(id);
|
||||
}
|
||||
} else {
|
||||
allowedMentions = { users: [id] };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -209,10 +206,8 @@ class APIMessage {
|
|||
embeds,
|
||||
username,
|
||||
avatar_url: avatarURL,
|
||||
allowed_mentions:
|
||||
typeof content === 'undefined' && typeof message_reference === 'undefined' ? undefined : allowedMentions,
|
||||
allowed_mentions: typeof content === 'undefined' ? undefined : allowedMentions,
|
||||
flags,
|
||||
message_reference,
|
||||
};
|
||||
return this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,102 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
const Base = require('./Base');
|
||||
const { ApplicationCommandOptionType } = require('../util/Constants');
|
||||
const Snowflake = require('../util/Snowflake');
|
||||
|
||||
/**
|
||||
* Represents an application command, see {@link InteractionClient}.
|
||||
* @extends {Base}
|
||||
*/
|
||||
class ApplicationCommand extends Base {
|
||||
constructor(client, data, guildID) {
|
||||
super(client);
|
||||
|
||||
/**
|
||||
* The ID of the guild this command is part of, if any.
|
||||
* @type {Snowflake?}
|
||||
* @readonly
|
||||
*/
|
||||
this.guildID = guildID || null;
|
||||
|
||||
this._patch(data);
|
||||
}
|
||||
|
||||
_patch(data) {
|
||||
/**
|
||||
* The ID of this command.
|
||||
* @type {Snowflake}
|
||||
* @readonly
|
||||
*/
|
||||
this.id = data.id;
|
||||
|
||||
/**
|
||||
* The ID of the application which owns this command.
|
||||
* @type {Snowflake}
|
||||
* @readonly
|
||||
*/
|
||||
this.appplicationID = data.application_id;
|
||||
|
||||
/**
|
||||
* The name of this command.
|
||||
* @type {string}
|
||||
* @readonly
|
||||
*/
|
||||
this.name = data.name;
|
||||
|
||||
/**
|
||||
* The description of this command.
|
||||
* @type {string}
|
||||
* @readonly
|
||||
*/
|
||||
this.description = data.description;
|
||||
|
||||
/**
|
||||
* The options of this command.
|
||||
* @type {Object[]}
|
||||
* @readonly
|
||||
*/
|
||||
this.options = data.options?.map(function m(o) {
|
||||
return {
|
||||
type: ApplicationCommandOptionType[o.type],
|
||||
name: o.name,
|
||||
description: o.description,
|
||||
default: o.default,
|
||||
required: o.required,
|
||||
choices: o.choices,
|
||||
options: o.options ? o.options.map(m) : undefined,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* The timestamp the command was created at.
|
||||
* @type {number}
|
||||
* @readonly
|
||||
*/
|
||||
get createdTimestamp() {
|
||||
return Snowflake.deconstruct(this.id).timestamp;
|
||||
}
|
||||
|
||||
/**
|
||||
* The time the command was created at.
|
||||
* @type {Date}
|
||||
* @readonly
|
||||
*/
|
||||
get createdAt() {
|
||||
return new Date(this.createdTimestamp);
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete this command.
|
||||
*/
|
||||
async delete() {
|
||||
let path = this.client.api.applications('@me');
|
||||
if (this.guildID) {
|
||||
path = path.guilds(this.guildID);
|
||||
}
|
||||
await path.commands(this.id).delete();
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ApplicationCommand;
|
||||
|
|
@ -17,7 +17,7 @@ class BaseGuildEmoji extends Emoji {
|
|||
*/
|
||||
this.guild = guild;
|
||||
|
||||
this.requiresColons = null;
|
||||
this.requireColons = null;
|
||||
this.managed = null;
|
||||
this.available = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class Emoji extends Base {
|
|||
* @example
|
||||
* // Send a custom emoji from a guild:
|
||||
* const emoji = guild.emojis.cache.first();
|
||||
* msg.channel.send(`Hello! ${emoji}`);
|
||||
* msg.reply(`Hello! ${emoji}`);
|
||||
* @example
|
||||
* // Send the emoji used in a reaction to the channel the reaction is part of
|
||||
* reaction.message.channel.send(`The emoji used was: ${reaction.emoji}`);
|
||||
|
|
|
|||
|
|
@ -637,6 +637,18 @@ class Guild extends Base {
|
|||
return this.voiceStates.cache.get(this.client.user.id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the GuildMember form of a User object, if the user is present in the guild.
|
||||
* @param {UserResolvable} user The user that you want to obtain the GuildMember of
|
||||
* @returns {?GuildMember}
|
||||
* @example
|
||||
* // Get the guild member of a user
|
||||
* const member = guild.member(message.author);
|
||||
*/
|
||||
member(user) {
|
||||
return this.members.resolve(user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches this guild.
|
||||
* @returns {Promise<Guild>}
|
||||
|
|
@ -1432,23 +1444,6 @@ class Guild extends Base {
|
|||
.then(() => this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the commands associated with this guild.
|
||||
* @returns {ApplicationCommand[]} A list of commands.
|
||||
*/
|
||||
getCommands() {
|
||||
return this.client.interactionClient.getCommands(this.id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a command. See {@link InteractionClient}.
|
||||
* @param {Object} command The command description.
|
||||
* @returns {ApplicationCommand} The created command.
|
||||
*/
|
||||
createCommand(command) {
|
||||
return this.client.interactionClient.createCommand(command, this.id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Leaves the guild.
|
||||
* @returns {Promise<Guild>}
|
||||
|
|
|
|||
|
|
@ -198,9 +198,8 @@ class GuildTemplate extends Base {
|
|||
* @readonly
|
||||
*/
|
||||
get guild() {
|
||||
return this.client.guilds.cache.get(this.guildID) || null;
|
||||
return this.client.guilds.get(this.guildID) || null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The URL of this template
|
||||
* @type {string}
|
||||
|
|
|
|||
|
|
@ -1,133 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
const APIMessage = require('./APIMessage');
|
||||
const Base = require('./Base');
|
||||
const Snowflake = require('../util/Snowflake');
|
||||
|
||||
/**
|
||||
* Represents an interaction, see {@link InteractionClient}.
|
||||
* @extends {Base}
|
||||
*/
|
||||
class Interaction extends Base {
|
||||
constructor(client, data, syncHandle) {
|
||||
super(client);
|
||||
this.syncHandle = syncHandle;
|
||||
this._patch(data);
|
||||
}
|
||||
|
||||
_patch(data) {
|
||||
/**
|
||||
* The ID of this interaction.
|
||||
* @type {Snowflake}
|
||||
* @readonly
|
||||
*/
|
||||
this.id = data.id;
|
||||
|
||||
/**
|
||||
* The token of this interaction.
|
||||
* @type {string}
|
||||
* @readonly
|
||||
*/
|
||||
this.token = data.token;
|
||||
|
||||
/**
|
||||
* The ID of the invoked command.
|
||||
* @type {Snowflake}
|
||||
* @readonly
|
||||
*/
|
||||
this.commandID = data.data.id;
|
||||
|
||||
/**
|
||||
* The name of the invoked command.
|
||||
* @type {string}
|
||||
* @readonly
|
||||
*/
|
||||
this.commandName = data.data.name;
|
||||
|
||||
/**
|
||||
* The options passed to the command.
|
||||
* @type {Object}
|
||||
* @readonly
|
||||
*/
|
||||
this.options = data.data.options;
|
||||
|
||||
/**
|
||||
* The channel this interaction was sent in.
|
||||
* @type {?Channel}
|
||||
* @readonly
|
||||
*/
|
||||
this.channel = this.client.channels?.cache.get(data.channel_id) || null;
|
||||
|
||||
/**
|
||||
* The guild this interaction was sent in, if any.
|
||||
* @type {?Guild}
|
||||
* @readonly
|
||||
*/
|
||||
this.guild = data.guild_id ? this.client.guilds?.cache.get(data.guild_id) : null;
|
||||
|
||||
/**
|
||||
* If this interaction was sent in a guild, the member which sent it.
|
||||
* @type {?Member}
|
||||
* @readonly
|
||||
*/
|
||||
this.member = data.member ? this.guild?.members.add(data.member, false) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The timestamp the interaction was created at.
|
||||
* @type {number}
|
||||
* @readonly
|
||||
*/
|
||||
get createdTimestamp() {
|
||||
return Snowflake.deconstruct(this.id).timestamp;
|
||||
}
|
||||
|
||||
/**
|
||||
* The time the interaction was created at.
|
||||
* @type {Date}
|
||||
* @readonly
|
||||
*/
|
||||
get createdAt() {
|
||||
return new Date(this.createdTimestamp);
|
||||
}
|
||||
|
||||
/**
|
||||
* Acknowledge this interaction without content.
|
||||
*/
|
||||
async acknowledge() {
|
||||
await this.syncHandle.acknowledge();
|
||||
}
|
||||
|
||||
/**
|
||||
* Reply to this interaction.
|
||||
* @param {(StringResolvable | APIMessage)?} content The content for the message.
|
||||
* @param {(MessageOptions | MessageAdditions)?} options The options to provide.
|
||||
*/
|
||||
async reply(content, options) {
|
||||
let apiMessage;
|
||||
|
||||
if (content instanceof APIMessage) {
|
||||
apiMessage = content.resolveData();
|
||||
} else {
|
||||
apiMessage = APIMessage.create(this, content, options).resolveData();
|
||||
if (Array.isArray(apiMessage.data.content)) {
|
||||
throw new Error('Message is too long');
|
||||
}
|
||||
}
|
||||
|
||||
const resolved = await apiMessage.resolveFiles();
|
||||
|
||||
if (!this.syncHandle.reply(resolved)) {
|
||||
const clientID =
|
||||
this.client.interactionClient.clientID || (await this.client.api.oauth2.applications('@me').get()).id;
|
||||
|
||||
await this.client.api.webhooks(clientID, this.token).post({
|
||||
auth: false,
|
||||
data: resolved.data,
|
||||
files: resolved.files,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Interaction;
|
||||
|
|
@ -205,11 +205,11 @@ class Message extends Base {
|
|||
this.flags = new MessageFlags(data.flags).freeze();
|
||||
|
||||
/**
|
||||
* Reference data sent in a crossposted message or inline reply.
|
||||
* Reference data sent in a crossposted message.
|
||||
* @typedef {Object} MessageReference
|
||||
* @property {string} channelID ID of the channel the message was referenced
|
||||
* @property {?string} guildID ID of the guild the message was referenced
|
||||
* @property {?string} messageID ID of the message that was referenced
|
||||
* @property {string} channelID ID of the channel the message was crossposted from
|
||||
* @property {?string} guildID ID of the guild the message was crossposted from
|
||||
* @property {?string} messageID ID of the message that was crossposted
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -223,10 +223,6 @@ class Message extends Base {
|
|||
messageID: data.message_reference.message_id,
|
||||
}
|
||||
: null;
|
||||
|
||||
if (data.referenced_message) {
|
||||
this.channel.messages.add(data.referenced_message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -288,7 +284,7 @@ class Message extends Base {
|
|||
* @readonly
|
||||
*/
|
||||
get member() {
|
||||
return this.guild ? this.guild.members.resolve(this.author) || null : null;
|
||||
return this.guild ? this.guild.member(this.author) || null : null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -429,18 +425,6 @@ class Message extends Base {
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The Message this crosspost/reply/pin-add references, if cached
|
||||
* @type {?Message}
|
||||
* @readonly
|
||||
*/
|
||||
get referencedMessage() {
|
||||
if (!this.reference) return null;
|
||||
const referenceChannel = this.client.channels.resolve(this.reference.channelID);
|
||||
if (!referenceChannel) return null;
|
||||
return referenceChannel.messages.resolve(this.reference.messageID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the message is crosspostable by the client user
|
||||
* @type {boolean}
|
||||
|
|
@ -604,19 +588,21 @@ class Message extends Base {
|
|||
}
|
||||
|
||||
/**
|
||||
* Send an inline reply to this message.
|
||||
* Replies to the message.
|
||||
* @param {StringResolvable|APIMessage} [content=''] The content for the message
|
||||
* @param {MessageOptions|MessageAdditions} [options] The additional options to provide
|
||||
* @param {MessageResolvable} [options.replyTo=this] The message to reply to
|
||||
* @param {MessageOptions|MessageAdditions} [options={}] The options to provide
|
||||
* @returns {Promise<Message|Message[]>}
|
||||
* @example
|
||||
* // Reply to a message
|
||||
* message.reply('Hey, I\'m a reply!')
|
||||
* .then(() => console.log(`Sent a reply to ${message.author.username}`))
|
||||
* .catch(console.error);
|
||||
*/
|
||||
reply(content, options) {
|
||||
return this.channel.send(
|
||||
content instanceof APIMessage
|
||||
? content
|
||||
: APIMessage.transformOptions(content, options, {
|
||||
replyTo: this,
|
||||
}),
|
||||
: APIMessage.transformOptions(content, options, { reply: this.member || this.author }),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ class MessageMentions {
|
|||
if (!this.guild) return null;
|
||||
this._members = new Collection();
|
||||
this.users.forEach(user => {
|
||||
const member = this.guild.members.resolve(user);
|
||||
const member = this.guild.member(user);
|
||||
if (member) this._members.set(member.user.id, member);
|
||||
});
|
||||
return this._members;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@ class MessageReaction {
|
|||
*/
|
||||
this.message = message;
|
||||
|
||||
/**
|
||||
* Whether the client has given this reaction
|
||||
* @type {boolean}
|
||||
*/
|
||||
this.me = data.me;
|
||||
|
||||
/**
|
||||
* A manager of the users that have given this reaction
|
||||
* @type {ReactionUserManager}
|
||||
|
|
@ -48,12 +54,6 @@ class MessageReaction {
|
|||
*/
|
||||
this.count = data.count;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the client has given this reaction
|
||||
* @type {boolean}
|
||||
*/
|
||||
this.me = data.me;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ class Role extends Base {
|
|||
*/
|
||||
get editable() {
|
||||
if (this.managed) return false;
|
||||
const clientMember = this.guild.members.resolve(this.client.user);
|
||||
const clientMember = this.guild.member(this.client.user);
|
||||
if (!clientMember.permissions.has(Permissions.FLAGS.MANAGE_ROLES)) return false;
|
||||
return clientMember.roles.highest.comparePositionTo(this) > 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ class User extends Base {
|
|||
this.id = data.id;
|
||||
|
||||
this.system = null;
|
||||
this.locale = null;
|
||||
this.flags = null;
|
||||
|
||||
this._patch(data);
|
||||
|
|
@ -80,6 +81,14 @@ class User extends Base {
|
|||
this.system = Boolean(data.system);
|
||||
}
|
||||
|
||||
if ('locale' in data) {
|
||||
/**
|
||||
* The locale of the user's client (ISO 639-1)
|
||||
* @type {?string}
|
||||
*/
|
||||
this.locale = data.locale;
|
||||
}
|
||||
|
||||
if ('public_flags' in data) {
|
||||
/**
|
||||
* The flags for this user
|
||||
|
|
@ -278,7 +287,7 @@ class User extends Base {
|
|||
|
||||
/**
|
||||
* Fetches this user's flags.
|
||||
* @param {boolean} [force=false] Whether to skip the cache check and request the API
|
||||
* @param {boolean} [force=false] Whether to skip the cache check and request the AP
|
||||
* @returns {Promise<UserFlags>}
|
||||
*/
|
||||
async fetchFlags(force = false) {
|
||||
|
|
@ -290,7 +299,7 @@ class User extends Base {
|
|||
|
||||
/**
|
||||
* Fetches this user.
|
||||
* @param {boolean} [force=false] Whether to skip the cache check and request the API
|
||||
* @param {boolean} [force=false] Whether to skip the cache check and request the AP
|
||||
* @returns {Promise<User>}
|
||||
*/
|
||||
fetch(force = false) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
const EventEmitter = require('events');
|
||||
const { TypeError } = require('../../errors');
|
||||
const Collection = require('../../util/Collection');
|
||||
const Util = require('../../util/Util');
|
||||
|
||||
|
|
@ -75,10 +74,6 @@ class Collector extends EventEmitter {
|
|||
*/
|
||||
this._idletimeout = null;
|
||||
|
||||
if (typeof filter !== 'function') {
|
||||
throw new TypeError('INVALID_TYPE', 'filter', 'function');
|
||||
}
|
||||
|
||||
this.handleCollect = this.handleCollect.bind(this);
|
||||
this.handleDispose = this.handleDispose.bind(this);
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class TextBasedChannel {
|
|||
* @property {string|boolean} [code] Language for optional codeblock formatting to apply
|
||||
* @property {boolean|SplitOptions} [split=false] Whether or not the message should be split into multiple messages if
|
||||
* it exceeds the character limit. If an object is provided, these are the options for splitting the message
|
||||
* @property {MessageResolvable} [replyTo] The message to reply to (must be in the same channel)
|
||||
* @property {UserResolvable} [reply] User to reply to (prefixes the message with a mention, except in DMs)
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -74,7 +74,6 @@ class TextBasedChannel {
|
|||
* @property {MessageMentionTypes[]} [parse] Types of mentions to be parsed
|
||||
* @property {Snowflake[]} [users] Snowflakes of Users to be parsed as mentions
|
||||
* @property {Snowflake[]} [roles] Snowflakes of Roles to be parsed as mentions
|
||||
* @property {boolean} [repliedUser] Whether the author of the Message being replied to should be pinged
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -77,14 +77,14 @@ exports.DefaultOptions = {
|
|||
/**
|
||||
* HTTP options
|
||||
* @typedef {Object} HTTPOptions
|
||||
* @property {number} [version=8] API version to use
|
||||
* @property {number} [version=7] API version to use
|
||||
* @property {string} [api='https://discord.com/api'] Base url of the API
|
||||
* @property {string} [cdn='https://cdn.discordapp.com'] Base url of the CDN
|
||||
* @property {string} [invite='https://discord.gg'] Base url of invites
|
||||
* @property {string} [template='https://discord.new'] Base url of templates
|
||||
*/
|
||||
http: {
|
||||
version: 8,
|
||||
version: 7,
|
||||
api: 'https://discord.com/api',
|
||||
cdn: 'https://cdn.discordapp.com',
|
||||
invite: 'https://discord.gg',
|
||||
|
|
@ -282,7 +282,6 @@ exports.Events = {
|
|||
SHARD_READY: 'shardReady',
|
||||
SHARD_RESUME: 'shardResume',
|
||||
INVALIDATED: 'invalidated',
|
||||
INTERACTION_CREATE: 'interactionCreate',
|
||||
RAW: 'raw',
|
||||
};
|
||||
|
||||
|
|
@ -346,7 +345,6 @@ exports.PartialTypes = keyMirror(['USER', 'CHANNEL', 'GUILD_MEMBER', 'MESSAGE',
|
|||
* * VOICE_STATE_UPDATE
|
||||
* * VOICE_SERVER_UPDATE
|
||||
* * WEBHOOKS_UPDATE
|
||||
* * INTERACTION_CREATE
|
||||
* @typedef {string} WSEventType
|
||||
*/
|
||||
exports.WSEvents = keyMirror([
|
||||
|
|
@ -386,7 +384,6 @@ exports.WSEvents = keyMirror([
|
|||
'VOICE_STATE_UPDATE',
|
||||
'VOICE_SERVER_UPDATE',
|
||||
'WEBHOOKS_UPDATE',
|
||||
'INTERACTION_CREATE',
|
||||
]);
|
||||
|
||||
/**
|
||||
|
|
@ -406,7 +403,6 @@ exports.WSEvents = keyMirror([
|
|||
* * CHANNEL_FOLLOW_ADD
|
||||
* * GUILD_DISCOVERY_DISQUALIFIED
|
||||
* * GUILD_DISCOVERY_REQUALIFIED
|
||||
* * REPLY
|
||||
* @typedef {string} MessageType
|
||||
*/
|
||||
exports.MessageTypes = [
|
||||
|
|
@ -426,10 +422,6 @@ exports.MessageTypes = [
|
|||
null,
|
||||
'GUILD_DISCOVERY_DISQUALIFIED',
|
||||
'GUILD_DISCOVERY_REQUALIFIED',
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
'REPLY',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -679,33 +671,6 @@ exports.WebhookTypes = [
|
|||
'Channel Follower',
|
||||
];
|
||||
|
||||
exports.ApplicationCommandOptionType = {
|
||||
SUB_COMMAND: 1,
|
||||
SUB_COMMAND_GROUP: 2,
|
||||
STRING: 3,
|
||||
INTEGER: 4,
|
||||
BOOLEAN: 5,
|
||||
USER: 6,
|
||||
CHANNEL: 7,
|
||||
ROLE: 8,
|
||||
};
|
||||
Object.entries(exports.ApplicationCommandOptionType).forEach(([k, v]) => {
|
||||
exports.ApplicationCommandOptionType[v] = k;
|
||||
});
|
||||
|
||||
exports.InteractionType = {
|
||||
PING: 1,
|
||||
APPLICATION_COMMAND: 2,
|
||||
};
|
||||
|
||||
exports.InteractionResponseType = {
|
||||
PONG: 1,
|
||||
ACKNOWLEDGE: 2,
|
||||
CHANNEL_MESSAGE: 3,
|
||||
CHANNEL_MESSAGE_WITH_SOURCE: 4,
|
||||
ACKNOWLEDGE_WITH_SOURCE: 5,
|
||||
};
|
||||
|
||||
function keyMirror(arr) {
|
||||
let tmp = Object.create(null);
|
||||
for (const value of arr) tmp[value] = value;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ class MessageFlags extends BitField {}
|
|||
* * `SUPPRESS_EMBEDS`
|
||||
* * `SOURCE_MESSAGE_DELETED`
|
||||
* * `URGENT`
|
||||
* * `EPHEMERAL`
|
||||
* @type {Object}
|
||||
* @see {@link https://discord.com/developers/docs/resources/channel#message-object-message-flags}
|
||||
*/
|
||||
|
|
@ -32,7 +31,6 @@ MessageFlags.FLAGS = {
|
|||
SUPPRESS_EMBEDS: 1 << 2,
|
||||
SOURCE_MESSAGE_DELETED: 1 << 3,
|
||||
URGENT: 1 << 4,
|
||||
EPHEMERAL: 1 << 6,
|
||||
};
|
||||
|
||||
module.exports = MessageFlags;
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ client.on('message', message => {
|
|||
// Clean content and log each character
|
||||
console.log(Util.cleanContent(args.join(' '), message).split(''));
|
||||
|
||||
if (command === 'test1') message.channel.send(tests[0]);
|
||||
else if (command === 'test2') message.channel.send(tests[1]);
|
||||
else if (command === 'test3') message.channel.send(tests[2]);
|
||||
if (command === 'test1') message.reply(tests[0]);
|
||||
else if (command === 'test2') message.reply(tests[1]);
|
||||
else if (command === 'test3') message.reply(tests[2]);
|
||||
});
|
||||
|
||||
client.login(token).catch(console.error);
|
||||
|
|
|
|||
|
|
@ -116,8 +116,7 @@ client.on('message', message => {
|
|||
|
||||
if (message.content.startsWith('kick')) {
|
||||
message.guild
|
||||
.members
|
||||
.resolve(message.mentions.users.first())
|
||||
.member(message.mentions.users.first())
|
||||
.kick()
|
||||
.then(member => {
|
||||
console.log(member);
|
||||
|
|
@ -135,7 +134,7 @@ client.on('message', message => {
|
|||
}
|
||||
message.channel.send('last one...').then(m => {
|
||||
const diff = Date.now() - start;
|
||||
m.channel.send(`Each message took ${diff / 21}ms to send`);
|
||||
m.reply(`Each message took ${diff / 21}ms to send`);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -206,7 +205,7 @@ client.on('message', msg => {
|
|||
.join()
|
||||
.then(conn => {
|
||||
con = conn;
|
||||
msg.channel.send('done');
|
||||
msg.reply('done');
|
||||
const s = ytdl(song, { filter: 'audioonly' }, { passes: 3 });
|
||||
s.on('error', e => console.log(`e w stream 2 ${e}`));
|
||||
disp = conn.playStream(s);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ const tests = [
|
|||
|
||||
m => m.channel.send(fill('x'), { split: true }),
|
||||
m => m.channel.send(fill('1'), { code: 'js', split: true }),
|
||||
m => m.channel.send(fill('x'), { reply: m.author, code: 'js', split: true }),
|
||||
m => m.channel.send(fill('xyz '), { split: { char: ' ' } }),
|
||||
|
||||
m => m.channel.send('x', { embed: { description: 'a' } }),
|
||||
|
|
@ -98,6 +99,7 @@ const tests = [
|
|||
async m => m.channel.send({ files: [await read(fileA)] }),
|
||||
async m =>
|
||||
m.channel.send(fill('x'), {
|
||||
reply: m.author,
|
||||
code: 'js',
|
||||
split: true,
|
||||
embed: embed().setImage('attachment://zero.png'),
|
||||
|
|
@ -109,6 +111,7 @@ const tests = [
|
|||
m => m.channel.send({ files: [{ attachment: readStream(fileA) }] }),
|
||||
async m =>
|
||||
m.channel.send(fill('xyz '), {
|
||||
reply: m.author,
|
||||
code: 'js',
|
||||
split: { char: ' ', prepend: 'hello! ', append: '!!!' },
|
||||
embed: embed().setImage('attachment://zero.png'),
|
||||
|
|
|
|||
|
|
@ -31,13 +31,16 @@ const commands = {
|
|||
}
|
||||
message.channel.send(res, { code: 'js' });
|
||||
},
|
||||
ping: message => message.channel.send('pong'),
|
||||
ping: message => message.reply('pong'),
|
||||
};
|
||||
|
||||
client.on('message', message => {
|
||||
if (!message.content.startsWith(prefix) || message.author.bot) return;
|
||||
|
||||
message.content = message.content.replace(prefix, '').trim().split(' ');
|
||||
message.content = message.content
|
||||
.replace(prefix, '')
|
||||
.trim()
|
||||
.split(' ');
|
||||
const command = message.content.shift();
|
||||
message.content = message.content.join(' ');
|
||||
|
||||
|
|
|
|||
|
|
@ -43,15 +43,20 @@ client.on('message', m => {
|
|||
conn.receiver.createStream(m.author, true).on('data', b => console.log(b.toString()));
|
||||
conn.player.on('error', (...e) => console.log('player', ...e));
|
||||
if (!connections.has(m.guild.id)) connections.set(m.guild.id, { conn, queue: [] });
|
||||
m.channel.send('ok!');
|
||||
m.reply('ok!');
|
||||
conn.play(ytdl('https://www.youtube.com/watch?v=_XXOSf0s2nk', { filter: 'audioonly' }, { passes: 3 }));
|
||||
});
|
||||
} else {
|
||||
m.channel.send('Specify a voice channel!');
|
||||
m.reply('Specify a voice channel!');
|
||||
}
|
||||
} else if (m.content.startsWith('#eval') && m.author.id === '66564597481480192') {
|
||||
try {
|
||||
const com = eval(m.content.split(' ').slice(1).join(' '));
|
||||
const com = eval(
|
||||
m.content
|
||||
.split(' ')
|
||||
.slice(1)
|
||||
.join(' '),
|
||||
);
|
||||
m.channel.send(com, { code: true });
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ const tests = [
|
|||
|
||||
(m, hook) => hook.send(fill('x'), { split: true }),
|
||||
(m, hook) => hook.send(fill('1'), { code: 'js', split: true }),
|
||||
(m, hook) => hook.send(fill('x'), { reply: m.author, code: 'js', split: true }),
|
||||
(m, hook) => hook.send(fill('xyz '), { split: { char: ' ' } }),
|
||||
|
||||
(m, hook) => hook.send({ embeds: [{ description: 'a' }] }),
|
||||
|
|
@ -95,6 +96,7 @@ const tests = [
|
|||
async (m, hook) => hook.send({ files: [await read(fileA)] }),
|
||||
async (m, hook) =>
|
||||
hook.send(fill('x'), {
|
||||
reply: m.author,
|
||||
code: 'js',
|
||||
split: true,
|
||||
embeds: [embed().setImage('attachment://zero.png')],
|
||||
|
|
@ -106,6 +108,7 @@ const tests = [
|
|||
(m, hook) => hook.send({ files: [{ attachment: readStream(fileA) }] }),
|
||||
async (m, hook) =>
|
||||
hook.send(fill('xyz '), {
|
||||
reply: m.author,
|
||||
code: 'js',
|
||||
split: { char: ' ', prepend: 'hello! ', append: '!!!' },
|
||||
embeds: [embed().setImage('attachment://zero.png')],
|
||||
|
|
|
|||
39
typings/index.d.ts
vendored
39
typings/index.d.ts
vendored
|
|
@ -199,7 +199,7 @@ declare module 'discord.js' {
|
|||
private _validateOptions(options?: ClientOptions): void;
|
||||
|
||||
public channels: ChannelManager;
|
||||
public readonly emojis: BaseGuildEmojiManager;
|
||||
public readonly emojis: GuildEmojiManager;
|
||||
public guilds: GuildManager;
|
||||
public readyAt: Date | null;
|
||||
public readonly readyTimestamp: number | null;
|
||||
|
|
@ -658,6 +658,7 @@ declare module 'discord.js' {
|
|||
public fetchWidget(): Promise<GuildWidget>;
|
||||
public iconURL(options?: ImageURLOptions & { dynamic?: boolean }): string | null;
|
||||
public leave(): Promise<Guild>;
|
||||
public member(user: UserResolvable): GuildMember | null;
|
||||
public setAFKChannel(afkChannel: ChannelResolvable | null, reason?: string): Promise<Guild>;
|
||||
public setAFKTimeout(afkTimeout: number, reason?: string): Promise<Guild>;
|
||||
public setBanner(banner: Base64Resolvable | null, reason?: string): Promise<Guild>;
|
||||
|
|
@ -975,7 +976,7 @@ declare module 'discord.js' {
|
|||
public id: Snowflake;
|
||||
public readonly member: GuildMember | null;
|
||||
public mentions: MessageMentions;
|
||||
public nonce: string | number | null;
|
||||
public nonce: string | null;
|
||||
public readonly partial: false;
|
||||
public readonly pinnable: boolean;
|
||||
public pinned: boolean;
|
||||
|
|
@ -987,7 +988,6 @@ declare module 'discord.js' {
|
|||
public webhookID: Snowflake | null;
|
||||
public flags: Readonly<MessageFlags>;
|
||||
public reference: MessageReference | null;
|
||||
public readonly referencedMessage: Message | null;
|
||||
public awaitReactions(
|
||||
filter: CollectorFilter,
|
||||
options?: AwaitReactionsOptions,
|
||||
|
|
@ -1529,6 +1529,7 @@ declare module 'discord.js' {
|
|||
public flags: Readonly<UserFlags> | null;
|
||||
public id: Snowflake;
|
||||
public lastMessageID: Snowflake | null;
|
||||
public locale: string | null;
|
||||
public readonly partial: false;
|
||||
public readonly presence: Presence;
|
||||
public system: boolean | null;
|
||||
|
|
@ -1871,6 +1872,11 @@ declare module 'discord.js' {
|
|||
|
||||
//#region Managers
|
||||
|
||||
export class ChannelManager extends BaseManager<Snowflake, Channel, ChannelResolvable> {
|
||||
constructor(client: Client, iterable: Iterable<any>);
|
||||
public fetch(id: Snowflake, cache?: boolean, force?: boolean): Promise<Channel>;
|
||||
}
|
||||
|
||||
export abstract class BaseManager<K, Holds, R> {
|
||||
constructor(client: Client, iterable: Iterable<any>, holds: Constructable<Holds>, cacheType: Collection<K, Holds>);
|
||||
public holds: Constructable<Holds>;
|
||||
|
|
@ -1883,16 +1889,6 @@ declare module 'discord.js' {
|
|||
public valueOf(): Collection<K, Holds>;
|
||||
}
|
||||
|
||||
export class BaseGuildEmojiManager extends BaseManager<Snowflake, GuildEmoji, EmojiResolvable> {
|
||||
constructor(client: Client, iterable?: Iterable<any>);
|
||||
public resolveIdentifier(emoji: EmojiIdentifierResolvable): string | null;
|
||||
}
|
||||
|
||||
export class ChannelManager extends BaseManager<Snowflake, Channel, ChannelResolvable> {
|
||||
constructor(client: Client, iterable: Iterable<any>);
|
||||
public fetch(id: Snowflake, cache?: boolean, force?: boolean): Promise<Channel>;
|
||||
}
|
||||
|
||||
export class GuildChannelManager extends BaseManager<Snowflake, GuildChannel, GuildChannelResolvable> {
|
||||
constructor(guild: Guild, iterable?: Iterable<any>);
|
||||
public guild: Guild;
|
||||
|
|
@ -1905,7 +1901,7 @@ declare module 'discord.js' {
|
|||
): Promise<TextChannel | VoiceChannel | CategoryChannel>;
|
||||
}
|
||||
|
||||
export class GuildEmojiManager extends BaseGuildEmojiManager {
|
||||
export class GuildEmojiManager extends BaseManager<Snowflake, GuildEmoji, EmojiResolvable> {
|
||||
constructor(guild: Guild, iterable?: Iterable<any>);
|
||||
public guild: Guild;
|
||||
public create(
|
||||
|
|
@ -1913,6 +1909,7 @@ declare module 'discord.js' {
|
|||
name: string,
|
||||
options?: GuildEmojiCreateOptions,
|
||||
): Promise<GuildEmoji>;
|
||||
public resolveIdentifier(emoji: EmojiIdentifierResolvable): string | null;
|
||||
}
|
||||
|
||||
export class GuildEmojiRoleManager {
|
||||
|
|
@ -2016,7 +2013,7 @@ declare module 'discord.js' {
|
|||
|
||||
public create(options?: { data?: RoleData; reason?: string }): Promise<Role>;
|
||||
public fetch(id: Snowflake, cache?: boolean, force?: boolean): Promise<Role | null>;
|
||||
public fetch(id?: Snowflake, cache?: boolean, force?: boolean): Promise<Collection<Snowflake, Role>>;
|
||||
public fetch(id?: Snowflake, cache?: boolean, force?: boolean): Promise<this>;
|
||||
}
|
||||
|
||||
export class UserManager extends BaseManager<Snowflake, User, UserResolvable> {
|
||||
|
|
@ -2827,14 +2824,13 @@ declare module 'discord.js' {
|
|||
parse?: MessageMentionTypes[];
|
||||
roles?: Snowflake[];
|
||||
users?: Snowflake[];
|
||||
repliedUser?: boolean;
|
||||
}
|
||||
|
||||
type MessageMentionTypes = 'roles' | 'users' | 'everyone';
|
||||
|
||||
interface MessageOptions {
|
||||
tts?: boolean;
|
||||
nonce?: string | number;
|
||||
nonce?: string;
|
||||
content?: StringResolvable;
|
||||
embed?: MessageEmbed | MessageEmbedOptions;
|
||||
disableMentions?: 'none' | 'all' | 'everyone';
|
||||
|
|
@ -2842,7 +2838,7 @@ declare module 'discord.js' {
|
|||
files?: (FileOptions | BufferResolvable | Stream | MessageAttachment)[];
|
||||
code?: string | boolean;
|
||||
split?: boolean | SplitOptions;
|
||||
replyTo?: MessageResolvable;
|
||||
reply?: UserResolvable;
|
||||
}
|
||||
|
||||
type MessageReactionResolvable = MessageReaction | Snowflake;
|
||||
|
|
@ -2872,8 +2868,7 @@ declare module 'discord.js' {
|
|||
| 'USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3'
|
||||
| 'CHANNEL_FOLLOW_ADD'
|
||||
| 'GUILD_DISCOVERY_DISQUALIFIED'
|
||||
| 'GUILD_DISCOVERY_REQUALIFIED'
|
||||
| 'REPLY';
|
||||
| 'GUILD_DISCOVERY_REQUALIFIED';
|
||||
|
||||
interface OverwriteData {
|
||||
allow?: PermissionResolvable;
|
||||
|
|
@ -3060,9 +3055,11 @@ declare module 'discord.js' {
|
|||
|
||||
type PartialTypes = 'USER' | 'CHANNEL' | 'GUILD_MEMBER' | 'MESSAGE' | 'REACTION';
|
||||
|
||||
interface PartialUser extends Omit<Partialize<User, 'bot' | 'flags' | 'system' | 'tag' | 'username'>, 'deleted'> {
|
||||
interface PartialUser
|
||||
extends Omit<Partialize<User, 'bot' | 'flags' | 'locale' | 'system' | 'tag' | 'username'>, 'deleted'> {
|
||||
bot: User['bot'];
|
||||
flags: User['flags'];
|
||||
locale: User['locale'];
|
||||
system: User['system'];
|
||||
readonly tag: null;
|
||||
username: null;
|
||||
|
|
|
|||
Loading…
Reference in a new issue