Match IRC conventions when bridging file uploads

Usually, IRC users just upload files somewhere and send a bare link,
perhaps with a bit of explanation.

The bridge originally did something like this for files:

	* f_[mtrx] uploaded an image: (20KiB) < https://matrix.org/_matrix/media/v3/download/something/some-other-thing/image.png >

and something like this for code blocks:

	* f_[mtrx] sent a code block: https://matrix.org/_matrix/media/v3/download/something/some-other-thing

That is quite unusual on IRC. This commit changes it to:

	<f_[mtrx]> https://matrix.org/_matrix/media/v3/download/something/some-other-thing/image.png (20KiB)
	<f_[mtrx]> https://matrix.org/_matrix/media/v3/download/something/some-other-thing

Which is more natural.

Signed-off-by: Ferass El Hafidi <[email protected]>

Author: Ferass El Hafidi

src/bridge/MatrixHandler.ts

@@ -1175,10 +1175,9 @@ export class MatrixHandler {
             // we check event.content.body since ircAction already has the markers stripped
             const codeBlockMatch = event.content.body.match(/^```(\w+)?/);
             if (codeBlockMatch) {
-                const type = codeBlockMatch[1] ? ` ${codeBlockMatch[1]}` : '';
                 event.content = {
-                    msgtype: "m.emote",
-                    body:    `sent a${type} code block: ${httpUrl}`
+                    ...event.content,
+                    body:    `${httpUrl}`
                 };
             }
             else {
@@ -1209,7 +1208,7 @@ export class MatrixHandler {
             // Modify the event to become a truncated version of the original
             //  the truncation limits the number of lines sent to lineLimit.
 
-            const msg = '\n...(truncated)';
+            const msg = '\n(truncated)';
 
             const sendingEvent: MatrixMessageEvent = { ...event,
                 content: {

src/models/IrcAction.ts

@@ -54,18 +54,18 @@ export class IrcAction {
                 return new IrcAction(matrixAction.type, matrixAction.text, matrixAction.ts);
             case "image":
                 return new IrcAction(
-                    "emote", "uploaded an image: " + matrixAction.text, matrixAction.ts
+                    "message", "" + matrixAction.text, matrixAction.ts
                 );
             case "video":
                 return new IrcAction(
-                    "emote", "uploaded a video: " + matrixAction.text, matrixAction.ts
+                    "message", "" + matrixAction.text, matrixAction.ts
                 );
             case "audio":
                 return new IrcAction(
-                    "emote", "uploaded an audio file: " + matrixAction.text, matrixAction.ts
+                    "message", "" + matrixAction.text, matrixAction.ts
                 );
             case "file":
-                return new IrcAction("emote", "posted a file: " + matrixAction.text, matrixAction.ts);
+                return new IrcAction("message", "" + matrixAction.text, matrixAction.ts);
             case "topic":
                 if (matrixAction.text === null) {
                     break;

src/models/MatrixAction.ts

@@ -220,12 +220,12 @@ export class MatrixAction {
 
                 if (filename) {
                     url += `/${encodeURIComponent(filename)}`;
-                    text = `${fileSize} < ${url} >`;
+                    text = `${url} ${fileSize}`;
                 }
                 else {
                     fileSize = fileSize ? ` ${fileSize}` : "";
                     // If not a filename, print the body
-                    text = `${event.content.body}${fileSize} < ${url} >`;
+                    text = `${url} ${event.content.body}${fileSize}`;
                 }
             }
         }