mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-08 07:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(ffi): tweak alias names in the FFI layer

Browse Source 
It doesn't make sense to name a thing "Matrix" when it comes from the
core SDK crate.

Also adjust a now slightly-incorrect doc comment for `get_notification`.
This commit is contained in:
Benjamin Bouvier
2025-07-02 16:10:06 +02:00
parent f0b6225e40
commit 58748bec3a
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bindings/matrix-sdk-ffi/src/notification.rs
View File

@@ -1,7 +1,7 @@
use std::{collections::HashMap, sync::Arc};
use matrix_sdk_ui::notification_client::{
NotificationClient as MatrixNotificationClient, NotificationItem as MatrixNotificationItem,
NotificationClient as SdkNotificationClient, NotificationItem as SdkNotificationItem,
NotificationStatus as SdkNotificationStatus,
};
use ruma::{EventId, OwnedEventId, OwnedRoomId, RoomId};
@@ -55,7 +55,7 @@ pub struct NotificationItem {
}
impl NotificationItem {
fn from_inner(item: MatrixNotificationItem) -> Self {
fn from_inner(item: SdkNotificationItem) -> Self {
let event = match item.event {
matrix_sdk_ui::notification_client::NotificationEvent::Timeline(event) => {
NotificationEvent::Timeline { event: Arc::new(TimelineEvent(event)) }
@@ -103,7 +103,7 @@ pub enum NotificationStatus {
#[derive(uniffi::Object)]
pub struct NotificationClient {
pub(crate) inner: MatrixNotificationClient,
pub(crate) inner: SdkNotificationClient,
/// A reference to the FFI client.
///
@@ -127,8 +127,14 @@ impl NotificationClient {
Ok(room)
}
/// See also documentation of
/// `MatrixNotificationClient::get_notification`.
/// Fetches the content of a notification.
///
/// This will first try to get the notification using a short-lived sliding
/// sync, and if the sliding-sync can't find the event, then it'll use a
/// `/context` query to find the event with associated member information.
///
/// An error result means that we couldn't resolve the notification; in that
/// case, a dummy notification may be displayed instead.
pub async fn get_notification(
&self,
room_id: String,

4
crates/matrix-sdk-ui/src/notification_client.rs
View File

@@ -143,9 +143,7 @@ impl NotificationClient {
/// `/context` query to find the event with associated member information.
///
/// An error result means that we couldn't resolve the notification; in that
/// case, a dummy notification may be displayed instead. A `None` result
/// means the notification has been filtered out by the user's push
/// rules.
/// case, a dummy notification may be displayed instead.
#[instrument(skip(self))]
pub async fn get_notification(
&self,