ZhenYi/gitdataai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update channel pagination and reconnect

Browse Source
This commit is contained in:
zhenyi 2026-05-30 15:07:20 +08:00
parent 22192301a0
commit 4d2e4d8b36
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/channel/pagination.rs
View File

@ -65,7 +65,7 @@ impl MessagePagination {
db::sqlx::query_as::<_, model::room::RoomMessageModel>( db::sqlx::query_as::<_, model::room::RoomMessageModel>(
db::sqlx::AssertSqlSafe(format!( db::sqlx::AssertSqlSafe(format!(
"SELECT {RM_COLUMNS} FROM room_message \ "SELECT {RM_COLUMNS} FROM room_message \
WHERE room = $1 AND seq < $2 AND deleted_at IS NULL \ WHERE room = $1 AND seq < $2 AND deleted_at IS NULL AND thread IS NULL \
ORDER BY seq DESC LIMIT $3" ORDER BY seq DESC LIMIT $3"
)), )),
) )
@ -79,7 +79,7 @@ impl MessagePagination {
db::sqlx::query_as::<_, model::room::RoomMessageModel>( db::sqlx::query_as::<_, model::room::RoomMessageModel>(
db::sqlx::AssertSqlSafe(format!( db::sqlx::AssertSqlSafe(format!(
"SELECT {RM_COLUMNS} FROM room_message \ "SELECT {RM_COLUMNS} FROM room_message \
WHERE room = $1 AND seq > $2 AND deleted_at IS NULL \ WHERE room = $1 AND seq > $2 AND deleted_at IS NULL AND thread IS NULL \
ORDER BY seq ASC LIMIT $3" ORDER BY seq ASC LIMIT $3"
)), )),
) )
@ -93,7 +93,7 @@ impl MessagePagination {
db::sqlx::query_as::<_, model::room::RoomMessageModel>( db::sqlx::query_as::<_, model::room::RoomMessageModel>(
db::sqlx::AssertSqlSafe(format!( db::sqlx::AssertSqlSafe(format!(
"SELECT {RM_COLUMNS} FROM room_message \ "SELECT {RM_COLUMNS} FROM room_message \
WHERE room = $1 AND deleted_at IS NULL \ WHERE room = $1 AND deleted_at IS NULL AND thread IS NULL \
ORDER BY seq DESC LIMIT $2" ORDER BY seq DESC LIMIT $2"
)), )),
) )

14
lib/channel/reconnect.rs
View File

@ -22,6 +22,12 @@ pub struct MissedMessage {
pub content: String, pub content: String,
pub sender_id: Uuid, pub sender_id: Uuid,
pub send_at: chrono::DateTime<chrono::Utc>, pub send_at: chrono::DateTime<chrono::Utc>,
pub thread: Option<Uuid>,
pub parent: Option<Uuid>,
pub content_type: String,
pub pinned: bool,
pub system_type: Option<String>,
pub metadata: serde_json::Value,
} }
#[derive(Clone)] #[derive(Clone)]
@ -69,7 +75,7 @@ impl ReconnectManager {
let messages = db::sqlx::query_as::<_, RoomMessageModel>( let messages = db::sqlx::query_as::<_, RoomMessageModel>(
db::sqlx::AssertSqlSafe(format!( db::sqlx::AssertSqlSafe(format!(
"SELECT {RM_COLUMNS} FROM room_message \ "SELECT {RM_COLUMNS} FROM room_message \
WHERE room = $1 AND seq > $2 AND deleted_at IS NULL \ WHERE room = $1 AND seq > $2 AND deleted_at IS NULL AND thread IS NULL \
ORDER BY seq ASC \ ORDER BY seq ASC \
LIMIT 100" LIMIT 100"
)), )),
@ -88,6 +94,12 @@ impl ReconnectManager {
content: m.content, content: m.content,
sender_id: m.author, sender_id: m.author,
send_at: m.created_at, send_at: m.created_at,
thread: m.thread,
parent: m.parent,
content_type: m.content_type,
pinned: m.pinned,
system_type: m.system_type,
metadata: m.metadata,
}) })
.collect(); .collect();