give BufferLine.id default value, overwrite in ircv3_msgid.py

1 files changed, 11 insertions, 4 deletions

diff --git a/src/core_modules/ircv3_msgid.py b/src/core_modules/ircv3_msgid.py
index f95f9fd4..0f20a45f 100644
--- a/src/core_modules/ircv3_msgid.py
+++ b/src/core_modules/ircv3_msgid.py
@@ -3,25 +3,32 @@ from src import ModuleManager, utils
 TAG = utils.irc.MessageTag("msgid", "draft/msgid")
 
 class Module(ModuleManager.BaseModule):
-    def _on_channel(self, channel, tags):
+    def _on_channel(self, channel, tags, buffer_line):
         msgid = TAG.get_value(tags)
         if not msgid == None:
             channel.set_setting("last-msgid", msgid)
 
+            if buffer_line:
+                buffer_line.id = msgid
+
     @utils.hook("received.message.channel")
     @utils.hook("send.message.channel")
     @utils.hook("received.notice.channel")
     @utils.hook("send.notice.channel")
+    def on_channel(self, event):
+        self._on_channel(event["channel"], event["tags"], event["buffer_line"])
+
     @utils.hook("received.tagmsg.channel")
     @utils.hook("send.tagmsg.channel")
-    def on_channel(self, event):
-        self._on_channel(event["channel"], event["tags"])
+    def tagmsg(self, event):
+        self._on_channel(event["channel"], event["tags"], None)
+
 
     @utils.hook("received.ctcp.request")
     @utils.hook("received.ctcp.response")
     def ctcp(self, event):
         if event["is_channel"]:
-            self._on_channel(event["target"], event["tags"])
+            self._on_channel(event["target"], event["tags"], None)
 
     @utils.hook("postprocess.command")
     def postprocess_command(self, event):