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

reply no longer mentions in PM

Browse Source 
for much more fluent conversations in PM
This commit is contained in:
Amish Shah
2015-12-09 18:56:20 +00:00
parent d9b9d1d0a3
commit a789b1f396
3 changed files with 160 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Client/Client.js
View File

@@ -18,6 +18,10 @@ var _events = require("events");
var _events2 = _interopRequireDefault(_events); var _events2 = _interopRequireDefault(_events);
var _StructuresPMChannel = require("../Structures/PMChannel");
var _StructuresPMChannel2 = _interopRequireDefault(_StructuresPMChannel);
function errCB(callback) { function errCB(callback) {
return function (error) { return function (error) {
callback(error); callback(error);
@@ -117,7 +121,9 @@ var Client = (function (_EventEmitter) {
var msg = this.internal.resolver.resolveMessage(where); var msg = this.internal.resolver.resolveMessage(where);
if (msg) { if (msg) {
content = msg.author + ", " + content; if (!(msg.channel instanceof _StructuresPMChannel2["default"])) {
content = msg.author + ", " + content;
}
return this.internal.sendMessage(msg, content, options).then(function (m) { return this.internal.sendMessage(msg, content, options).then(function (m) {
callback(null, m); callback(null, m);
return m; return m;

301
src/Client/Client.js
View File

@@ -2,6 +2,7 @@
import InternalClient from "./InternalClient"; import InternalClient from "./InternalClient";
import EventEmitter from "events"; import EventEmitter from "events";
import PMChannel from "../Structures/PMChannel";
function errCB(callback) { function errCB(callback) {
return error => { return error => {
@@ -56,18 +57,18 @@ export default class Client extends EventEmitter {
} }
// def login // def login
login(email, password, callback = (/*err, token*/) => {}) { login(email, password, callback = (/*err, token*/) => { }) {
return this.internal.login(email, password) return this.internal.login(email, password)
.then(token => { .then(token => {
callback(null, token); callback(null, token);
return token; return token;
}, errCB(callback)); }, errCB(callback));
} }
// def logout // def logout
logout(callback = (/*err*/) => {}) { logout(callback = (/*err*/) => { }) {
return this.internal.logout() return this.internal.logout()
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def destroy // def destroy
@@ -79,29 +80,29 @@ export default class Client extends EventEmitter {
} }
// def sendMessage // def sendMessage
sendMessage(where, content, options = {}, callback = (/*e, m*/) => {}) { sendMessage(where, content, options = {}, callback = (/*e, m*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.sendMessage(where, content, options) return this.internal.sendMessage(where, content, options)
.then(m => { .then(m => {
callback(null, m); callback(null, m);
return m; return m;
}, errCB(callback)); }, errCB(callback));
} }
// def sendTTSMessage // def sendTTSMessage
sendTTSMessage(where, content, callback = (/*e, m*/) => {}) { sendTTSMessage(where, content, callback = (/*e, m*/) => { }) {
return this.sendMessage(where, content, { tts: true }) return this.sendMessage(where, content, { tts: true })
.then(m => { .then(m => {
callback(null, m); callback(null, m);
return m; return m;
}, errCB(callback)); }, errCB(callback));
} }
// def reply // def reply
reply(where, content, options = {}, callback = (/*e, m*/) => {}) { reply(where, content, options = {}, callback = (/*e, m*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
@@ -110,12 +111,14 @@ export default class Client extends EventEmitter {
var msg = this.internal.resolver.resolveMessage(where); var msg = this.internal.resolver.resolveMessage(where);
if (msg) { if (msg) {
content = msg.author + ", " + content; if (!(msg.channel instanceof PMChannel)) {
content = msg.author + ", " + content;
}
return this.internal.sendMessage(msg, content, options) return this.internal.sendMessage(msg, content, options)
.then(m => { .then(m => {
callback(null, m); callback(null, m);
return m; return m;
}, errCB(callback)); }, errCB(callback));
} }
var err = new Error("Destination not resolvable to a message!"); var err = new Error("Destination not resolvable to a message!");
callback(err); callback(err);
@@ -123,219 +126,219 @@ export default class Client extends EventEmitter {
} }
// def replyTTS // def replyTTS
replyTTS(where, content, callback = (/**/) => {}) { replyTTS(where, content, callback = (/**/) => { }) {
return this.reply(where, content, { tts: true }) return this.reply(where, content, { tts: true })
.then(m => { .then(m => {
callback(null, m); callback(null, m);
return m; return m;
}, errCB(callback)); }, errCB(callback));
} }
// def deleteMessage // def deleteMessage
deleteMessage(msg, options = {}, callback = (/*e*/) => {}) { deleteMessage(msg, options = {}, callback = (/*e*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.deleteMessage(msg, options) return this.internal.deleteMessage(msg, options)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def updateMessage //def updateMessage
updateMessage(msg, content, options = {}, callback = (/*err, msg*/) => {}) { updateMessage(msg, content, options = {}, callback = (/*err, msg*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.updateMessage(msg, content, options) return this.internal.updateMessage(msg, content, options)
.then(msg => { .then(msg => {
callback(null, msg); callback(null, msg);
return msg; return msg;
}, errCB(callback)); }, errCB(callback));
} }
// def getChannelLogs // def getChannelLogs
getChannelLogs(where, limit = 500, options = {}, callback = (/*err, logs*/) => {}) { getChannelLogs(where, limit = 500, options = {}, callback = (/*err, logs*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.getChannelLogs(where, limit, options) return this.internal.getChannelLogs(where, limit, options)
.then(logs => { .then(logs => {
callback(null, logs); callback(null, logs);
return logs; return logs;
}, errCB(callback)); }, errCB(callback));
} }
// def getBans // def getBans
getBans(where, callback = (/*err, bans*/) => {}) { getBans(where, callback = (/*err, bans*/) => { }) {
return this.internal.getBans(where) return this.internal.getBans(where)
.then(bans => { .then(bans => {
callback(null, bans); callback(null, bans);
return bans; return bans;
}, errCB(callback)); }, errCB(callback));
} }
// def sendFile // def sendFile
sendFile(where, attachment, name = "image.png", callback = (/*err, m*/) => {}) { sendFile(where, attachment, name = "image.png", callback = (/*err, m*/) => { }) {
return this.internal.sendFile(where, attachment, name) return this.internal.sendFile(where, attachment, name)
.then(m => { .then(m => {
callback(null, m); callback(null, m);
return m; return m;
}, errCB(callback)); }, errCB(callback));
} }
// def joinServer // def joinServer
joinServer(invite, callback = (/*err, srv*/) => {}) { joinServer(invite, callback = (/*err, srv*/) => { }) {
return this.internal.joinServer(invite) return this.internal.joinServer(invite)
.then(srv => { .then(srv => {
callback(null, srv); callback(null, srv);
return srv; return srv;
}, errCB(callback)); }, errCB(callback));
} }
// def createServer // def createServer
createServer(name, region = "london", callback = (/*err, srv*/) => {}) { createServer(name, region = "london", callback = (/*err, srv*/) => { }) {
return this.internal.createServer(name, region) return this.internal.createServer(name, region)
.then(srv => { .then(srv => {
callback(null, srv); callback(null, srv);
return srv; return srv;
}, errCB(callback)); }, errCB(callback));
} }
// def leaveServer // def leaveServer
leaveServer(server, callback = (/*err*/) => {}) { leaveServer(server, callback = (/*err*/) => { }) {
return this.internal.leaveServer(server) return this.internal.leaveServer(server)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def deleteServer // def deleteServer
deleteServer(server, callback = (/*err*/) => {}) { deleteServer(server, callback = (/*err*/) => { }) {
return this.internal.leaveServer(server) return this.internal.leaveServer(server)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def createChannel // def createChannel
createChannel(server, name, type = "text", callback = (/*err, channel*/) => {}) { createChannel(server, name, type = "text", callback = (/*err, channel*/) => { }) {
if (typeof type === "function") { if (typeof type === "function") {
// options is the callback // options is the callback
callback = type; callback = type;
} }
return this.internal.createChannel(server, name, type) return this.internal.createChannel(server, name, type)
.then(channel => { .then(channel => {
callback(channel); callback(channel);
return channel; return channel;
}, errCB(callback)); }, errCB(callback));
} }
// def deleteChannel // def deleteChannel
deleteChannel(channel, callback = (/*err*/) => {}) { deleteChannel(channel, callback = (/*err*/) => { }) {
return this.internal.deleteChannel(channel) return this.internal.deleteChannel(channel)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def banMember //def banMember
banMember(user, server, length = 1, callback = (/*err*/) => {}) { banMember(user, server, length = 1, callback = (/*err*/) => { }) {
if (typeof length === "function") { if (typeof length === "function") {
// length is the callback // length is the callback
callback = length; callback = length;
} }
return this.internal.banMember(user, server, length) return this.internal.banMember(user, server, length)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def unbanMember //def unbanMember
unbanMember(user, server, callback = (/*err*/) => {}) { unbanMember(user, server, callback = (/*err*/) => { }) {
return this.internal.unbanMember(user, server) return this.internal.unbanMember(user, server)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def kickMember //def kickMember
kickMember(user, server, callback = (/*err*/) => {}) { kickMember(user, server, callback = (/*err*/) => { }) {
return this.internal.kickMember(user, server) return this.internal.kickMember(user, server)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def createRole //def createRole
createRole(server, data = null, callback = (/*err, res*/) => {}) { createRole(server, data = null, callback = (/*err, res*/) => { }) {
if (typeof data === "function") { if (typeof data === "function") {
// data is the callback // data is the callback
callback = data; callback = data;
} }
return this.internal.createRole(server, data) return this.internal.createRole(server, data)
.then(role => { .then(role => {
callback(null, role); callback(null, role);
return role; return role;
}, errCB(callback)); }, errCB(callback));
} }
//def updateRole //def updateRole
updateRole(role, data = null, callback = (/*err, res*/) => {}) { updateRole(role, data = null, callback = (/*err, res*/) => { }) {
if (typeof data === "function") { if (typeof data === "function") {
// data is the callback // data is the callback
callback = data; callback = data;
} }
return this.internal.updateRole(role, data) return this.internal.updateRole(role, data)
.then(role => { .then(role => {
callback(null, role); callback(null, role);
return role; return role;
}, errCB(callback)); }, errCB(callback));
} }
//def deleteRole //def deleteRole
deleteRole(role, callback = (/*err*/) => {}) { deleteRole(role, callback = (/*err*/) => { }) {
return this.internal.deleteRole(role) return this.internal.deleteRole(role)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def addMemberToRole //def addMemberToRole
addMemberToRole(member, role, callback = (/*err*/) => {}) { addMemberToRole(member, role, callback = (/*err*/) => { }) {
return this.internal.addMemberToRole(member, role) return this.internal.addMemberToRole(member, role)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def addUserToRole // def addUserToRole
addUserToRole(member, role, callback = (/*err*/) => {}) { addUserToRole(member, role, callback = (/*err*/) => { }) {
return this.addMemberToRole(member, role, callback); return this.addMemberToRole(member, role, callback);
} }
// def removeMemberFromRole // def removeMemberFromRole
removeMemberFromRole(member, role, callback = (/*err*/) => {}) { removeMemberFromRole(member, role, callback = (/*err*/) => { }) {
return this.internal.removeMemberFromRole(member, role) return this.internal.removeMemberFromRole(member, role)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def removeUserFromRole // def removeUserFromRole
removeUserFromRole(member, role, callback = (/*err*/) => {}) { removeUserFromRole(member, role, callback = (/*err*/) => { }) {
return this.removeMemberFromRole(member, role, callback); return this.removeMemberFromRole(member, role, callback);
} }
//def addMemberToRole //def addMemberToRole
addMemberToRoles(member, roles, callback = (/*err*/) => {}) { addMemberToRoles(member, roles, callback = (/*err*/) => { }) {
return this.internal.addMemberToRoles(member, roles) return this.internal.addMemberToRoles(member, roles)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def addUserToRole // def addUserToRole
addUserToRoles(member, roles, callback = (/*err*/) => {}) { addUserToRoles(member, roles, callback = (/*err*/) => { }) {
return this.addMemberToRoles(member, roles, callback); return this.addMemberToRoles(member, roles, callback);
} }
// def removeMemberFromRole // def removeMemberFromRole
removeMemberFromRoles(member, roles, callback = (/*err*/) => {}) { removeMemberFromRoles(member, roles, callback = (/*err*/) => { }) {
return this.internal.removeMemberFromRoles(member, roles) return this.internal.removeMemberFromRoles(member, roles)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def removeUserFromRole // def removeUserFromRole
removeUserFromRoles(member, roles, callback = (/*err*/) => {}) { removeUserFromRoles(member, roles, callback = (/*err*/) => { }) {
return this.removeMemberFromRoles(member, roles, callback); return this.removeMemberFromRoles(member, roles, callback);
} }
// def createInvite // def createInvite
createInvite(chanServ, options, callback = (/*err, invite*/) => {}) { createInvite(chanServ, options, callback = (/*err, invite*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// length is the callback // length is the callback
@@ -343,25 +346,25 @@ export default class Client extends EventEmitter {
} }
return this.internal.createInvite(chanServ, options) return this.internal.createInvite(chanServ, options)
.then(invite => { .then(invite => {
callback(null, invite); callback(null, invite);
}, errCB(callback)); }, errCB(callback));
} }
// def deleteInvite // def deleteInvite
deleteInvite(invite, callback = (/*err*/) => {}) { deleteInvite(invite, callback = (/*err*/) => { }) {
return this.internal.deleteInvite(invite) return this.internal.deleteInvite(invite)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def overwritePermissions // def overwritePermissions
overwritePermissions(channel, role, options = {}, callback = (/*err*/) => {}) { overwritePermissions(channel, role, options = {}, callback = (/*err*/) => { }) {
return this.internal.overwritePermissions(channel, role, options) return this.internal.overwritePermissions(channel, role, options)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def setStatus //def setStatus
setStatus(idleStatus, gameID, callback = (/*err*/) => {}) { setStatus(idleStatus, gameID, callback = (/*err*/) => { }) {
if (typeof gameID === "function") { if (typeof gameID === "function") {
// gameID is the callback // gameID is the callback
@@ -372,92 +375,92 @@ export default class Client extends EventEmitter {
} }
return this.internal.setStatus(idleStatus, gameID) return this.internal.setStatus(idleStatus, gameID)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def sendTyping //def sendTyping
sendTyping(channel, callback = (/*err*/) => {}) { sendTyping(channel, callback = (/*err*/) => { }) {
return this.internal.sendTyping(channel) return this.internal.sendTyping(channel)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def setTopic // def setTopic
setChannelTopic(channel, topic, callback = (/*err*/) => {}) { setChannelTopic(channel, topic, callback = (/*err*/) => { }) {
return this.internal.setChannelTopic(channel, topic) return this.internal.setChannelTopic(channel, topic)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def setChannelName //def setChannelName
setChannelName(channel, name, callback = (/*err*/) => {}) { setChannelName(channel, name, callback = (/*err*/) => { }) {
return this.internal.setChannelName(channel, name) return this.internal.setChannelName(channel, name)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def setChannelNameAndTopic //def setChannelNameAndTopic
setChannelNameAndTopic(channel, name, topic, callback = (/*err*/) => {}) { setChannelNameAndTopic(channel, name, topic, callback = (/*err*/) => { }) {
return this.internal.setChannelNameAndTopic(channel, name, topic) return this.internal.setChannelNameAndTopic(channel, name, topic)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def setChannelPosition //def setChannelPosition
setChannelPosition(channel, position, callback = (/*err*/) => {}) { setChannelPosition(channel, position, callback = (/*err*/) => { }) {
return this.internal.setChannelPosition(channel, position) return this.internal.setChannelPosition(channel, position)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def updateChannel //def updateChannel
updateChannel(channel, data, callback = (/*err*/) => {}) { updateChannel(channel, data, callback = (/*err*/) => { }) {
return this.internal.updateChannel(channel, data) return this.internal.updateChannel(channel, data)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def startTyping //def startTyping
startTyping(channel, callback = (/*err*/) => {}) { startTyping(channel, callback = (/*err*/) => { }) {
return this.internal.startTyping(channel) return this.internal.startTyping(channel)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def stopTyping //def stopTyping
stopTyping(channel, callback = (/*err*/) => {}) { stopTyping(channel, callback = (/*err*/) => { }) {
return this.internal.stopTyping(channel) return this.internal.stopTyping(channel)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def updateDetails //def updateDetails
updateDetails(details, callback = (/*err*/) => {}) { updateDetails(details, callback = (/*err*/) => { }) {
return this.internal.updateDetails(details) return this.internal.updateDetails(details)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def setUsername //def setUsername
setUsername(name, callback = (/*err*/) => {}) { setUsername(name, callback = (/*err*/) => { }) {
return this.internal.setUsername(name) return this.internal.setUsername(name)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def setAvatar //def setAvatar
setAvatar(avatar, callback = (/*err*/) => {}) { setAvatar(avatar, callback = (/*err*/) => { }) {
return this.internal.setAvatar(avatar) return this.internal.setAvatar(avatar)
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
//def joinVoiceChannel //def joinVoiceChannel
joinVoiceChannel(channel, callback = (/*err*/) => {}) { joinVoiceChannel(channel, callback = (/*err*/) => { }) {
return this.internal.joinVoiceChannel(channel) return this.internal.joinVoiceChannel(channel)
.then(chan => { .then(chan => {
callback(null, chan); callback(null, chan);
return chan; return chan;
}, errCB(callback)); }, errCB(callback));
} }
// def leaveVoiceChannel // def leaveVoiceChannel
leaveVoiceChannel(callback = (/*err*/) => {}) { leaveVoiceChannel(callback = (/*err*/) => { }) {
return this.internal.leaveVoiceChannel() return this.internal.leaveVoiceChannel()
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
// def awaitResponse // def awaitResponse
awaitResponse(msg, toSend = null, options = null, callback = (/*e, newMsg*/) => {}) { awaitResponse(msg, toSend = null, options = null, callback = (/*e, newMsg*/) => { }) {
var ret; var ret;
@@ -488,20 +491,20 @@ export default class Client extends EventEmitter {
} }
// (msg) promise // (msg) promise
return ret.then(() => this.internal.awaitResponse(msg)) return ret.then(() => this.internal.awaitResponse(msg))
.then(newMsg => { .then(newMsg => {
callback(null, newMsg); callback(null, newMsg);
return newMsg; return newMsg;
}, errCB(callback)); }, errCB(callback));
} }
setStatusIdle(callback = (/*err*/) => {}) { setStatusIdle(callback = (/*err*/) => { }) {
return this.internal.setStatus("idle") return this.internal.setStatus("idle")
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
setStatusOnline(callback = (/*err*/) => {}) { setStatusOnline(callback = (/*err*/) => { }) {
return this.internal.setStatus("online") return this.internal.setStatus("online")
.then(callback, errCB(callback)); .then(callback, errCB(callback));
} }
setStatusActive(callback) { setStatusActive(callback) {

2
test/msgbot.js
View File

@@ -42,7 +42,7 @@ client.on("message", msg => {
} }
if (msg.content === "$$$") { if (msg.content === "$$$") {
client.sendMessage(msg.sender, "hi!"); client.reply(msg, "hi!");
} }
}); });