tidy up IRCBuffer.find, respect line.deleted there too

1 files changed, 8 insertions, 5 deletions

diff --git a/src/IRCBuffer.py b/src/IRCBuffer.py
index a1000f7f..8ff21d4c 100644
--- a/src/IRCBuffer.py
+++ b/src/IRCBuffer.py
@@ -49,12 +49,13 @@ class Buffer(object):
             for line in self._lines:
                 yield line
 
-    def find(self, pattern: typing.Union[str, typing.Pattern[str]], **kwargs
+    def find(self, pattern: typing.Union[str, typing.Pattern[str]],
+            not_pattern: typing.Union[str, typing.Pattern[str]],
+            from_self=True, for_user: str=None, deleted=False
             ) -> typing.Optional[BufferLineMatch]:
-        from_self = kwargs.get("from_self", True)
-        for_user = kwargs.get("for_user", "")
-        for_user = self.server.irc_lower(for_user) if for_user else None
-        not_pattern = kwargs.get("not_pattern", None)
+        if for_user:
+            for_user = self.server.irc_lower(for_user)
+
         for line in self._lines:
             if line.from_self and not from_self:
                 continue
@@ -66,6 +67,8 @@ class Buffer(object):
                     if for_user and not self.server.irc_lower(line.sender
                             ) == for_user:
                         continue
+                    if line.deleted and not deleted:
+                        continue
                     return BufferLineMatch(line, match.group(0))
         return None