Fix file naming consistency

Luminara.py

@@ -1,9 +1,9 @@
 import os
 
 import discord
-import services.Client
-import services.GuildConfig
-import services.Help
+import Client
+import services.config_service
+import services.help_service
 import services.logging_service
 import config.parser
 
@@ -16,12 +16,12 @@ async def get_prefix(bot, message):
     except AttributeError:
         return "."
 
-client = services.Client.LumiBot(
+client = Client.LumiBot(
     owner_id=int(os.environ.get('LUMI_OWNER_ID')),
     command_prefix=get_prefix,
     intents=discord.Intents.all(),
     status=discord.Status.online,
-    help_command=services.Help.LumiHelp()
+    help_command=services.help_service.LumiHelp()
 )
 
 

handlers/event_handler.py

@@ -6,7 +6,7 @@ from discord.ext.commands import Cog
 from lib.embeds.greet import Greet
 from lib.embeds.boost import Boost
 import lib.embeds.boost
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 
 _logs = logging.getLogger('Lumi.Core')
 

handlers/xp_handler.py

@@ -8,7 +8,7 @@ from discord.ext.commands import Cog
 
 from config.parser import JsonCache
 from lib import formatter
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 from services.xp_service import XpService, XpRewardService
 
 _strings = JsonCache.read_json("strings")

lib/checks.py

@@ -1,7 +1,7 @@
 from discord.ext import commands
 
 from lib.exceptions import LumiExceptions
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 
 
 def birthdays_enabled():

lib/formatter.py

@@ -2,7 +2,7 @@ import textwrap
 
 import discord
 
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 
 
 def template(text, username, level=None):

modules/admin/award.py

@@ -1,6 +1,6 @@
 import discord
 
-from services.Currency import Currency
+from services.currency_service import Currency
 
 
 async def cmd(ctx, user: discord.User, amount: int):

modules/birthdays/__init__.py

@@ -8,8 +8,8 @@ from discord.ext import commands, tasks, bridge
 from config.parser import JsonCache
 from lib import time, checks
 from modules.birthdays import upcoming, birthday
-from services.Birthday import Birthday
-from services.GuildConfig import GuildConfig
+from services.birthday_service import Birthday
+from services.config_service import GuildConfig
 
 logs = logging.getLogger('Lumi.Core')
 data = JsonCache.read_json("birthday")

modules/birthdays/birthday.py

@@ -4,7 +4,7 @@ import datetime
 from discord.ext import commands
 
 from lib.embeds.info import BdayInfo
-from services.Birthday import Birthday
+from services.birthday_service import Birthday
 
 
 async def set_birthday(ctx, month, month_index, day):

modules/birthdays/upcoming.py

@@ -2,7 +2,7 @@ import datetime
 
 import discord
 
-from services.Birthday import Birthday
+from services.birthday_service import Birthday
 
 
 async def cmd(ctx):

modules/config/__init__.py

@@ -10,7 +10,7 @@ from lib.embeds.greet import Greet
 from lib.embeds.boost import Boost
 from lib.embeds.error import GenericErrors
 from modules.config import config, set_prefix, xp_reward
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 
 strings = JsonCache.read_json("strings")
 logs = logging.getLogger('Lumi.Core')

modules/config/config.py

@@ -1,7 +1,7 @@
 import discord
 
 from config.parser import JsonCache
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 
 strings = JsonCache.read_json("strings")
 

modules/config/set_prefix.py

@@ -1,6 +1,6 @@
 from lib.embeds.error import MiscErrors
 from lib.embeds.info import MiscInfo
-from services.GuildConfig import GuildConfig
+from services.config_service import GuildConfig
 
 
 async def set_cmd(ctx, prefix):

modules/economy/balance.py

@@ -1,6 +1,6 @@
 import discord
 
-from services.Currency import Currency
+from services.currency_service import Currency
 
 
 async def cmd(ctx):

modules/economy/blackjack.py

@@ -10,8 +10,8 @@ from config.parser import JsonCache
 from lib import interaction
 from lib.embeds.error import EconErrors
 from lib.embeds.error import GenericErrors
-from services.BlackJackStats import BlackJackStats
-from services.Currency import Currency
+from services.stats_service import BlackJackStats
+from services.currency_service import Currency
 
 resources = JsonCache.read_json("resources")
 logs = logging.getLogger('Lumi.Core')

modules/economy/daily.py

@@ -3,8 +3,8 @@ from datetime import datetime, timedelta
 import lib.time
 from lib.embeds.error import EconErrors
 from lib.embeds.info import EconInfo
-from services.Currency import Currency
-from services.Dailies import Dailies
+from services.currency_service import Currency
+from services.daily_service import Dailies
 
 
 async def cmd(ctx):

modules/economy/give.py

@@ -1,7 +1,7 @@
 import discord
 from discord.ext import commands
 
-from services.Currency import Currency
+from services.currency_service import Currency
 
 
 async def cmd(ctx, user, amount):

modules/economy/inventory.py

@@ -1,6 +1,6 @@
 import discord
 
-from services.Inventory import Inventory
+from services.inventory_service import Inventory
 
 
 async def cmd(self, ctx):

modules/economy/slots.py

@@ -8,8 +8,8 @@ import pytz
 from discord.ext import commands
 
 from config.parser import JsonCache
-from services.Currency import Currency
-from services.SlotsStats import SlotsStats
+from services.currency_service import Currency
+from services.stats_service import SlotsStats
 
 resources = JsonCache.read_json("resources")
 est = pytz.timezone('US/Eastern')

modules/economy/stats.py

@@ -1,7 +1,6 @@
 from config.parser import JsonCache
-from services.BlackJackStats import BlackJackStats
-from services.Currency import Currency
-from services.SlotsStats import SlotsStats
+from services.stats_service import BlackJackStats, SlotsStats
+from services.currency_service import Currency
 
 strings = JsonCache.read_json("strings")
 resources = JsonCache.read_json("resources")

modules/levels/leaderboard.py

@@ -3,8 +3,8 @@ from datetime import datetime
 
 import discord
 
-from services.Currency import Currency
-from services.Dailies import Dailies
+from services.currency_service import Currency
+from services.daily_service import Dailies
 from services.xp_service import XpService
 
 logs = logging.getLogger('Lumi.Core')

modules/misc/info.py

@@ -7,8 +7,8 @@ import psutil
 
 from config.parser import JsonCache
 from lib import metadata
-from services.BlackJackStats import BlackJackStats
-from services.Currency import Currency
+from services.stats_service import BlackJackStats
+from services.currency_service import Currency
 
 _logs = logging.getLogger('Lumi.Core')
 _art = JsonCache.read_json("art")

services/BlackJackStats.py

@@ -1,55 +0,0 @@
-import json
-
-from db import database
-
-
-class BlackJackStats:
-    def __init__(self, user_id, is_won, bet, payout, hand_player, hand_dealer):
-        self.user_id = user_id
-        self.is_won = is_won
-        self.bet = bet
-        self.payout = payout
-        self.hand_player = json.dumps(hand_player)
-        self.hand_dealer = json.dumps(hand_dealer)
-
-    def push(self):
-        query = """
-        INSERT INTO blackjack (user_id, is_won, bet, payout, hand_player, hand_dealer)
-        VALUES (%s, %s, %s, %s, %s, %s)
-        """
-
-        values = (self.user_id, self.is_won, self.bet, self.payout, self.hand_player, self.hand_dealer)
-
-        database.execute_query(query, values)
-
-    @staticmethod
-    def get_user_stats(user_id):
-        query = """
-                SELECT
-                    COUNT(*) AS amount_of_games,
-                    SUM(bet) AS total_bet,
-                    SUM(payout) AS total_payout,
-                    SUM(CASE WHEN is_won = 1 THEN 1 ELSE 0 END) AS winning,
-                    SUM(CASE WHEN is_won = 0 THEN 1 ELSE 0 END) AS losing
-                FROM blackjack
-                WHERE user_id = %s;
-                """
-        (amount_of_games, total_bet,
-         total_payout, winning_amount, losing_amount) = database.select_query(query, (user_id,))[0]
-
-        return {
-            "amount_of_games": amount_of_games,
-            "total_bet": total_bet,
-            "total_payout": total_payout,
-            "winning_amount": winning_amount,
-            "losing_amount": losing_amount
-        }
-
-    @staticmethod
-    def get_total_rows_count():
-        query = """
-                SELECT SUM(TABLE_ROWS)
-                FROM INFORMATION_SCHEMA.TABLES
-                """
-
-        return database.select_query_one(query)

services/daily_service.py

@@ -4,7 +4,7 @@ import pytz
 
 from config.parser import JsonCache
 from db import database
-from services.Currency import Currency
+from services.currency_service import Currency
 
 resources = JsonCache.read_json("resources")
 

services/inventory_service.py

@@ -1,7 +1,7 @@
 import logging
 
 from db import database
-from services import Item
+from services import item_service
 
 logs = logging.getLogger('Lumi.Core')
 
@@ -10,7 +10,7 @@ class Inventory:
     def __init__(self, user_id):
         self.user_id = user_id
 
-    def add_item(self, item: Item.Item, quantity=1):
+    def add_item(self, item: item_service.Item, quantity=1):
         """
         Adds an item with a specific count (default 1) to the database, if there are
         no records of this user having that item yet, it will just add a record with quantity=quantity.
@@ -27,7 +27,7 @@ class Inventory:
 
         database.execute_query(query, (self.user_id, item.id, abs(quantity), abs(quantity)))
 
-    def take_item(self, item: Item.Item, quantity=1):
+    def take_item(self, item: item_service.Item, quantity=1):
 
         query = """
         INSERT INTO inventory (user_id, item_id, quantity)
@@ -47,12 +47,12 @@ class Inventory:
         items_dict = {}
         for row in results:
             item_id, quantity = row
-            item = Item.Item(item_id)
+            item = item_service.Item(item_id)
             items_dict[item] = quantity
 
         return items_dict
 
-    def get_item_quantity(self, item: Item.Item):
+    def get_item_quantity(self, item: item_service.Item):
         query = "SELECT COALESCE(quantity, 0) FROM inventory WHERE user_id = %s AND item_id = %s"
         result = database.select_query_one(query, (self.user_id, item.id))
         return result

services/stats_service.py

@@ -3,6 +3,58 @@ import json
 from db import database
 
 
+class BlackJackStats:
+    def __init__(self, user_id, is_won, bet, payout, hand_player, hand_dealer):
+        self.user_id = user_id
+        self.is_won = is_won
+        self.bet = bet
+        self.payout = payout
+        self.hand_player = json.dumps(hand_player)
+        self.hand_dealer = json.dumps(hand_dealer)
+
+    def push(self):
+        query = """
+        INSERT INTO blackjack (user_id, is_won, bet, payout, hand_player, hand_dealer)
+        VALUES (%s, %s, %s, %s, %s, %s)
+        """
+
+        values = (self.user_id, self.is_won, self.bet, self.payout, self.hand_player, self.hand_dealer)
+
+        database.execute_query(query, values)
+
+    @staticmethod
+    def get_user_stats(user_id):
+        query = """
+                SELECT
+                    COUNT(*) AS amount_of_games,
+                    SUM(bet) AS total_bet,
+                    SUM(payout) AS total_payout,
+                    SUM(CASE WHEN is_won = 1 THEN 1 ELSE 0 END) AS winning,
+                    SUM(CASE WHEN is_won = 0 THEN 1 ELSE 0 END) AS losing
+                FROM blackjack
+                WHERE user_id = %s;
+                """
+        (amount_of_games, total_bet,
+         total_payout, winning_amount, losing_amount) = database.select_query(query, (user_id,))[0]
+
+        return {
+            "amount_of_games": amount_of_games,
+            "total_bet": total_bet,
+            "total_payout": total_payout,
+            "winning_amount": winning_amount,
+            "losing_amount": losing_amount
+        }
+
+    @staticmethod
+    def get_total_rows_count():
+        query = """
+                SELECT SUM(TABLE_ROWS)
+                FROM INFORMATION_SCHEMA.TABLES
+                """
+
+        return database.select_query_one(query)
+
+
 class SlotsStats:
     """
     Handles statistics for the /slots command
@@ -60,3 +112,4 @@ class SlotsStats:
             "games_won_three_diamonds": games_won_three_diamonds,
             "games_won_jackpot": games_won_jackpot
         }
+