Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-10 08:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'indev' of https://github.com/hydrabolt/discord.js into indev

Browse Source
This commit is contained in:
Amish Shah
2016-10-26 14:19:39 +01:00
parent 0c4a4023ce 05f73c3edf
commit 968883ec35
11 changed files with 176 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/structures/Message.js
View File

@@ -236,8 +236,7 @@ class Message {
*/
get cleanContent() {
return this.content
.replace(/@everyone/g, '@\u200Beveryone')
.replace(/@here/g, '@\u200Bhere')
.replace(/@(everyone|here)/g, '@\u200b$1')
.replace(/<@!?[0-9]+>/g, (input) => {
const id = input.replace(/<|!|>|@/g, '');
if (this.channel.type === 'dm' || this.channel.type === 'group') {
@@ -396,7 +395,7 @@ class Message {
content = `${prepend}${content}`;
if (options.split) {
if (typeof options.split !== 'object' && typeof options.split !== 'boolean') options.split = {};
if (typeof options.split !== 'object') options.split = {};
if (!options.split.prepend) options.split.prepend = prepend;
}