blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-01 03:55:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(webapi): include cid in ServerEvent::Msg

Browse source
This commit is contained in:
oxalica 2024-10-08 21:14:13 -04:00
parent 814fac1974
commit ff7fd9e4b2
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
blahd/src/event.rs
View file

@ -11,7 +11,7 @@ use anyhow::{bail, Context as _, Result};
use axum::extract::ws::{close_code, CloseFrame, Message, WebSocket};
use axum::extract::WebSocketUpgrade;
use axum::response::Response;
use blah_types::msg::{AuthPayload, SignedChatMsg};
use blah_types::msg::{AuthPayload, SignedChatMsgWithId};
use blah_types::server::{ClientEvent, ServerEvent};
use blah_types::Signed;
use futures_util::future::Either;
@ -58,7 +58,7 @@ pub struct State {
}
impl State {
pub fn on_room_msg(&self, msg: SignedChatMsg, room_members: Vec<i64>) {
pub fn on_room_msg(&self, msg: SignedChatMsgWithId, room_members: Vec<i64>) {
let listeners = self.user_listeners.lock();
let mut cnt = 0usize;
let msg = Arc::new(ServerEvent::Msg(msg));

4
blahd/src/lib.rs
View file

@ -13,7 +13,7 @@ use axum_extra::extract::WithRejection as R;
use blah_types::msg::{
ChatPayload, CreateGroup, CreatePeerChat, CreateRoomPayload, DeleteRoomPayload,
MemberPermission, RoomAdminOp, RoomAdminPayload, RoomAttrs, ServerPermission,
SignedChatMsgWithId,
SignedChatMsgWithId, WithMsgId,
};
use blah_types::server::{
ErrorResponseWithChallenge, RoomList, RoomMember, RoomMemberList, RoomMetadata, RoomMsgs,
@ -460,7 +460,7 @@ async fn post_room_msg(
})?;
// FIXME: Optimize this to not traverses over all members.
st.event.on_room_msg(chat, members);
st.event.on_room_msg(WithMsgId::new(cid, chat), members);
Ok(Json(cid))
}

10
blahd/tests/webapi.rs
View file

@ -1525,7 +1525,7 @@ async fn event(server: Server) {
{
let chat = server.post_chat(rid1, &ALICE, "alice1").await.unwrap();
let got = ws.next().await.unwrap().unwrap();
assert_eq!(got, ServerEvent::Msg(chat.msg));
assert_eq!(got, ServerEvent::Msg(chat));
}
// Should receive msgs from other user.
@ -1536,7 +1536,7 @@ async fn event(server: Server) {
.unwrap();
let chat = server.post_chat(rid1, &BOB, "bob1").await.unwrap();
let got = ws.next().await.unwrap().unwrap();
assert_eq!(got, ServerEvent::Msg(chat.msg));
assert_eq!(got, ServerEvent::Msg(chat));
}
// Should receive msgs from new room.
@ -1547,7 +1547,7 @@ async fn event(server: Server) {
{
let chat = server.post_chat(rid2, &ALICE, "alice2").await.unwrap();
let got = ws.next().await.unwrap().unwrap();
assert_eq!(got, ServerEvent::Msg(chat.msg));
assert_eq!(got, ServerEvent::Msg(chat));
}
// Each streams should receive each message once.
@ -1556,9 +1556,9 @@ async fn event(server: Server) {
let chat = server.post_chat(rid1, &ALICE, "alice1").await.unwrap();
let got1 = ws.next().await.unwrap().unwrap();
assert_eq!(got1, ServerEvent::Msg(chat.msg.clone()));
assert_eq!(got1, ServerEvent::Msg(chat.clone()));
let got2 = ws2.next().await.unwrap().unwrap();
assert_eq!(got2, ServerEvent::Msg(chat.msg));
assert_eq!(got2, ServerEvent::Msg(chat));
}
}