From 6aaa2377a4e2e2ff8642253e80a149ea63d90bd4 Mon Sep 17 00:00:00 2001 From: Conatum Date: Wed, 29 Dec 2021 20:13:24 +0200 Subject: [PATCH] refactor: Split `stats` module from `study`. --- bot/modules/__init__.py | 1 + bot/modules/stats/__init__.py | 6 ++++++ bot/modules/stats/data.py | 13 +++++++++++++ bot/modules/stats/module.py | 4 ++++ .../{study/stats_cmd.py => stats/profile.py} | 2 +- bot/modules/{study => stats}/top_cmd.py | 0 bot/modules/study/__init__.py | 3 --- bot/modules/study/module.py | 2 +- 8 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 bot/modules/stats/__init__.py create mode 100644 bot/modules/stats/data.py create mode 100644 bot/modules/stats/module.py rename bot/modules/{study/stats_cmd.py => stats/profile.py} (99%) rename bot/modules/{study => stats}/top_cmd.py (100%) diff --git a/bot/modules/__init__.py b/bot/modules/__init__.py index 9a6a51ae..b1763cae 100644 --- a/bot/modules/__init__.py +++ b/bot/modules/__init__.py @@ -3,6 +3,7 @@ from .guild_admin import * from .meta import * from .economy import * from .study import * +from .stats import * from .user_config import * from .workout import * from .todo import * diff --git a/bot/modules/stats/__init__.py b/bot/modules/stats/__init__.py new file mode 100644 index 00000000..4478e63d --- /dev/null +++ b/bot/modules/stats/__init__.py @@ -0,0 +1,6 @@ +from .module import module + +from . import data +from . import profile +from . import setprofile +from . import top_cmd diff --git a/bot/modules/stats/data.py b/bot/modules/stats/data.py new file mode 100644 index 00000000..79bcb7a9 --- /dev/null +++ b/bot/modules/stats/data.py @@ -0,0 +1,13 @@ +from data import Table + + +profile_tags = Table('member_profile_tags', attach_as='profile_tags') + + +@profile_tags.save_query +def get_tags_for(guildid, userid): + rows = profile_tags.select_where( + guildid=guildid, userid=userid, + _extra="ORDER BY tagid ASC" + ) + return [row['tag'] for row in rows] diff --git a/bot/modules/stats/module.py b/bot/modules/stats/module.py new file mode 100644 index 00000000..d820c4de --- /dev/null +++ b/bot/modules/stats/module.py @@ -0,0 +1,4 @@ +from LionModule import LionModule + + +module = LionModule("Statistics") diff --git a/bot/modules/study/stats_cmd.py b/bot/modules/stats/profile.py similarity index 99% rename from bot/modules/study/stats_cmd.py rename to bot/modules/stats/profile.py index 88bc8be5..09239ad8 100644 --- a/bot/modules/study/stats_cmd.py +++ b/bot/modules/stats/profile.py @@ -7,7 +7,7 @@ from data import tables from data.conditions import LEQ from core import Lion -from .tracking.data import session_history +from modules.study.tracking.data import session_history from .module import module diff --git a/bot/modules/study/top_cmd.py b/bot/modules/stats/top_cmd.py similarity index 100% rename from bot/modules/study/top_cmd.py rename to bot/modules/stats/top_cmd.py diff --git a/bot/modules/study/__init__.py b/bot/modules/study/__init__.py index 30f59149..8e7830b0 100644 --- a/bot/modules/study/__init__.py +++ b/bot/modules/study/__init__.py @@ -3,6 +3,3 @@ from .module import module from . import badges from . import timers from . import tracking - -from . import top_cmd -from . import stats_cmd diff --git a/bot/modules/study/module.py b/bot/modules/study/module.py index ae88f7dd..38f5340a 100644 --- a/bot/modules/study/module.py +++ b/bot/modules/study/module.py @@ -1,4 +1,4 @@ from LionModule import LionModule -module = LionModule("Study_Stats") +module = LionModule("Study_Tracking")