-
Notifications
You must be signed in to change notification settings - Fork 58
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.
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
Add chat API #436
Merged
Merged
Add chat API #436
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
a065d91
Add chat APIs - wip
lukasIO 7cc3785
generated protobuf
github-actions[bot] f97fc09
updates
lukasIO b44fceb
Merge branch 'lukas/chat-api' of https://github.com/livekit/rust-sdks…
lukasIO 1d575c7
fix types and build
lukasIO 139e875
Merge branch 'main' into lukas/chat-api
lukasIO f07f655
Add conversion traits and update API
lukasIO 9614963
fix unwrapping
lukasIO 9363544
Populate timestamps and add edit support
lukasIO 078f696
fix default values
lukasIO e3c08a3
Merge branch 'main' into lukas/chat-api
lukasIO 752b018
generated protobuf
github-actions[bot] ef71fb9
fix match
lukasIO f298162
remove explicit resolver
lukasIO 466e342
move conversion
lukasIO 336f697
error handling
lukasIO bb8bea4
no imports
lukasIO File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,32 @@ | ||
#![allow(non_snake_case)] | ||
#![allow(clippy::enum_variant_names)] | ||
|
||
use livekit::ChatMessage as RoomChatMessage; | ||
|
||
include!("livekit.proto.rs"); | ||
|
||
impl From<ChatMessage> for RoomChatMessage { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. currently defining these conversions both in livekit-ffi and in livekit, which feels wrong, but couldn't make it work otherwise. |
||
fn from(proto_msg: ChatMessage) -> Self { | ||
RoomChatMessage { | ||
id: proto_msg.id, | ||
message: proto_msg.message, | ||
timestamp: proto_msg.timestamp, | ||
edit_timestamp: proto_msg.edit_timestamp, | ||
deleted: proto_msg.deleted, | ||
generated: proto_msg.generated, | ||
} | ||
} | ||
} | ||
|
||
impl From<RoomChatMessage> for ChatMessage { | ||
fn from(msg: RoomChatMessage) -> Self { | ||
ChatMessage { | ||
id: msg.id, | ||
message: msg.message, | ||
timestamp: msg.timestamp, | ||
edit_timestamp: msg.edit_timestamp, | ||
deleted: msg.deleted.into(), | ||
generated: msg.generated.into(), | ||
} | ||
} | ||
lukasIO marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the whole ChatMessage? Is it possible to just use the message_id?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in an ideal world, yeah, the ID would be enough.
We don't have a central authority for chat messages though. So for an edited message we'd still want to keep the e.g. original timestamp of the message, so passing the whole message seemed like the best idea.
But would be happy about alternative suggestions