Merge branch 'develop'

.gitignore

@@ -6,6 +6,7 @@ logs
 *.log.*
 npm-debug.log*
 .audit.json
+*-audit.json
 
 # Runtime data
 pids

README.md

@@ -32,11 +32,12 @@ These instructions were tested against Node.js v8.11.1 and the Synapse homeserve
 * Copy ``config/config.sample.yaml`` to ``config.yaml`` and edit it to reflect your setup.
   * Note that you are expected to set ``domain`` and ``homeserverURL`` to your **public** host name.
   While localhost would work, it does not resolve correctly with Webhooks/Avatars.
+  Please note that a self-signed SSL certificate won't work, either.
 
   ```yaml
   bridge:
       domain: "example.com"
-      homeserverUrl: "https://example.com:8448"
+      homeserverUrl: "https://example.com"
   ```
 
 * Run ``node build/src/discordas.js -r -u "http://localhost:9005" -c config.yaml``

config/config.sample.yaml

@@ -19,20 +19,14 @@ bridge:
   disablePresence: false
   # Disable sending typing notifications when somebody on Discord types.
   disableTypingNotifications: false
-  # Disable parsing discord usernames out of matrix messages so
-  # that it highlights discord users.
-  # WARNING: Not always 100% accurate, but close enough usually.
-  disableDiscordMentions: false
   # Disable deleting messages on Discord if a message is redacted on Matrix.
   disableDeletionForwarding: false
   # Enable users to bridge rooms using !discord commands. See
   # https://t2bot.io/discord for instructions.
   enableSelfServiceBridging: false
-  # For both below, a space is inserted after @ to stop the mentions working.
-  # Disable relaying @everyone to Discord. Non-puppeted users can abuse this.
-  disableEveryoneMention: false
-  # Disable relaying @here to Discord. Non-puppeted users can abuse this.
-  disableHereMention: false
+  # Disable sending of read receipts for Matrix events which have been
+  # successfully bridged to Discord.
+  disableReadReceipts: false
 # Authentication configuration for the discord bot.
 auth:
   clientID: "12345"

config/config.schema.yaml

@@ -16,15 +16,11 @@ properties:
             type: "boolean"
           disableTypingNotifications:
             type: "boolean"
-          disableDiscordMentions:
-            type: "boolean"
           disableDeletionForwarding:
             type: "boolean"
           enableSelfServiceBridging:
             type: "boolean"
-          disableEveryoneMention:
-            type: "boolean"
-          disableHereMention:
+          disableReadReceipts:
             type: "boolean"
     auth:
         type: "object"