Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ruff
Browse files Browse the repository at this point in the history
* origin/main:
  Refs #66 -- handle edited Slack message (#79)
  • Loading branch information
amureki committed Apr 24, 2024
2 parents 65b0635 + cde7b9e commit 7aad8ab
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
6 changes: 3 additions & 3 deletions sam/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ async def get_bot_user_id():
async def handle_message(event: {str, Any}, say: AsyncSay):
"""Handle a message event from Slack."""
logger.debug(f"handle_message={json.dumps(event)}")
if event.get("subtype") == "message_deleted":
logger.debug("Ignoring message_deleted event %s", event)
return # https://api.slack.com/events/message#hidden_subtypes
if event.get("subtype") in ["message_changed", "message_deleted"]:
logger.debug(f"Ignoring `{event['subtype']}` event {event}")
return
bot_id = await get_bot_user_id()
channel_id = event["channel"]
channel_type = event["channel_type"]
Expand Down
23 changes: 22 additions & 1 deletion tests/test_slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,28 @@ async def test_handle_message__subtype_deleted(caplog):
}
with caplog.at_level(logging.DEBUG):
await slack.handle_message(event, None)
assert "Ignoring message_deleted event" in caplog.text
assert "Ignoring `message_deleted` event" in caplog.text


@pytest.mark.asyncio
async def test_handle_message__subtype_changed(caplog):
event = {
"type": "message",
"subtype": "message_changed",
"hidden": True,
"channel": "C123ABC456",
"ts": "1358878755.000001",
"message": {
"type": "message",
"user": "U123ABC456",
"text": "Hello, world!",
"ts": "1355517523.000005",
"edited": {"user": "U123ABC456", "ts": "1358878755.000001"},
},
}
with caplog.at_level(logging.DEBUG):
await slack.handle_message(event, None)
assert "Ignoring `message_changed` event" in caplog.text


def test_get_user_profile(monkeypatch):
Expand Down

0 comments on commit 7aad8ab

Please sign in to comment.