Bump version to 1.4.0

.gitlab-ci.yml

@@ -0,0 +1,27 @@
+image: dock.mau.dev/maubot/maubot
+
+stages:
+- build
+
+variables:
+  PYTHONPATH: /opt/maubot
+
+build:
+  stage: build
+  except:
+  - tags
+  script:
+  - python3 -m maubot.cli build -o xyz.maubot.$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.mbp
+  artifacts:
+    paths:
+    - "*.mbp"
+
+build tags:
+  stage: build
+  only:
+  - tags
+  script:
+  - python3 -m maubot.cli build -o xyz.maubot.$CI_PROJECT_NAME-$CI_COMMIT_TAG.mbp
+  artifacts:
+    paths:
+    - "*.mbp"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Tulir Asokan
+Copyright (c) 2020 Tulir Asokan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

echo.py

@@ -1,7 +1,8 @@
 from typing import Optional
 from time import time
+from html import escape
 
-from mautrix.types import TextMessageEventContent, MessageType
+from mautrix.types import TextMessageEventContent, MessageType, Format, RelatesTo, RelationType
 
 from maubot import Plugin, MessageEvent
 from maubot.handlers import command
@@ -34,17 +35,31 @@ class EchoBot(Plugin):
                 f"{cls.plural(minutes, 'minute')} and {cls.plural(seconds, 'second')}")
 
     @command.new("ping", help="Ping")
-    async def ping_handler(self, evt: MessageEvent) -> None:
+    @command.argument("message", pass_raw=True, required=False)
+    async def ping_handler(self, evt: MessageEvent, message: str = "") -> None:
         diff = int(time() * 1000) - evt.timestamp
-        content = TextMessageEventContent(msgtype=MessageType.NOTICE,
-                                          body="Pong! (ping took "
-                                          f"{self.prettify_diff(diff)} to arrive)")
+        pretty_diff = self.prettify_diff(diff)
+        text_message = f'"{message[:20]}" took' if message else "took"
+        html_message = f'"{escape(message[:20])}" took' if message else "took"
+        content = TextMessageEventContent(
+            msgtype=MessageType.NOTICE, format=Format.HTML,
+            body=f"{evt.sender}: Pong! (ping {text_message} {pretty_diff} to arrive)",
+            formatted_body=f"<a href='https://matrix.to/#/{evt.sender}'>{evt.sender}</a>: Pong! "
+            f"(<a href='https://matrix.to/#/{evt.room_id}/{evt.event_id}'>ping</a> {html_message} "
+            f"{pretty_diff} to arrive)",
+            relates_to=RelatesTo(
+                rel_type=RelationType("xyz.maubot.pong"),
+                event_id=evt.event_id,
+            ))
+        pong_from = evt.sender.split(":", 1)[1]
+        content.relates_to["from"] = pong_from
+        content.relates_to["ms"] = diff
         content["pong"] = {
             "ms": diff,
-            "from": evt.sender.split(":", 1)[1],
+            "from": pong_from,
             "ping": evt.event_id,
         }
-        await evt.reply(content)
+        await evt.respond(content)
 
     @command.new("echo", help="Repeat a message")
     @command.argument("message", pass_raw=True)

maubot.yaml

@@ -1,6 +1,6 @@
 maubot: 0.1.0
 id: xyz.maubot.echo
-version: 1.1.1
+version: 1.4.0
 license: MIT
 modules:
 - echo