remove IRCBuffer.skip_next (not used), pass buffer lines on message events

1 files changed, 9 insertions, 6 deletions

diff --git a/modules/line_handler/message.py b/modules/line_handler/message.py
index f0053866..ae16a1f6 100644
--- a/modules/line_handler/message.py
+++ b/modules/line_handler/message.py
@@ -91,17 +91,20 @@ def message(events, event):
     hook = events.on(direction).on(event_type).on(context)
 
     if is_channel:
-        hook.call(channel=target_obj, **kwargs)
+        buffer_line = None
         if message:
-            target_obj.buffer.add_message(user.nickname, message, action,
-                event["line"].tags, from_self)
+            buffer_line = target_obj.buffer.add_message(user.nickname, message,
+                action, event["line"].tags, from_self)
+        hook.call(channel=target_obj, buffer_line=buffer_line, **kwargs)
     else:
-        hook.call(**kwargs)
 
         buffer_obj = target_obj
         if not from_self:
             buffer_obj = user
 
+        buffer_line = None
         if message:
-            buffer_obj.buffer.add_message(user.nickname, message, action,
-                event["line"].tags, from_self)
+            buffer_line = buffer_obj.buffer.add_message(user.nickname, message,
+                action, event["line"].tags, from_self)
+
+        hook.call(buffer_line=buffer_line, **kwargs)