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.

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

ffi: with_mentions method #2727

Merged
merged 1 commit into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion bindings/matrix-sdk-ffi/src/api.udl
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
namespace matrix_sdk_ffi {};

interface RoomMessageEventContentWithoutRelation {};
dictionary Mentions {
sequence<string> user_ids;
boolean room;
};

interface RoomMessageEventContentWithoutRelation {
RoomMessageEventContentWithoutRelation with_mentions(Mentions mentions);
};

[Error]
interface ClientError {
Expand Down
6 changes: 5 additions & 1 deletion bindings/matrix-sdk-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ use matrix_sdk::ruma::events::room::{
};
use matrix_sdk_ui::timeline::{BackPaginationStatus, EventItemOrigin};

use self::{error::ClientError, task_handle::TaskHandle, timeline::MediaSourceExt};
use self::{
error::ClientError,
task_handle::TaskHandle,
timeline::{MediaSourceExt, Mentions, RoomMessageEventContentWithoutRelationExt},
};

uniffi::include_scaffolding!("api");

Expand Down
37 changes: 35 additions & 2 deletions bindings/matrix-sdk-ffi/src/timeline.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
use std::{collections::HashMap, sync::Arc, time::Duration};
use std::{
collections::{BTreeSet, HashMap},
sync::Arc,
time::Duration,
};

use as_variant::as_variant;
use extension_trait::extension_trait;
Expand Down Expand Up @@ -31,7 +35,7 @@ use matrix_sdk::{
},
};
use matrix_sdk_ui::timeline::{EventItemOrigin, PollResult, Profile, TimelineDetails};
use ruma::{assign, serde::JsonObject, UInt};
use ruma::{assign, serde::JsonObject, OwnedUserId, UInt, UserId};
use tracing::{info, warn};

use crate::{
Expand Down Expand Up @@ -1379,3 +1383,32 @@ impl From<PollResult> for TimelineItemContentKind {
}
}
}

#[extension_trait]
pub impl RoomMessageEventContentWithoutRelationExt for RoomMessageEventContentWithoutRelation {
fn with_mentions(self: Arc<Self>, mentions: Mentions) -> Arc<Self> {
let mut content = unwrap_or_clone_arc(self);
content.mentions = Some(mentions.into());
Arc::new(content)
}
}

pub struct Mentions {
pub user_ids: Vec<String>,
pub room: bool,
}

impl From<Mentions> for ruma::events::Mentions {
fn from(value: Mentions) -> Self {
let mut user_ids = BTreeSet::<OwnedUserId>::new();
for user_id in value.user_ids {
if let Ok(user_id) = UserId::parse(user_id) {
user_ids.insert(user_id);
}
}
let mut result = Self::default();
result.user_ids = user_ids;
result.room = value.room;
result
}
}