Merge pull request #148 from Half-Shot/hs/attachment-check-format

Don't try to upload content missing a URL.

src/matrixeventprocessor.ts

@@ -126,11 +126,17 @@ export class MatrixEventProcessor {
         if (!hasAttachment) {
             return "";
         }
+
         if (event.content.info == null) {
             log.info("Event was an attachment type but was missing a content.info");
             return "";
         }
 
+        if (event.content.url == null) {
+            log.info("Event was an attachment type but was missing a content.url");
+            return "";
+        }
+
         let size = event.content.info.size || 0;
         const url = mxClient.mxcUrlToHttp(event.content.url);
         const name = this.GetFilenameForMediaEvent(event.content);

test/test_matrixeventprocessor.ts

@@ -350,6 +350,17 @@ describe("MatrixEventProcessor", () => {
                 },
             }, mxClient)).to.eventually.eq("");
         });
+        it("message without a url", () => {
+            const processor = createMatrixEventProcessor();
+            return expect(processor.HandleAttachment({
+                content: {
+                    msgtype: "m.video",
+                    info: {
+                        size: 1,
+                    },
+                },
+            }, mxClient)).to.eventually.eq("");
+        });
         it("message with a large info.size", () => {
             const LARGE_FILE = 8000000;
             const processor = createMatrixEventProcessor();