From 34cc3db0336fcf881f9faf43f2b88f9950345aeb Mon Sep 17 00:00:00 2001
From: Oliver Hartmann <oliver.hartmann@freiewildbahn.de>
Date: Sat, 13 Mar 2021 18:14:04 +0100
Subject: [PATCH] Added from and to variable

---
 src/data.py   | 8 +++++---
 src/trader.py | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/data.py b/src/data.py
index 9aa32c9..002e131 100644
--- a/src/data.py
+++ b/src/data.py
@@ -47,17 +47,19 @@ class Message():
                  date: datetime.datetime,
                  user: str,
                  channel: Channel,
-                 guild: str) -> None:
+                 guild: str = None,
+                 to_from: str = None) -> None:
         self.message = message
         self.date = date
         self.channel = channel
-        if channel is Channel.WHISPER:
-            user = user.lstrip('From ')
         self.user = user
         self.guild = guild
+        self.to_from = to_from
 
     def __str__(self) -> str:
         text = f'{self.date} - {self.channel.name}: '
+        if self.to_from:
+            text = text + f'{self.to_from} '
         if self.guild:
             text = text + f'<{self.guild}> '
         text = text + f'{self.user}: {self.message}'
diff --git a/src/trader.py b/src/trader.py
index 6bd767a..9c8d9a9 100644
--- a/src/trader.py
+++ b/src/trader.py
@@ -10,7 +10,7 @@ logging.basicConfig(level=logging.DEBUG)
 
 
 re_log = re.compile(
-    '(?P<date>\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P<level>\S+) (\S+) (\d+)\] (?P<channel>[#@%$&]?)(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)')
+    '(?P<date>\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d) (\d+) (\S+) \[(?P<level>\S+) (\S+) (\d+)\] (?P<channel>[#@%$&]?)(?P<ToFrom>To|From)?\s?(?P<guild><\S+>)? ?(?P<user>[^:]+): (?P<message>.*)')
 
 
 def parse_log(text: str) -> Message:
@@ -23,7 +23,7 @@ def parse_log(text: str) -> Message:
     guild = result.group('guild')
     if guild:
         guild = guild.strip('<>')
-    return Message(result.group('message'), date, result.group('user'), channel_mapping[result.group('channel')], guild)
+    return Message(result.group('message'), date, result.group('user'), channel_mapping[result.group('channel')], guild, result.group('ToFrom'))
 
 
 def read_log(logfile: str, app: gui.Gui) -> None: