Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Disabling suggested topics because Google Trends integration is curre…
…ntly broken
  • Loading branch information
Antrikshy committed Nov 14, 2018
1 parent 6bbaf12 commit f325f2b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 33 deletions.
44 changes: 22 additions & 22 deletions app.js
Expand Up @@ -3,26 +3,26 @@ var path = require('path');
var favicon = require('serve-favicon');
var bodyParser = require('body-parser');
var fs = require('fs');
var schedule = require('node-schedule');
// var schedule = require('node-schedule');
var antiSpam = require('socket-anti-spam');
var watchr = require('watchr');
var touch = require("touch")

var routes = require('./routes');
var topicHandler = require(path.resolve(__dirname, 'lib', 'topic_handler.js'));
// var topicHandler = require(path.resolve(__dirname, 'lib', 'topic_handler.js'));

var app = express();
var server = require('http').Server(app);
var io = require('socket.io')(server);

topicsLocation = path.resolve(__dirname, 'lib', 'topics.json');
manualTopicsLocation = path.resolve(__dirname, 'lib', 'manual-topics.json');
// topicsLocation = path.resolve(__dirname, 'lib', 'topics.json');
// manualTopicsLocation = path.resolve(__dirname, 'lib', 'manual-topics.json');
spamStringsLocation = path.resolve(__dirname, 'lib', 'spam-strings');

currTopic = {
"topic": "Loading...",
"url": null
};
// currTopic = {
// "topic": "Loading...",
// "url": null
// };

// view engine setup
app.set('views', path.join(__dirname, 'views'));
Expand Down Expand Up @@ -199,25 +199,25 @@ io.on('connection', function(socket) {
});
});

topicHandler.firstTimeSetup();
// topicHandler.firstTimeSetup();

topicHandler.topicsScheduler(function() {
broadcastTopic(topicHandler.getNextTopic());
});
// topicHandler.topicsScheduler(function() {
// broadcastTopic(topicHandler.getNextTopic());
// });

var rule = new schedule.RecurrenceRule();
rule.minute = [0, 15, 30, 45];
var j = schedule.scheduleJob(rule, function() {
broadcastTopic(topicHandler.getNextTopic());
});
// var rule = new schedule.RecurrenceRule();
// rule.minute = [0, 15, 30, 45];
// var j = schedule.scheduleJob(rule, function() {
// broadcastTopic(topicHandler.getNextTopic());
// });


// Some helper functions
function broadcastTopic(topicObj) {
currTopic = topicObj;
io.emit('new topic', currTopic);
console.log("New topic: " + currTopic.title);
}
// function broadcastTopic(topicObj) {
// currTopic = topicObj;
// io.emit('new topic', currTopic);
// console.log("New topic: " + currTopic.title);
// }

function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min + 1)) + min;
Expand Down
3 changes: 2 additions & 1 deletion routes.js
@@ -1,3 +1,4 @@
exports.index = function(req, res) {
res.render('index', { users: numOfUsers, topic: currTopic });
// res.render('index', { users: numOfUsers, topic: currTopic });
res.render('index', { users: numOfUsers });
};
10 changes: 0 additions & 10 deletions views/index.jade
Expand Up @@ -7,9 +7,6 @@ block content
p.intro-welcome-to Welcome to
img.pure-img.intro-logo(src="/images/intro-logo.png")
p.intro-instructions Witness people conversing in real time.
p.intro-instructions Feel free to comment on the suggested topic or
em anything
| else.
p.intro-instructions Your message will flash momentarily to everyone and disappear forever.
input.usertag-box(type="text", autocomplete="off", autocorrect="off", autofocus=true, placeholder="Pick a tag (optional)")
br
Expand All @@ -24,13 +21,6 @@ block content
img.pure-img.header-logo(src="/images/header-logo.png")
span.subreddit-link
a(href="http://www.reddit.com/r/QuibblerApp") /r/QuibblerApp
span.topic-label Discuss:
span.chat-topic
em
if (topic.url)
a(href=topic.url, target="_blank") #{topic.title}
else
| #{topic.title}
a(href="#")
i(id="soundVolume", class="fa fa-volume-up")
.visualizer
Expand Down

0 comments on commit f325f2b

Please sign in to comment.