From: Edward Delaporte Date: Sun, 29 Mar 2026 15:44:26 +0000 (-0500) Subject: Add basics to bot X-Git-Tag: 1.0.0~3 X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/commitdiff_plain/6a132ab99f10f2b589fe6b4eb2ab034a1773f59b?ds=sidebyside Add basics to bot --- diff --git a/app.py b/app.py index c2550ef..01be94e 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,12 @@ -from matrix_shop_bot.bot import get_bot, shop_bot +from matrix_shop_bot.bot import shop_bot + +SERVER = os.environ.get('MATRIX_SERVER') +BOT_NAME = os.environ.get('GOAL_BOT') +BOT_PWD = os.environ.get('GOAL_BOT_PWD') + +def get_bot(): + creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD) + return botlib.Bot(creds) bot = get_bot() diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py index 9c0bec0..8a25f53 100644 --- a/matrix_shop_bot/bot.py +++ b/matrix_shop_bot/bot.py @@ -6,47 +6,33 @@ import simplematrixbotlib as botlib from .db import Data, pretty_print -SERVER = os.environ.get('MATRIX_SERVER') -BOT_NAME = os.environ.get('GOAL_BOT') -BOT_PWD = os.environ.get('GOAL_BOT_PWD') - -def get_bot(): - creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD) - return botlib.Bot(creds) +MODULE='shop' DATE_FORMAT = '%Y-%m-%d' def today(): return dt.now().strftime(DATE_FORMAT) -PREFIX = '!goal' - +PREFIX = f'!{MODULE}' logger = logging.getLogger(__name__) -logging.basicConfig(filename='goals.log', encoding='utf-8', level=logging.DEBUG) +logging.basicConfig(filename=f'{MODULE}.log', encoding='utf-8', level=logging.DEBUG) logging.getLogger('nio').setLevel(logging.WARNING) -async def do_goal(match): +async def do_shop(match): ''' - Prefix: !goal + Prefix: !shop Synax: - !goal COMMAND ARGS + !shop COMMAND ARGS Commands: help - show this help - add - add a goal - add-task ID - add a task under the goal specified by ID - add-vision - add a new vision (collection of goals) - close-goal ID - mark goal done by ID - close-vision ID - mark vision as complete by ID - done ID - mark task done by ID - list - list incomplete goals - list-all - list everything - list-done - list completed goals - print GOAL_ID - print a goal and all tasks - print-vision ID - print a vision and all goals - set-vision GOAL_ID VISION_ID- associate GOAL_ID with VISION_ID - visions - list incomplete visions + add - add an item to shop for + add-store - add a store + assign STORE_ID ITEM_ID - plan to shop for at store for item + list STORE_ID - list all items assigned to store + list-unsorted - list all items not assigned to any store + setup - run one time database setup ''' if match.command('setup'): @@ -55,106 +41,36 @@ async def do_goal(match): if match.command('add'): new = ' '.join(match.args()[1:]) - result = Data().add_goal(new) - return [f'Goal added with id {result}'] + result = Data().add_item(new) + return [f'Item added with id {result}'] - if match.command('list'): - goals = Data().get_all_goals() - results = ['# Goals list...'] - for goal in goals: - results.append(str(goal)) - return results - - - if match.command('list-done'): - goals = Data().get_done_goals() - results = ['# Completed Goals...'] - for goal in goals: - results.append(str(goal)) - return results - - - if match.command('add-task'): - goal_id = int(match.args()[1]) - new = ' '.join(match.args()[2:]) - result = Data().add_task(goal_id=goal_id, name=new) - goal,tasks = Data().get_goal(goal_id) - results = pretty_print(goal, tasks) - return results - # return [f'Added task with id {result}'] - - if match.command('add-vision'): + if match.command('add-store'): new = ' '.join(match.args()[1:]) - result = Data().add_vision(new) - return [f'Vision added with id {result}'] - - if match.command('print'): - goal_id = int(match.args()[1]) - logger.debug(f'Searching for goal {goal_id}...') - goal,tasks = Data().get_goal(goal_id) - results = pretty_print(goal, tasks) - return results - + result = Data().add_store(new) + return [f'Store added with id {result}'] - if match.command('print-vision'): - get_id = int(match.args()[1]) - vision,goals = Data().get_vision(get_id) - results = pretty_print(vision, goals) - return results - - if match.command('close-goal'): - goal_id = int(match.args()[1]) - vision_id = Data().complete_goal(goal_id) - vision,goals = Data().get_vision(vision_id) - results = pretty_print(vision, goals) - return results - if match.command('close-vision'): - vision_id = int(match.args()[1]) - Data().complete_vision(vision_id) - vision,goals = Data().get_vision(vision_id) - results = pretty_print(vision, goals) - return results - - - if match.command('done'): - task_id = int(match.args()[1]) - goal_id = Data().complete_task(task_id) - goal,tasks = Data().get_goal(goal_id) - results = pretty_print(goal, tasks) - return results - - if match.command('list-all'): - goals = Data().get_all_goals() - results = ['# Everything is...'] - for goal in goals: - _,tasks = Data().get_goal(goal.id) - details = pretty_print(goal, tasks) - results += details + if match.command('list'): + items = Data().get_shopping_list(store_id) + for item in items: + results.append(str(item)) return results - if match.command('visions'): - items = Data().get_all_visions() - results = ['# Visions'] - if not items: - results.append('-- No current visions --') - + if match.command('unsorted'): + items = Data().list_unsorted() for item in items: - results.append(item) + results.append(str(item)) return results + if match.command('assign'): + store_id = int(match.args()[1]) + item_id = int(match.args()[2]) + result = Data().assign_store(store_id, item_id) + return result - if match.command('set-vision'): - goal_id = int(match.args()[1]) - vision_id = int(match.args()[2]) - Data().assign_vision(goal_id=goal_id, vision_id=vision_id) - vision,goals = Data().get_vision(vision_id) - results = pretty_print(vision, goals) - return results - - return [do_goal.__doc__] + return [do_shop.__doc__] -async def goal_bot(room, message, bot): +async def shop_bot(room, message, bot): match = botlib.MessageMatch(room, message, bot, PREFIX) if not match.is_not_from_this_bot() and match.prefix(): @@ -162,11 +78,11 @@ async def goal_bot(room, message, bot): try: if match.prefix(): - result_lines = await do_goal(match) + result_lines = await do_shop(match) for line in result_lines: await bot.api.send_text_message( room.room_id, str(line)) except Exception as ex: - return ['Ye cannot get ye flask.'] + return ['You have:', ' no tea']