Added chatters from the TMI api.

Author: PetterKraabol

setup.py

@@ -39,6 +39,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/PetterKraabol/Twitch-Python',
-    version='0.0.16',
+    version='0.0.17',
     zip_safe=True,
 )

twitch/__init__.py

@@ -2,12 +2,14 @@
 
 from twitch.chat import Chat
 from twitch.helix import Helix
+from twitch.tmi import TMI
 from twitch.v5 import V5
 
 name: str = "twitch"
 
 __all__: List[Callable] = [
     Helix,
     V5,
-    Chat
+    TMI,
+    Chat,
 ]

twitch/api.py

@@ -13,6 +13,7 @@ class API:
     def __init__(self,
                  base_url: Optional[str] = None,
                  client_id: Optional[str] = None,
+                 client_secret: Optional[str] = None,
                  use_cache: Optional[bool] = False,
                  request_rate: Optional[int] = None,
                  bearer_token: Optional[str] = None,
@@ -29,6 +30,7 @@ def __init__(self,
         """
         self.base_url: Optional[str] = base_url
         self.client_id: Optional[str] = client_id
+        self.client_secret: Optional[str] = client_secret
         self.use_cache: bool = use_cache
         self.request_rate: Optional[int] = request_rate
         self.bearer_token: Optional[str] = bearer_token

twitch/helix/helix.py

@@ -32,7 +32,8 @@ def __init__(self,
             bearer_token = 'Bearer ' + bearer_token.lower().lstrip('bearer').strip()
 
         self.api = API(Helix.BASE_URL,
-                       client_id,
+                       client_id=client_id,
+                       client_secret=client_secret,
                        use_cache=use_cache,
                        cache_duration=cache_duration,
                        handle_rate_limit=handle_rate_limit,

twitch/helix/models/user.py

@@ -1,6 +1,7 @@
 from typing import Dict, Any
 
 import twitch.helix as helix
+import twitch.tmi as tmi
 from twitch.api import API
 from .model import Model
 
@@ -39,6 +40,14 @@ def is_live(self) -> bool:
         except helix.StreamNotFound:
             return False
 
+    @property
+    def chatters(self) -> 'tmi.Chatters':
+        source = tmi.TMI('')
+        source.api = self._api
+        source.api.base_url = tmi.TMI.BASE_URL
+
+        return source.chatters(self.login)
+
     def following(self, **kwargs) -> 'helix.Follows':
         kwargs['from_id'] = self.id
         return helix.Follows(api=self._api, follow_type='following', **kwargs)

twitch/helix/resources/users.py

@@ -24,6 +24,10 @@ def __init__(self, api: API, *args):
             ]
         ]
 
+        # todo: Authenticated user if bearer token is provided
+        if not len(params['id'] + params['login']):
+            pass
+
         # Custom user caching
         if self._api.use_cache:
             cache_hits: Dict[str, list] = {'id': [], 'login': []}
@@ -53,6 +57,7 @@ def __init__(self, api: API, *args):
                     API.SHARED_CACHE.set(f'helix.users.login.{user.login}', data)
                     API.SHARED_CACHE.set(f'helix.users.id.{user.id}', data)
 
+
     def _can_paginate(self) -> bool:
         return False
 

twitch/tmi/__init__.py

@@ -0,0 +1,10 @@
+from typing import List, Callable
+
+from twitch.tmi.models.chatter import Chatter
+from twitch.tmi.resources.chatters import Chatters
+from twitch.tmi.tmi import TMI
+
+__all__: List[Callable] = [
+    TMI,
+    Chatter, Chatters
+]

twitch/tmi/models/__init__.py

@@ -0,0 +1,9 @@
+from typing import List, Callable
+
+from .chatter import Chatter
+from .model import Model
+
+__all__: List[Callable] = [
+    Chatter,
+    Model,
+]

twitch/tmi/models/chatter.py

@@ -0,0 +1,20 @@
+from typing import Dict, Any, List
+
+import twitch.helix as helix
+from twitch.api import API
+from .model import Model
+
+
+class Chatter(Model):
+
+    def __init__(self, api: API, name: str, chatter_type: str):
+        super().__init__(api, {})
+        self.name: str = name
+        self.type: str = chatter_type
+
+    @property
+    def user(self) -> 'helix.User':
+        source = helix.Helix('')
+        source.api = self._api
+        source.api.base_url = helix.Helix.BASE_URL
+        return source.user(self.name)

twitch/tmi/models/model.py

@@ -0,0 +1,11 @@
+from abc import ABCMeta
+from dataclasses import dataclass
+from typing import Optional, Dict, Any
+
+from twitch.api import API
+
+
+@dataclass
+class Model(metaclass=ABCMeta):
+    _api: Optional[API]
+    data: Optional[Dict[str, Any]]