summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-05-12 20:13:50 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-05-12 20:13:50 +0200
commit54565aeccffb0722de554820eb856b23ac3c004f (patch)
tree11f969963f6d6b1bb1a437e8e4572df902ae6f43
parent29f937a1d97c60334fa0e707150f73e5c3c773bb (diff)
downloaddiscordbot-54565aeccffb0722de554820eb856b23ac3c004f.tar.gz
discordbot-54565aeccffb0722de554820eb856b23ac3c004f.zip
fix update subscribe inf loop
-rw-r--r--api.js1
-rw-r--r--commands/vainsocial/me.js4
-rw-r--r--views/register.js1
3 files changed, 3 insertions, 3 deletions
diff --git a/api.js b/api.js
index 0fe9e78..66d52da 100644
--- a/api.js
+++ b/api.js
@@ -170,6 +170,7 @@ module.exports.subscribeUpdates = (name, timeout=UPDATE_TIMEOUT) => {
} };
}
if (msg == Channel.DONE) {
+ subscribed = false;
subscription.unsubscribe();
return undefined;
}
diff --git a/commands/vainsocial/me.js b/commands/vainsocial/me.js
index de87b4c..8679a65 100644
--- a/commands/vainsocial/me.js
+++ b/commands/vainsocial/me.js
@@ -35,10 +35,8 @@ Store your in game name for quicker access to other commands and for Guild manag
async run(msg, args) {
util.trackAction(msg, "vainsocial-me", args.name);
const registerView = new RegisterView(msg, args.name);
- await api.upsearchPlayer(args.name);
try {
- const waiter = api.subscribeUpdates(args.name);
- while (await waiter.next() != "stats_update");
+ await api.upsearchPlayerSync(args.name);
await api.setUser(msg.author.id, args.name);
} catch (err) {
console.log(err);
diff --git a/views/register.js b/views/register.js
index b744bd1..a636e84 100644
--- a/views/register.js
+++ b/views/register.js
@@ -4,6 +4,7 @@
const emoji = require("discord-emoji"),
View = require("./view"),
+ PlayerView = require("./player"),
util = require("../util"),
api = require("../api"),
strings = require("../strings"),