Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/api/endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ async def message_actions(payload: str = Form(...)) -> JSONResponse:
).get("text", None)

user_id = form_json.get("user", {}).get("id")
await slack.add_announcement(message_object, user_id)

username: str = await slack.get_username(user_id=user_id)
username = username[:40]

slack.add_announcement(message_object, username)

if response_url:
async with httpx.AsyncClient() as client:
Expand Down
4 changes: 1 addition & 3 deletions src/core/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def get_announcement() -> dict[str, str] | None:
return announcements.pop(0)


async def add_announcement(announcement_text: str, user_id: str) -> None:
def add_announcement(announcement_text: str, username: str) -> None:
"""
Adds an announcement to the queue.

Expand All @@ -177,8 +177,6 @@ async def add_announcement(announcement_text: str, user_id: str) -> None:
logger.warning("Attempted to add empty announcement, skipping!")
return

username: str = await get_username(user_id=user_id)

new_addition: dict[str, str] = {"content": announcement_text, "user": username}

announcements.append(new_addition)
8 changes: 4 additions & 4 deletions tests/src/core/test_slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,18 @@ def test_get_and_add_announcement(monkeypatch):

skip_announcements: list[str | None] = [None, "", " "]
for ann in skip_announcements:
slack.add_announcement(ann)
slack.add_announcement(ann, "FAKE ID")

assert slack.get_announcement() is None

test_announcements: list[str] = ["First", "Second", "Third"]

for ann in test_announcements:
slack.add_announcement(ann)
slack.add_announcement(ann, "FAKE ID")

for ann in test_announcements:
assert slack.get_announcement() == ann
assert slack.get_announcement().get("content", "") == ann

assert (
slack.get_announcement() == test_announcements[-1]
slack.get_announcement().get("content", "") == test_announcements[-1]
) # should return last announcement when queue is empty
Loading