From b8bc1c28b02526e7e1edfc99e4f2e4f4fae7f4f7 Mon Sep 17 00:00:00 2001
From: Flummi <flummi@f0ck.space>
Date: Sun, 17 Dec 2017 13:10:05 +0100
Subject: [PATCH] fixed waifu/husbando for tg

---
 src/inc/trigger/useless_nxy.mjs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/inc/trigger/useless_nxy.mjs b/src/inc/trigger/useless_nxy.mjs
index f6be60c..eef0d45 100644
--- a/src/inc/trigger/useless_nxy.mjs
+++ b/src/inc/trigger/useless_nxy.mjs
@@ -179,18 +179,21 @@ export default bot => {
   bot._trigger.set("waifu_husbando", new bot.trigger({
     call: /^(\.|\/)(waifu|husbando)/i,
     f: e => {
-      let nick = e.args[0] || e.user.nick;
+      let nick = e.args[0] || (e.type === "tg"?e.user.username || e.user.nick:e.user.nick)
       let mode = e.cmd;
+      nick = nick.split("@").join("");
 
       if(e.args.length > 0 && e.args[0].charAt(0) === "=") {
         let tmp = e.args[0].slice(1);
-        sql.any(`insert into nxy_users (nick, ${mode}) values (lower($1), $2) on conflict (nick) do update set ${mode} = excluded.${mode}`, [e.user.nick, tmp])
+        sql.any(
+          `insert into nxy_users (nick, ${mode}) values (lower($1), $2) on conflict (nick) do update set ${mode} = excluded.${mode}`, [
+            (e.type === "tg"?e.user.username || e.user.nick:e.user.nick),
+            tmp
+          ])
           .then(rows => {
             e.reply(`${mode.charAt(0).toUpperCase()+mode.slice(1)} set to: [b]${tmp}[/b]`)
           })
-          .catch(err => {
-            console.log(err);
-          });
+          .catch(err => console.log(err));
       }
       else {
         sql.any(`select ${mode} from nxy_users where lower(nick) = lower($1) limit 1`, [nick])
@@ -199,9 +202,7 @@ export default bot => {
               return e.reply(`[b]${mode.charAt(0).toUpperCase() + mode.slice(1)}[/b]: none`);
             e.reply(`${mode.charAt(0).toUpperCase() + mode.slice(1)}: [b]${rows[0][mode]}[/b]`);
           })
-          .catch(err => {
-            console.log(err);
-          });
+          .catch(err => console.log(err));
       }
     }
   }));