From 1d902c75e0bc7343a8d45ed87bf42058c42fa34f Mon Sep 17 00:00:00 2001 From: profitroll Date: Sun, 7 May 2023 09:42:21 +0200 Subject: [PATCH] Removed deprecated shit --- classes/holo_user.py | 126 ------------------------------------------- modules/database.py | 4 -- 2 files changed, 130 deletions(-) diff --git a/classes/holo_user.py b/classes/holo_user.py index 0696301..08633b1 100644 --- a/classes/holo_user.py +++ b/classes/holo_user.py @@ -51,108 +51,10 @@ class HoloUser: self.db_id = jav_user["_id"] - # self.xp = jav_user["xp"] - # self.xp_next = jav_user["xp_next"] - # self.level = jav_user["level"] - # self.work_xp = jav_user["work_xp"] - # self.balance = jav_user["balance"] self.customrole = jav_user["customrole"] self.customchannel = jav_user["customchannel"] - # self.married = jav_user["married"] - # self.marriage_request = jav_user["marriage_request"] - # self.marriage_request_sent = jav_user["marriage_request_sent"] - # self.cooldown = jav_user["cooldown"] self.warnings = self.warns() - # def xp_add(self, amount: int = 1) -> None: - # """Add some amount of XP points - - # ### Args: - # * `amount` (int, optional): Amount of XP points to give. Defaults to 1. - # """ - # self.xp += amount - # col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { "xp": self.xp } }) - - # def xp_level_up(self) -> None: - # """Add 1 to the current XP level""" - # xp_diff = int(self.xp - self.xp_next) - # xp_next = int(self.xp_next*configGet("multiplier", "leveling")+configGet("addition", "leveling")) - # self.xp = xp_diff - # self.xp_next = xp_next - # self.level += 1 - # col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { "xp": xp_diff } }) - # col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { "xp_next": xp_next } }) - # col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { "level": self.level } }) - - # def balance_set(self, amount: int) -> None: - # """Set the balance to amount - - # ### Args: - # * `amount` (int): Amount of currency to be set - # """ - # self.balance = amount - # col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { "balance": self.balance } }) - - # def balance_add(self, amount: int) -> None: - # """Add amount to the balance - - # ### Args: - # * `amount` (int): Amount to be added - # """ - # self.balance_set(self.balance+amount) - - # def balance_take(self, amount: int) -> bool: - # """Take amount from the balance - - # ### Args: - # * `amount` (int): Amount to be taken - - # ### Returns: - # * `bool`: True if successful and False if not - # """ - # if self.balance >= amount: - # self.balance_set(self.balance-amount) - # return True - # else: - # return False - # #raise NotEnoughMoneyError() - - # def balance_transfer(self, amount: int, destination: Union[Any, int]) -> None: - # """Transfer money to another user - - # ### Args: - # * `amount` (int): Amount to be transferred - # * `destination` (Union[Any, int]): Destination user of the transfer (should have attribute "id" or be id itself if int) - - # ### Raises: - # * `NotEnoughMoneyError`: Not enough money to perform this transaction - # """ - # if self.balance >= amount: - # if isinstance(destination, int): - # destination = HoloUser(destination) - # self.balance_take(amount) - # destination.balance_add(amount) # type: ignore - # else: - # raise NotEnoughMoneyError() - - # def salary_get(self) -> int: - # """Get the salary level depending on work_xp - - # ### Returns: - # * `int`: Amount of money to be earned - # """ - # if self.work_xp >= 100: - # return randint(configGet("min", "work", "level", "4"), configGet("max", "work", "level", "4")) - # elif self.work_xp >= 50: - # return randint(configGet("min", "work", "level", "3"), configGet("max", "work", "level", "3")) - # elif self.work_xp > 10: - # return randint(configGet("min", "work", "level", "2"), configGet("max", "work", "level", "2")) - # else: - # return randint(configGet("min", "work", "level", "1"), configGet("max", "work", "level", "1")) - - # def work_xp_add(self) -> None: - # self.set("work_xp", self.work_xp+1) - def warns(self) -> int: """Get number of warnings user has @@ -181,15 +83,6 @@ class HoloUser: col_warnings.insert_one(document={"user": self.id, "warns": count}) logger.info(f"User {self.id} was warned {count} times due to: {reason}") - # def cooldown_go(self, kind: Literal["work", "daily", "weekly", "monthly", "steal"]) -> None: - # """Set cooldown start of kind now - - # ### Args: - # * `kind` (Literal["work", "daily", "weekly", "monthly", "steal"]): Kind of a cooldown - # """ - # self.cooldown[kind] = datetime.now(tz=timezone.utc) - # col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { "cooldown": self.cooldown } }) - def set(self, key: str, value: Any) -> None: """Set attribute data and save it into database @@ -209,22 +102,3 @@ class HoloUser: # """Completely remove data from database. Will not remove transactions logs and warnings.""" # col_users.delete_one(filter={"_id": self.db_id}) # self.unauthorize() - - # def unauthorize(self) -> None: - # """Cancel Oauth2 authorization""" - # col_authorized.find_one_and_delete({"user": self.id}) - - # def is_authorized(self) -> bool: - # """Check if user provided Oauth2 authorization - - # ### Returns: - # * `bool`: True if yes and False if no - # """ - # if configGet("mode") == "secure": - # authorized = col_authorized.find_one({"user": self.id}) - # if authorized is not None: - # return True - # else: - # return False - # else: - # return True diff --git a/modules/database.py b/modules/database.py index 8e2aa71..bb7eaaf 100644 --- a/modules/database.py +++ b/modules/database.py @@ -25,7 +25,3 @@ for collection in ["users", "warnings", "scheduler", "analytics"]: col_users = db.get_collection("users") col_warnings = db.get_collection("warnings") col_analytics = db.get_collection("analytics") -# col_checkouts = db.get_collection("checkouts") -# col_trackings = db.get_collection("trackings") -# col_authorized = db.get_collection("authorized") -# col_transactions = db.get_collection("transactions")