diff --git a/makibot/modules/sql/__init__.py b/makibot/modules/sql/__init__.py index 5ee4579..f6a3035 100644 --- a/makibot/modules/sql/__init__.py +++ b/makibot/modules/sql/__init__.py @@ -2,7 +2,7 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker, scoped_session -from tg_bot import DB_URI +from makibot import DB_URI def start() -> scoped_session: diff --git a/makibot/modules/sql/afk_sql.py b/makibot/modules/sql/afk_sql.py index d3a1900..36ad4e0 100644 --- a/makibot/modules/sql/afk_sql.py +++ b/makibot/modules/sql/afk_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, UnicodeText, Boolean, Integer -from tg_bot.modules.sql import BASE, SESSION +from makibot.modules.sql import BASE, SESSION class AFK(BASE): diff --git a/makibot/modules/sql/antiflood_sql.py b/makibot/modules/sql/antiflood_sql.py index 4cac782..754a504 100644 --- a/makibot/modules/sql/antiflood_sql.py +++ b/makibot/modules/sql/antiflood_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, Integer, String -from tg_bot.modules.sql import BASE, SESSION +from makibot.modules.sql import BASE, SESSION DEF_COUNT = 0 DEF_LIMIT = 0 diff --git a/makibot/modules/sql/blacklist_sql.py b/makibot/modules/sql/blacklist_sql.py index 0a4d22b..4f46334 100644 --- a/makibot/modules/sql/blacklist_sql.py +++ b/makibot/modules/sql/blacklist_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import func, distinct, Column, String, UnicodeText -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class BlackListFilters(BASE): diff --git a/makibot/modules/sql/cust_filters_sql.py b/makibot/modules/sql/cust_filters_sql.py index 1b888b9..c40eb0e 100644 --- a/makibot/modules/sql/cust_filters_sql.py +++ b/makibot/modules/sql/cust_filters_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, String, UnicodeText, Boolean, Integer, distinct, func -from tg_bot.modules.sql import BASE, SESSION +from makibot.modules.sql import BASE, SESSION class CustomFilters(BASE): diff --git a/makibot/modules/sql/disable_sql.py b/makibot/modules/sql/disable_sql.py index 36ba2d4..02701a2 100644 --- a/makibot/modules/sql/disable_sql.py +++ b/makibot/modules/sql/disable_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, String, UnicodeText, func, distinct -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class Disable(BASE): diff --git a/makibot/modules/sql/global_bans_sql.py b/makibot/modules/sql/global_bans_sql.py index 7dbccab..73711fc 100644 --- a/makibot/modules/sql/global_bans_sql.py +++ b/makibot/modules/sql/global_bans_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, UnicodeText, Integer, String, Boolean -from tg_bot.modules.sql import BASE, SESSION +from makibot.modules.sql import BASE, SESSION class GloballyBannedUsers(BASE): diff --git a/makibot/modules/sql/locks_sql.py b/makibot/modules/sql/locks_sql.py index 351a065..425918b 100644 --- a/makibot/modules/sql/locks_sql.py +++ b/makibot/modules/sql/locks_sql.py @@ -3,7 +3,7 @@ from sqlalchemy import Column, String, Boolean -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class Permissions(BASE): diff --git a/makibot/modules/sql/log_channel_sql.py b/makibot/modules/sql/log_channel_sql.py index 35a6212..94881f4 100644 --- a/makibot/modules/sql/log_channel_sql.py +++ b/makibot/modules/sql/log_channel_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, String, func, distinct -from tg_bot.modules.sql import BASE, SESSION +from makibot.modules.sql import BASE, SESSION class GroupLogs(BASE): diff --git a/makibot/modules/sql/notes_sql.py b/makibot/modules/sql/notes_sql.py index 0f9ba1b..1a71fcf 100644 --- a/makibot/modules/sql/notes_sql.py +++ b/makibot/modules/sql/notes_sql.py @@ -3,8 +3,8 @@ from sqlalchemy import Column, String, Boolean, UnicodeText, Integer, func, distinct -from tg_bot.modules.helper_funcs.msg_types import Types -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.helper_funcs.msg_types import Types +from makibot.modules.sql import SESSION, BASE class Notes(BASE): diff --git a/makibot/modules/sql/reporting_sql.py b/makibot/modules/sql/reporting_sql.py index 8b1e0f5..c7714d2 100644 --- a/makibot/modules/sql/reporting_sql.py +++ b/makibot/modules/sql/reporting_sql.py @@ -3,7 +3,7 @@ from sqlalchemy import Column, Integer, String, Boolean -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class ReportingUserSettings(BASE): diff --git a/makibot/modules/sql/rss_sql.py b/makibot/modules/sql/rss_sql.py index 64e1d3c..3687417 100644 --- a/makibot/modules/sql/rss_sql.py +++ b/makibot/modules/sql/rss_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, UnicodeText, Integer -from tg_bot.modules.sql import BASE, SESSION +from makibot.modules.sql import BASE, SESSION class RSS(BASE): diff --git a/makibot/modules/sql/rules_sql.py b/makibot/modules/sql/rules_sql.py index 4680490..7b750e7 100644 --- a/makibot/modules/sql/rules_sql.py +++ b/makibot/modules/sql/rules_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, String, UnicodeText, func, distinct -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class Rules(BASE): diff --git a/makibot/modules/sql/userinfo_sql.py b/makibot/modules/sql/userinfo_sql.py index 1a1fe14..61be71e 100644 --- a/makibot/modules/sql/userinfo_sql.py +++ b/makibot/modules/sql/userinfo_sql.py @@ -2,7 +2,7 @@ from sqlalchemy import Column, Integer, UnicodeText -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class UserInfo(BASE): diff --git a/makibot/modules/sql/users_sql.py b/makibot/modules/sql/users_sql.py index f6d340e..50ef407 100644 --- a/makibot/modules/sql/users_sql.py +++ b/makibot/modules/sql/users_sql.py @@ -2,8 +2,8 @@ from sqlalchemy import Column, Integer, UnicodeText, String, ForeignKey, UniqueConstraint, func -from tg_bot import dispatcher -from tg_bot.modules.sql import BASE, SESSION +from makibot import dispatcher +from makibot.modules.sql import BASE, SESSION class Users(BASE): diff --git a/makibot/modules/sql/warns_sql.py b/makibot/modules/sql/warns_sql.py index 665824b..8670972 100644 --- a/makibot/modules/sql/warns_sql.py +++ b/makibot/modules/sql/warns_sql.py @@ -3,7 +3,7 @@ from sqlalchemy import Integer, Column, String, UnicodeText, func, distinct, Boolean from sqlalchemy.dialects import postgresql -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.sql import SESSION, BASE class Warns(BASE): diff --git a/makibot/modules/sql/welcome_sql.py b/makibot/modules/sql/welcome_sql.py index 631dcd3..32f0924 100644 --- a/makibot/modules/sql/welcome_sql.py +++ b/makibot/modules/sql/welcome_sql.py @@ -2,8 +2,8 @@ from sqlalchemy import Column, String, Boolean, UnicodeText, Integer, BigInteger -from tg_bot.modules.helper_funcs.msg_types import Types -from tg_bot.modules.sql import SESSION, BASE +from makibot.modules.helper_funcs.msg_types import Types +from makibot.modules.sql import SESSION, BASE DEFAULT_WELCOME = "Hey {first}, how are you?" DEFAULT_GOODBYE = "Nice knowing ya!"