diff --git a/src/data_types/__init__.py b/src/data_types/__init__.py new file mode 100644 index 0000000..1ea4568 --- /dev/null +++ b/src/data_types/__init__.py @@ -0,0 +1 @@ +from .emote import Emote diff --git a/src/utils/data_types.py b/src/data_types/emote.py similarity index 98% rename from src/utils/data_types.py rename to src/data_types/emote.py index 006f8e6..d2e0a46 100644 --- a/src/utils/data_types.py +++ b/src/data_types/emote.py @@ -5,7 +5,7 @@ import discord # Custom libs -from .utils import mention, plural, day_interval +from utils import mention, plural, day_interval class Emote: diff --git a/src/scanners/__init__.py b/src/scanners/__init__.py index bdd5e40..4670fbc 100644 --- a/src/scanners/__init__.py +++ b/src/scanners/__init__.py @@ -1 +1,2 @@ -from .emotes_scanner import EmotesScanner, FrequencyScanner +from .emotes_scanner import EmotesScanner +from .frequency_scanner import FrequencyScanner diff --git a/src/scanners/emotes_scanner.py b/src/scanners/emotes_scanner.py index bfa286c..633872a 100644 --- a/src/scanners/emotes_scanner.py +++ b/src/scanners/emotes_scanner.py @@ -5,7 +5,7 @@ import discord # Custom libs from utils.log_manager import ChannelLogs, MessageLog -from utils.data_types import Emote +from data_types import Emote from .scanner import Scanner from utils import emojis diff --git a/src/scanners/scanner.py b/src/scanners/scanner.py index cfdf793..792907c 100644 --- a/src/scanners/scanner.py +++ b/src/scanners/scanner.py @@ -3,9 +3,9 @@ from typing import List from collections import defaultdict import discord -from utils.utils import no_duplicate, get_intro +from utils import no_duplicate, get_intro from utils.log_manager import GuildLogs, ChannelLogs, MessageLog -from utils.data_types import Emote +from data_types import Emote class Scanner(ABC): diff --git a/src/utils/__init__.py b/src/utils/__init__.py index e69de29..16281fe 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -0,0 +1 @@ +from .utils import * diff --git a/src/utils/utils.py b/src/utils/utils.py index 8d5920b..b3ccd29 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -1,4 +1,4 @@ -from typing import List, Dict +from typing import List import os import logging import discord