major refactoring
This commit is contained in:
calzoneman
parent
542461a533
commit
f2c996ebfa
1
index.js
1
index.js
|
|
@ -11,6 +11,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|||
|
||||
var Server = require("./lib/server");
|
||||
var Config = require("./lib/config");
|
||||
var Logger = require("./lib/logger");
|
||||
|
||||
Config.load("cfg.json", function (cfg) {
|
||||
var sv = Server.init(cfg);
|
||||
|
|
|
|||
30
lib/acp.js
30
lib/acp.js
|
|
@ -10,24 +10,25 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|||
*/
|
||||
|
||||
var Logger = require("./logger");
|
||||
var Server = require("./server");
|
||||
var ActionLog = require("./actionlog");
|
||||
|
||||
module.exports = function (Server) {
|
||||
var db = Server.db;
|
||||
var ActionLog = Server.actionlog;
|
||||
return {
|
||||
module.exports = {
|
||||
init: function (user) {
|
||||
var sv = Server.getServer();
|
||||
var db = sv.db;
|
||||
ActionLog.record(user.ip, user.name, "acp-init");
|
||||
user.socket.on("acp-announce", function(data) {
|
||||
ActionLog.record(user.ip, user.name, "acp-announce", data);
|
||||
Server.announcement = data;
|
||||
Server.io.sockets.emit("announcement", data);
|
||||
if (Server.cfg["enable-ssl"])
|
||||
Server.sslio.sockets.emit("announcement", data);
|
||||
sv.announcement = data;
|
||||
sv.io.sockets.emit("announcement", data);
|
||||
if (sv.cfg["enable-ssl"])
|
||||
sv.ioSecure.sockets.emit("announcement", data);
|
||||
});
|
||||
|
||||
user.socket.on("acp-announce-clear", function() {
|
||||
ActionLog.record(user.ip, user.name, "acp-announce-clear");
|
||||
Server.announcement = null;
|
||||
sv.announcement = null;
|
||||
});
|
||||
|
||||
user.socket.on("acp-global-ban", function(data) {
|
||||
|
|
@ -113,7 +114,7 @@ module.exports = function (Server) {
|
|||
|
||||
user.socket.on("acp-list-loaded", function() {
|
||||
var chans = [];
|
||||
var all = Server.channels;
|
||||
var all = sv.channels;
|
||||
for(var c in all) {
|
||||
var chan = all[c];
|
||||
|
||||
|
|
@ -131,8 +132,8 @@ module.exports = function (Server) {
|
|||
});
|
||||
|
||||
user.socket.on("acp-channel-unload", function(data) {
|
||||
if(Server.isChannelLoaded(data.name)) {
|
||||
var c = Server.getChannel(data.name);
|
||||
if(sv.isChannelLoaded(data.name)) {
|
||||
var c = sv.getChannel(data.name);
|
||||
if(!c)
|
||||
return;
|
||||
ActionLog.record(user.ip, user.name, "acp-channel-unload");
|
||||
|
|
@ -146,8 +147,8 @@ module.exports = function (Server) {
|
|||
|
||||
// At this point c should be unloaded
|
||||
// if it's still loaded, kill it
|
||||
if(Server.isChannelLoaded(data.name))
|
||||
Server.unloadChannel(Server.getChannel(data.name));
|
||||
if(sv.isChannelLoaded(data.name))
|
||||
sv.unloadChannel(sv.getChannel(data.name));
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -176,4 +177,3 @@ module.exports = function (Server) {
|
|||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|||
*/
|
||||
|
||||
var Logger = require("./logger");
|
||||
var Server = require("./server");
|
||||
|
||||
module.exports = function (Server) {
|
||||
var db = Server.db;
|
||||
return {
|
||||
module.exports = {
|
||||
record: function (ip, name, action, args) {
|
||||
var db = Server.getServer().db;
|
||||
if(!args)
|
||||
args = "";
|
||||
else {
|
||||
|
|
@ -29,14 +29,17 @@ module.exports = function (Server) {
|
|||
},
|
||||
|
||||
clear: function (actions) {
|
||||
var db = Server.getServer().db;
|
||||
db.clearActions(actions);
|
||||
},
|
||||
|
||||
clearOne: function (item) {
|
||||
var db = Server.getServer().db;
|
||||
db.clearSingleAction(item);
|
||||
},
|
||||
|
||||
throttleRegistrations: function (ip, callback) {
|
||||
var db = Server.getServer().db;
|
||||
db.recentRegistrationCount(ip, function (err, count) {
|
||||
if(err) {
|
||||
callback(err, null);
|
||||
|
|
@ -48,11 +51,12 @@ module.exports = function (Server) {
|
|||
},
|
||||
|
||||
listActionTypes: function (callback) {
|
||||
var db = Server.getServer().db;
|
||||
db.listActionTypes(callback);
|
||||
},
|
||||
|
||||
listActions: function (types, callback) {
|
||||
var db = Server.getServer().db;
|
||||
db.listActions(types, callback);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ var Logger = require("./logger");
|
|||
var fs = require("fs");
|
||||
var path = require("path");
|
||||
var $util = require("./utilities");
|
||||
var ActionLog = require("./actionlog");
|
||||
|
||||
module.exports = function (Server) {
|
||||
var ActionLog = Server.actionlog;
|
||||
function getIP(req) {
|
||||
var raw = req.connection.remoteAddress;
|
||||
var forward = req.header("x-forwarded-for");
|
||||
|
|
|
|||
|
|
@ -12,24 +12,25 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|||
|
||||
var fs = require("fs");
|
||||
var path = require("path");
|
||||
var url = require("url");
|
||||
var Poll = require("./poll.js").Poll;
|
||||
var Media = require("./media.js").Media;
|
||||
var Logger = require("./logger.js");
|
||||
var Rank = require("./rank.js");
|
||||
var ChatCommand = require("./chatcommand.js");
|
||||
var Filter = require("./filter.js").Filter;
|
||||
var Playlist = require("./playlist");
|
||||
var sanitize = require("validator").sanitize;
|
||||
var $util = require("./utilities");
|
||||
var url = require("url");
|
||||
var AsyncQueue = require("./asyncqueue");
|
||||
var ActionLog = require("./actionlog");
|
||||
var InfoGetter = require("./get-info");
|
||||
|
||||
var Channel = function(name, Server) {
|
||||
var Channel = function(name) {
|
||||
var self = this;
|
||||
Logger.syslog.log("Opening channel " + name);
|
||||
self.initialized = false;
|
||||
self.dbloaded = false;
|
||||
self.server = Server;
|
||||
self.server = Server.getServer();
|
||||
|
||||
self.name = name;
|
||||
self.canonical_name = name.toLowerCase();
|
||||
|
|
@ -384,7 +385,7 @@ Channel.prototype.tryReadLog = function (user) {
|
|||
Channel.prototype.tryRegister = function (user) {
|
||||
var self = this;
|
||||
if(self.registered) {
|
||||
self.server.actionlog.record(user.ip, user.name, "channel-register-failure",
|
||||
ActionLog.record(user.ip, user.name, "channel-register-failure",
|
||||
[self.name, "Channel already registered"]);
|
||||
user.socket.emit("registerChannel", {
|
||||
success: false,
|
||||
|
|
@ -392,7 +393,7 @@ Channel.prototype.tryRegister = function (user) {
|
|||
});
|
||||
}
|
||||
else if(!user.loggedIn) {
|
||||
self.server.actionlog.record(user.ip, user.name, "channel-register-failure",
|
||||
ActionLog.record(user.ip, user.name, "channel-register-failure",
|
||||
[self.name, "Not logged in"]);
|
||||
user.socket.emit("registerChannel", {
|
||||
success: false,
|
||||
|
|
@ -400,8 +401,8 @@ Channel.prototype.tryRegister = function (user) {
|
|||
});
|
||||
|
||||
}
|
||||
else if(!Rank.hasPermission(user, "registerChannel")) {
|
||||
self.server.actionlog.record(user.ip, user.name, "channel-register-failure",
|
||||
else if(user.rank < 10) {
|
||||
ActionLog.record(user.ip, user.name, "channel-register-failure",
|
||||
[self.name, "Insufficient permissions"]);
|
||||
user.socket.emit("registerChannel", {
|
||||
success: false,
|
||||
|
|
@ -419,7 +420,7 @@ Channel.prototype.tryRegister = function (user) {
|
|||
return;
|
||||
}
|
||||
|
||||
self.server.actionlog.record(user.ip, user.name,
|
||||
ActionLog.record(user.ip, user.name,
|
||||
"channel-register-success", self.name);
|
||||
if (self.dead)
|
||||
return;
|
||||
|
|
@ -927,7 +928,7 @@ Channel.prototype.sendBanlist = function(user) {
|
|||
var name = this.ipbans[ip][0];
|
||||
var ip_hidden = this.hideIP(ip);
|
||||
var disp = ip;
|
||||
if(user.rank < Rank.Siteadmin) {
|
||||
if(user.rank < 255) {
|
||||
disp = $util.maskIP(ip);
|
||||
}
|
||||
ents.push({
|
||||
|
|
@ -971,7 +972,7 @@ Channel.prototype.sendRankStuff = function(user) {
|
|||
}
|
||||
|
||||
Channel.prototype.sendChannelRanks = function(user) {
|
||||
if(Rank.hasPermission(user, "acl") && this.registered) {
|
||||
if(user.rank >= 3 && this.registered) {
|
||||
this.server.db.listChannelRanks(this.name, function (err, res) {
|
||||
if(err) {
|
||||
user.socket.emit("errorMsg", {
|
||||
|
|
@ -1031,9 +1032,9 @@ Channel.prototype.sendAll = function(message, data) {
|
|||
this.server.ioSecure.sockets.in(this.name).emit(message, data);
|
||||
}
|
||||
|
||||
Channel.prototype.sendAllWithPermission = function(perm, msg, data) {
|
||||
Channel.prototype.sendAllWithRank = function(rank, msg, data) {
|
||||
for(var i = 0; i < this.users.length; i++) {
|
||||
if(Rank.hasPermission(this.users[i], perm)) {
|
||||
if(this.users[i].rank >= rank) {
|
||||
this.users[i].socket.emit(msg, data);
|
||||
}
|
||||
}
|
||||
|
|
@ -1101,7 +1102,7 @@ Channel.prototype.broadcastNewUser = function(user) {
|
|||
profile: user.profile
|
||||
});
|
||||
|
||||
if(user.rank > Rank.Guest) {
|
||||
if(user.rank > 0) {
|
||||
self.saveRank(user);
|
||||
}
|
||||
|
||||
|
|
@ -1209,7 +1210,7 @@ Channel.prototype.broadcastBanlist = function() {
|
|||
}
|
||||
for(var i = 0; i < this.users.length; i++) {
|
||||
if(this.hasPermission(this.users[i], "ban")) {
|
||||
if(this.users[i].rank >= Rank.Siteadmin) {
|
||||
if(this.users[i].rank >= 255) {
|
||||
this.users[i].socket.emit("banlist", adminents);
|
||||
}
|
||||
else {
|
||||
|
|
@ -1248,8 +1249,7 @@ Channel.prototype.broadcastVoteskipUpdate = function() {
|
|||
var count = this.calcVoteskipMax();
|
||||
var need = this.voteskip ? Math.ceil(count * this.opts.voteskip_ratio) : 0;
|
||||
for(var i = 0; i < this.users.length; i++) {
|
||||
if(Rank.hasPermission(this.users[i], "seeVoteskip") ||
|
||||
this.leader == this.users[i]) {
|
||||
if(this.users[i].rank >= 1.5) {
|
||||
this.users[i].socket.emit("voteskip", {
|
||||
count: amt,
|
||||
need: need
|
||||
|
|
@ -1332,7 +1332,7 @@ Channel.prototype.tryQueue = function(user, data) {
|
|||
sustained: 1
|
||||
};
|
||||
|
||||
if (user.rank >= Rank.Moderator || this.leader == user) {
|
||||
if (user.rank >= 2 || this.leader == user) {
|
||||
limit = {
|
||||
burst: 10,
|
||||
sustained: 2
|
||||
|
|
@ -1471,7 +1471,7 @@ Channel.prototype.addMedia = function(data, user) {
|
|||
self.plqueue.queue(function (q) {
|
||||
if (self.dead)
|
||||
return;
|
||||
self.server.infogetter.getMedia(data.id, data.type,
|
||||
InfoGetter.getMedia(data.id, data.type,
|
||||
function (e, vids) {
|
||||
if (e) {
|
||||
user.socket.emit("queueFail", {
|
||||
|
|
@ -1506,7 +1506,7 @@ Channel.prototype.addMedia = function(data, user) {
|
|||
if (self.dead)
|
||||
return;
|
||||
var cb = afterData.bind(self, q, false);
|
||||
self.server.infogetter.getMedia(data.id, data.type,
|
||||
InfoGetter.getMedia(data.id, data.type,
|
||||
function (e, m) {
|
||||
if (self.dead)
|
||||
return;
|
||||
|
|
@ -1550,7 +1550,7 @@ Channel.prototype.addMedia = function(data, user) {
|
|||
|
||||
afterData.bind(self, q, true)(item);
|
||||
} else {
|
||||
self.server.infogetter.getMedia(data.id, data.type,
|
||||
InfoGetter.getMedia(data.id, data.type,
|
||||
function (e, m) {
|
||||
if (self.dead)
|
||||
return;
|
||||
|
|
@ -1671,7 +1671,7 @@ Channel.prototype.tryDequeue = function(user, data) {
|
|||
|
||||
Channel.prototype.tryUncache = function(user, data) {
|
||||
var self = this;
|
||||
if(!Rank.hasPermission(user, "uncache")) {
|
||||
if(user.rank < 2) {
|
||||
return;
|
||||
}
|
||||
if(typeof data.id != "string") {
|
||||
|
|
@ -1923,7 +1923,7 @@ Channel.prototype.setLock = function(locked) {
|
|||
}
|
||||
|
||||
Channel.prototype.trySetLock = function(user, data) {
|
||||
if(!Rank.hasPermission(user, "qlock")) {
|
||||
if(user.rank < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1936,7 +1936,7 @@ Channel.prototype.trySetLock = function(user, data) {
|
|||
}
|
||||
|
||||
Channel.prototype.tryToggleLock = function(user) {
|
||||
if(!Rank.hasPermission(user, "qlock")) {
|
||||
if(user.rank < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2028,7 +2028,7 @@ Channel.prototype.tryMoveFilter = function(user, data) {
|
|||
}
|
||||
|
||||
Channel.prototype.tryUpdatePermissions = function(user, perms) {
|
||||
if(!Rank.hasPermission(user, "channelperms")) {
|
||||
if(user.rank < 3) {
|
||||
return;
|
||||
}
|
||||
for(var key in perms) {
|
||||
|
|
@ -2039,7 +2039,7 @@ Channel.prototype.tryUpdatePermissions = function(user, perms) {
|
|||
}
|
||||
|
||||
Channel.prototype.tryUpdateOptions = function(user, data) {
|
||||
if(!Rank.hasPermission(user, "channelOpts")) {
|
||||
if(user.rank < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2058,7 +2058,7 @@ Channel.prototype.tryUpdateOptions = function(user, data) {
|
|||
|
||||
for(var key in this.opts) {
|
||||
if(key in data) {
|
||||
if(key in adminonly && user.rank < Rank.Owner) {
|
||||
if(key in adminonly && user.rank < 3) {
|
||||
continue;
|
||||
}
|
||||
if(key === "afk_timeout" && this.opts[key] != data[key]) {
|
||||
|
|
@ -2075,7 +2075,7 @@ Channel.prototype.tryUpdateOptions = function(user, data) {
|
|||
}
|
||||
|
||||
Channel.prototype.trySetCSS = function(user, data) {
|
||||
if(!Rank.hasPermission(user, "setcss")) {
|
||||
if(user.rank < 3) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2092,7 +2092,7 @@ Channel.prototype.trySetCSS = function(user, data) {
|
|||
}
|
||||
|
||||
Channel.prototype.trySetJS = function(user, data) {
|
||||
if(!Rank.hasPermission(user, "setjs")) {
|
||||
if(user.rank < 3) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2234,7 +2234,7 @@ Channel.prototype.sendMessage = function(username, msg, msgclass, data) {
|
|||
|
||||
Channel.prototype.trySetRank = function(user, data) {
|
||||
var self = this;
|
||||
if(!Rank.hasPermission(user, "promote"))
|
||||
if(user.rank < 2)
|
||||
return;
|
||||
|
||||
if(typeof data.user !== "string" || typeof data.rank !== "number")
|
||||
|
|
@ -2265,7 +2265,7 @@ Channel.prototype.trySetRank = function(user, data) {
|
|||
|
||||
self.logger.log("*** " + user.name + " set " +
|
||||
data.user + "'s rank to " + data.rank);
|
||||
self.sendAllWithPermission("acl", "setChannelRank", data);
|
||||
self.sendAllWithRank(3, "setChannelRank", data);
|
||||
});
|
||||
}
|
||||
self.broadcastUserUpdate(receiver);
|
||||
|
|
@ -2286,7 +2286,7 @@ Channel.prototype.trySetRank = function(user, data) {
|
|||
|
||||
self.logger.log("*** " + user.name + " set " +
|
||||
data.user + "'s rank to " + data.rank);
|
||||
self.sendAllWithPermission("acl", "setChannelRank", data);
|
||||
self.sendAllWithRank(3, "setChannelRank", data);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -2329,7 +2329,7 @@ Channel.prototype.changeLeader = function(name) {
|
|||
}
|
||||
|
||||
Channel.prototype.tryChangeLeader = function(user, data) {
|
||||
if(!Rank.hasPermission(user, "assignLeader")) {
|
||||
if(user.rank < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ The above copyright notice and this permission notice shall be included in all c
|
|||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
var Rank = require("./rank.js");
|
||||
var Poll = require("./poll.js").Poll;
|
||||
var Logger = require("./logger.js");
|
||||
|
||||
function handle(chan, user, msg, data) {
|
||||
|
|
@ -19,7 +17,7 @@ function handle(chan, user, msg, data) {
|
|||
else if(msg.indexOf("/sp ") == 0)
|
||||
chan.sendMessage(user.name, msg.substring(4), "spoiler", data);
|
||||
else if(msg.indexOf("/say ") == 0) {
|
||||
if(Rank.hasPermission(user, "shout") || chan.leader == user) {
|
||||
if(user.rank >= 1.5) {
|
||||
chan.sendMessage(user.name, msg.substring(5), "shout", data);
|
||||
}
|
||||
}
|
||||
|
|
@ -27,12 +25,12 @@ function handle(chan, user, msg, data) {
|
|||
user.setAFK(!user.meta.afk);
|
||||
}
|
||||
else if(msg.indexOf("/m ") == 0) {
|
||||
if(user.rank >= Rank.Moderator) {
|
||||
if(user.rank >= 2) {
|
||||
chan.chainMessage(user, msg.substring(3), {modflair: user.rank})
|
||||
}
|
||||
}
|
||||
else if(msg.indexOf("/a ") == 0) {
|
||||
if(user.rank >= Rank.Siteadmin) {
|
||||
if(user.rank >= 255) {
|
||||
var flair = {
|
||||
superadminflair: {
|
||||
labelclass: "label-important",
|
||||
|
|
@ -241,7 +239,7 @@ function handleDrink(chan, user, msg, data) {
|
|||
}
|
||||
|
||||
function handleClear(chan, user) {
|
||||
if(user.rank < Rank.Moderator) {
|
||||
if(user.rank < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ var domain = require("domain");
|
|||
var Logger = require("./logger.js");
|
||||
var Media = require("./media.js").Media;
|
||||
var CustomEmbedFilter = require("./customembed").filter;
|
||||
var Server = require("./server");
|
||||
|
||||
module.exports = function (Server) {
|
||||
var urlRetrieve = function (transport, options, callback) {
|
||||
// Catch any errors that crop up along the way of the request
|
||||
// in order to prevent them from reaching the global handler.
|
||||
|
|
@ -47,7 +47,8 @@ module.exports = function (Server) {
|
|||
var Getters = {
|
||||
/* youtube.com */
|
||||
yt: function (id, callback) {
|
||||
if(Server.cfg["enable-ytv3"] && Server.cfg["ytv3apikey"]) {
|
||||
var sv = Server.getServer();
|
||||
if (sv.cfg["enable-ytv3"] && sv.cfg["ytv3apikey"]) {
|
||||
Getters["ytv3"](id, callback);
|
||||
return;
|
||||
}
|
||||
|
|
@ -69,9 +70,9 @@ module.exports = function (Server) {
|
|||
timeout: 1000
|
||||
};
|
||||
|
||||
if(Server.cfg["ytv2devkey"]) {
|
||||
if(sv.cfg["ytv2devkey"]) {
|
||||
options.headers = {
|
||||
"X-Gdata-Key": "key=" + Server.cfg["ytv2devkey"]
|
||||
"X-Gdata-Key": "key=" + sv.cfg["ytv2devkey"]
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -138,6 +139,7 @@ module.exports = function (Server) {
|
|||
|
||||
/* youtube.com API v3 (requires API key) */
|
||||
ytv3: function (id, callback) {
|
||||
var sv = Server.getServer();
|
||||
var m = id.match(/([\w-]+)/);
|
||||
if (m) {
|
||||
id = m[1];
|
||||
|
|
@ -148,7 +150,7 @@ module.exports = function (Server) {
|
|||
var params = [
|
||||
"part=" + encodeURIComponent("id,snippet,contentDetails"),
|
||||
"id=" + id,
|
||||
"key=" + Server.cfg["ytapikey"]
|
||||
"key=" + sv.cfg["ytapikey"]
|
||||
].join("&");
|
||||
var options = {
|
||||
host: "www.googleapis.com",
|
||||
|
|
@ -192,6 +194,7 @@ module.exports = function (Server) {
|
|||
|
||||
/* youtube.com playlists */
|
||||
yp: function (id, callback, url) {
|
||||
var sv = Server.getServer();
|
||||
var m = id.match(/([\w-]+)/);
|
||||
if (m) {
|
||||
id = m[1];
|
||||
|
|
@ -214,9 +217,9 @@ module.exports = function (Server) {
|
|||
timeout: 1000
|
||||
};
|
||||
|
||||
if(Server.cfg["ytv2devkey"]) {
|
||||
if(sv.cfg["ytv2devkey"]) {
|
||||
options.headers = {
|
||||
"X-Gdata-Key": "key=" + Server.cfg["ytv2devkey"]
|
||||
"X-Gdata-Key": "key=" + sv.cfg["ytv2devkey"]
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -265,6 +268,7 @@ module.exports = function (Server) {
|
|||
|
||||
/* youtube.com search */
|
||||
ytSearch: function (terms, callback) {
|
||||
var sv = Server.getServer();
|
||||
for(var i in terms)
|
||||
terms[i] = encodeURIComponent(terms[i]);
|
||||
var query = terms.join("+");
|
||||
|
|
@ -278,9 +282,9 @@ module.exports = function (Server) {
|
|||
timeout: 1000
|
||||
};
|
||||
|
||||
if(Server.cfg["ytv2devkey"]) {
|
||||
if(sv.cfg["ytv2devkey"]) {
|
||||
options.headers = {
|
||||
"X-Gdata-Key": "key=" + Server.cfg["ytv2devkey"]
|
||||
"X-Gdata-Key": "key=" + sv.cfg["ytv2devkey"]
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -614,7 +618,7 @@ module.exports = function (Server) {
|
|||
}
|
||||
};
|
||||
|
||||
return {
|
||||
module.exports = {
|
||||
Getters: Getters,
|
||||
getMedia: function (id, type, callback) {
|
||||
if(type in this.Getters) {
|
||||
|
|
@ -624,4 +628,3 @@ module.exports = function (Server) {
|
|||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,29 @@ The above copyright notice and this permission notice shall be included in all c
|
|||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
var singleton = null;
|
||||
|
||||
module.exports = {
|
||||
init: function (cfg) {
|
||||
Logger.syslog.log("Starting CyTube v" + VERSION);
|
||||
var chanlogpath = path.join(__dirname, "../chanlogs");
|
||||
fs.exists(chanlogpath, function (exists) {
|
||||
exists || fs.mkdir(chanlogpath);
|
||||
});
|
||||
|
||||
var chandumppath = path.join(__dirname, "../chandump");
|
||||
fs.exists(chandumppath, function (exists) {
|
||||
exists || fs.mkdir(chandumppath);
|
||||
});
|
||||
singleton = new Server(cfg);
|
||||
return singleton;
|
||||
},
|
||||
|
||||
getServer: function () {
|
||||
return singleton;
|
||||
}
|
||||
};
|
||||
|
||||
var path = require("path");
|
||||
var fs = require("fs");
|
||||
var http = require("http");
|
||||
|
|
@ -36,7 +59,6 @@ var Server = function (cfg) {
|
|||
self.ioSecure = null;
|
||||
self.ipCount = {};
|
||||
self.db = null;
|
||||
self.acp = null;
|
||||
self.api = null;
|
||||
self.announcement = null;
|
||||
self.httplog = null;
|
||||
|
|
@ -46,8 +68,7 @@ var Server = function (cfg) {
|
|||
// database init ------------------------------------------------------
|
||||
var Database = require("./database");
|
||||
self.db = new Database(self.cfg);
|
||||
// TODO self.db.init();
|
||||
self.actionlog = require("./actionlog")(self);
|
||||
self.actionlog = require("./actionlog");
|
||||
self.httplog = new Logger.Logger(path.join(__dirname,
|
||||
"../httpaccess.log"));
|
||||
// webserver init -----------------------------------------------------
|
||||
|
|
@ -139,15 +160,12 @@ var Server = function (cfg) {
|
|||
self.handleSocketConnection(sock);
|
||||
});
|
||||
|
||||
// acp init -----------------------------------------------------------
|
||||
self.acp = require("./acp")(self);
|
||||
|
||||
// background tasks init ----------------------------------------------
|
||||
require("./bgtask")(self);
|
||||
|
||||
// media metadata retriever init --------------------------------------
|
||||
// TODO make the constructor just accept cfg?
|
||||
self.infogetter = require("./get-info")(self);
|
||||
self.infogetter = require("./get-info");
|
||||
};
|
||||
|
||||
Server.prototype.getHTTPIP = function (req) {
|
||||
|
|
@ -190,7 +208,7 @@ Server.prototype.getChannel = function (name) {
|
|||
return this.channels[i];
|
||||
}
|
||||
|
||||
var c = new Channel(name, this);
|
||||
var c = new Channel(name);
|
||||
this.channels.push(c);
|
||||
return c;
|
||||
};
|
||||
|
|
@ -268,7 +286,7 @@ Server.prototype.handleSocketConnection = function (socket) {
|
|||
}
|
||||
|
||||
Logger.syslog.log("Accepted socket from " + ip);
|
||||
new User(socket, self);
|
||||
new User(socket);
|
||||
};
|
||||
|
||||
Server.prototype.shutdown = function () {
|
||||
|
|
@ -283,25 +301,3 @@ Server.prototype.shutdown = function () {
|
|||
process.exit(0);
|
||||
};
|
||||
|
||||
var singleton = null;
|
||||
|
||||
module.exports = {
|
||||
init: function (cfg) {
|
||||
Logger.syslog.log("Starting CyTube v" + VERSION);
|
||||
var chanlogpath = path.join(__dirname, "../chanlogs");
|
||||
fs.exists(chanlogpath, function (exists) {
|
||||
exists || fs.mkdir(chanlogpath);
|
||||
});
|
||||
|
||||
var chandumppath = path.join(__dirname, "../chandump");
|
||||
fs.exists(chandumppath, function (exists) {
|
||||
exists || fs.mkdir(chandumppath);
|
||||
});
|
||||
singleton = new Server(cfg);
|
||||
return singleton;
|
||||
},
|
||||
|
||||
getServer: function () {
|
||||
return singleton;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
27
lib/user.js
27
lib/user.js
|
|
@ -9,21 +9,24 @@ The above copyright notice and this permission notice shall be included in all c
|
|||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
var Rank = require("./rank.js");
|
||||
var Channel = require("./channel.js").Channel;
|
||||
var Logger = require("./logger.js");
|
||||
var $util = require("./utilities");
|
||||
var ActionLog = require("./actionlog");
|
||||
var Server = require("./server");
|
||||
var ACP = require("./acp");
|
||||
var InfoGetter = require("./get-info");
|
||||
|
||||
// Represents a client connected via socket.io
|
||||
var User = function (socket, Server) {
|
||||
var User = function (socket) {
|
||||
this.ip = socket._ip;
|
||||
this.server = Server;
|
||||
this.server = Server.getServer();
|
||||
this.socket = socket;
|
||||
this.loggedIn = false;
|
||||
this.loggingIn = false;
|
||||
this.saverank = false;
|
||||
this.rank = Rank.Anonymous;
|
||||
this.global_rank = Rank.Anonymous;
|
||||
this.rank = -1
|
||||
this.global_rank = -1;
|
||||
this.channel = null;
|
||||
this.name = "";
|
||||
this.meta = {
|
||||
|
|
@ -42,8 +45,8 @@ var User = function (socket, Server) {
|
|||
this.autoAFK();
|
||||
|
||||
this.initCallbacks();
|
||||
if (Server.announcement !== null) {
|
||||
this.socket.emit("announcement", Server.announcement);
|
||||
if (this.server.announcement !== null) {
|
||||
this.socket.emit("announcement", this.server.announcement);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -321,7 +324,7 @@ User.prototype.initCallbacks = function () {
|
|||
self.socket.on("searchMedia", function (data) {
|
||||
if (self.inChannel()) {
|
||||
if (data.source == "yt") {
|
||||
var searchfn = self.server.infogetter.Getters.ytSearch;
|
||||
var searchfn = InfoGetter.Getters.ytSearch;
|
||||
searchfn(data.query.split(" "), function (e, vids) {
|
||||
if (!e) {
|
||||
self.socket.emit("searchResults", {
|
||||
|
|
@ -556,8 +559,8 @@ User.prototype.initCallbacks = function () {
|
|||
});
|
||||
|
||||
self.socket.on("acp-init", function () {
|
||||
if (self.global_rank >= Rank.Siteadmin)
|
||||
self.server.acp.init(self);
|
||||
if (self.global_rank >= 255)
|
||||
ACP.init(self);
|
||||
});
|
||||
|
||||
self.socket.on("borrow-rank", function (rank) {
|
||||
|
|
@ -662,7 +665,7 @@ User.prototype.login = function (name, pw, session) {
|
|||
self.server.db.userLogin(name, pw, session, function (err, row) {
|
||||
if (err) {
|
||||
self.loggingIn = false;
|
||||
self.server.actionlog.record(self.ip, name, "login-failure",
|
||||
ActionLog.record(self.ip, name, "login-failure",
|
||||
err);
|
||||
self.socket.emit("login", {
|
||||
success: false,
|
||||
|
|
@ -686,7 +689,7 @@ User.prototype.login = function (name, pw, session) {
|
|||
}
|
||||
// Record logins for administrator accounts
|
||||
if (self.global_rank >= 255)
|
||||
self.server.actionlog.record(self.ip, name, "login-success");
|
||||
ActionLog.record(self.ip, name, "login-success");
|
||||
self.loggedIn = true;
|
||||
self.loggingIn = false;
|
||||
self.socket.emit("login", {
|
||||
|
|
|
|||
Loading…
Reference in a new issue