Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(platform): add chat history #183

Merged
merged 1 commit into from
Jan 10, 2024
Merged

feat(platform): add chat history #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions platform/api/src/api/v1/gql/subscription/chat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::api::v1::gql::error::Result;
use crate::api::v1::gql::ext::ContextExt;
use crate::api::v1::gql::models::chat_message::{ChatMessage, MessageType};
use crate::api::v1::gql::models::ulid::GqlUlid;
use crate::database;
use crate::global::ApiGlobal;
use crate::subscription::SubscriptionTopic;

Expand Down Expand Up @@ -41,20 +42,31 @@ impl<G: ApiGlobal> ChatSubscription<G> {
};

// TODO: check if user is allowed to read this chat
// let channel = global
// .user_by_id_loader
// .load_one(channel_id.into())
// .await
// .map_err_gql("failed to fetch user")?
// .ok_or(GqlError::NotFound.with_message("user not found"))?;

let mut message_stream = global
.subscription_manager()
.subscribe(SubscriptionTopic::ChannelChatMessages(channel_id.to_ulid()))
.await
.map_err_gql("failed to subscribe to chat messages")?;

// load old messages not older than 10 minutes, max 100 messages
let not_older_than = chrono::Utc::now() - chrono::Duration::minutes(10);
let not_older_than = ulid::Ulid::from_parts(not_older_than.timestamp() as u64, u128::MAX);
let messages: Vec<database::ChatMessage> = sqlx::query_as(
"SELECT * FROM chat_messages WHERE channel_id = $1 AND deleted_at IS NULL AND id >= $2 ORDER BY id LIMIT 100",
)
.bind(common::database::Ulid::from(channel_id.to_ulid()))
.bind(common::database::Ulid::from(not_older_than))
.fetch_all(global.db().as_ref())
.await
.map_err_gql("failed to fetch chat messages")?;

dbg!(&messages);

Ok(stream!({
for message in messages {
yield Ok(message.into());
}
yield Ok(welcome_message);
while let Ok(message) = message_stream.recv().await {
let event = pb::scuffle::platform::internal::events::ChatMessage::decode(message.payload)
Expand Down
6 changes: 4 additions & 2 deletions platform/api/src/database/chat_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ use common::database::Ulid;
pub struct ChatMessage {
/// The unique identifier for the chat message.
pub id: Ulid,
/// The unique identifier for the chat room which owns the message.
pub channel_id: Ulid,
/// The unique identifier for the user who sent the message.
pub user_id: Ulid,
/// The unique identifier for the chat room which owns the message.
pub channel_id: Ulid,
/// The content of the message.
pub content: String,
/// The time the message was deleted.
pub deleted_at: Option<chrono::DateTime<chrono::Utc>>,
}

impl ChatMessage {
Expand Down