moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I think it works

This commit is contained in:
Calvin Montgomery 2013-07-15 23:01:12 -04:00
parent bf8fef29cf
commit 5a9b3128d1
4 changed files with 189 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
acp.js
View File

@ -9,12 +9,11 @@ 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. 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 Server = require("./server");
var Auth = require("./auth"); var Auth = require("./auth");
var Database = require("./database");
var ActionLog = require("./actionlog"); var ActionLog = require("./actionlog");
module.exports = { module.exports = function (Server) {
return {
init: function(user) { init: function(user) {
ActionLog.record(user.ip, user.name, "acp-init"); ActionLog.record(user.ip, user.name, "acp-init");
user.socket.on("acp-announce", function(data) { user.socket.on("acp-announce", function(data) {
@ -30,25 +29,25 @@ module.exports = {
user.socket.on("acp-global-ban", function(data) { user.socket.on("acp-global-ban", function(data) {
ActionLog.record(user.ip, user.name, "acp-global-ban", data.ip); ActionLog.record(user.ip, user.name, "acp-global-ban", data.ip);
Database.globalBanIP(data.ip, data.note); Server.db.globalBanIP(data.ip, data.note);
user.socket.emit("acp-global-banlist", Database.refreshGlobalBans()); user.socket.emit("acp-global-banlist", Server.db.refreshGlobalBans());
}); });
user.socket.on("acp-global-unban", function(ip) { user.socket.on("acp-global-unban", function(ip) {
ActionLog.record(user.ip, user.name, "acp-global-unban", ip); ActionLog.record(user.ip, user.name, "acp-global-unban", ip);
Database.globalUnbanIP(ip); Server.db.globalUnbanIP(ip);
user.socket.emit("acp-global-banlist", Database.refreshGlobalBans()); user.socket.emit("acp-global-banlist", Server.db.refreshGlobalBans());
}); });
user.socket.emit("acp-global-banlist", Database.refreshGlobalBans()); user.socket.emit("acp-global-banlist", Server.db.refreshGlobalBans());
user.socket.on("acp-lookup-user", function(name) { user.socket.on("acp-lookup-user", function(name) {
var db = Database.getConnection(); var db = Server.db.getConnection();
if(!db) { if(!db) {
return; return;
} }
var query = Database.createQuery( var query = Server.db.createQuery(
"SELECT id,uname,global_rank,profile_image,profile_text,email FROM registrations WHERE uname LIKE ?", "SELECT id,uname,global_rank,profile_image,profile_text,email FROM registrations WHERE uname LIKE ?",
["%"+name+"%"] ["%"+name+"%"]
); );
@ -65,7 +64,7 @@ module.exports = {
if(Auth.getGlobalRank(data.name) >= user.global_rank) if(Auth.getGlobalRank(data.name) >= user.global_rank)
return; return;
try { try {
var hash = Database.generatePasswordReset(user.ip, data.name, data.email); var hash = Server.db.generatePasswordReset(user.ip, data.name, data.email);
ActionLog.record(user.ip, user.name, "acp-reset-password", data.name); ActionLog.record(user.ip, user.name, "acp-reset-password", data.name);
} }
catch(e) { catch(e) {
@ -97,12 +96,12 @@ module.exports = {
if(Auth.getGlobalRank(data.name) >= user.global_rank) if(Auth.getGlobalRank(data.name) >= user.global_rank)
return; return;
var db = Database.getConnection(); var db = Server.db.getConnection();
if(!db) if(!db)
return; return;
ActionLog.record(user.ip, user.name, "acp-set-rank", data); ActionLog.record(user.ip, user.name, "acp-set-rank", data);
var query = Database.createQuery( var query = Server.db.createQuery(
"UPDATE registrations SET global_rank=? WHERE uname=?", "UPDATE registrations SET global_rank=? WHERE uname=?",
[data.rank, data.name] [data.rank, data.name]
); );
@ -164,4 +163,5 @@ module.exports = {
ActionLog.record(user.ip, user.name, "acp-actionlog-clear-one", data); ActionLog.record(user.ip, user.name, "acp-actionlog-clear-one", data);
}); });
} }
}
} }

58
channel.js
View File

@ -11,15 +11,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
*/ */
var fs = require("fs"); var fs = require("fs");
var Database = require("./database.js");
var Poll = require("./poll.js").Poll; var Poll = require("./poll.js").Poll;
var Media = require("./media.js").Media; var Media = require("./media.js").Media;
var formatTime = require("./media.js").formatTime; var formatTime = require("./media.js").formatTime;
var Logger = require("./logger.js"); var Logger = require("./logger.js");
var InfoGetter = require("./get-info.js"); var InfoGetter = require("./get-info.js");
var Server = require("./server.js");
var io = Server.io;
var NWS = require("./notwebsocket");
var Rank = require("./rank.js"); var Rank = require("./rank.js");
var Auth = require("./auth.js"); var Auth = require("./auth.js");
var ChatCommand = require("./chatcommand.js"); var ChatCommand = require("./chatcommand.js");
@ -28,9 +24,10 @@ var ActionLog = require("./actionlog");
var Playlist = require("./playlist"); var Playlist = require("./playlist");
var sanitize = require("validator").sanitize; var sanitize = require("validator").sanitize;
var Channel = function(name) { var Channel = function(name, Server) {
Logger.syslog.log("Opening channel " + name); Logger.syslog.log("Opening channel " + name);
this.initialized = false; this.initialized = false;
this.server = Server;
this.name = name; this.name = name;
// Initialize defaults // Initialize defaults
@ -118,7 +115,7 @@ var Channel = function(name) {
this.ipkey += "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[parseInt(Math.random() * 65)] this.ipkey += "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[parseInt(Math.random() * 65)]
} }
Database.loadChannel(this); Server.db.loadChannel(this);
if(this.registered) { if(this.registered) {
this.loadDump(); this.loadDump();
} }
@ -303,7 +300,7 @@ Channel.prototype.tryRegister = function(user) {
}); });
} }
else { else {
if(Database.registerChannel(this.name, user.name)) { if(this.server.db.registerChannel(this.name, user.name)) {
ActionLog.record(user.ip, user.name, "channel-register-success", this.name); ActionLog.record(user.ip, user.name, "channel-register-success", this.name);
this.registered = true; this.registered = true;
this.initialized = true; this.initialized = true;
@ -325,7 +322,7 @@ Channel.prototype.tryRegister = function(user) {
} }
Channel.prototype.unregister = function() { Channel.prototype.unregister = function() {
if(Database.deleteChannel(this.name)) { if(this.server.db.deleteChannel(this.name)) {
this.registered = false; this.registered = false;
return true; return true;
} }
@ -337,23 +334,23 @@ Channel.prototype.getRank = function(name) {
if(!this.registered) { if(!this.registered) {
return global; return global;
} }
var local = Database.getChannelRank(this.name, name); var local = this.server.db.getChannelRank(this.name, name);
return local > global ? local : global; return local > global ? local : global;
} }
Channel.prototype.saveRank = function(user) { Channel.prototype.saveRank = function(user) {
return Database.setChannelRank(this.name, user.name, user.rank); return this.server.db.setChannelRank(this.name, user.name, user.rank);
} }
Channel.prototype.getIPRank = function(ip) { Channel.prototype.getIPRank = function(ip) {
var names = []; var names = [];
if(!(ip in this.ip_alias)) if(!(ip in this.ip_alias))
this.ip_alias[ip] = Database.getAliases(ip); this.ip_alias[ip] = this.server.db.getAliases(ip);
this.ip_alias[ip].forEach(function(name) { this.ip_alias[ip].forEach(function(name) {
names.push(name); names.push(name);
}); });
var ranks = Database.getChannelRank(this.name, names); var ranks = this.server.db.getChannelRank(this.name, names);
var rank = 0; var rank = 0;
for(var i = 0; i < ranks.length; i++) { for(var i = 0; i < ranks.length; i++) {
rank = (ranks[i] > rank) ? ranks[i] : rank; rank = (ranks[i] > rank) ? ranks[i] : rank;
@ -369,7 +366,7 @@ Channel.prototype.cacheMedia = function(media) {
} }
this.library[media.id] = media; this.library[media.id] = media;
if(this.registered) { if(this.registered) {
return Database.addToLibrary(this.name, media); return this.server.db.addToLibrary(this.name, media);
} }
return false; return false;
} }
@ -403,7 +400,7 @@ Channel.prototype.tryNameBan = function(actor, name) {
return false; return false;
} }
return Database.channelBan(this.name, "*", name, actor.name); return this.server.db.channelBan(this.name, "*", name, actor.name);
} }
Channel.prototype.unbanName = function(actor, name) { Channel.prototype.unbanName = function(actor, name) {
@ -419,7 +416,7 @@ Channel.prototype.unbanName = function(actor, name) {
this.users.forEach(function(u) { this.users.forEach(function(u) {
chan.sendBanlist(u); chan.sendBanlist(u);
}); });
return Database.channelUnbanName(this.name, name); return this.server.db.channelUnbanName(this.name, name);
} }
Channel.prototype.tryIPBan = function(actor, name, range) { Channel.prototype.tryIPBan = function(actor, name, range) {
@ -429,7 +426,7 @@ Channel.prototype.tryIPBan = function(actor, name, range) {
if(typeof name != "string") { if(typeof name != "string") {
return false; return false;
} }
var ips = Database.ipForName(name); var ips = this.server.db.ipForName(name);
var chan = this; var chan = this;
ips.forEach(function(ip) { ips.forEach(function(ip) {
if(chan.getIPRank(ip) >= actor.rank) { if(chan.getIPRank(ip) >= actor.rank) {
@ -461,7 +458,7 @@ Channel.prototype.tryIPBan = function(actor, name, range) {
return false; return false;
// Update database ban table // Update database ban table
return Database.channelBan(chan.name, ip, name, actor.name); return this.server.db.channelBan(chan.name, ip, name, actor.name);
}); });
var chan = this; var chan = this;
@ -488,7 +485,7 @@ Channel.prototype.banIP = function(actor, receiver) {
return false; return false;
// Update database ban table // Update database ban table
return Database.channelBanIP(this.name, receiver.ip, receiver.name, actor.name); return this.server.db.channelBanIP(this.name, receiver.ip, receiver.name, actor.name);
} }
Channel.prototype.unbanIP = function(actor, ip) { Channel.prototype.unbanIP = function(actor, ip) {
@ -506,7 +503,7 @@ Channel.prototype.unbanIP = function(actor, ip) {
//this.broadcastBanlist(); //this.broadcastBanlist();
// Update database ban table // Update database ban table
return Database.channelUnbanIP(this.name, ip); return this.server.db.channelUnbanIP(this.name, ip);
} }
Channel.prototype.tryUnban = function(actor, data) { Channel.prototype.tryUnban = function(actor, data) {
@ -651,7 +648,7 @@ Channel.prototype.userLeave = function(user) {
if(this.users.length == 0) { if(this.users.length == 0) {
this.logger.log("*** Channel empty, unloading"); this.logger.log("*** Channel empty, unloading");
var name = this.name; var name = this.name;
Server.unload(this); this.server.unload(this);
} }
} }
@ -733,7 +730,7 @@ Channel.prototype.sendRankStuff = function(user) {
Channel.prototype.sendChannelRanks = function(user) { Channel.prototype.sendChannelRanks = function(user) {
if(Rank.hasPermission(user, "acl")) { if(Rank.hasPermission(user, "acl")) {
user.socket.emit("channelRanks", Database.listChannelRanks(this.name)); user.socket.emit("channelRanks", this.server.db.listChannelRanks(this.name));
} }
} }
@ -777,8 +774,7 @@ Channel.prototype.sendRecentChat = function(user) {
/* REGION Broadcasts to all clients */ /* REGION Broadcasts to all clients */
Channel.prototype.sendAll = function(message, data) { Channel.prototype.sendAll = function(message, data) {
io.sockets.in(this.name).emit(message, data); this.server.io.sockets.in(this.name).emit(message, data);
NWS.inRoom(this.name).emit(message, data);
} }
Channel.prototype.sendAllWithPermission = function(perm, msg, data) { Channel.prototype.sendAllWithPermission = function(perm, msg, data) {
@ -811,7 +807,7 @@ Channel.prototype.broadcastUsercount = function() {
} }
Channel.prototype.broadcastNewUser = function(user) { Channel.prototype.broadcastNewUser = function(user) {
var aliases = Database.getAliases(user.ip); var aliases = this.server.db.getAliases(user.ip);
var chan = this; var chan = this;
this.ip_alias[user.ip] = aliases; this.ip_alias[user.ip] = aliases;
aliases.forEach(function(alias) { aliases.forEach(function(alias) {
@ -939,7 +935,7 @@ Channel.prototype.broadcastBanlist = function() {
} }
Channel.prototype.broadcastRankTable = function() { Channel.prototype.broadcastRankTable = function() {
var ranks = Database.listChannelRanks(this.name); var ranks = this.server.db.listChannelRanks(this.name);
for(var i = 0; i < this.users.length; i++) { for(var i = 0; i < this.users.length; i++) {
this.sendACL(this.users[i]); this.sendACL(this.users[i]);
} }
@ -1299,7 +1295,7 @@ Channel.prototype.tryQueuePlaylist = function(user, data) {
return; return;
} }
var pl = Database.loadUserPlaylist(user.name, data.name); var pl = this.server.db.loadUserPlaylist(user.name, data.name);
data.list = pl; data.list = pl;
data.queueby = user.name; data.queueby = user.name;
this.addMediaList(data, user); this.addMediaList(data, user);
@ -1362,7 +1358,7 @@ Channel.prototype.tryUncache = function(user, data) {
if(typeof data.id != "string") { if(typeof data.id != "string") {
return; return;
} }
if(Database.removeFromLibrary(this.name, data.id)) { if(this.server.db.removeFromLibrary(this.name, data.id)) {
delete this.library[data.id]; delete this.library[data.id];
} }
} }
@ -1866,7 +1862,7 @@ Channel.prototype.trySetRank = function(user, data) {
var rrank = this.getRank(data.user); var rrank = this.getRank(data.user);
if(rrank >= user.rank) if(rrank >= user.rank)
return; return;
Database.setChannelRank(this.name, data.user, data.rank); this.server.db.setChannelRank(this.name, data.user, data.rank);
} }
this.sendAllWithPermission("acl", "setChannelRank", data); this.sendAllWithPermission("acl", "setChannelRank", data);
@ -1903,7 +1899,7 @@ Channel.prototype.tryPromoteUser = function(actor, data) {
this.broadcastUserUpdate(receiver); this.broadcastUserUpdate(receiver);
} }
else { else {
Database.setChannelRank(this.name, data.name, rank); this.server.db.setChannelRank(this.name, data.name, rank);
} }
this.logger.log("*** " + actor.name + " promoted " + data.name + " from " + (rank - 1) + " to " + rank); this.logger.log("*** " + actor.name + " promoted " + data.name + " from " + (rank - 1) + " to " + rank);
//this.broadcastRankTable(); //this.broadcastRankTable();
@ -1940,7 +1936,7 @@ Channel.prototype.tryDemoteUser = function(actor, data) {
this.broadcastUserUpdate(receiver); this.broadcastUserUpdate(receiver);
} }
else { else {
Database.setChannelRank(this.name, data.name, rank); this.server.db.setChannelRank(this.name, data.name, rank);
} }
this.logger.log("*** " + actor.name + " demoted " + data.name + " from " + (rank + 1) + " to " + rank); this.logger.log("*** " + actor.name + " demoted " + data.name + " from " + (rank + 1) + " to " + rank);
//this.broadcastRankTable(); //this.broadcastRankTable();
@ -1995,4 +1991,4 @@ Channel.prototype.tryChangeLeader = function(user, data) {
this.changeLeader(data.name); this.changeLeader(data.name);
} }
exports.Channel = Channel; module.exports = Channel;

8
server.js
View File

@ -68,6 +68,7 @@ var Server = {
ioserv: null, ioserv: null,
db: null, db: null,
ips: {}, ips: {},
acp: null,
init: function () { init: function () {
this.app = express(); this.app = express();
// channel path // channel path
@ -137,12 +138,15 @@ var Server = {
// finally a valid user // finally a valid user
Logger.syslog.log("Accepted socket from /" + socket._ip); Logger.syslog.log("Accepted socket from /" + socket._ip);
new User(socket, this); new User(socket, this);
}); }.bind(this));
// init database // init database
this.db = require("./database"); this.db = require("./database");
this.db.setup(Config); this.db.setup(Config);
this.db.init(); this.db.init();
// init ACP
this.acp = require("./acp")(this);
}, },
shutdown: function () { shutdown: function () {
Logger.syslog.log("Unloading channels"); Logger.syslog.log("Unloading channels");
@ -165,5 +169,5 @@ if(!Config.DEBUG) {
}); });
process.on("exit", Server.shutdown); process.on("exit", Server.shutdown);
process.on("SIGINT", Server.shutdown); process.on("SIGINT", function () { process.exit(0); });
} }

67
user.js
View File

@ -13,16 +13,14 @@ var Rank = require("./rank.js");
var Auth = require("./auth.js"); var Auth = require("./auth.js");
var Channel = require("./channel.js").Channel; var Channel = require("./channel.js").Channel;
var formatTime = require("./media.js").formatTime; var formatTime = require("./media.js").formatTime;
var Server = require("./server.js");
var Database = require("./database.js");
var Logger = require("./logger.js"); var Logger = require("./logger.js");
var Config = require("./config.js"); var Config = require("./config.js");
var ACP = require("./acp");
var ActionLog = require("./actionlog"); var ActionLog = require("./actionlog");
// Represents a client connected via socket.io // Represents a client connected via socket.io
var User = function(socket, ip) { var User = function(socket, Server) {
this.ip = ip; this.ip = socket._ip;
this.server = Server;
this.socket = socket; this.socket = socket;
this.loggedIn = false; this.loggedIn = false;
this.rank = Rank.Anonymous; this.rank = Rank.Anonymous;
@ -92,12 +90,12 @@ User.prototype.initCallbacks = function() {
return; return;
if(typeof data.name != "string") if(typeof data.name != "string")
return; return;
if(!data.name.match(/^[a-zA-Z0-9-_]+$/)) if(!data.name.match(/^[\w-_]+$/))
return; return;
if(data.name.length > 100) if(data.name.length > 100)
return; return;
data.name = data.name.toLowerCase(); data.name = data.name.toLowerCase();
this.channel = Server.getOrCreateChannel(data.name); this.channel = this.server.getChannel(data.name);
if(this.loggedIn) { if(this.loggedIn) {
var chanrank = this.channel.getRank(this.name); var chanrank = this.channel.getRank(this.name);
if(chanrank > this.rank) { if(chanrank > this.rank) {
@ -117,14 +115,6 @@ User.prototype.initCallbacks = function() {
this.login(name, pw, session); this.login(name, pw, session);
}.bind(this)); }.bind(this));
this.socket.on("register", function(data) {
if(data.name == undefined || data.pw == undefined)
return;
if(data.pw.length > 100)
data.pw = data.pw.substring(0, 100);
this.register(data.name, data.pw);
}.bind(this));
this.socket.on("assignLeader", function(data) { this.socket.on("assignLeader", function(data) {
if(this.channel != null) { if(this.channel != null) {
this.channel.tryChangeLeader(this, data); this.channel.tryChangeLeader(this, data);
@ -328,18 +318,6 @@ User.prototype.initCallbacks = function() {
} }
}.bind(this)); }.bind(this));
this.socket.on("announce", function(data) {
if(Rank.hasPermission(this, "announce")) {
if(data.clear) {
Server.announcement = null;
}
else {
Server.io.sockets.emit("announcement", data);
Server.announcement = data;
}
}
}.bind(this));
this.socket.on("setOptions", function(data) { this.socket.on("setOptions", function(data) {
if(this.channel != null) { if(this.channel != null) {
this.channel.tryUpdateOptions(this, data); this.channel.tryUpdateOptions(this, data);
@ -420,23 +398,6 @@ User.prototype.initCallbacks = function() {
} }
}.bind(this)); }.bind(this));
this.socket.on("setProfile", function(data) {
if(!this.name) {
return;
}
data.image = data.image || "";
data.text = data.text || "";
if(data.text.length > 4000) {
data.text = data.text.substring(0, 4000);
}
if(Database.setProfile(this.name, data)) {
this.profile = data;
if(this.channel != null) {
this.channel.broadcastUserUpdate(this);
}
}
}.bind(this));
this.socket.on("listPlaylists", function(data) { this.socket.on("listPlaylists", function(data) {
if(this.name == "" || this.rank < 1) { if(this.name == "" || this.rank < 1) {
this.socket.emit("listPlaylists", { this.socket.emit("listPlaylists", {
@ -446,7 +407,7 @@ User.prototype.initCallbacks = function() {
return; return;
} }
var list = Database.getUserPlaylists(this.name); var list = this.server.db.getUserPlaylists(this.name);
for(var i = 0; i < list.length; i++) { for(var i = 0; i < list.length; i++) {
list[i].time = formatTime(list[i].time); list[i].time = formatTime(list[i].time);
} }
@ -477,12 +438,12 @@ User.prototype.initCallbacks = function() {
} }
var pl = this.channel.playlist.items.toArray(); var pl = this.channel.playlist.items.toArray();
var result = Database.saveUserPlaylist(pl, this.name, data.name); var result = this.server.db.saveUserPlaylist(pl, this.name, data.name);
this.socket.emit("savePlaylist", { this.socket.emit("savePlaylist", {
success: result, success: result,
error: result ? false : "Unknown" error: result ? false : "Unknown"
}); });
var list = Database.getUserPlaylists(this.name); var list = this.server.db.getUserPlaylists(this.name);
for(var i = 0; i < list.length; i++) { for(var i = 0; i < list.length; i++) {
list[i].time = formatTime(list[i].time); list[i].time = formatTime(list[i].time);
} }
@ -502,8 +463,8 @@ User.prototype.initCallbacks = function() {
return; return;
} }
Database.deleteUserPlaylist(this.name, data.name); this.server.db.deleteUserPlaylist(this.name, data.name);
var list = Database.getUserPlaylists(this.name); var list = this.server.db.getUserPlaylists(this.name);
for(var i = 0; i < list.length; i++) { for(var i = 0; i < list.length; i++) {
list[i].time = formatTime(list[i].time); list[i].time = formatTime(list[i].time);
} }
@ -514,7 +475,7 @@ User.prototype.initCallbacks = function() {
this.socket.on("acp-init", function() { this.socket.on("acp-init", function() {
if(this.global_rank >= Rank.Siteadmin) if(this.global_rank >= Rank.Siteadmin)
ACP.init(this); this.server.acp.init(this);
}.bind(this)); }.bind(this));
this.socket.on("borrow-rank", function(rank) { this.socket.on("borrow-rank", function(rank) {
@ -580,7 +541,7 @@ User.prototype.login = function(name, pw, session) {
lastguestlogin[this.ip] = Date.now(); lastguestlogin[this.ip] = Date.now();
this.rank = Rank.Guest; this.rank = Rank.Guest;
Logger.syslog.log(this.ip + " signed in as " + name); Logger.syslog.log(this.ip + " signed in as " + name);
Database.recordVisit(this.ip, name); this.server.db.recordVisit(this.ip, name);
this.name = name; this.name = name;
this.loggedIn = false; this.loggedIn = false;
this.socket.emit("login", { this.socket.emit("login", {
@ -620,7 +581,7 @@ User.prototype.login = function(name, pw, session) {
name: name name: name
}); });
Logger.syslog.log(this.ip + " logged in as " + name); Logger.syslog.log(this.ip + " logged in as " + name);
Database.recordVisit(this.ip, name); this.server.db.recordVisit(this.ip, name);
this.profile = { this.profile = {
image: row.profile_image, image: row.profile_image,
text: row.profile_text text: row.profile_text
@ -695,4 +656,4 @@ User.prototype.register = function(name, pw) {
} }
} }
exports.User = User; module.exports = User;