From 4586bc790339eb4c28e5c7ec29618fedb7c87f85 Mon Sep 17 00:00:00 2001
From: jesopo <github@lolnerd.net>
Date: Mon, 25 Nov 2019 16:28:03 +0000
Subject: [PATCH] remove `tags` from StdOut objects - expose through
 event_kwargs

---
 modules/commands/__init__.py | 8 ++++----
 modules/commands/outs.py     | 1 -
 modules/ircv3_msgid.py       | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/commands/__init__.py b/modules/commands/__init__.py
index af65f0af..ae6779d5 100644
--- a/modules/commands/__init__.py
+++ b/modules/commands/__init__.py
@@ -180,7 +180,7 @@ class Module(ModuleManager.BaseModule):
             "target": target, "target_str": target_str,
             "is_channel": is_channel, "line": line, "args_split": args_split,
             "command": command, "args": " ".join(args_split), "stdout": stdout,
-            "stderr": stderr}
+            "stderr": stderr, "tags": {}}
         event_kwargs.update(kwargs)
 
         check_assert = lambda check: self._check_assert(event_kwargs, user,
@@ -222,9 +222,9 @@ class Module(ModuleManager.BaseModule):
         else:
             return
         self._out(event["server"], event["target"], event["target_str"], obj,
-            type)
+            type, event["tags"])
 
-    def _out(self, server, target, target_str, obj, type):
+    def _out(self, server, target, target_str, obj, type, tags):
         if type == OutType.OUT:
             color = utils.consts.GREEN
         else:
@@ -240,7 +240,7 @@ class Module(ModuleManager.BaseModule):
             raise ValueError("Unknown command-method '%s'" % method)
 
         line = IRCLine.ParsedLine(method, [target_str, line_str],
-            tags=obj.tags)
+            tags=tags)
         valid, trunc = line.truncate(server.hostmask(),
             margin=STR_MORE_LEN)
 
diff --git a/modules/commands/outs.py b/modules/commands/outs.py
index fb3c29ef..e82ceefd 100644
--- a/modules/commands/outs.py
+++ b/modules/commands/outs.py
@@ -5,7 +5,6 @@ class StdOut(object):
     def __init__(self, prefix):
         self.prefix = prefix
         self._lines = []
-        self.tags = {}
         self._assured = False
 
     def assure(self):
diff --git a/modules/ircv3_msgid.py b/modules/ircv3_msgid.py
index cbb207dc..f95f9fd4 100644
--- a/modules/ircv3_msgid.py
+++ b/modules/ircv3_msgid.py
@@ -27,5 +27,5 @@ class Module(ModuleManager.BaseModule):
     def postprocess_command(self, event):
         msgid = TAG.get_value(event["line"].tags)
         if msgid:
-            event["stdout"].tags["+draft/reply"] = msgid
-            event["stderr"].tags["+draft/reply"] = msgid
+            event["tags"]["+draft/reply"] = msgid
+            event["tags"]["+draft/reply"] = msgid