BREAKING CHANGES: 4.0.0-a1

MeowerBot/__init__.py

@@ -10,6 +10,6 @@
 # Public library imports
 from . import bot as botm
 
-from .bot import Bot, cbids, CallBackIds
+from .bot import Bot, CallBackIds
 
-__all__ = ["__version__", "Bot", "botm", "cbids", "CallBackIds"]
+__all__ = ["__version__", "Bot", "botm", "CallBackIds"]

MeowerBot/_cache.py

@@ -1,24 +1,23 @@
 import time
-from typing import Dict, List, Tuple
+from typing import Dict, Tuple, Any
 
-from MeowerBot.context import Chat, PartialChat, PartialUser, User
+from MeowerBot.context import Chat, User
 from MeowerBot.data.generic import UUID
 
 # 5 hours
 CASHE_EXPIRATION = 60 * 60 * 5
 
 
 class Cache:
-	chats: Dict[UUID, Tuple[float, Chat | PartialChat]]
-	users: Dict[str, Tuple[float, User | PartialUser]]
-	bots:  Dict[str, float]
+	chats: Dict[str, Tuple[float, Chat]]
+	users: Dict[str, Tuple[float, User]]
 
 	def __init__(self):
 		self.bots  = {}
 		self.chats = {}
 		self.users = {}
 
-	def get_user(self, user_id: str) -> User | PartialUser | None:
+	def get_user(self, user_id: str) -> User | None | bool:
 		if user_id not in self.users:
 			return None
 
@@ -27,6 +26,10 @@ def get_user(self, user_id: str) -> User | PartialUser | None:
 			self.users.pop(user_id)
 			return None
 
+		if not isinstance(user[1], User):
+			self.users.pop(user_id)
+			return False
+
 		return user[1]
 
 	def add_user(self, user: User):
@@ -38,7 +41,7 @@ def add_user(self, user: User):
 
 		self.users[user.id] = (time.time(), user)
 
-	def get_chat(self, chat_id: UUID) -> Chat | PartialChat | None:
+	def get_chat(self, chat_id: UUID) -> Chat | None:
 		if chat_id not in self.chats:
 			return None
 
@@ -59,38 +62,4 @@ def add_chat(self, chat: Chat):
 
 		self.chats[chat.id] = (time.time(), chat)
 
-	def try_clear_bots(self):
-		ret = []
-		rem = []
-		for username, timeout in self.bots.items():
-			if timeout + CASHE_EXPIRATION < time.time():
-				rem.append(username)
-				continue
-
-			ret.append(username)
-
-		for user in rem:
-			del self.bots[user]
-
-		return ret
-
-	def add_bot(self, user):
-		if user in self.bots:
-			self.bots[user] = time.time()
-			return
-
-		self.bots[user] = time.time()
-		if user not in self.users:
-			return
-
-		self.users[user][1].is_bot = True
-
-	def remove_bot(self, user):
-		if user not in self.bots:
-			return
-
-		del self.bots[user]
-		if user not in self.users:
-			return
 
-		self.users[user][1].is_bot = False

MeowerBot/_version.py

@@ -1 +1 @@
-__version__ = '3.3.2'
+__version__ = '4.0.0-alpha.2'

MeowerBot/api/user.py

@@ -7,7 +7,8 @@
 from ..data.api.chats import ChatGroup
 from ..data.api.reports import PagedRequest
 from ..data.api.user import (
-	Relationship
+	Relationship,
+	User as RawUser
 )
 from ..data.generic import Post
 
@@ -26,6 +27,9 @@ async def _get(self, username, url, page=1, query=None, params=None):
 
 		return await self.client.get(urljoin(f"/users/{username}/", url), params={"q": query, "p": page, **params})
 
+	async def get(self, username: str):
+		return api_resp(RawUser, await self._get(username, ""))
+
 	async def get_posts(self, username, query, page=1):
 		return api_resp(PagedRequest[Post], await self._get(username, "posts", query=query, page=page, params={"autoget": None}))