From ed2bd2a2c6511b3a764459beda30d8922e46604a Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Wed, 10 Apr 2019 14:56:24 +0000
Subject: [PATCH] Add some logging to Room

---
 test.py        | 8 ++++++--
 yaboli/room.py | 5 +++++
 yaboli/util.py | 5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/test.py b/test.py
index 92e75e4..6129252 100644
--- a/test.py
+++ b/test.py
@@ -6,7 +6,11 @@ import logging
 
 import yaboli
 
-FORMAT = "{asctime} [{levelname:<7}] <{name}> {funcName}(): {message}"
+#FORMAT = "{asctime} [{levelname:<7}] <{name}> {funcName}(): {message}"
+#LEVEL = logging.DEBUG
+FORMAT = "{asctime} [{levelname:<7}] <{name}>: {message}"
+LEVEL = logging.INFO
+
 DATE_FORMAT = "%F %T"
 handler = logging.StreamHandler()
 handler.setFormatter(logging.Formatter(
@@ -16,7 +20,7 @@ handler.setFormatter(logging.Formatter(
 ))
 
 logger = logging.getLogger('yaboli')
-logger.setLevel(logging.DEBUG)
+logger.setLevel(LEVEL)
 logger.addHandler(handler)
 
 class TestClient(yaboli.Client):
diff --git a/yaboli/room.py b/yaboli/room.py
index 48d5af3..2fb8a92 100644
--- a/yaboli/room.py
+++ b/yaboli/room.py
@@ -9,6 +9,7 @@ from .events import Events
 from .exceptions import *
 from .message import LiveMessage
 from .session import Account, LiveSession, LiveSessionListing
+from .util import atmention
 
 logger = logging.getLogger(__name__)
 
@@ -238,6 +239,7 @@ class Room:
         session = LiveSession.from_data(self, data)
         self._users = self.users.with_join(session)
 
+        logger.info(f"{session.atmention} joined")
         self._events.fire("join", session)
 
     async def _on_login_event(self, packet: Any) -> None:
@@ -258,6 +260,7 @@ class Room:
             for user in self.users:
                 if user.server_id == server_id and user.server_era == server_era:
                     users = users.with_part(user)
+                    logger.info(f"{user.atmention} left")
                     self._events.fire("part", user)
 
             self._users = users
@@ -274,6 +277,7 @@ class Room:
         else:
             await self.who() # recalibrating self._users
 
+        logger.info(f"{atmention(nick_from)} is now called {atmention(nick_to)}")
         self._events.fire("nick", session, nick_from, nick_to)
 
     async def _on_edit_message_event(self, packet: Any) -> None:
@@ -289,6 +293,7 @@ class Room:
         session = LiveSession.from_data(self, data)
         self._users = self.users.with_part(session)
 
+        logger.info(f"{session.atmention} left")
         self._events.fire("part", session)
 
     async def _on_pm_initiate_event(self, packet: Any) -> None:
diff --git a/yaboli/util.py b/yaboli/util.py
index 27eda6e..1d2069b 100644
--- a/yaboli/util.py
+++ b/yaboli/util.py
@@ -1,6 +1,6 @@
 import re
 
-__all__ = ["mention", "normalize", "similar"]
+__all__ = ["mention", "atmention", "normalize", "similar"]
 
 # Name/nick related functions
 
@@ -8,6 +8,9 @@ def mention(nick: str, ping: bool = False) -> str:
     mentioned = re.sub(r"""[,.!?;&<'"\s]""", "", nick)
     return "@" + mentioned if ping else mentioned
 
+def atmention(nick: str) -> str:
+    return mention(nick, ping=True)
+
 def normalize(nick: str) -> str:
     return mention(nick, ping=False).lower()