summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-04-17 19:05:12 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-04-17 19:05:12 +0200
commit6e2f2c80463e8d19c24edebbe85331f6b083cf06 (patch)
tree4623d78c61651484b1dc7bc4abb882f1a35f7781
parent7aa7a45e3f46fd1bc3a965c0c4a40bded288d7a8 (diff)
downloaddiscordbot-6e2f2c80463e8d19c24edebbe85331f6b083cf06.tar.gz
discordbot-6e2f2c80463e8d19c24edebbe85331f6b083cf06.zip
have timeouts as env vars
-rw-r--r--api.js4
-rw-r--r--responses.js5
2 files changed, 6 insertions, 3 deletions
diff --git a/api.js b/api.js
index a13eb8c..fe0ba82 100644
--- a/api.js
+++ b/api.js
@@ -14,6 +14,8 @@ let cache = cacheManager.caching({
ttl: 10 // s
});
+const UPDATE_TIMEOUT = parseInt(process.env.UPDATE_TIMEOUT) || 60; // s
+
const API_FE_URL = process.env.API_FE_URL || "http://vainsocial.dev/bots/api",
API_MAP_URL = process.env.API_MAP_URL || "http://vainsocial.dev/masters/",
API_WS_URL = process.env.API_WS_URL || "ws://vainsocial.dev/ws",
@@ -79,7 +81,7 @@ module.exports.mapGameMode = async function(id) {
// be an async iterator
// next() returns promises that are awaited until there is an update
-module.exports.subscribeUpdates = function(name, timeout=60) {
+module.exports.subscribeUpdates = function(name, timeout=UPDATE_TIMEOUT) {
const channel = new Channel(),
subscription = subscribe("player." + name, channel);
diff --git a/responses.js b/responses.js
index 15e7ec7..9137af0 100644
--- a/responses.js
+++ b/responses.js
@@ -11,7 +11,8 @@ const Commando = require("discord.js-commando"),
api = require("./api");
const PREVIEW = process.env.PREVIEW || true,
- MATCH_HISTORY_LEN = parseInt(process.env.MATCH_HISTORY_LEN) || 3;
+ MATCH_HISTORY_LEN = parseInt(process.env.MATCH_HISTORY_LEN) || 3,
+ REACTION_TIMEOUT = parseInt(process.env.REACTION_TIMEOUT) || 60; // s
const reactionsPipe = new Channel();
@@ -116,7 +117,7 @@ module.exports.onNewReaction = (reaction) => {
// create an iterator that returns promises to await new reactions
// the Promise result is the reaction name
-function awaitReactions(message, emoji, timeout=60) {
+function awaitReactions(message, emoji, timeout=REACTION_TIMEOUT) {
const pipeOut = new Channel();
// stop listening after timeout
setTimeout(() => pipeOut.close(), timeout*1000);