From 21a5fa3ef0ccb1ad9ae9ea6328146e6dd69e4d78 Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Sun, 25 Feb 2024 10:30:30 +0000
Subject: [PATCH] refactor: use re-exported JsOption from ruma rather than
 directly adding it as a dependency

---
 Cargo.lock                              |  1 -
 Cargo.toml                              |  3 ---
 src/api/client_server/sync.rs           | 12 +++++-------
 src/service/rooms/state_accessor/mod.rs |  3 +--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 78e85266..e99928e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -387,7 +387,6 @@ dependencies = [
  "http",
  "hyper",
  "image",
- "js_option",
  "jsonwebtoken",
  "lazy_static",
  "lru-cache",
diff --git a/Cargo.toml b/Cargo.toml
index 4f873cff..e8c1c8bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,9 +116,6 @@ async-trait = "0.1.68"
 
 sd-notify = { version = "0.4.1", optional = true }
 
-# stupid ruma using JsOption instead of Option
-js_option = "0.1"
-
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.26.2", features = ["resource"] }
 
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index 600a9737..04fdb2bb 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -20,7 +20,7 @@ use ruma::{
         StateEventType, TimelineEventType,
     },
     serde::Raw,
-    uint, DeviceId, OwnedDeviceId, OwnedUserId, RoomId, UInt, UserId,
+    uint, DeviceId, JsOption, OwnedDeviceId, OwnedUserId, RoomId, UInt, UserId,
 };
 use std::{
     collections::{hash_map::Entry, BTreeMap, BTreeSet, HashMap, HashSet},
@@ -1616,14 +1616,12 @@ pub async fn sync_events_v4_route(
             sync_events::v4::SlidingSyncRoom {
                 name: services().rooms.state_accessor.get_name(room_id)?.or(name),
                 avatar: if let Some(avatar) = avatar {
-                    ruma::JsOption::Some(avatar)
+                    JsOption::Some(avatar)
                 } else {
                     match services().rooms.state_accessor.get_avatar(room_id)? {
-                        ruma::JsOption::Some(avatar) => {
-                            js_option::JsOption::from_option(avatar.url)
-                        }
-                        ruma::JsOption::Null => ruma::JsOption::Null,
-                        ruma::JsOption::Undefined => ruma::JsOption::Undefined,
+                        JsOption::Some(avatar) => JsOption::from_option(avatar.url),
+                        JsOption::Null => JsOption::Null,
+                        JsOption::Undefined => JsOption::Undefined,
                     }
                 },
                 initial: Some(roomsince == &0),
diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor/mod.rs
index f49d8a3c..903ad47b 100644
--- a/src/service/rooms/state_accessor/mod.rs
+++ b/src/service/rooms/state_accessor/mod.rs
@@ -5,7 +5,6 @@ use std::{
 };
 
 pub use data::Data;
-use js_option::JsOption;
 use lru_cache::LruCache;
 use ruma::{
     events::{
@@ -17,7 +16,7 @@ use ruma::{
         },
         StateEventType,
     },
-    EventId, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId,
+    EventId, JsOption, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId,
 };
 use tracing::error;