From 0a302dfd21f7cd3503e01ca81f4a0093048d5375 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Fri, 21 Jun 2019 20:20:28 +0100
Subject: pass ParsedLine on message and formatted.* message events

---
 modules/format_activity.py       | 6 +++---
 modules/line_handler/__init__.py | 2 +-
 modules/line_handler/message.py  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/format_activity.py b/modules/format_activity.py
index 8bcbb187..d6c2809e 100644
--- a/modules/format_activity.py
+++ b/modules/format_activity.py
@@ -42,19 +42,19 @@ class Module(ModuleManager.BaseModule):
         line = self._privmsg(event, event["channel"], user, nickname)
         self._event("message.channel", event["server"], line,
             event["channel"].name, channel=event["channel"], user=user,
-            from_self=event["from_self"])
+            parsed_line=event["line"])
 
     def _on_notice(self, event, sender):
         return "(notice) <%s> %s" % (sender, event["message"])
     def _channel_notice(self, event, sender, channel):
         line = self._on_notice(event, sender)
         self._event("notice.channel", event["server"], line,
-            event["channel"].name, from_self=event["from_self"])
+            event["channel"].name, parsed_line=event["line"])
 
     def _private_notice(self, event, sender, target):
         line = self._on_notice(event, sender)
         self._event("notice.private", event["server"], line, None,
-            from_self=event["from_self"])
+            parsed_line=event["line"])
 
     @utils.hook("received.notice.channel", priority=EventManager.PRIORITY_HIGH)
     def channel_notice(self, event):
diff --git a/modules/line_handler/__init__.py b/modules/line_handler/__init__.py
index 55455c46..fc5c73d1 100644
--- a/modules/line_handler/__init__.py
+++ b/modules/line_handler/__init__.py
@@ -11,7 +11,7 @@ class Module(ModuleManager.BaseModule):
         default_event = any(default_events)
 
         kwargs = {"command": line.command, "args": line.args, "tags": line.tags,
-            "server": server, "source": line.source,
+            "server": server, "source": line.source, "line": line,
             "direction": utils.Direction.Recv}
 
         self.events.on("raw.received").on(line.command).call_unsafe(**kwargs)
diff --git a/modules/line_handler/message.py b/modules/line_handler/message.py
index 355e78b3..daa1131f 100644
--- a/modules/line_handler/message.py
+++ b/modules/line_handler/message.py
@@ -53,7 +53,7 @@ def message(events, event):
 
     kwargs = {"server": event["server"], "target": target_obj,
         "target_str": target_str, "user": user, "tags": event["tags"],
-        "is_channel": is_channel, "from_self": from_self}
+        "is_channel": is_channel, "from_self": from_self, "line": event["line"]}
 
     action = False
 
-- 
cgit v1.3.1-10-gc9f91