Merge branch 'master' of https://github.com/TwitchIO/TwitchIO

Author: IAmTomahawkx

twitchio/abcs.py

@@ -121,10 +121,10 @@ async def send(self, content: str):
         except AttributeError:
             name = entity.name
 
-        if not entity.__messageable_channel__:
-            await ws.send(f"PRIVMSG #jtv :/w {name} {content}\r\n")
-        else:
+        if entity.__messageable_channel__:
             await ws.send(f"PRIVMSG #{name} :{content}\r\n")
+        else:
+            await ws.send(f"PRIVMSG #jtv :/w {entity.name} {content}\r\n")
 
     async def reply(self, content: str):
         """|coro|

twitchio/parse.py

@@ -30,8 +30,19 @@
 if typing.TYPE_CHECKING:
     from .websocket import WSConnection
 
-ACTIONS = ("JOIN", "PART", "PING", "PRIVMSG", "PRIVMSG(ECHO)", "USERSTATE", "MODE", "RECONNECT", "WHISPER")
-ACTIONS2 = ("USERSTATE", "ROOMSTATE", "PRIVMSG", "WHISPER")
+ACTIONS = (
+    "JOIN",
+    "PART",
+    "PING",
+    "PRIVMSG",
+    "PRIVMSG(ECHO)",
+    "USERSTATE",
+    "MODE",
+    "RECONNECT",
+    "WHISPER",
+    "USERNOTICE",
+)
+ACTIONS2 = ("USERSTATE", "ROOMSTATE", "PRIVMSG", "USERNOTICE", "WHISPER")
 USER_SUB = re.compile(r":(?P<user>.*)!")
 TMI = "tmi.twitch.tv"
 

twitchio/websocket.py

@@ -385,7 +385,7 @@ async def _privmsg(self, parsed):  # TODO(Update Cache properly)
 
         self.dispatch("message", message)
 
-    async def _privmsg_echo(self, parsed):  # TODO
+    async def _privmsg_echo(self, parsed):
         log.debug(f'ACTION: PRIVMSG(ECHO):: {parsed["channel"]}')
 
         channel = Channel(name=parsed["channel"], websocket=self)
@@ -395,7 +395,7 @@ async def _privmsg_echo(self, parsed):  # TODO
 
         self.dispatch("message", message)
 
-    async def _userstate(self, parsed):  # TODO
+    async def _userstate(self, parsed):
         log.debug(f'ACTION: USERSTATE:: {parsed["channel"]}')
         self._cache_add(parsed)
 
@@ -405,9 +405,15 @@ async def _userstate(self, parsed):  # TODO
 
         self.dispatch("userstate", user)
 
-    async def _usernotice(self, parsed):  # TODO
+    async def _usernotice(self, parsed):
         log.debug(f'ACTION: USERNOTICE:: {parsed["channel"]}')
 
+        channel = Channel(name=parsed["channel"], websocket=self)
+        rawData = parsed["groups"][0]
+        tags = dict(x.split("=") for x in rawData.split(";"))
+
+        self.dispatch("raw_usernotice", channel, tags)
+
     async def _join(self, parsed):
         log.debug(f'ACTION: JOIN:: {parsed["channel"]}')
         channel = parsed["channel"]