Give IRC users power according to modePowerMap. Fixes #385

And is required to fix #453, which is now working.
matrix-org · Jun 28, 2017 · 9a813a3 · 9a813a3
1 parent 1b55548
commit 9a813a3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/lib/bridge/IrcHandler.js b/lib/bridge/IrcHandler.js
@@ -654,8 +654,6 @@ IrcHandler.prototype.onPart = Promise.coroutine(function*(req, server, leavingUs
     yield Promise.all(promises);
 });
 
-// TODO: Pass in the prefix letter along with the special char letter so we don't need to
-//       look up an unsafeClient constantly and therefore can make this work for IRC users.
 IrcHandler.prototype.onMode = Promise.coroutine(function*(req, server, channel, by,
                                                 mode, enabled, arg) {
     req.log.info(
@@ -675,54 +673,58 @@ IrcHandler.prototype.onMode = Promise.coroutine(function*(req, server, channel,
         return;
     }
 
-    // Bridge operator modes to power levels
+    // Bridge usermodes to power levels
     let modeToPower = server.getModePowerMap();
-
     if (Object.keys(modeToPower).indexOf(mode) === -1) {
         // Not an operator power mode
         return;
     }
 
     const nick = arg;
-
     const matrixRooms = yield this.ircBridge.getStore().getMatrixRoomsForChannel(server, channel);
-
     if (matrixRooms.length === 0) {
         req.log.info("No mapped matrix rooms for IRC channel %s", channel);
         return;
     }
 
+    // Work out what power levels to give
+    const userPowers = [];
+    if (modeToPower[mode] && enabled) { // only give this power if it's +, not -
+        userPowers.push(modeToPower[mode]);
+    }
+
+    // Try to also add in other modes for this client connection
     const bridgedClient = this.ircBridge.getClientPool().getBridgedClientByNick(
         server, nick
     );
+    let userId = null;
+    if (bridgedClient) {
+        userId = bridgedClient.userId;
+        if (!bridgedClient.unsafeClient) {
+            req.log.info(`Bridged client for ${nick} has no IRC client.`);
+            return;
+        }
+        const chanData = bridgedClient.unsafeClient.chanData(channel);
+        if (!(chanData && chanData.users)) {
+            req.log.error(`No channel data for ${channel}`);
+            return;
+        }
+        const userPrefixes = chanData.users[nick];
 
-    if (!bridgedClient) {
-        req.log.info("No bridged client for %s", nick);
-        return;
-    }
-
-    if (!bridgedClient.unsafeClient) {
-        req.log.info(`Bridged client for ${nick} has no IRC client.`);
-        return;
+        userPrefixes.split('').forEach(
+            prefix => {
+                const m = bridgedClient.unsafeClient.modeForPrefix[prefix];
+                if (modeToPower[m] !== undefined) {
+                    userPowers.push(modeToPower[m]);
+                }
+            }
+        );
     }
-    const chanData = bridgedClient.unsafeClient.chanData(channel);
-
-    if (!(chanData && chanData.users)) {
-        req.log.error(`No channel data for ${channel}`);
-        return;
+    else {
+        // real IRC user, work out their user ID
+        userId = server.getUserIdFromNick(nick);
     }
 
-    const userPrefixes = chanData.users[nick];
-    const userPowers = [];
-    userPrefixes.split('').forEach(
-        prefix => {
-            const m = bridgedClient.unsafeClient.modeForPrefix[prefix];
-            if (modeToPower[m] !== undefined) {
-                userPowers.push(modeToPower[m]);
-            }
-        }
-    );
-
     // By default, unset the user's power level. This will be treated
     // as the users_default defined in the power levels (or 0 otherwise).
     let level = undefined;
@@ -731,12 +733,9 @@ IrcHandler.prototype.onMode = Promise.coroutine(function*(req, server, channel,
     if (userPowers.length > 0) {
         level = userPowers.sort((a, b) => b - a)[0];
     }
-    const userId = bridgedClient.userId;
 
     req.log.info(
-        `Mode ${mode} received for ${nick}, prefixes now = ${userPrefixes} ` +
-        `and powers are now = ${userPowers}, bridging power level of ${userId} ` +
-        `at ${level}.`
+        `onMode: Mode ${mode} received for ${nick} - granting level of ${level} to ${userId}`
     );
 
     const promises = matrixRooms.map((room) => {

diff --git a/lib/irc/IrcEventBroker.js b/lib/irc/IrcEventBroker.js
@@ -372,13 +372,16 @@ IrcEventBroker.prototype.addHooks = function(client, connInst) {
                 req.log.error("No client exists to set onMode for " + name.nick);
                 return null;
             }
+            req.log.info(
+                "Calculating +mode for " + name.nick + " in " + name.chan + " with opLevel=" + name.opLevel
+            );
             // send onMode for the most powerful prefix only.
             let prefixLetter = null;
             for (let i = 0; i < name.opLevel.length; i++) {
                 const prefix = name.opLevel[i];
                 if (!prefixLetter) {
                     prefixLetter = prefix;
-                    return null;
+                    continue;
                 }
                 if (client.unsafeClient.isUserPrefixMorePowerfulThan(prefixLetter, prefix)) {
                     prefixLetter = prefix;