3.10

eduu/database/admins.py

@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2018-2023 Amano LLC
 
-from typing import Optional
 
 from .core import database
 
@@ -17,7 +16,7 @@ async def check_if_del_service(chat_id: int) -> bool:
     return row[0]
 
 
-async def toggle_del_service(chat_id: int, mode: Optional[bool]) -> None:
+async def toggle_del_service(chat_id: int, mode: bool | None) -> None:
     await conn.execute(
         "UPDATE groups SET delservicemsgs = ? WHERE chat_id = ?", (mode, chat_id)
     )
@@ -33,7 +32,7 @@ async def check_if_antichannelpin(chat_id: int) -> bool:
     return row[0]
 
 
-async def toggle_antichannelpin(chat_id: int, mode: Optional[bool]) -> None:
+async def toggle_antichannelpin(chat_id: int, mode: bool | None) -> None:
     await conn.execute(
         "UPDATE groups SET antichannelpin = ? WHERE chat_id = ?", (mode, chat_id)
     )

eduu/database/warns.py

@@ -1,22 +1,21 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2018-2023 Amano LLC
 
-from typing import Optional
 
 from .core import database
 
 conn = database.get_conn()
 
 
-async def get_warn_action(chat_id: int) -> tuple[Optional[str], bool]:
+async def get_warn_action(chat_id: int) -> tuple[str | None, bool]:
     cursor = await conn.execute(
         "SELECT warn_action FROM groups WHERE chat_id = (?)", (chat_id,)
     )
     res = (await cursor.fetchone())[0]
     return "ban" if res is None else res
 
 
-async def set_warn_action(chat_id: int, action: Optional[str]):
+async def set_warn_action(chat_id: int, action: str | None):
     await conn.execute(
         "UPDATE groups SET warn_action = ? WHERE chat_id = ?", (action, chat_id)
     )

eduu/database/welcome.py

@@ -1,21 +1,20 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2018-2023 Amano LLC
 
-from typing import Optional
 
 from .core import database
 
 conn = database.get_conn()
 
 
-async def get_welcome(chat_id: int) -> tuple[Optional[str], bool]:
+async def get_welcome(chat_id: int) -> tuple[str | None, bool]:
     cursor = await conn.execute(
         "SELECT welcome, welcome_enabled FROM groups WHERE chat_id = (?)", (chat_id,)
     )
     return await cursor.fetchone()
 
 
-async def set_welcome(chat_id: int, welcome: Optional[str]):
+async def set_welcome(chat_id: int, welcome: str | None):
     await conn.execute(
         "UPDATE groups SET welcome = ? WHERE chat_id = ?", (welcome, chat_id)
     )

eduu/plugins/langs.py

@@ -2,7 +2,6 @@
 # Copyright (c) 2018-2023 Amano LLC
 
 from itertools import zip_longest
-from typing import Union
 
 from pyrogram import Client, filters
 from pyrogram.enums import ChatType
@@ -39,7 +38,7 @@ def gen_langs_kb():
 )
 @require_admin(allow_in_private=True)
 @use_chat_lang
-async def chlang(c: Client, m: Union[CallbackQuery, Message], strings):
+async def chlang(c: Client, m: CallbackQuery | Message, strings):
     keyboard = InlineKeyboardMarkup(
         inline_keyboard=[
             *gen_langs_kb(),

eduu/plugins/start.py

@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2018-2023 Amano LLC
 
-from typing import Union
 
 from pyrogram import Client, filters
 from pyrogram.types import (
@@ -21,7 +20,7 @@
 @Client.on_message(filters.command("start", PREFIXES) & filters.private, group=2)
 @Client.on_callback_query(filters.regex("^start_back$"))
 @use_chat_lang
-async def start_pvt(c: Client, m: Union[Message, CallbackQuery], strings):
+async def start_pvt(c: Client, m: Message | CallbackQuery, strings):
     if isinstance(m, CallbackQuery):
         msg = m.message
         send = msg.edit_text
@@ -49,7 +48,7 @@ async def start_pvt(c: Client, m: Union[Message, CallbackQuery], strings):
 
 @Client.on_message(filters.command("start", PREFIXES) & filters.group, group=2)
 @use_chat_lang
-async def start_grp(c: Client, m: Union[Message, CallbackQuery], strings):
+async def start_grp(c: Client, m: Message | CallbackQuery, strings):
     keyboard = InlineKeyboardMarkup(
         inline_keyboard=[
             [

eduu/plugins/sudos.py

@@ -11,7 +11,6 @@
 import traceback
 from contextlib import redirect_stdout, suppress
 from sqlite3 import IntegrityError, OperationalError
-from typing import Union
 
 import humanfriendly
 import speedtest
@@ -28,7 +27,7 @@
 from eduu.utils.localization import use_chat_lang
 from eduu.utils.utils import shell_exec
 
-prefix: Union[list, str] = "!"
+prefix: list | str = "!"
 
 conn = database.get_conn()
 

eduu/plugins/weather.py

@@ -2,7 +2,6 @@
 # Copyright (c) 2018-2023 Amano LLC
 
 import re
-from typing import Union
 
 from pyrogram import Client, filters
 from pyrogram.types import (
@@ -85,7 +84,7 @@ def get_status_emoji(status_code: int) -> str:
 @Client.on_message(filters.command(["clima", "weather"], PREFIXES))
 @Client.on_inline_query(filters.regex(r"^(clima|weather) .+", re.I))
 @use_chat_lang
-async def weather(c: Client, m: Union[InlineQuery, Message], strings):
+async def weather(c: Client, m: InlineQuery | Message, strings):
     text = m.text if isinstance(m, Message) else m.query
     if len(text.split(maxsplit=1)) == 1:
         if isinstance(m, Message):

eduu/utils/decorators.py

@@ -2,8 +2,8 @@
 # Copyright (c) 2018-2023 Amano LLC
 
 import asyncio
+from collections.abc import Callable
 from functools import partial, wraps
-from typing import Callable, Optional, Union
 
 from pyrogram import Client, StopPropagation
 from pyrogram.enums import ChatType
@@ -30,7 +30,7 @@ async def run(*args, loop=None, executor=None, **kwargs):
 
 
 def require_admin(
-    permissions: Optional[ChatPrivileges] = None,
+    permissions: ChatPrivileges | None = None,
     allow_in_private: bool = False,
     complain_missing_perms: bool = True,
 ):
@@ -55,7 +55,7 @@ def require_admin(
     def decorator(func):
         @wraps(func)
         async def wrapper(
-            client: Client, message: Union[CallbackQuery, Message], *args, **kwargs
+            client: Client, message: CallbackQuery | Message, *args, **kwargs
         ):
             lang = await get_lang(message)
             strings = partial(

eduu/utils/localization.py

@@ -2,9 +2,9 @@
 # Copyright (c) 2018-2023 Amano LLC
 
 import json
+from collections.abc import Callable
 from functools import partial
 from pathlib import Path
-from typing import Callable, Optional, Union
 
 from pyrogram.enums import ChatType
 from pyrogram.types import CallbackQuery, InlineQuery, Message
@@ -67,7 +67,7 @@ def get_locale_string(
     language: str,
     default_context: str,
     key: str,
-    context: Optional[str] = None,
+    context: str | None = None,
 ) -> str:
     if context:
         default_context = context
@@ -78,7 +78,7 @@ def get_locale_string(
     return res
 
 
-async def get_lang(message: Union[CallbackQuery, Message, InlineQuery]) -> str:
+async def get_lang(message: CallbackQuery | (Message | InlineQuery)) -> str:
     if isinstance(message, CallbackQuery):
         chat = message.message.chat if message.message else message.from_user
         chat_type = message.message.chat.type if message.message else ChatType.PRIVATE

eduu/utils/utils.py

@@ -9,7 +9,6 @@
 from functools import partial
 from pathlib import Path
 from string import Formatter
-from typing import Optional, Union
 
 import httpx
 from pyrogram import Client, emoji, filters
@@ -52,8 +51,8 @@ def pretty_size(size_bytes):
 
 
 async def check_perms(
-    message: Union[CallbackQuery, Message],
-    permissions: Optional[ChatPrivileges] = None,
+    message: CallbackQuery | Message,
+    permissions: ChatPrivileges | None = None,
     complain_missing_perms: bool = True,
     strings=None,
 ) -> bool:
@@ -94,7 +93,7 @@ async def check_perms(
 sudofilter = filters.user(SUDOERS)
 
 
-async def extract_time(m: Message, t: str) -> Optional[datetime]:
+async def extract_time(m: Message, t: str) -> datetime | None:
     if t[-1] in ["m", "h", "d"]:
         unit = t[-1]
         num = t[:-1]
@@ -227,7 +226,7 @@ def add_command(
         self,
         command: str,
         category: str,
-        aliases: Optional[list] = None,
+        aliases: list | None = None,
     ):
         context = get_caller_context()
 
@@ -244,7 +243,7 @@ def add_command(
             }
         )
 
-    def get_commands_message(self, strings, category: Optional[str] = None):
+    def get_commands_message(self, strings, category: str | None = None):
         # TODO: Add pagination support.
         if category is None:
             cmds_list = []
@@ -273,7 +272,7 @@ def __init__(self):
     def add_command(
         self,
         command: str,
-        aliases: Optional[list] = None,
+        aliases: list | None = None,
     ):
         context = get_caller_context()
 
@@ -288,7 +287,7 @@ def add_command(
             }
         )
 
-    def search_commands(self, query: Optional[str] = None):
+    def search_commands(self, query: str | None = None):
         return [
             cmd
             for cmd in sorted(self.commands, key=lambda k: k["command"])

pyproject.toml

@@ -38,7 +38,7 @@ homepage = "https://github.com/AmanoTeam/EduuRobot"
 
 [tool.ruff]
 src = ["."]
-target-version = "py39"
+target-version = "py310"
 select = [
   "I",    # isort
   "E",    # pycodestyle