Merge pull request #2458 from bitfriend/activate-integration-test

Miscellaneous fixes

native/acter/src/api/account.rs

@@ -1,8 +1,9 @@
 use acter_core::events::settings::{ActerUserAppSettingsContent, APP_USER_SETTINGS};
 use anyhow::{bail, Context, Result};
 use futures::stream::StreamExt;
-use matrix_sdk::{media::MediaRequestParameters, Account as SdkAccount};
+use matrix_sdk::Account as SdkAccount;
 use matrix_sdk_base::{
+    media::MediaRequestParameters,
     ruma::{
         api::client::uiaa::{AuthData, Password},
         assign,

native/acter/src/api/attachments.rs

@@ -9,16 +9,13 @@ use acter_core::{
 };
 use anyhow::{bail, Context, Result};
 use futures::stream::StreamExt;
-use matrix_sdk::{
+use matrix_sdk::room::Room;
+use matrix_sdk_base::{
     media::{MediaFormat, MediaRequestParameters},
-    room::Room,
+    ruma::{events::MessageLikeEventType, EventId, OwnedEventId, OwnedTransactionId, OwnedUserId},
     RoomState,
 };
-use matrix_sdk_base::ruma::{
-    events::{room::message::RoomMessageEvent, MessageLikeEventType},
-    EventId, OwnedEventId, OwnedTransactionId, OwnedUserId,
-};
-use std::{fs::exists, io::Write, ops::Deref, path::PathBuf, str::FromStr};
+use std::{fs::exists, io::Write, ops::Deref, path::PathBuf};
 use tokio::sync::broadcast::Receiver;
 use tokio_stream::Stream;
 use tracing::warn;

native/acter/src/api/auth.rs

@@ -4,20 +4,23 @@ use lazy_static::lazy_static;
 use matrix_sdk::{
     matrix_auth::{MatrixSession, MatrixSessionTokens},
     reqwest::{ClientBuilder as ReqClientBuilder, StatusCode},
-    Client as SdkClient, ClientBuilder as SdkClientBuilder, SessionMeta,
+    Client as SdkClient, ClientBuilder as SdkClientBuilder,
 };
-use matrix_sdk_base::ruma::{
-    api::client::{
-        account::{
-            register, request_password_change_token_via_email, request_registration_token_via_email,
+use matrix_sdk_base::{
+    ruma::{
+        api::client::{
+            account::{
+                register, request_password_change_token_via_email,
+                request_registration_token_via_email,
+            },
+            uiaa::{AuthData, Dummy, RegistrationToken},
         },
-        uiaa::{AuthData, Dummy, Password, RegistrationToken},
+        assign, uint, ClientSecret, OwnedClientSecret, OwnedUserId, UserId,
     },
-    assign, uint, ClientSecret, OwnedClientSecret, OwnedUserId, UserId,
+    SessionMeta,
 };
-use serde::Deserialize;
-use std::{ops::Deref, sync::RwLock};
-use tracing::{error, info};
+use std::sync::RwLock;
+use tracing::info;
 use url::Url;
 use uuid::Uuid;
 

native/acter/src/api/backup.rs

@@ -1,7 +1,6 @@
 use anyhow::Result;
 use futures::{Stream, StreamExt};
 use matrix_sdk::encryption::{recovery::RecoveryState, Encryption};
-use tracing::warn;
 
 use crate::{Client, RUNTIME};
 

native/acter/src/api/bookmarks.rs

@@ -1,7 +1,6 @@
 use acter_core::events::bookmarks::BookmarksEventContent;
 use anyhow::Result;
 use matrix_sdk::Account;
-use tracing::warn;
 
 use crate::RUNTIME;
 

native/acter/src/api/calendar_events.rs

@@ -4,7 +4,7 @@ use acter_core::{
             self as calendar_events, CalendarEventBuilder, EventLocation, EventLocationInfo,
         },
         rsvp::RsvpStatus,
-        CalendarEventRefPreview, RefDetails, RefPreview, UtcDateTime,
+        CalendarEventRefPreview, RefDetails, UtcDateTime,
     },
     models::{self, can_redact, ActerModel, AnyActerModel},
     statics::KEYS,
@@ -13,11 +13,13 @@ use anyhow::{bail, Result};
 use chrono::DateTime;
 use futures::stream::StreamExt;
 use icalendar::Calendar as iCalendar;
-use matrix_sdk::{room::Room, RoomState};
-use matrix_sdk_base::ruma::{
-    events::{room::message::TextMessageEventContent, MessageLikeEventType},
-    serde::PartialEqAsRefStr,
-    OwnedEventId, OwnedRoomId, OwnedUserId,
+use matrix_sdk::room::Room;
+use matrix_sdk_base::{
+    ruma::{
+        events::{room::message::TextMessageEventContent, MessageLikeEventType},
+        OwnedEventId, OwnedRoomId, OwnedUserId,
+    },
+    RoomState,
 };
 use std::{
     collections::{hash_map::Entry, HashMap},

native/acter/src/api/client.rs

@@ -11,16 +11,13 @@ use futures::{
     future::join_all,
     stream::{Stream, StreamExt},
 };
-use matrix_sdk::{
-    media::{MediaRequestParameters, UniqueKey},
-    room::Room as SdkRoom,
-    Client as SdkClient,
-};
+use matrix_sdk::{room::Room as SdkRoom, Client as SdkClient};
 use matrix_sdk_base::{
+    media::{MediaRequestParameters, UniqueKey},
     ruma::{
-        device_id, events::room::MediaSource, IdParseError, OwnedDeviceId, OwnedMxcUri,
-        OwnedRoomAliasId, OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName, OwnedUserId,
-        RoomAliasId, RoomId, RoomOrAliasId, UserId,
+        device_id, events::room::MediaSource, OwnedDeviceId, OwnedMxcUri, OwnedRoomAliasId,
+        OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName, OwnedUserId, RoomAliasId, RoomId,
+        RoomOrAliasId, UserId,
     },
     RoomStateFilter,
 };

native/acter/src/api/comments.rs

@@ -4,10 +4,13 @@ use acter_core::{
 };
 use anyhow::{bail, Result};
 use futures::stream::StreamExt;
-use matrix_sdk::{room::Room, RoomState};
-use matrix_sdk_base::ruma::{
-    events::{room::message::TextMessageEventContent, MessageLikeEventType},
-    OwnedEventId, OwnedUserId,
+use matrix_sdk::room::Room;
+use matrix_sdk_base::{
+    ruma::{
+        events::{room::message::TextMessageEventContent, MessageLikeEventType},
+        OwnedEventId, OwnedUserId,
+    },
+    RoomState,
 };
 use std::ops::Deref;
 use tokio::sync::broadcast::Receiver;

native/acter/src/api/common.rs

@@ -1,31 +1,28 @@
 use acter_core::events::{
     attachments::{AttachmentContent, FallbackAttachmentContent},
     rsvp::RsvpStatus,
-    ColorizeBuilder, Display, DisplayBuilder, ObjRefBuilder, Position, RefDetails,
-    RefDetailsBuilder,
+    ColorizeBuilder, DisplayBuilder, ObjRefBuilder, Position, RefDetails, RefDetailsBuilder,
 };
 use anyhow::{Context, Result};
 use core::time::Duration;
-use matrix_sdk::{
+use matrix_sdk::{HttpError, RumaApiError};
+use matrix_sdk_base::{
     media::{MediaFormat, MediaThumbnailSettings},
-    ComposerDraft, ComposerDraftType, HttpError, RumaApiError,
-};
-use matrix_sdk_base::ruma::{
-    api::{
-        client::{error::ErrorBody, media::get_content_thumbnail},
-        error::FromHttpResponseError,
-    },
-    events::room::{
-        message::{
-            AudioInfo, AudioMessageEventContent, EmoteMessageEventContent, FileInfo,
-            FileMessageEventContent, ImageMessageEventContent, LocationInfo,
-            LocationMessageEventContent, TextMessageEventContent, UnstableAudioDetailsContentBlock,
-            VideoInfo, VideoMessageEventContent,
+    ruma::{
+        api::{client::error::ErrorBody, error::FromHttpResponseError},
+        events::room::{
+            message::{
+                AudioInfo, AudioMessageEventContent, EmoteMessageEventContent, FileInfo,
+                FileMessageEventContent, ImageMessageEventContent, LocationInfo,
+                LocationMessageEventContent, TextMessageEventContent,
+                UnstableAudioDetailsContentBlock, VideoInfo, VideoMessageEventContent,
+            },
+            ImageInfo, MediaSource as SdkMediaSource, ThumbnailInfo as SdkThumbnailInfo,
         },
-        ImageInfo, MediaSource as SdkMediaSource, ThumbnailInfo as SdkThumbnailInfo,
+        EventId, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedEventId, OwnedMxcUri, OwnedUserId,
+        UInt,
     },
-    EventId, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedEventId, OwnedMxcUri, OwnedUserId,
-    UInt,
+    ComposerDraft, ComposerDraftType,
 };
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;

native/acter/src/api/convo.rs

@@ -2,25 +2,26 @@ use acter_core::{statics::default_acter_convo_states, Error};
 use anyhow::{bail, Context, Result};
 use derive_builder::Builder;
 use futures::stream::{Stream, StreamExt};
-use matrix_sdk::{executor::JoinHandle, ComposerDraft, ComposerDraftType, RoomMemberships};
-use matrix_sdk_base::ruma::{
-    api::client::room::{create_room, Visibility},
-    assign,
-    events::{
-        receipt::{ReceiptThread, ReceiptType},
-        room::{
-            avatar::{ImageInfo, InitialRoomAvatarEvent, RoomAvatarEventContent},
-            join_rules::{AllowRule, InitialRoomJoinRulesEvent, RoomJoinRulesEventContent},
+use matrix_sdk_base::{
+    executor::JoinHandle,
+    ruma::{
+        api::client::room::{create_room, Visibility},
+        assign,
+        events::{
+            room::{
+                avatar::{ImageInfo, InitialRoomAvatarEvent, RoomAvatarEventContent},
+                join_rules::{AllowRule, InitialRoomJoinRulesEvent, RoomJoinRulesEventContent},
+            },
+            space::parent::SpaceParentEventContent,
+            InitialStateEvent,
         },
-        space::parent::SpaceParentEventContent,
-        InitialStateEvent,
+        serde::Raw,
+        MxcUri, OwnedEventId, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId,
+        RoomOrAliasId, ServerName, UserId,
     },
-    serde::Raw,
-    MxcUri, OwnedEventId, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId,
-    RoomOrAliasId, ServerName, UserId,
+    ComposerDraft, ComposerDraftType,
 };
 use matrix_sdk_ui::{timeline::RoomExt, Timeline};
-use ruma::OwnedTransactionId;
 use std::{
     ops::Deref,
     path::PathBuf,