Merge pull request #75 from yupix/v1.0.2

v1.0.2

Author: yupix

CHANGELOG.md

@@ -7,18 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v1.0.2] 2021-12-24
+
 ### Added
 
-- add event `on_mention`
-- add `favorite`, `add_to_clips`, `add_reaction` and `remove_favorite` method to `Note` class
-- add `favorite`, `add_note_to_clips`, `add_reaction_to_note` and `remove_favorite` method to `NoteAction` class
-- add class
-    - NoteActions
-    - ClientAction
+- add event `on_follow` and `follow_request`
+- add a new `Following` and `UserAction` class
+- add `accept_request` and `reject_request` method to `Following` class
+- add `accept_following_request` and `reject_following_request` method to `UserAction` class
 
 ### Fixed
 
-- fixed a bug where json arguments were replaced with data in requests.
+- Fixed a problem where renote would say the key was missing.
 
 ## [v1.0.1] 2021-12-24
 

mi/__init__.py

@@ -4,7 +4,7 @@
 __copyright__ = "Copyright 2021-present yupix"
 __author_email__ = "[email protected]"
 __url__ = "https://github.com/yupix/Mi.py"
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 

mi/http.py

@@ -7,7 +7,7 @@
 import aiohttp
 
 from mi.gateway import MisskeyClientWebSocketResponse
-from mi.utils import upper_to_lower
+from mi.utils import remove_dict_empty, upper_to_lower
 from . import __version__, config, exception
 
 
@@ -75,6 +75,10 @@ async def request(self, route: Route, *, files=None, form=None, **kwargs) -> Any
                 kwargs[key] = {}
             kwargs[key]['i'] = self.token
 
+        for i in ('json', 'data'):
+            if kwargs.get(i):
+                kwargs[i] = remove_dict_empty(kwargs[i])
+
         async with self.__session.request(route.method, route.url, **kwargs) as res:
             data = await json_or_text(res)
             if is_lower:

mi/state.py

@@ -14,7 +14,7 @@
 from mi.http import Route
 from mi.iterators import InstanceIterator
 from mi.note import Note, Poll, Reaction
-from mi.user import Follower
+from mi.user import Follower, Following
 from mi.emoji import Emoji
 from mi.utils import check_multi_arg, get_cache_key, get_module_logger, key_builder, remove_dict_empty, str_lower, \
     upper_to_lower
@@ -46,7 +46,21 @@ async def add_reaction_to_note(self, note_id: str, reaction: str) -> bool:
         return bool(await self.http.request(Route('POST', '/api/reactions/create', json=data, auth=True)))
 
 
-class ClientAction(NoteActions):
+class UserAction:
+    def __init__(self, http: HTTPClient, loop: asyncio.AbstractEventLoop):
+        self.http = http
+        self.loop = loop
+
+    async def accept_following_request(self, user_id: str) -> bool:
+        data = {'userId': user_id}
+        return bool(await self.http.request(Route('POST', '/api/following/requests/accept'), json=data, auth=True))
+
+    async def reject_following_request(self, user_id: str) -> bool:
+        data = {'userId': user_id}
+        return bool(await self.http.request(Route('POST', '/api/following/requests/reject'), json=data, auth=True))
+
+
+class ClientAction(NoteActions, UserAction):
     pass
 
 
@@ -85,6 +99,21 @@ def parse_channel(self, message: Dict[str, Any]) -> None:
     def parse_renote(self, message: Dict[str, Any]):
         pass
 
+    def parse_unfollow(self, message: Dict[str, Any]):
+        """
+        フォローを解除した際のイベントを解析する関数
+        """
+
+    def parse_receive_follow_request(self, message: Dict[str, Any]):
+        """
+        フォローリクエストを受け取った際のイベントを解析する関数
+        """
+
+        self.dispatch('follow_request', Following(message, state=self))
+
+    def parse_me_updated(self, message: Dict[str, Any]):
+        pass
+
     def parse_read_all_announcements(self, message: Dict[str, Any]) -> None:
         pass  # TODO: 実装
 
@@ -105,7 +134,8 @@ def parse_followed(self, message: Dict[str, Any]) -> None:
         """
         フォローイベントを解析する関数
         """
-        # self.dispatch('follow', Follower(message, state=self))
+
+        self.dispatch('follow', User(message, state=self))
 
     def parse_mention(self, message: Dict[str, Any]) -> None:
         """
@@ -159,8 +189,8 @@ def parse_notification(self, message: Dict[str, Any]) -> None:
         -------
         None
         """
-        notification_type = str_lower(message['type'])
-        getattr(self, f'parse_{notification_type}')(message)
+        #notification_type = str_lower(message['type'])
+        #getattr(self, f'parse_{notification_type}')(message)
 
     def parse_follow_request_accepted(self, message: Dict[str, Any]) -> None:
         pass
@@ -177,8 +207,8 @@ def parse_unread_notification(self, message: Dict[str, Any]) -> None:
         message : Dict[str, Any]
             Received message
         """
-        notification_type = str_lower(message['type'])
-        getattr(self, f'parse_{notification_type}')(message)
+        #notification_type = str_lower(message['type'])
+        #getattr(self, f'parse_{notification_type}')(message)
 
     def parse_reaction(self, message: Dict[str, Any]) -> None:
         """
@@ -385,7 +415,7 @@ async def fetch_user(self, user_id: Optional[str] = None, username: Optional[str
         return User(data, state=self)
 
     async def post_note(self,
-                        content: Optional[str],
+                        content: Optional[str] = None,
                         visibility: str = "public",
                         visible_user_ids: Optional[List[str]] = None,
                         cw: Optional[str] = None,

mi/user.py

@@ -10,7 +10,7 @@
 if TYPE_CHECKING:
     from mi import ConnectionState
 
-__all__ = ['User', 'UserDetails']
+__all__ = ['User', 'UserDetails', 'Following']
 
 
 class Follower:
@@ -22,6 +22,28 @@ def __init__(self, data, state: ConnectionState):
         self.user: User = User(data['follower'], state=state)
         self._state = state
 
+class Following:
+    def __init__(self, data, state:ConnectionState):
+        self.id = data['id']
+        self.name = data['name']
+        self.username = data['username']
+        self.host = data['host']
+        self.avatar_url = data['avatar_url']
+        self.avatar_blurhash = data['avatar_blurhash']
+        self.avatar_color = data['avatar_color']
+        self.emojis = data['emojis']
+        self.online_status = data['online_status']
+        self.is_admin = bool(data['is_admin'])
+        self.is_bot = bool(data['is_bot'])
+        self.is_cat = bool(data['is_cat'])
+        self._state = state
+    
+    async def accept_request(self) -> bool:
+        return await self._state.accept_following_request(self.id)
+    
+    async def reject_request(self) -> bool:
+        return await self._state.reject_following_request(self.id)
+    
 
 class Channel(BaseModel):
     id: Optional[str] = None

setup.py

@@ -34,7 +34,7 @@
 
 setup(
     name="mi.py",
-    version="1.0.1",
+    version="1.0.2",
     install_requires=["pydantic", "emoji", 'aiocache', 'aiohttp'],
     url="https://github.com/yupix/mi.py",
     author="yupix",