GNOME.org
 

[fractal/fractal-next] bump deps

commit c3a9b63b0088aeadcebe3f774d443edaf6c33894
Author: Julian Sparber <julian sparber net>
Date:   Tue Nov 9 12:36:26 2021 +0100

    bump deps

 Cargo.lock                                        | 44 +++++++++++------------
 src/session/avatar.rs                             |  4 +--
 src/session/content/message_row.rs                |  6 ++--
 src/session/room/member.rs                        | 12 +++----
 src/session/room/mod.rs                           | 18 +++++-----
 src/session/room/power_levels.rs                  | 11 +++---
 src/session/verification/emoji.rs                 | 10 +++---
 src/session/verification/identity_verification.rs |  4 +--
 src/session/verification/session_verification.rs  |  4 +--
 9 files changed, 58 insertions(+), 55 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index e96e7842..59741759 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1731,7 +1731,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 [[package]]
 name = "matrix-qrcode"
 version = "0.2.0"
-source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#3642051380e8c7a8497c40c3c56f16bcfeb7d970";
+source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#03b8d8cd7e296f800bb94b077a471385c2267fb1";
 dependencies = [
  "base64",
  "byteorder",
@@ -1745,7 +1745,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.4.1"
-source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#3642051380e8c7a8497c40c3c56f16bcfeb7d970";
+source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#03b8d8cd7e296f800bb94b077a471385c2267fb1";
 dependencies = [
  "async-stream",
  "backoff",
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.4.1"
-source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#3642051380e8c7a8497c40c3c56f16bcfeb7d970";
+source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#03b8d8cd7e296f800bb94b077a471385c2267fb1";
 dependencies = [
  "chacha20poly1305",
  "dashmap",
@@ -1798,7 +1798,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.4.1"
-source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#3642051380e8c7a8497c40c3c56f16bcfeb7d970";
+source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#03b8d8cd7e296f800bb94b077a471385c2267fb1";
 dependencies = [
  "async-trait",
  "futures",
@@ -1814,7 +1814,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.4.1"
-source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#3642051380e8c7a8497c40c3c56f16bcfeb7d970";
+source = 
"git+https://github.com/jsparber/matrix-rust-sdk.git?branch=messages-api#03b8d8cd7e296f800bb94b077a471385c2267fb1";
 dependencies = [
  "aes 0.7.5",
  "aes-gcm",
@@ -2682,9 +2682,9 @@ dependencies = [
 
 [[package]]
 name = "rqrr"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e88a63da014e6f18dbe76e3084feb2f6c5a570ad8d524cc1afff4a6db18404cd"
+checksum = "6fa79947f53b20adb909a323d828d0fd744fa9d854792df07913b083bcd4d63b"
 dependencies = [
  "g2p",
  "image",
@@ -2694,7 +2694,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.4.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "assign",
  "js_int",
@@ -2712,7 +2712,7 @@ dependencies = [
 [[package]]
 name = "ruma-api"
 version = "0.18.5"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "bytes",
  "http",
@@ -2728,7 +2728,7 @@ dependencies = [
 [[package]]
 name = "ruma-api-macros"
 version = "0.18.5"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2 1.0.30",
@@ -2739,7 +2739,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.12.3"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "assign",
  "bytes",
@@ -2759,7 +2759,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "indexmap",
  "js_int",
@@ -2774,7 +2774,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.24.6"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "indoc",
  "js_int",
@@ -2791,7 +2791,7 @@ dependencies = [
 [[package]]
 name = "ruma-events-macros"
 version = "0.24.6"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2 1.0.30",
@@ -2802,7 +2802,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.3.1"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "js_int",
  "ruma-api",
@@ -2817,7 +2817,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.20.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "paste",
  "percent-encoding",
@@ -2831,7 +2831,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-macros"
 version = "0.20.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "quote 1.0.10",
  "ruma-identifiers-validation",
@@ -2841,7 +2841,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "thiserror",
 ]
@@ -2849,7 +2849,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "bytes",
  "form_urlencoded",
@@ -2863,7 +2863,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde-macros"
 version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2 1.0.30",
@@ -2874,7 +2874,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "base64",
  "ed25519-dalek",
@@ -2891,7 +2891,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.4.1"
-source = "git+https://github.com/ruma/ruma?rev=0101e110f#0101e110f8b56e5f0b0bcaac5a31a9cdbf299b8e";
+source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7";
 dependencies = [
  "itertools",
  "js_int",
diff --git a/src/session/avatar.rs b/src/session/avatar.rs
index 739ac720..9e2d49c2 100644
--- a/src/session/avatar.rs
+++ b/src/session/avatar.rs
@@ -4,7 +4,7 @@ use gtk::{gdk, gdk_pixbuf::Pixbuf, gio, glib, glib::clone, prelude::*, subclass:
 
 use log::{debug, error, info};
 use matrix_sdk::room::Room as MatrixRoom;
-use matrix_sdk::ruma::events::room::avatar::AvatarEventContent;
+use matrix_sdk::ruma::events::room::avatar::RoomAvatarEventContent;
 use matrix_sdk::ruma::events::AnyStateEventContent;
 use matrix_sdk::Client;
 use matrix_sdk::{
@@ -265,7 +265,7 @@ where
         _ => return Err(AvatarError::NotAMember),
     };
 
-    let mut content = AvatarEventContent::new();
+    let mut content = RoomAvatarEventContent::new();
 
     let uri = if let Some(filename) = filename {
         Some(upload_avatar(matrix_client, filename).await?)
diff --git a/src/session/content/message_row.rs b/src/session/content/message_row.rs
index df164d5e..5d9fbdc0 100644
--- a/src/session/content/message_row.rs
+++ b/src/session/content/message_row.rs
@@ -12,7 +12,7 @@ use html2pango::{
 use log::warn;
 use matrix_sdk::ruma::events::{
     room::message::{FormattedBody, MessageFormat, MessageType, Relation},
-    room::redaction::RedactionEventContent,
+    room::redaction::RoomRedactionEventContent,
     AnyMessageEventContent, AnySyncMessageEvent, AnySyncRoomEvent,
 };
 use sourceview::prelude::*;
@@ -219,7 +219,7 @@ impl MessageRow {
                     ))
                 } else {
                     Some(AnyMessageEventContent::RoomRedaction(
-                        RedactionEventContent::new(),
+                        RoomRedactionEventContent::new(),
                     ))
                 }
             }
@@ -230,7 +230,7 @@ impl MessageRow {
                     ))
                 } else {
                     Some(AnyMessageEventContent::RoomRedaction(
-                        RedactionEventContent::new(),
+                        RoomRedactionEventContent::new(),
                     ))
                 }
             }
diff --git a/src/session/room/member.rs b/src/session/room/member.rs
index 33f5e2af..4b7af9fa 100644
--- a/src/session/room/member.rs
+++ b/src/session/room/member.rs
@@ -1,7 +1,7 @@
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use matrix_sdk::ruma::events::room::member::MemberEventContent;
+use matrix_sdk::ruma::events::room::member::RoomMemberEventContent;
 use matrix_sdk::ruma::events::{StrippedStateEvent, SyncStateEvent};
 use matrix_sdk::ruma::identifiers::{MxcUri, UserId};
 use matrix_sdk::RoomMember;
@@ -104,7 +104,7 @@ impl Member {
 
 pub trait MemberEvent {
     fn sender(&self) -> &UserId;
-    fn content(&self) -> &MemberEventContent;
+    fn content(&self) -> &RoomMemberEventContent;
 
     fn avatar_url(&self) -> Option<MxcUri> {
         self.content().avatar_url.clone()
@@ -122,19 +122,19 @@ pub trait MemberEvent {
     }
 }
 
-impl MemberEvent for SyncStateEvent<MemberEventContent> {
+impl MemberEvent for SyncStateEvent<RoomMemberEventContent> {
     fn sender(&self) -> &UserId {
         &self.sender
     }
-    fn content(&self) -> &MemberEventContent {
+    fn content(&self) -> &RoomMemberEventContent {
         &self.content
     }
 }
-impl MemberEvent for StrippedStateEvent<MemberEventContent> {
+impl MemberEvent for StrippedStateEvent<RoomMemberEventContent> {
     fn sender(&self) -> &UserId {
         &self.sender
     }
-    fn content(&self) -> &MemberEventContent {
+    fn content(&self) -> &RoomMemberEventContent {
         &self.content
     }
 }
diff --git a/src/session/room/mod.rs b/src/session/room/mod.rs
index 29e833b1..a9871453 100644
--- a/src/session/room/mod.rs
+++ b/src/session/room/mod.rs
@@ -25,13 +25,13 @@ use matrix_sdk::{
         api::client::r0::sync::sync_events::InvitedRoom,
         events::{
             room::{
-                member::{MemberEventContent, MembershipState},
+                member::{MembershipState, RoomMemberEventContent},
                 message::{
-                    EmoteMessageEventContent, MessageEventContent, MessageType,
+                    EmoteMessageEventContent, MessageType, RoomMessageEventContent,
                     TextMessageEventContent,
                 },
-                name::NameEventContent,
-                topic::TopicEventContent,
+                name::RoomNameEventContent,
+                topic::RoomTopicEventContent,
             },
             tag::TagName,
             AnyRoomAccountDataEvent, AnyStateEventContent, AnyStrippedStateEvent,
@@ -555,7 +555,7 @@ impl Room {
                 return;
             }
         };
-        let name_content = NameEventContent::new(Some(room_name));
+        let name_content = RoomNameEventContent::new(Some(room_name));
 
         let handle = spawn_tokio!(async move {
             let content = AnyStateEventContent::RoomName(name_content);
@@ -599,7 +599,7 @@ impl Room {
         };
 
         let handle = spawn_tokio!(async move {
-            let content = AnyStateEventContent::RoomTopic(TopicEventContent::new(topic));
+            let content = AnyStateEventContent::RoomTopic(RoomTopicEventContent::new(topic));
             joined_room.send_state_event(content, "").await
         });
 
@@ -737,7 +737,7 @@ impl Room {
     }
 
     /// Updates a room member based on the room member state event
-    fn update_member_for_member_event(&self, event: &SyncStateEvent<MemberEventContent>) {
+    fn update_member_for_member_event(&self, event: &SyncStateEvent<RoomMemberEventContent>) {
         let priv_ = imp::Room::from_instance(self);
         let mut room_members = priv_.room_members.borrow_mut();
         let user_id = &event.sender;
@@ -814,14 +814,14 @@ impl Room {
             } else {
                 EmoteMessageEventContent::plain(body)
             };
-            MessageEventContent::new(MessageType::Emote(emote))
+            RoomMessageEventContent::new(MessageType::Emote(emote))
         } else {
             let text = if markdown_enabled {
                 TextMessageEventContent::markdown(body)
             } else {
                 TextMessageEventContent::plain(body)
             };
-            MessageEventContent::new(MessageType::Text(text))
+            RoomMessageEventContent::new(MessageType::Text(text))
         };
 
         let txn_id = Uuid::new_v4();
diff --git a/src/session/room/power_levels.rs b/src/session/room/power_levels.rs
index 4bd3869d..1e134798 100644
--- a/src/session/room/power_levels.rs
+++ b/src/session/room/power_levels.rs
@@ -1,7 +1,7 @@
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use matrix_sdk::ruma::events::room::power_levels::PowerLevelsEventContent;
+use matrix_sdk::ruma::events::room::power_levels::RoomPowerLevelsEventContent;
 use matrix_sdk::ruma::events::{EventType, SyncStateEvent};
 
 use crate::session::room::Member;
@@ -9,7 +9,7 @@ use crate::utils::prop_expr;
 
 #[derive(Clone, Debug, Default, glib::GBoxed)]
 #[gboxed(type_name = "BoxedPowerLevelsEventContent")]
-pub struct BoxedPowerLevelsEventContent(PowerLevelsEventContent);
+pub struct BoxedPowerLevelsEventContent(RoomPowerLevelsEventContent);
 
 mod imp {
     use super::*;
@@ -90,7 +90,7 @@ impl PowerLevels {
     }
 
     /// Updates the power levels from the given event.
-    pub fn update_from_event(&self, event: SyncStateEvent<PowerLevelsEventContent>) {
+    pub fn update_from_event(&self, event: SyncStateEvent<RoomPowerLevelsEventContent>) {
         let priv_ = imp::PowerLevels::from_instance(self);
         let content = BoxedPowerLevelsEventContent(event.content);
         priv_.content.replace(content);
@@ -105,7 +105,10 @@ impl Default for PowerLevels {
 }
 
 /// Returns the power level minimally required to perform the given action.
-fn min_level_for_room_action(content: &PowerLevelsEventContent, room_action: &RoomAction) -> u32 {
+fn min_level_for_room_action(
+    content: &RoomPowerLevelsEventContent,
+    room_action: &RoomAction,
+) -> u32 {
     let power_level = i64::from(match room_action {
         RoomAction::Ban => content.ban,
         RoomAction::Invite => content.invite,
diff --git a/src/session/verification/emoji.rs b/src/session/verification/emoji.rs
index 4505c688..acfac3f8 100644
--- a/src/session/verification/emoji.rs
+++ b/src/session/verification/emoji.rs
@@ -1,7 +1,7 @@
 use adw::subclass::prelude::*;
 
 use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
-
+use matrix_sdk::encryption::verification::Emoji as MatrixEmoji;
 mod imp {
     use super::*;
     use glib::subclass::InitializingObject;
@@ -42,17 +42,17 @@ glib::wrapper! {
 }
 
 impl Emoji {
-    pub fn new(emoji: (&str, &str)) -> Self {
+    pub fn new(emoji: &MatrixEmoji) -> Self {
         let obj: Self = glib::Object::new(&[]).expect("Failed to create Emoji");
 
         obj.set_emoji(emoji);
         obj
     }
 
-    pub fn set_emoji(&self, emoji: (&str, &str)) {
+    pub fn set_emoji(&self, emoji: &MatrixEmoji) {
         let priv_ = imp::Emoji::from_instance(self);
 
-        priv_.emoji.set_text(emoji.0);
-        priv_.emoji_name.set_text(emoji.1);
+        priv_.emoji.set_text(emoji.symbol);
+        priv_.emoji_name.set_text(emoji.description);
     }
 }
diff --git a/src/session/verification/identity_verification.rs 
b/src/session/verification/identity_verification.rs
index a3da69e5..a2abc07e 100644
--- a/src/session/verification/identity_verification.rs
+++ b/src/session/verification/identity_verification.rs
@@ -7,7 +7,7 @@ use matrix_sdk::{
     encryption::{
         identities::RequestVerificationError,
         verification::{
-            CancelInfo, QrVerification, SasVerification, Verification as MatrixVerification,
+            CancelInfo, Emoji, QrVerification, SasVerification, Verification as MatrixVerification,
             VerificationRequest,
         },
     },
@@ -300,7 +300,7 @@ impl IdentityVerification {
     ///
     /// This is only set once the request reached the `State::Ready`
     /// and if a Sas verification was started
-    pub fn emoji(&self) -> Option<[(&'static str, &'static str); 7]> {
+    pub fn emoji(&self) -> Option<[Emoji; 7]> {
         let priv_ = imp::IdentityVerification::from_instance(self);
 
         match &*priv_.request.borrow() {
diff --git a/src/session/verification/session_verification.rs 
b/src/session/verification/session_verification.rs
index 88986c62..e14a46d6 100644
--- a/src/session/verification/session_verification.rs
+++ b/src/session/verification/session_verification.rs
@@ -281,9 +281,9 @@ impl SessionVerification {
                 if let Some(emoji) = request.emoji() {
                     for (index, emoji) in emoji.iter().enumerate() {
                         if index < 4 {
-                            priv_.emoji_row_1.append(&Emoji::new(*emoji));
+                            priv_.emoji_row_1.append(&Emoji::new(emoji));
                         } else {
-                            priv_.emoji_row_2.append(&Emoji::new(*emoji));
+                            priv_.emoji_row_2.append(&Emoji::new(emoji));
                         }
                     }
                     priv_.main_stack.set_visible_child_name("emoji");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]