Use AS-specific room publication API

config.sample.yaml

@@ -31,6 +31,9 @@ ircService:
       # A human-readable description string
       # description: "Example.com IRC network"
 
+      # An ID for uniquely identifying this server amongst other servers being bridged.
+      # networkId: "example"
+
       # The port to connect to. Optional.
       port: 6697
       # Whether to use SSL or not. Default: false.

lib/DataStore.js

@@ -170,7 +170,7 @@ DataStore.prototype.getAllChannelMappings = Promise.coroutine(function*() {
             (e) => e.matrix_id === roomId
         ).map((e) => {
             return {
-                domain: e.remote.domain,
+                networkId: this._serverMappings[e.remote.domain].getNetworkId(),
                 channel: e.remote.channel
             }
         });

lib/bridge/IrcBridge.js

@@ -560,6 +560,7 @@ IrcBridge.prototype.getThirdPartyProtocol = function(protocol) {
         },
         instances: servers.map((server) => {
             return {
+                network_id: server.getNetworkId(),
                 bot_user_id: this.getAppServiceUserId(),
                 desc: server.config.name || server.domain,
                 icon: server.config.icon,

lib/bridge/IrcHandler.js

@@ -571,9 +571,11 @@ IrcHandler.prototype.onMode = Promise.coroutine(function*(req, server, channel,
             req.log.info("Not syncing publicity: shouldPublishRooms is false");
             return Promise.resolve();
         }
+        const key = this.ircBridge.publicitySyncer.getIRCVisMapKey(server.getNetworkId(), channel);
+
         // Update the visibility for all rooms connected to this channel
         return this.ircBridge.publicitySyncer.updateVisibilityMap(
-            true, server.domain + ' ' + channel, enabled
+            true, key, enabled
         );
     }
 

lib/bridge/PublicitySyncer.js

@@ -20,10 +20,10 @@ function PublicitySyncer(ircBridge) {
     // should be resolved by keeping the matrix side as private as necessary
     this._visibilityMap = {
         mappings: {
-            //room_id: ['server #channel1', 'server channel2',...]
+            //room_id: ['funNetwork #channel1', 'funNetwork channel2',...]
         },
         channelIsSecret: {
-            // '$server $channel': true | false
+            // '$networkId $channel': true | false
         },
         roomVisibilities: {
             // room_id: "private" | "public"
@@ -61,6 +61,22 @@ PublicitySyncer.prototype.initModes = Promise.coroutine(function*(server) {
     });
 });
 
+/**
+ * Returns the key used when calling `updateVisibilityMap` for updating an IRC channel
+ * visibility mode (+s or -s).
+ * ```
+ * // Set channel on server to be +s
+ * const key = publicitySyncer.getIRCVisMapKey(server.getNetworkId(), channel);
+ * publicitySyncer.updateVisibilityMap(true, key, true);
+ * ```
+ * @param {string} networkId
+ * @param {string} channel
+ * @returns {string}
+ */
+PublicitySyncer.prototype.getIRCVisMapKey = function(networkId, channel) {
+    return networkId + ' ' + channel;
+}
+
 // This is used so that any updates to the visibility map will cause the syncer to
 // reset a timer and begin counting down again to the eventual call to solve any
 // inconsistencies in the visibility map.
@@ -125,7 +141,7 @@ PublicitySyncer.prototype._solveVisibility = Promise.coroutine(function*() {
 
     roomIds.forEach((roomId) => {
         this._visibilityMap.mappings[roomId] = mappings[roomId].map((mapping) => {
-            return mapping.domain + ' ' + mapping.channel
+            return getIRCVisMapKey(mapping.networkId, mapping.channel);
         });
     });
 
@@ -181,8 +197,12 @@ PublicitySyncer.prototype._solveVisibility = Promise.coroutine(function*() {
         let currentState = this._visibilityMap.roomVisibilities[roomId];
         let correctState = shouldBePrivate(roomId, []) ? 'private' : 'public';
 
+        // Use the server network ID of the first mapping
+        // 'funNetwork #channel1' => 'funNetwork'
+        const networkId = this._visibilityMap.mappings[roomId][0].split(' ')[0];
+
         if (currentState !== correctState) {
-            return cli.setRoomDirectoryVisibility(roomId, correctState).then(
+            return cli.setRoomDirectoryVisibilityAppService(networkId, roomId, correctState).then(
                 () => {
                     // Update cache
                     this._visibilityMap.roomVisibilities[roomId] = correctState;

lib/config/schema.yml

@@ -112,6 +112,9 @@ properties:
                             type: "string"
                         description:
                             type: "string"
+                        networkId:
+                            type: "string"
+                            pattern: "^[a-zA-Z0-9]+$"
                         icon:
                             type: "string"
                         quitDebounce:

lib/irc/IrcServer.js

@@ -33,6 +33,15 @@ IrcServer.prototype.getReadableName = function() {
     return '';
 }
 
+/**
+ * Returns the network ID of this server, which should be unique across all
+ * IrcServers on the bridge. Defaults to the domain of this IrcServer.
+ * @return {string} this.config.networkId || this.domain
+ */
+IrcServer.prototype.getNetworkId = function() {
+    return this.config.networkId || this.domain;
+}
+
 /**
  * Returns whether the server is configured to wait getQuitDebounceDelayMs before
  * parting a user that has disconnected due to a net-split.