From fd6497b2df14433fe4ac9786e048a550c4149462 Mon Sep 17 00:00:00 2001 From: Ovidiu Pacurar Date: Fri, 21 Feb 2025 14:50:49 +0200 Subject: [PATCH 1/2] fix get message --- slackbot/base.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/slackbot/base.py b/slackbot/base.py index 0080099..e175846 100644 --- a/slackbot/base.py +++ b/slackbot/base.py @@ -1,7 +1,7 @@ import argparse import shlex from typing import NoReturn, Optional, Sequence, Union -from slackbot import get_user_model +from slackbot import get_user_model, get_message_model class MessageProcessor: @@ -40,7 +40,9 @@ def process(self, message, **kw) -> Optional[Union[int, tuple[int, int]]]: return return self.handle(message, **kw) - def handle(self, message, user=None, channel=None, ts=None, raw=None) -> Optional[Union[int, tuple[int, int]]]: + def handle( + self, message, user=None, channel=None, ts=None, raw=None + ) -> Optional[Union[int, tuple[int, int]]]: """ :return: None, self.STOP, self.PROCESSED, or tuple PROCESSED,STOP @@ -75,7 +77,9 @@ def __init__( self.ts = ts super().__init__(prog=command, description=description, exit_on_error=False) - def parse_args(self, args: Optional[Union[str, Sequence[str]]] = None, namespace=None): + def parse_args( + self, args: Optional[Union[str, Sequence[str]]] = None, namespace=None + ): if not args: raise NoMatchSlackCommand @@ -97,7 +101,9 @@ def exit(self, status: int = 0, message: Optional[str] = None) -> NoReturn: def _print_message(self, message: str, file=None) -> None: if message: - self.message_processor.post_message(channel=self.channel, text=message, thread_ts=self.ts) + self.message_processor.post_message( + channel=self.channel, text=message, thread_ts=self.ts + ) def print_usage(self, file=None) -> None: self._print_message("```\n" + self.format_usage() + "```", file) From b28f6be9724aa15ea5122d8fde3d83bc664e9378 Mon Sep 17 00:00:00 2001 From: Ovidiu Pacurar Date: Fri, 21 Feb 2025 15:08:08 +0200 Subject: [PATCH 2/2] black formatting --- slackbot/base.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/slackbot/base.py b/slackbot/base.py index e175846..e9316ca 100644 --- a/slackbot/base.py +++ b/slackbot/base.py @@ -40,9 +40,7 @@ def process(self, message, **kw) -> Optional[Union[int, tuple[int, int]]]: return return self.handle(message, **kw) - def handle( - self, message, user=None, channel=None, ts=None, raw=None - ) -> Optional[Union[int, tuple[int, int]]]: + def handle(self, message, user=None, channel=None, ts=None, raw=None) -> Optional[Union[int, tuple[int, int]]]: """ :return: None, self.STOP, self.PROCESSED, or tuple PROCESSED,STOP @@ -77,9 +75,7 @@ def __init__( self.ts = ts super().__init__(prog=command, description=description, exit_on_error=False) - def parse_args( - self, args: Optional[Union[str, Sequence[str]]] = None, namespace=None - ): + def parse_args(self, args: Optional[Union[str, Sequence[str]]] = None, namespace=None): if not args: raise NoMatchSlackCommand @@ -101,9 +97,7 @@ def exit(self, status: int = 0, message: Optional[str] = None) -> NoReturn: def _print_message(self, message: str, file=None) -> None: if message: - self.message_processor.post_message( - channel=self.channel, text=message, thread_ts=self.ts - ) + self.message_processor.post_message(channel=self.channel, text=message, thread_ts=self.ts) def print_usage(self, file=None) -> None: self._print_message("```\n" + self.format_usage() + "```", file)