Feat: Switch to pycharm

- Fixes a few type bugs
- Make it so you can shut the bot down dynamically

.editorconfig

@@ -1,3 +1,4 @@
+root=true
 end_of_line = lf
 insert_final_newline = true
 

.env.example

@@ -0,0 +1,4 @@
+# This is for deploying mb.py's docs
+cloudflare_token=
+account_id=
+project_name=

MeowerBot/__init__.py

@@ -5,12 +5,11 @@
 
 """
 
-__version__ = "3.0.3"
-
+from ._version import __version__
 
 # Public library imports
 from . import bot as botm
 
-from .bot import Bot, cbids
+from .bot import Bot, cbids, CallBackIds
 
-__all__ = ["__version__", "Bot", "botm", "cbids"]
+__all__ = ["__version__", "Bot", "botm", "cbids", "CallBackIds"]

MeowerBot/_version.py

@@ -0,0 +1 @@
+__version__ = '3.2.0'

MeowerBot/api/__init__.py

@@ -1,14 +1,13 @@
 
 from httpx import AsyncClient
-from ..data import generic
-from ..data.api.reports import PagedRequest
-from ..data.generic import Post
-
-from .shared import api_resp, post_resp
 
 from .admin import Admin
 from .chats import Chats
+from .shared import api_resp, post_resp
 from .user import User as API_USER_WRAPPER
+from ..data import generic
+from ..data.api.reports import PagedRequest
+from ..data.generic import Post
 
 
 class MeowerAPI:
@@ -66,5 +65,5 @@ async def get_inbox(self):
 	async def search_users(self, query: str, page: int = 1, ):
 		return api_resp(PagedRequest[Post], await self.client.get("/search/users", params={"q": query, "p": page, "autoget": None}))
 
-	async def search_home(self, query: str, page: int = 1) -> PagedRequest[Post]:
+	async def search_home(self, query: str, page: int = 1):
 		return api_resp(PagedRequest[Post], await self.client.get("/search/home", params={"q": query, "p": page, "autoget": None}))

MeowerBot/api/admin.py

@@ -1,9 +1,10 @@
-from httpx import AsyncClient
-from ..data.api.reports import ReportRequest, Report, AdminNotesResponse
-from ..data import generic
 from typing import Literal
 
+from httpx import AsyncClient
+
 from .shared import api_resp, post_resp
+from ..data import generic
+from ..data.api.reports import AdminNotesResponse, Report, ReportRequest
 
 
 def notes_return(resp): return api_resp(AdminNotesResponse, resp)
@@ -28,11 +29,11 @@ async def edit_report(self, uuid: generic.UUID, status: Literal["no_action_taken
 	async def escalate_report(self, uuid: generic.UUID):
 		return reports_return(await self.client.post(f"/admin/reports/{uuid}/escalate/"))
 
-	async def fetch_note(self, indentifier: str):
-		return notes_return(await self.client.get(f"/admin/notes/{indentifier}", params={"autoget": None}))
+	async def fetch_note(self, identifier: str):
+		return notes_return(await self.client.get(f"/admin/notes/{identifier}", params={"autoget": None}))
 
-	async def create_note(self, indentifier: str, notes: str):
-		return notes_return(await self.client.put(f"/admin/notes/{indentifier}", json={"notes": notes}))
+	async def create_note(self, identifier: str, notes: str):
+		return notes_return(await self.client.put(f"/admin/notes/{identifier}", json={"notes": notes}))
 
 	async def get_post(self, uuid: generic.UUID):
 		return post_resp(await self.client.get(f"/admin/posts/{uuid}", params={"autoget": None}))

MeowerBot/api/chats.py

@@ -1,10 +1,8 @@
-from httpx import AsyncClient
-from ..data import generic
-from ..data.api.chats import Chats, ChatGroup
-
-from httpx import Response
+from httpx import AsyncClient, Response
 
 from .shared import api_resp
+from ..data import generic
+from ..data.api.chats import ChatGroup, Chats
 
 
 def chat_return(resp: Response):
@@ -15,7 +13,7 @@ class Chats:
 	def __init__(self, client: AsyncClient) -> None:
 		self.client = client
 
-	async def fetch_all(self) -> Chats:
+	async def fetch_all(self):
 		return api_resp(Chats, await self.client.get("/chats/", params={"autoget": None}))
 
 	async def create(self, nickname: str):
@@ -27,6 +25,7 @@ async def get(self, uuid: generic.UUID):
 	async def update(self, uuid: generic.UUID, nickname: str):
 		return chat_return(await self.client.patch(f"/chats/{uuid}", josn={"nickname": nickname}))
 
+	# noinspection PyTypeChecker
 	async def leave(self, uuid: generic.UUID) -> dict:
 		return api_resp(dict, await self.client.delete(f"/chats/{uuid}"))
 

MeowerBot/api/shared.py

@@ -1,5 +1,7 @@
+from typing import Tuple, Union
+
 from httpx import Response
-from typing import Union, Tuple
+
 from ..data.generic import Post
 
 

MeowerBot/api/user.py

@@ -1,16 +1,15 @@
+from typing import Literal
+from urllib.parse import urljoin
+
 from httpx import AsyncClient
 
+from .shared import api_resp
+from ..data.api.chats import ChatGroup
 from ..data.api.reports import PagedRequest
-from ..data.generic import Post
 from ..data.api.user import (
 	Relationship
 )
-from ..data.api.chats import ChatGroup
-
-from typing import Literal
-
-from .shared import api_resp
-from urllib.parse import urljoin
+from ..data.generic import Post
 
 
 class User:
@@ -30,4 +29,4 @@ async def edit_relationship(self, username, state: Literal[0, 1, 2]):
 		return api_resp(Relationship, await self.client.patch(f"/users/{username}/relationship", json={"state": state}))
 
 	async def dm(self, username):
-		return api_resp(ChatGroup, self._get(username, 'dm'))
+		return api_resp(ChatGroup, await self._get(username, 'dm'))