deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-07 16:22:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1528 from thelounge/xpaw/move-log-function

Browse source 
Move user log function where it belongs
This commit is contained in:
Al McKinlay 2017-09-16 20:50:06 +01:00 committed by GitHub
parent 59a5f6237c 17dd18a605
commit aace1aab05
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client.js
View file

@ -5,7 +5,6 @@ var colors = require("colors/safe");
var pkg = require("../package.json");
var Chan = require("./models/chan");
var crypto = require("crypto");
var userLog = require("./userLog");
var Msg = require("./models/msg");
var Network = require("./models/network");
var ircFramework = require("irc-framework");
@ -114,23 +113,6 @@ Client.prototype.emit = function(event, data) {
if (this.sockets !== null) {
this.sockets.in(this.id).emit(event, data);
}
if (this.config.log === true) {
if (event === "msg") {
var target = this.find(data.chan);
if (target) {
var chan = target.chan.name;
if (target.chan.type === Chan.Type.LOBBY) {
chan = target.network.host;
}
userLog.write(
this.name,
target.network.host,
chan,
data.msg
);
}
}
}
};
Client.prototype.find = function(channelId) {

16
src/models/chan.js
View file

@ -2,6 +2,7 @@
var _ = require("lodash");
var Helper = require("../helper");
const userLog = require("../userLog");
const storage = require("../plugins/storage");
module.exports = Chan;
@ -57,6 +58,10 @@ Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
this.messages.push(msg);
if (client.config.log === true) {
writeUserLog(client, msg);
}
if (Helper.config.maxHistory >= 0 && this.messages.length > Helper.config.maxHistory) {
const deleted = this.messages.splice(0, this.messages.length - Helper.config.maxHistory);
@ -127,3 +132,14 @@ Chan.prototype.toJSON = function() {
clone.messages = clone.messages.slice(-100);
return clone;
};
function writeUserLog(client, msg) {
const target = client.find(this.id);
userLog.write(
client.name,
target.network.host, // TODO: Fix #1392, multiple connections to same server results in duplicate logs
this.type === Chan.Type.LOBBY ? target.network.host : this.name,
msg
);
}

2
src/userLog.js
View file

@ -18,7 +18,7 @@ module.exports.write = function(user, network, chan, msg) {
var format = Helper.config.logs.format || "YYYY-MM-DD HH:mm:ss";
var tz = Helper.config.logs.timezone || "UTC+00:00";
var time = moment().utcOffset(tz).format(format);
var time = moment(msg.time).utcOffset(tz).format(format);
var line = `[${time}] `;
var type = msg.type.trim();