Merge pull request #2 from EpsilonRationes/Typo

This commit is contained in:
firedotguy
2026-02-05 01:32:01 +06:00
committed by GitHub
3 changed files with 53 additions and 11 deletions

View File

@@ -1,3 +1,4 @@
from warnings import deprecated
from uuid import UUID from uuid import UUID
from _io import BufferedReader from _io import BufferedReader
from typing import cast from typing import cast
@@ -7,14 +8,14 @@ from requests.exceptions import HTTPError, ConnectionError
from itd.routes.users import get_user, update_profile, follow, unfollow, get_followers, get_following, update_privacy 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.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.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.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.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.reports import report
from itd.routes.search import search from itd.routes.search import search
from itd.routes.files import upload_file from itd.routes.files import upload_file
from itd.routes.auth import refresh_token, change_password, logout 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.comment import Comment
from itd.models.notification import Notification from itd.models.notification import Notification
@@ -80,7 +81,7 @@ class Client:
"""Смена пароля """Смена пароля
Args: Args:
old (str): Страый пароль old (str): Старый пароль
new (str): Новый пароль new (str): Новый пароль
Raises: Raises:
@@ -280,7 +281,7 @@ class Client:
return [UserFollower.model_validate(user) for user in res.json()['data']['users']], Pagination.model_validate(res.json()['data']['pagination']) 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 @refresh_on_error
def verificate(self, file_url: str) -> Verification: def verificate(self, file_url: str) -> Verification:
"""Отправить запрос на верификацию """Отправить запрос на верификацию
@@ -294,7 +295,22 @@ class Client:
Returns: Returns:
Verification: Верификация 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': if res.json().get('error', {}).get('code') == 'PENDING_REQUEST_EXISTS':
raise PendingRequestExists() raise PendingRequestExists()
res.raise_for_status() res.raise_for_status()
@@ -313,10 +329,9 @@ class Client:
return VerificationStatus.model_validate(res.json()) return VerificationStatus.model_validate(res.json())
@refresh_on_error @refresh_on_error
def get_who_to_follow(self) -> list[UserWhoToFollow]: def get_who_to_follow(self) -> list[UserWhoToFollow]:
"""Получить список популярнык пользователей (кого читать) """Получить список популярных пользователей (кого читать)
Returns: Returns:
list[UserWhoToFollow]: Список пользователей list[UserWhoToFollow]: Список пользователей
@@ -492,7 +507,7 @@ class Client:
raise Forbidden('delete comment') raise Forbidden('delete comment')
res.raise_for_status() res.raise_for_status()
@deprecated("get_hastags устарел используйте get_hashtags")
@refresh_on_error @refresh_on_error
def get_hastags(self, limit: int = 10) -> list[Hashtag]: def get_hastags(self, limit: int = 10) -> list[Hashtag]:
"""Получить список популярных хэштэгов """Получить список популярных хэштэгов
@@ -503,7 +518,19 @@ class Client:
Returns: Returns:
list[Hashtag]: Список хэштэгов 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() res.raise_for_status()
return [Hashtag.model_validate(hashtag) for hashtag in res.json()['data']['hashtags']] return [Hashtag.model_validate(hashtag) for hashtag in res.json()['data']['hashtags']]
@@ -522,7 +549,7 @@ class Client:
list[Post]: Посты list[Post]: Посты
Pagination: Пагинация 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() res.raise_for_status()
data = res.json()['data'] data = res.json()['data']

View File

@@ -1,8 +1,17 @@
from warnings import deprecated
from uuid import UUID from uuid import UUID
from itd.request import fetch from itd.request import fetch
@deprecated("get_hastags устарела используйте get_hashtags")
def get_hastags(token: str, limit: int = 10): def get_hastags(token: str, limit: int = 10):
return fetch(token, 'get', 'hashtags/trending', {'limit': limit}) 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): 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}) 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})

View File

@@ -1,8 +1,14 @@
from warnings import deprecated
from itd.request import fetch 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"}} # {"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}) 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): def get_verification_status(token: str):
return fetch(token, 'get', 'verification/status') return fetch(token, 'get', 'verification/status')