Merge branch 'v1' of https://github.com/firedotguy/pyITDclient into v1

itd/client.py

@@ -1,3 +1,4 @@
+from warnings import deprecated
 from uuid import UUID
 from _io import BufferedReader
 from typing import cast
@@ -7,14 +8,14 @@ from requests.exceptions import ConnectionError, HTTPError
 from itd.routes.users import get_user, update_profile, follow, unfollow, get_followers, get_following, update_privacy
 from itd.routes.etc import get_top_clans, get_who_to_follow, get_platform_status
 from itd.routes.comments import get_comments, add_comment, delete_comment, like_comment, unlike_comment, add_reply_comment
-from itd.routes.hashtags import get_hastags, get_posts_by_hastag
+from itd.routes.hashtags import get_hashtags, get_posts_by_hashtag
 from itd.routes.notifications import get_notifications, mark_as_read, mark_all_as_read, get_unread_notifications_count
 from itd.routes.posts import create_post, get_posts, get_post, edit_post, delete_post, pin_post, repost, view_post, get_liked_posts
 from itd.routes.reports import report
 from itd.routes.search import search
 from itd.routes.files import upload_file
 from itd.routes.auth import refresh_token, change_password, logout
-from itd.routes.verification import verificate, get_verification_status
+from itd.routes.verification import verify, get_verification_status
 
 from itd.models.comment import Comment
 from itd.models.notification import Notification
@@ -78,7 +79,7 @@ class Client:
         """Смена пароля
 
         Args:
-            old (str): Страый пароль
+            old (str): Старый пароль
             new (str): Новый пароль
 
         Raises:
@@ -281,7 +282,7 @@ class Client:
 
         return [UserFollower.model_validate(user) for user in res.json()['data']['users']], Pagination.model_validate(res.json()['data']['pagination'])
 
-
+    @deprecated("verificate устарел используйте verify")
     @refresh_on_error
     def verificate(self, file_url: str) -> Verification:
         """Отправить запрос на верификацию
@@ -295,7 +296,22 @@ class Client:
         Returns:
             Verification: Верификация
         """
-        res = verificate(self.token, file_url)
+        return self.verify(file_url)
+
+    @refresh_on_error
+    def verify(self, file_url: str) -> Verification:
+        """Отправить запрос на верификацию
+
+            Args:
+                file_url (str): Ссылка на видео
+
+            Raises:
+                PendingRequestExists: Запрос уже отправлен
+
+            Returns:
+                Verification: Верификация
+            """
+        res = verify(self.token, file_url)
         if res.json().get('error', {}).get('code') == 'PENDING_REQUEST_EXISTS':
             raise PendingRequestExists()
         res.raise_for_status()
@@ -314,10 +330,9 @@ class Client:
 
         return VerificationStatus.model_validate(res.json())
 
-
     @refresh_on_error
     def get_who_to_follow(self) -> list[UserWhoToFollow]:
-        """Получить список популярнык пользователей (кого читать)
+        """Получить список популярных пользователей (кого читать)
 
         Returns:
             list[UserWhoToFollow]: Список пользователей
@@ -353,12 +368,13 @@ class Client:
 
 
     @refresh_on_error
-    def add_comment(self, post_id: UUID, content: str) -> Comment:
+    def add_comment(self, post_id: UUID, content: str, attachment_ids: list[UUID] = []) -> Comment:
         """Добавить комментарий
 
         Args:
             post_id (str): UUID поста
             content (str): Содержание
+            attachment_ids (list[UUID]): Список UUID прикреплённых файлов
             reply_comment_id (UUID | None, optional): ID коммента для ответа. Defaults to None.
 
         Raises:
@@ -368,7 +384,7 @@ class Client:
         Returns:
             Comment: Комментарий
         """
-        res = add_comment(self.token, post_id, content)
+        res = add_comment(self.token, post_id, content, attachment_ids)
         if res.status_code == 422 and 'found' in res.json():
             raise ValidationError(*list(res.json()['found'].items())[0])
         if res.json().get('error', {}).get('code') == 'NOT_FOUND':
@@ -379,13 +395,14 @@ class Client:
 
 
     @refresh_on_error
-    def add_reply_comment(self, comment_id: UUID, content: str, author_id: UUID) -> Comment:
+    def add_reply_comment(self, comment_id: UUID, content: str, author_id: UUID, attachment_ids: list[UUID] = []) -> Comment:
         """Добавить ответный комментарий
 
         Args:
             comment_id (str): UUID комментария
             content (str): Содержание
             author_id (UUID | None, optional): ID пользователя, отправившего комментарий. Defaults to None.
+            attachment_ids (list[UUID]): Список UUID прикреплённых файлов
 
         Raises:
             ValidationError: Ошибка валидации
@@ -394,7 +411,7 @@ class Client:
         Returns:
             Comment: Комментарий
         """
-        res = add_reply_comment(self.token, comment_id, content, author_id)
+        res = add_reply_comment(self.token, comment_id, content, author_id, attachment_ids)
         if res.status_code == 500 and 'Failed query' in res.text:
             raise NotFound('User')
         if res.status_code == 422 and 'found' in res.json():
@@ -491,7 +508,7 @@ class Client:
             raise Forbidden('delete comment')
         res.raise_for_status()
 
-
+    @deprecated("get_hastags устарел используйте get_hashtags")
     @refresh_on_error
     def get_hastags(self, limit: int = 10) -> list[Hashtag]:
         """Получить список популярных хэштэгов
@@ -502,7 +519,19 @@ class Client:
         Returns:
             list[Hashtag]: Список хэштэгов
         """
-        res = get_hastags(self.token, limit)
+        return self.get_hashtags(limit)
+
+    @refresh_on_error
+    def get_hashtags(self, limit: int = 10) -> list[Hashtag]:
+        """Получить список популярных хэштэгов
+
+        Args:
+            limit (int, optional): Лимит. Defaults to 10.
+
+        Returns:
+            list[Hashtag]: Список хэштэгов
+        """
+        res = get_hashtags(self.token, limit)
         res.raise_for_status()
 
         return [Hashtag.model_validate(hashtag) for hashtag in res.json()['data']['hashtags']]
@@ -521,7 +550,7 @@ class Client:
             list[Post]: Посты
             Pagination: Пагинация
         """
-        res = get_posts_by_hastag(self.token, hashtag, limit, cursor)
+        res = get_posts_by_hashtag(self.token, hashtag, limit, cursor)
         res.raise_for_status()
         data = res.json()['data']
 

itd/models/file.py

@@ -8,7 +8,7 @@ class File(BaseModel):
     id: UUID
     url: str
     filename: str
-    mime_type: str = Field('image/png', alias='mimeType')
+    mime_type: str = Field(alias='mimeType')
     size: int
 
 

itd/routes/comments.py

@@ -2,11 +2,11 @@ from uuid import UUID
 
 from itd.request import fetch
 
-def add_comment(token: str, post_id: UUID, content: str):
+def add_comment(token: str, post_id: UUID, content: str, attachment_ids: list[UUID] = []):
-    return fetch(token, 'post', f'posts/{post_id}/comments', {'content': content})
+    return fetch(token, 'post', f'posts/{post_id}/comments', {'content': content, "attachmentIds": list(map(str, attachment_ids))})
 
-def add_reply_comment(token: str, comment_id: UUID, content: str, author_id: UUID):
+def add_reply_comment(token: str, comment_id: UUID, content: str, author_id: UUID, attachment_ids: list[UUID] = []):
-    return fetch(token, 'post', f'comments/{comment_id}/replies', {'content': content, 'replyToUserId': str(author_id)})
+    return fetch(token, 'post', f'comments/{comment_id}/replies', {'content': content, 'replyToUserId': str(author_id), "attachmentIds": list(map(str, attachment_ids))})
 
 def get_comments(token: str, post_id: UUID, limit: int = 20, cursor: int = 0, sort: str = 'popular'):
     return fetch(token, 'get', f'posts/{post_id}/comments', {'limit': limit, 'sort': sort, 'cursor': cursor})

itd/routes/hashtags.py

@@ -1,8 +1,17 @@
+from warnings import deprecated
 from uuid import UUID
 from itd.request import fetch
 
+@deprecated("get_hastags устарела используйте get_hashtags")
 def get_hastags(token: str, limit: int = 10):
     return fetch(token, 'get', 'hashtags/trending', {'limit': limit})
 
+def get_hashtags(token: str, limit: int = 10):
+    return fetch(token, 'get', 'hashtags/trending', {'limit': limit})
+
+@deprecated("get_posts_by_hastag устерла используй get_posts_by_hashtag")
 def get_posts_by_hastag(token: str, hashtag: str, limit: int = 20, cursor: UUID | None = None):
     return fetch(token, 'get', f'hashtags/{hashtag}/posts', {'limit': limit, 'cursor': cursor})
+
+def get_posts_by_hashtag(token: str, hashtag: str, limit: int = 20, cursor: UUID | None = None):
+    return fetch(token, 'get', f'hashtags/{hashtag}/posts', {'limit': limit, 'cursor': cursor})

itd/routes/verification.py

@@ -1,8 +1,14 @@
+from warnings import deprecated
 from itd.request import fetch
 
-def verificate(token: str, file_url: str):
+def verify(token: str, file_url: str):
     # {"success":true,"request":{"id":"fc54e54f-8586-4d8c-809e-df93161f99da","userId":"9096a85b-c319-483e-8940-6921be427ad0","videoUrl":"https://943701f000610900cbe86b72234e451d.bckt.ru/videos/354f28a6-9ac7-48a6-879a-a454062b1d6b.mp4","status":"pending","rejectionReason":null,"reviewedBy":null,"reviewedAt":null,"createdAt":"2026-01-30T12:58:14.228Z","updatedAt":"2026-01-30T12:58:14.228Z"}}
     return fetch(token, 'post', 'verification/submit', {'videoUrl': file_url})
 
+@deprecated("verificate устарела используйте verify")
+def verificate(token: str, file_url: str):
+    return verify(token, file_url)
+
+
 def get_verification_status(token: str):
     return fetch(token, 'get', 'verification/status')