Fixed imports for modules
parent
1b1ff8ffbc
commit
330fa16970
|
@ -1,4 +1,4 @@
|
||||||
from DatabaseInterface import *
|
from geoffrey.DatabaseInterface import *
|
||||||
|
|
||||||
|
|
||||||
class Commands:
|
class Commands:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from DatabaseModels import *
|
from geoffrey.DatabaseModels import *
|
||||||
|
|
||||||
|
|
||||||
class DatabaseInterface:
|
class DatabaseInterface:
|
||||||
|
|
|
@ -7,9 +7,9 @@ from sqlalchemy.ext.declarative import declarative_base
|
||||||
from sqlalchemy.orm import relationship, column_property, sessionmaker
|
from sqlalchemy.orm import relationship, column_property, sessionmaker
|
||||||
from sqlalchemy.sql import expression
|
from sqlalchemy.sql import expression
|
||||||
|
|
||||||
from BotConfig import bot_config
|
from geoffrey.BotConfig import bot_config
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from MinecraftAccountInfoGrabber import *
|
from geoffrey.MinecraftAccountInfoGrabber import *
|
||||||
|
|
||||||
SQL_Base = declarative_base()
|
SQL_Base = declarative_base()
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from itertools import zip_longest
|
from itertools import zip_longest
|
||||||
|
|
||||||
from BotConfig import bot_config
|
from geoffrey.BotConfig import bot_config
|
||||||
|
|
||||||
|
|
||||||
def get_name(args):
|
def get_name(args):
|
||||||
|
|
|
@ -8,8 +8,8 @@ import logging
|
||||||
import logging.handlers as handlers
|
import logging.handlers as handlers
|
||||||
from sys import stdout
|
from sys import stdout
|
||||||
|
|
||||||
import bot
|
from geoffrey import bot
|
||||||
from BotConfig import bot_config
|
from geoffrey.BotConfig import bot_config
|
||||||
|
|
||||||
|
|
||||||
def setup_logging():
|
def setup_logging():
|
||||||
|
|
|
@ -2,7 +2,7 @@ from json import JSONDecodeError
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from BotErrors import UsernameLookupFailed
|
from geoffrey.BotErrors import UsernameLookupFailed
|
||||||
|
|
||||||
uuid_lookup_url = 'https://api.mojang.com/users/profiles/minecraft/{}'
|
uuid_lookup_url = 'https://api.mojang.com/users/profiles/minecraft/{}'
|
||||||
username_lookup_url = 'https://api.mojang.com/user/profiles/{}/names'
|
username_lookup_url = 'https://api.mojang.com/user/profiles/{}/names'
|
||||||
|
|
|
@ -6,11 +6,11 @@ from discord.ext import commands
|
||||||
from discord.utils import oauth_url
|
from discord.utils import oauth_url
|
||||||
from sqlalchemy.exc import OperationalError
|
from sqlalchemy.exc import OperationalError
|
||||||
|
|
||||||
from BotConfig import bot_config
|
from geoffrey.BotConfig import bot_config
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from Commands import Commands
|
from geoffrey.Commands import Commands
|
||||||
from DatabaseModels import Player
|
from geoffrey.DatabaseModels import Player
|
||||||
from MinecraftAccountInfoGrabber import *
|
from geoffrey.MinecraftAccountInfoGrabber import *
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from DiscordHelperFunctions import *
|
from geoffrey.DiscordHelperFunctions import *
|
||||||
from bot import bot_commands
|
from geoffrey.bot import bot_commands
|
||||||
|
|
||||||
|
|
||||||
@commands.cooldown(5, 60, commands.BucketType.user)
|
@commands.cooldown(5, 60, commands.BucketType.user)
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
from discord import Game
|
from discord import Game
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
from BotConfig import bot_config
|
from geoffrey.BotConfig import bot_config
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from bot import bot_commands
|
from geoffrey.bot import bot_commands
|
||||||
|
|
||||||
|
|
||||||
def check_mod(user):
|
def check_mod(user):
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from DiscordHelperFunctions import *
|
from geoffrey.DiscordHelperFunctions import *
|
||||||
from bot import bot_commands
|
from geoffrey.bot import bot_commands
|
||||||
|
|
||||||
|
|
||||||
class Delete_Commands:
|
class Delete_Commands:
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from DiscordHelperFunctions import *
|
from geoffrey.DiscordHelperFunctions import *
|
||||||
from bot import bot_commands
|
from geoffrey.bot import bot_commands
|
||||||
|
|
||||||
|
|
||||||
class Edit_Commands:
|
class Edit_Commands:
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
from BotErrors import *
|
from geoffrey.BotErrors import *
|
||||||
from DiscordHelperFunctions import *
|
from geoffrey.DiscordHelperFunctions import *
|
||||||
from bot import bot_commands
|
from geoffrey.bot import bot_commands
|
||||||
|
|
||||||
|
|
||||||
class Search_Commands:
|
class Search_Commands:
|
||||||
|
|
Loading…
Reference in New Issue