Working on #13

This commit is contained in:
kku 2024-12-15 23:36:48 +01:00
parent 982d0bce43
commit 41112018da
9 changed files with 47 additions and 114 deletions

View File

@ -3,25 +3,20 @@ from typing import Any, Union
import discord import discord
import discord.member import discord.member
from libbot import config_get
from modules.database import col_users, col_warnings from modules.database import col_users, col_warnings
from modules.utils import config_get
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class NotEnoughMoneyError(Exception):
"""User does not have enough money to do that"""
pass
class UserNotFoundError(Exception): class UserNotFoundError(Exception):
"""HoloUser could not find user with such an ID in database""" """HoloUser could not find user with such an ID in database"""
def __init__(self, user, user_id): def __init__(self, user, user_id):
self.user = user self.user = user
self.user_id = user_id self.user_id = user_id
super().__init__( super().__init__(
f"User of type {type(self.user)} with id {self.user_id} was not found" f"User of type {type(self.user)} with id {self.user_id} was not found"
) )
@ -63,10 +58,8 @@ class HoloUser:
* `int`: Number of warnings * `int`: Number of warnings
""" """
warns = col_warnings.find_one({"user": self.id}) warns = col_warnings.find_one({"user": self.id})
if warns == None:
return 0 return 0 if warns is None else warns["warns"]
else:
return warns["warns"]
def warn(self, count=1, reason: str = "Not provided") -> None: def warn(self, count=1, reason: str = "Not provided") -> None:
"""Warn and add count to warns number """Warn and add count to warns number
@ -75,13 +68,15 @@ class HoloUser:
* `count` (int, optional): Count of warnings to be added. Defaults to 1. * `count` (int, optional): Count of warnings to be added. Defaults to 1.
""" """
warns = col_warnings.find_one({"user": self.id}) warns = col_warnings.find_one({"user": self.id})
if warns != None:
if warns is not None:
col_warnings.update_one( col_warnings.update_one(
filter={"_id": self.db_id}, filter={"_id": self.db_id},
update={"$set": {"warns": warns["warns"] + count}}, update={"$set": {"warns": warns["warns"] + count}},
) )
else: else:
col_warnings.insert_one(document={"user": self.id, "warns": count}) col_warnings.insert_one(document={"user": self.id, "warns": count})
logger.info(f"User {self.id} was warned {count} times due to: {reason}") logger.info(f"User {self.id} was warned {count} times due to: {reason}")
def set(self, key: str, value: Any) -> None: def set(self, key: str, value: Any) -> None:
@ -93,10 +88,12 @@ class HoloUser:
""" """
if not hasattr(self, key): if not hasattr(self, key):
raise AttributeError() raise AttributeError()
setattr(self, key, value) setattr(self, key, value)
col_users.update_one( col_users.update_one(
filter={"_id": self.db_id}, update={"$set": {key: value}}, upsert=True filter={"_id": self.db_id}, update={"$set": {key: value}}, upsert=True
) )
logger.info(f"Set attribute {key} of user {self.id} to {value}") logger.info(f"Set attribute {key} of user {self.id} to {value}")
async def is_moderator( async def is_moderator(
@ -112,11 +109,14 @@ class HoloUser:
""" """
if isinstance(member, discord.User): if isinstance(member, discord.User):
return False return False
moderator_role = await config_get("moderators", "roles") moderator_role = await config_get("moderators", "roles")
council_role = await config_get("council", "roles") council_role = await config_get("council", "roles")
for role in member.roles: for role in member.roles:
if role.id == moderator_role or role.id == council_role: if role.id == moderator_role or role.id == council_role:
return True return True
return False return False
async def is_council( async def is_council(
@ -132,10 +132,13 @@ class HoloUser:
""" """
if isinstance(member, discord.User): if isinstance(member, discord.User):
return False return False
council_role = await config_get("council", "roles") council_role = await config_get("council", "roles")
for role in member.roles: for role in member.roles:
if role.id == council_role: if role.id == council_role:
return True return True
return False return False
# def purge(self) -> None: # def purge(self) -> None:

View File

@ -4,12 +4,13 @@ import sys
from discord import ApplicationContext, Embed, User, option, slash_command from discord import ApplicationContext, Embed, User, option, slash_command
from discord import utils as ds_utils from discord import utils as ds_utils
from discord.ext import commands from discord.ext import commands
from libbot import config_get
from libbot.pycord.classes import PycordBot from libbot.pycord.classes import PycordBot
from libbot.sync import config_get as sync_config_get
from enums.colors import Color from enums.colors import Color
from modules.scheduled import scheduler from modules.scheduled import scheduler
from modules.utils import config_get from modules.utils_sync import guild_name
from modules.utils_sync import config_get_sync, guild_name
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -106,7 +107,7 @@ class Admin(commands.Cog):
@slash_command( @slash_command(
name="clear", name="clear",
description="Видалити деяку кількість повідомлень в каналі", description="Видалити деяку кількість повідомлень в каналі",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option("amount", description="Кількість") @option("amount", description="Кількість")
@option("user", description="Користувач", default=None) @option("user", description="Користувач", default=None)
@ -170,7 +171,7 @@ class Admin(commands.Cog):
@slash_command( @slash_command(
name="reboot", name="reboot",
description="Перезапустити бота", description="Перезапустити бота",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
async def reboot_cmd(self, ctx: ApplicationContext): async def reboot_cmd(self, ctx: ApplicationContext):
await ctx.defer(ephemeral=True) await ctx.defer(ephemeral=True)

View File

@ -3,13 +3,14 @@ from discord import utils as ds_utils
from discord.abc import GuildChannel from discord.abc import GuildChannel
from discord.commands import SlashCommandGroup from discord.commands import SlashCommandGroup
from discord.ext import commands from discord.ext import commands
from libbot import config_get
from libbot.pycord.classes import PycordBot from libbot.pycord.classes import PycordBot
from libbot.sync import config_get as sync_config_get
from classes.holo_user import HoloUser from classes.holo_user import HoloUser
from enums.colors import Color from enums.colors import Color
from modules.database import col_users from modules.database import col_users
from modules.utils import config_get from modules.utils_sync import guild_name
from modules.utils_sync import config_get_sync, guild_name
class CustomChannels(commands.Cog): class CustomChannels(commands.Cog):
@ -27,7 +28,7 @@ class CustomChannels(commands.Cog):
@customchannel.command( @customchannel.command(
name="get", name="get",
description="Отримати персональний текстовий канал", description="Отримати персональний текстовий канал",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option("name", description="Назва каналу") @option("name", description="Назва каналу")
@option("reactions", description="Дозволити реакції") @option("reactions", description="Дозволити реакції")
@ -97,7 +98,7 @@ class CustomChannels(commands.Cog):
@customchannel.command( @customchannel.command(
name="edit", name="edit",
description="Змінити параметри особистого каналу", description="Змінити параметри особистого каналу",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option("name", description="Назва каналу") @option("name", description="Назва каналу")
@option("reactions", description="Дозволити реакції") @option("reactions", description="Дозволити реакції")
@ -142,7 +143,7 @@ class CustomChannels(commands.Cog):
@customchannel.command( @customchannel.command(
name="remove", name="remove",
description="Відібрати канал, знищуючи його, та частково повернути кошти", description="Відібрати канал, знищуючи його, та частково повернути кошти",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option("confirm", description="Підтвердження операції") @option("confirm", description="Підтвердження операції")
async def customchannel_remove_cmd( async def customchannel_remove_cmd(

View File

@ -7,13 +7,15 @@ from discord import ApplicationContext, Embed, File, option
from discord import utils as ds_utils from discord import utils as ds_utils
from discord.commands import SlashCommandGroup from discord.commands import SlashCommandGroup
from discord.ext import commands from discord.ext import commands
from libbot import config_get
from libbot.pycord.classes import PycordBot from libbot.pycord.classes import PycordBot
from libbot.sync import config_get as sync_config_get
from libbot.sync import json_write as sync_json_write
from classes.holo_user import HoloUser from classes.holo_user import HoloUser
from enums.colors import Color from enums.colors import Color
from modules.database import col_users from modules.database import col_users
from modules.utils import config_get from modules.utils_sync import guild_name
from modules.utils_sync import config_get_sync, guild_name, json_write_sync
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -27,7 +29,7 @@ class Data(commands.Cog):
@data.command( @data.command(
name="export", name="export",
description="Експортувати дані", description="Експортувати дані",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option( @option(
"kind", description="Тип даних, які треба експортувати", choices=["Користувачі"] "kind", description="Тип даних, які треба експортувати", choices=["Користувачі"]
@ -91,16 +93,14 @@ class Data(commands.Cog):
} }
) )
json_write_sync(users, str(Path(f"tmp/{uuid}"))) sync_json_write(users, Path(f"tmp/{uuid}"))
await ctx.respond( await ctx.respond(file=File(Path(f"tmp/{uuid}"), filename="users.json"))
file=File(str(Path(f"tmp/{uuid}")), filename="users.json")
)
@data.command( @data.command(
name="migrate", name="migrate",
description="Мігрувати всіх користувачів до бази", description="Мігрувати всіх користувачів до бази",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option( @option(
"kind", description="Тип даних, які треба експортувати", choices=["Користувачі"] "kind", description="Тип даних, які треба експортувати", choices=["Користувачі"]

View File

@ -1,12 +1,13 @@
import logging import logging
from WaifuPicsPython import WaifuAsync
from discord import ApplicationContext, Embed, User, option, slash_command from discord import ApplicationContext, Embed, User, option, slash_command
from discord.ext import commands from discord.ext import commands
from libbot import config_get
from libbot.pycord.classes import PycordBot from libbot.pycord.classes import PycordBot
from WaifuPicsPython import WaifuAsync from libbot.sync import config_get as sync_config_get
from modules.utils import config_get from modules.utils_sync import guild_name
from modules.utils_sync import config_get_sync, guild_name
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -20,12 +21,12 @@ class Fun(commands.Cog):
@slash_command( @slash_command(
name="action", name="action",
description="Провести над користувачем РП дію", description="Провести над користувачем РП дію",
guild_ids=[config_get_sync("guild")], guild_ids=[sync_config_get("guild")],
) )
@option( @option(
"type", "type",
description="Тип дії, яку хочете провести з користувачем", description="Тип дії, яку хочете провести з користувачем",
choices=config_get_sync("actions").keys(), choices=sync_config_get("actions").keys(),
) )
@option("user", description="Користувач") @option("user", description="Користувач")
async def action_cmd(self, ctx: ApplicationContext, type: str, user: User): async def action_cmd(self, ctx: ApplicationContext, type: str, user: User):

View File

@ -1,10 +1,10 @@
from discord import Member, Message from discord import Member, Message
from discord import utils as ds_utils from discord import utils as ds_utils
from discord.ext import commands from discord.ext import commands
from libbot import config_get
from libbot.pycord.classes import PycordBot from libbot.pycord.classes import PycordBot
from modules.database import col_users from modules.database import col_users
from modules.utils import config_get
class Logger(commands.Cog): class Logger(commands.Cog):

View File

@ -1,11 +1,11 @@
import logging import logging
from discord import Activity, ActivityType from discord import Activity, ActivityType
from libbot import config_get
from libbot.sync import config_get as sync_config_get
from modules.client import client from modules.client import client
from modules.scheduled import scheduler from modules.scheduled import scheduler
from modules.utils import config_get
from modules.utils_sync import config_get_sync
logging.basicConfig( logging.basicConfig(
level=logging.INFO, level=logging.INFO,
@ -67,7 +67,7 @@ def main():
try: try:
scheduler.start() scheduler.start()
client.run(config_get_sync("bot_token", "bot")) client.run(sync_config_get("bot_token", "bot"))
except KeyboardInterrupt: except KeyboardInterrupt:
scheduler.shutdown() scheduler.shutdown()
exit() exit()

View File

@ -1,38 +0,0 @@
from typing import Any
import aiofiles
from ujson import dumps, loads
async def json_read(path: str) -> Any:
async with aiofiles.open(path, mode="r", encoding="utf-8") as f:
data = await f.read()
return loads(data)
async def json_write(data: Any, path: str) -> None:
async with aiofiles.open(path, mode="w", encoding="utf-8") as f:
await f.write(
dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4)
)
async def config_get(key: str, *path: str) -> Any:
this_key = await json_read("config.json")
for dict_key in path:
this_key = this_key[dict_key]
return this_key[key]
async def config_set(key: str, value: Any, *path: str) -> None:
this_dict = await json_read("config.json")
string = "this_dict"
for arg in path:
string += f'["{arg}"]'
if type(value) in [str]:
string += f'["{key}"] = "{value}"'
else:
string += f'["{key}"] = {value}'
exec(string)
await json_write(this_dict, "config.json")
return

View File

@ -1,45 +1,10 @@
from typing import Any, Union from typing import Union
from discord import Member, User from discord import Member, User
from ujson import dumps, loads
def json_read_sync(path: str) -> Any:
with open(path, mode="r", encoding="utf-8") as f:
data = f.read()
return loads(data)
def json_write_sync(data: Any, path: str) -> None:
with open(path, mode="w", encoding="utf-8") as f:
f.write(dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4))
def config_get_sync(key: str, *path: str) -> Any:
this_key = json_read_sync("config.json")
for dict_key in path:
this_key = this_key[dict_key]
return this_key[key]
def config_set_sync(key: str, value: Any, *path: str) -> None:
this_dict = json_read_sync("config.json")
string = "this_dict"
for arg in path:
string += f'["{arg}"]'
if type(value) in [str]:
string += f'["{key}"] = "{value}"'
else:
string += f'["{key}"] = {value}'
exec(string)
json_write_sync(this_dict, "config.json")
return
def guild_name(member: Union[Member, User]) -> str: def guild_name(member: Union[Member, User]) -> str:
if isinstance(member, User): if isinstance(member, User):
return member.name return member.name
if member.nick == None:
return member.name return member.name if member.nick is None else member.nick
else:
return member.nick