secretary
/
waitonbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hook should now also check against conversation, since ts is only unique per channel

This commit is contained in:
Jacob Henry 2019-03-03 20:22:10 -05:00
parent d63ed10798
commit 2d84d40060
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks.py
View File

@ -161,8 +161,8 @@ class InteractionListener(AbsHook):
def __init__(self, def __init__(self,
callback: Callable[[slack_util.Event, Union[ActionVal, str]], MsgAction], callback: Callable[[slack_util.Event, Union[ActionVal, str]], MsgAction],
action_bindings: Optional[Dict[str, ActionVal]], action_bindings: Optional[Dict[str, ActionVal]], # The action_id -> value mapping. Value fed to callback
# The action_id -> value mapping. Value fed to callback conversation: slack_util.Conversation, # Where the message is posted
message_ts: str, # Which message contains the block we care about message_ts: str, # Which message contains the block we care about
lifetime: float, # How long to keep listening lifetime: float, # How long to keep listening
on_expire: Optional[Callable[[], None]] # Function to call on death by timeout. For instance, if you want to delete the message, or edit it to say "timed out" on_expire: Optional[Callable[[], None]] # Function to call on death by timeout. For instance, if you want to delete the message, or edit it to say "timed out"
@ -170,6 +170,7 @@ class InteractionListener(AbsHook):
super().__init__(True) super().__init__(True)
self.callback = callback self.callback = callback
self.bindings = action_bindings self.bindings = action_bindings
self.conversation = conversation
self.message_ts = message_ts self.message_ts = message_ts
self.lifetime = lifetime self.lifetime = lifetime
self.start_time = time() self.start_time = time()
@ -187,13 +188,13 @@ class InteractionListener(AbsHook):
self.on_death() self.on_death()
raise HookDeath() raise HookDeath()
# Next make sure we're actually a message # Next make sure we've got an interaction
if not (event.interaction and event.message): if not (event.interaction and event.message and event.user and event.conversation):
return None return None
# Otherwise proceed normally # Otherwise proceed normally
# Is the msg the one we care about? If not, ignore # Is the msg the one we care about? If not, ignore
if event.message.ts != self.message_ts: if event.message.ts != self.message_ts or event.conversation.get_conversation() != self.conversation:
return None return None
# Lookup the binding if we can/need to # Lookup the binding if we can/need to