supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3647 from thelounge/xpaw/mode-string

Browse Source 
Display the original sets mode string and make nicks clickable
This commit is contained in:
Pavel Djundik 2020-01-04 15:22:27 +02:00 committed by GitHub
commit b93cae2e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/irc-events/mode.js
View File

@ -34,7 +34,7 @@ module.exports = function(irc, network) {
const msg = new Msg({ const msg = new Msg({
type: Msg.Type.MODE_CHANNEL, type: Msg.Type.MODE_CHANNEL,
text: `${data.raw_modes} ${data.raw_params}`, text: `${data.raw_modes} ${data.raw_params.join(" ")}`,
}); });
targetChan.pushMessage(client, msg); targetChan.pushMessage(client, msg);
}); });
@ -52,6 +52,28 @@ module.exports = function(irc, network) {
} }
} }
const msg = new Msg({
time: data.time,
type: Msg.Type.MODE,
from: targetChan.getUser(data.nick),
text: `${data.raw_modes} ${data.raw_params.join(" ")}`,
self: data.nick === irc.user.nick,
});
for (const param of data.raw_params) {
const users = [];
if (targetChan.findUser(param)) {
users.push(param);
}
if (users.length > 0) {
msg.users = users;
}
}
targetChan.pushMessage(client, msg);
let usersUpdated; let usersUpdated;
const userModeSortPriority = {}; const userModeSortPriority = {};
const supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix"); const supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix");
@ -61,28 +83,14 @@ module.exports = function(irc, network) {
}); });
data.modes.forEach((mode) => { data.modes.forEach((mode) => {
let text = mode.mode; const add = mode.mode[0] === "+";
const add = text[0] === "+"; const char = mode.mode[1];
const char = text[1];
if (char === "k") { if (char === "k") {
targetChan.key = add ? mode.param : ""; targetChan.key = add ? mode.param : "";
client.save(); client.save();
} }
if (mode.param) {
text += " " + mode.param;
}
const msg = new Msg({
time: data.time,
type: Msg.Type.MODE,
from: targetChan.getUser(data.nick),
text: text,
self: data.nick === irc.user.nick,
});
targetChan.pushMessage(client, msg);
if (!mode.param) { if (!mode.param) {
return; return;
} }