Merge remote-tracking branch 'origin/soru/channels' into develop

src/discordmessageprocessor.ts

@@ -150,6 +150,9 @@ export class DiscordMessageProcessor {
     public InsertChannel(node: IDiscordNode, msg: Discord.Message, html: boolean = false): string {
         const id = node.id;
         const channel = msg.guild.channels.get(id);
+        if (!channel) {
+            return html ? `&lt;#${escapeHtml(id)}&gt;` : `<#${id}>`;
+        }
         const channelStr = escapeHtml(channel ? "#" + channel.name : "#" + id);
         if (!html) {
             return channelStr;

test/test_discordmessageprocessor.ts

@@ -262,11 +262,11 @@ describe("DiscordMessageProcessor", () => {
             const msg = new MockMessage(channel) as any;
             const content = { id: "123456789" };
             let reply = processor.InsertChannel(content, msg);
-            Chai.assert.equal(reply, "#123456789");
+            Chai.assert.equal(reply, "<#123456789>");
 
             reply = processor.InsertChannel(content, msg, true);
             Chai.assert.equal(reply,
-                "<a href=\"https://matrix.to/#/#_discord_123_123456789:localhost\">#123456789</a>");
+                "&lt;#123456789&gt;");
         });
         it("processes channels correctly", () => {
             const processor = new DiscordMessageProcessor(