Osnova
/
osnova-api-alert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #5

Merged
sergey merged 33 commits from dev into main 2024-10-11 07:57:44 +00:00
Conversation 0 Commits 33 Files Changed 30 +8 -2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15a3aeb6f5 - Show all commits

8
routers/tg_send.py
View File

@ -31,7 +31,9 @@ async def send_message(
await del_message_from_dashboard(message_id=msg_id) await del_message_from_dashboard(message_id=msg_id)
return return
result = await send_message_to_dashboard(text=message.text) result = await send_message_to_dashboard(
text=message.subject + "\n\n" + message.text
)
if result["status"] == 200: if result["status"] == 200:
log.info(f"Message sent to dashboard: {message.text}") log.info(f"Message sent to dashboard: {message.text}")
await set_value(message.problem_id, result["msg_id"]) await set_value(message.problem_id, result["msg_id"])
@ -45,7 +47,9 @@ async def send_message_net_service(
message: TelegramMessageToNetwork, message: TelegramMessageToNetwork,
token: str = Depends(verify_token_admin), token: str = Depends(verify_token_admin),
): ):
result = await send_message_to_net_chat(text=message.text) result = await send_message_to_net_chat(
text=message.subject + "\n\n" + message.text
)
if result["status"] == 200: if result["status"] == 200:
log.info(f"Message sent to network chat: {message.text}") log.info(f"Message sent to network chat: {message.text}")
else: else:

2
schemas/tg_send.py
View File

@ -4,7 +4,9 @@ from pydantic import BaseModel
class TelegramMessageToDashboard(BaseModel): class TelegramMessageToDashboard(BaseModel):
text: str text: str
problem_id: int problem_id: int
subject: str
class TelegramMessageToNetwork(BaseModel): class TelegramMessageToNetwork(BaseModel):
text: str text: str
subject: str