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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- [MAJOR] Added `apiPathPattern` to `logging.api`
- [MAJOR] Added `chainId` to `EthClientInterface`
- [MINOR] Added `call` and `multicall` to `EthClientInterface`
- [MINOR] Truncate discord notification messages to fit api

### Changed

Expand Down
4 changes: 4 additions & 0 deletions core/notifications/discord_client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from core import logging
from core.notifications.notification_client import NotificationClient
from core.requester import KibaResponse
from core.requester import Requester
Expand All @@ -9,6 +10,9 @@ def __init__(self, webhookUrl: str, requester: Requester) -> None:
self.requester = requester

async def post(self, messageText: str) -> KibaResponse:
if len(messageText) > 1000: # noqa: PLR2004
logging.info('Truncating Discord message to 1000 characters')
messageText = messageText[:997] + '...'
Comment on lines +13 to +15

Copilot AI Nov 1, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discord webhooks actually support a content limit of 2000 characters, not 1000. The current implementation unnecessarily truncates messages at half the actual API limit. Consider updating the limit to 2000 characters and adjusting the truncation to messageText[:1997] + '...'.

Suggested change
if len(messageText) > 1000: # noqa: PLR2004
logging.info('Truncating Discord message to 1000 characters')
messageText = messageText[:997] + '...'
if len(messageText) > 2000: # noqa: PLR2004
logging.info('Truncating Discord message to 2000 characters')
messageText = messageText[:1997] + '...'

Copilot uses AI. Check for mistakes.
data = {'content': messageText}
response = await self.requester.post(self.webhookUrl, dataDict=data, headers={'content-type': 'application/json'})
return response
5 changes: 3 additions & 2 deletions core/queues/sqs.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,18 @@ def from_sqs_message(cls, sqsMessage: RawSqsMessageTypeDef) -> SqsMessage:


class SqsMessageQueue(MessageQueue[SqsMessage]):
def __init__(self, region: str, accessKeyId: str, accessKeySecret: str, queueUrl: str) -> None:
def __init__(self, region: str, accessKeyId: str, accessKeySecret: str, queueUrl: str, sessionToken: str | None = None) -> None:
self.region = region
self._accessKeyId = accessKeyId
self._accessKeySecret = accessKeySecret
self._sessionToken = sessionToken
self.queueUrl = queueUrl
self._exitStack = AsyncExitStack()
self._sqsClient: SQSClient | None = None

async def connect(self) -> None:
session = get_botocore_session()
self._sqsClient = await self._exitStack.enter_async_context(session.create_client('sqs', region_name=self.region, aws_access_key_id=self._accessKeyId, aws_secret_access_key=self._accessKeySecret))
self._sqsClient = await self._exitStack.enter_async_context(session.create_client('sqs', region_name=self.region, aws_access_key_id=self._accessKeyId, aws_secret_access_key=self._accessKeySecret, aws_session_token=self._sessionToken))

async def disconnect(self) -> None:
await self._exitStack.aclose()
Expand Down
Loading