X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/e268526289d0a4957706be0b40e752b6123ca0b2..20c4ba82eda7e71635190228655360ee9a37f6c3:/bot.py diff --git a/bot.py b/bot.py index 839bf07..649cfe6 100644 --- a/bot.py +++ b/bot.py @@ -1,13 +1,11 @@ -import os from datetime import datetime as dt +import logging +import os import simplematrixbotlib as botlib -from school import (get_assignments, STUDENTS) - -from chore.db import Data as ChoreData +from goals.db import Data, pretty_print -CHORES = ChoreData() SERVER = os.environ.get('MATRIX_SERVER') BOT_NAME = os.environ.get('GOAL_BOT') @@ -22,130 +20,79 @@ creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD) bot = botlib.Bot(creds) PREFIX = '!goal' -@bot.listener.on_message_event -async def goals(room, message): - match = botlib.MessageMatch(room, message, bot, PREFIX) - - if not match.is_not_from_this_bot() and match.prefix(): - return +logger = logging.getLogger(__name__) +logging.basicConfig(filename='goals.log', encoding='utf-8', level=logging.DEBUG) +logging.getLogger('nio').setLevel(logging.WARNING) - if match.command("echo"): - await bot.api.send_text_message( - room.room_id, " ".join(arg for arg in match.args()) - ) - - help_text = ''' - # Print this help text - !school help - # List available students - !school list - # Get today's assignments - !school get [NAME] - # Get an assignment for a date - !school get [Name] 2026-03-09 +async def do_goal(match): ''' - if match.command("help"): - await bot.api.send_text_message( - room.room_id, help_text) - - if match.command("list"): - student_list = f"Known students are {STUDENTS}." - await bot.api.send_text_message( - room.room_id, student_list) - - person = '' - if match.command("get"): - print(match.args()) - if(len(match.args()) < 2): - result = ['Please specify person to get assignments for.'] - else: - person = match.args()[1] - - if(len(match.args()) > 2): - day = match.args()[2] - else: - day = today() - - if(person and day): - await bot.api.send_text_message(room.room_id, f'Fetching assignments for {person} on {day}') - results = get_assignments(person, day) - else: - results = ['Oops.'] - - if len(results) < 3: - results = [f'No assignments found for {person} on {day}.'] - - for line in results: - - await bot.api.send_text_message( - room.room_id, line) - - -@bot.listener.on_message_event -async def chores(room, message): - match = botlib.MessageMatch(room, message, bot, '!chore') - - if not match.is_not_from_this_bot() and match.prefix(): - return + Bot help here? - if match.command('list'): - - await bot.api.send_text_message( - room.room_id, 'Listing chores...') - - result = CHORES.list() - for item in result: - await bot.api.send_text_message( - room.room_id, item) + ''' + # logger.debug(f'match {str(match)}') + if match.command('help'): + return ['help'] - await bot.api.send_text_message( - room.room_id, '-- End of List --') - if match.command('setup'): - await bot.api.send_text_message( - room.room_id, f'Doing chore setup...') - result = CHORES.setup() - result = await bot.api.send_text_message( - room.room_id, f'Result: {result}') - + result = Data().setup() + return [result] if match.command('add'): - new_chore = ' '.join(match.args()[1:]) + new = ' '.join(match.args()[1:]) + result = Data().add_goal(new) + return [f'Goal added with id {result}'] - await bot.api.send_text_message( - room.room_id, f'Adding chore...{new_chore}...') + if match.command('list'): + goals = Data().list_goals() + results = ['Goals list...'] + 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) + return [f'Added task 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 + + if match.command('goal-done'): + goal_id = int(match.args()[1]) + logger.debug(f'Searching for goal {goal_id}...') + Data().complete_goal(goal_id) + goal,tasks = Data().get_goal(goal_id) + results = pretty_print(goal, tasks) + return results + - result = CHORES.add(new_chore) - await bot.api.send_text_message( - room.room_id, result) + 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 + return __doc__ - if match.command('check'): - chore_id = match.args()[1] +@bot.listener.on_message_event +async def goals(room, message): + match = botlib.MessageMatch(room, message, bot, PREFIX) - result = CHORES.check(chore_id) - await bot.api.send_text_message( - room.room_id, result) + if not match.is_not_from_this_bot() and match.prefix(): + return - if match.command('done'): - chore_id = match.args()[1] - result = CHORES.done(chore_id) - await bot.api.send_text_message( - room.room_id, result) - - if match.command('undo'): - chore_id = match.args()[1] - result = CHORES.undo(chore_id) - await bot.api.send_text_message( - room.room_id, result) - - - if match.command('remove'): - chore_id = match.args()[1] - result = CHORES.remove(chore_id) - await bot.api.send_text_message( - room.room_id, result) + if match.prefix(): + result_lines = await do_goal(match) + for line in result_lines: + await bot.api.send_text_message( + room.room_id, str(line)) bot.run()