specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix bug with userJoin, add password support to channel API

Browse source
This commit is contained in:
calzoneman 2013-11-26 11:04:02 -06:00
parent d006099fc7
commit 81b5c0eeaa
2 changed files with 60 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/api.js
View file

@ -74,8 +74,48 @@ module.exports = function (Server) {
loaded: false
};
if(Server.isChannelLoaded(name))
data = getChannelData(Server.getChannel(name));
var needPassword = false;
var chan = null;
if (Server.isChannelLoaded(name)) {
chan = Server.getChannel(name);
data = getChannelData(chan);
needPassword = chan.opts.password;
}
if (needPassword !== false) {
var pw = req.query.password;
if (pw !== needPassword) {
var uname = req.cookies.cytube_uname;
var session = req.cookies.cytube_session;
Server.db.userLoginSession(uname, session, function (err, row) {
if (err) {
res.status(403);
res.type("application/json");
res.jsonp({
error: "Password required to view this channel"
});
return;
}
if (chan !== null) {
chan.getRank(uname, function (err, rank) {
if (err || rank < 2) {
res.status(403);
res.type("application/json");
res.jsonp({
error: "Password required to view this channel"
});
return;
}
res.type("application/json");
res.jsonp(data);
});
}
});
return;
}
}
res.type("application/json");
res.jsonp(data);

28
lib/channel.js
View file

@ -99,7 +99,7 @@ var Channel = function(name) {
},
show_public: false,
enable_link_regex: true,
password: "tomato74"
password: false
};
self.filters = [
new Filter("monospace", "`([^`]+)`", "g", "<code>$1</code>"),
@ -801,6 +801,22 @@ Channel.prototype.search = function(query, callback) {
/* REGION User interaction */
Channel.prototype.addPendingJoin = function (user, password) {
var self = this;
if (!("pendingJoins" in self)) {
self.pendingJoins = [];
}
for (var i = 0; i < self.pendingJoins.length; i++) {
if (self.pendingJoins[i].user === user) {
return;
}
}
self.pendingJoins.push({
user: user,
pw: password
});
};
Channel.prototype.handlePendingJoins = function () {
var self = this;
self.pendingJoins.forEach(function (u) {
@ -812,15 +828,7 @@ Channel.prototype.handlePendingJoins = function () {
Channel.prototype.userJoin = function(user, password) {
var self = this;
if (!self.ready) {
if (!("pendingJoins" in self)) {
self.pendingJoins = [];
}
if (self.pendingJoins.indexOf(user) === -1) {
self.pendingJoins.push({
user: user,
pw: password
});
}
self.addPendingJoin(user, password);
return;
}