Add bad apple

[furrybot-discord.git] / common.js

diff --git a/common.js b/common.js
index 17563879c29a97933bf503aca600e09644598022..5bb4cff5badbfe47f3bb2a39ad2c7278c0d722de 100644 (file)
--- a/common.js
+++ b/common.js
@@ -2,14 +2,14 @@ const fs = require("fs")
 const google_images = require("free-google-images")
 
 const getPing = module.exports.getPing = (msg, ping, allowSelf) => {
-       if (ping && ping.startsWith("<@!") && ping.endsWith(">")) {
-               const id = ping.slice("<@!".length, -">".length)
+       if (ping && ping.startsWith("<\\@!") && ping.endsWith(">")) {
+               const id = ping.slice("<\\@!".length, -">".length)
 
                if (!allowSelf && id == msg.author.id) {
                        msg.reply("Please mention a user other than yourself")
                        return
                }
-               
+
                if (msg.guild.members.cache.get(id))
                        return id
        }
@@ -19,24 +19,27 @@ const getPing = module.exports.getPing = (msg, ping, allowSelf) => {
 
 module.exports.uppercase = str => str.slice(0, 1).toUpperCase() + str.slice(1)
 
-module.exports.requestCommand = (help, onRequest, onAccept) => new Object({
+module.exports.requestCommand = (help, info, onRequest, onAccept) => new Object({
        params: "<player>",
-       help: "Request to " + help + " another user",
+       help: "Request to " + help,
        func: (msg, [targetPing], {requests}) => {
                const target = getPing(msg, targetPing, false)
 
                if (target) {
                        const err = onRequest(msg, target)
 
-                       if (err)
+                       if (err) {
                                msg.reply(err)
-                       else
+                       } else {
+                               msg.channel.send(`<@!${target}>: <@!${msg.author.id}> ${info}. Type !accept to accept or !deny to deny.`)
+
                                requests[target] = {
                                        origin: msg.author.id,
                                        func: onAccept,
                                }
+                       }
                }
-                       
+
        }
 })
 
@@ -101,9 +104,3 @@ module.exports.listChangeCommand = (action, list, status) => new Object({
                }
        }
 })
-
-module.exports.stripPings = str => str
-       .replace(/<@!/g, "<@​!")
-       .replace(/<@&/g, "<@​&")
-       .replace(/@here/g, "@​here")
-       .replace(/@everyone/g, "@​everyone")