magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use ruma JsOption, bump figment

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-01-21 15:43:42 -05:00 • committed by June
parent 4e8823dedb
commit 9d0c85ab17
4 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/client_server/sync.rs
View file

@ -1640,9 +1640,7 @@ pub async fn sync_events_v4_route(
ruma::JsOption::Some(heroes_avatar)
} else {
match services().rooms.state_accessor.get_avatar(room_id)? {
ruma::JsOption::Some(avatar) => {
js_option::JsOption::Some(avatar.url.unwrap())
}
ruma::JsOption::Some(avatar) => ruma::JsOption::Some(avatar.url.unwrap()),
ruma::JsOption::Null => ruma::JsOption::Null,
ruma::JsOption::Undefined => ruma::JsOption::Undefined,
}

5
src/service/rooms/state_accessor/mod.rs
View file

@ -5,7 +5,6 @@ use std::{
};
pub use data::Data;
use js_option::JsOption;
use lru_cache::LruCache;
use ruma::{
events::{
@ -291,12 +290,12 @@ impl Service {
})
}
pub fn get_avatar(&self, room_id: &RoomId) -> Result<JsOption<RoomAvatarEventContent>> {
pub fn get_avatar(&self, room_id: &RoomId) -> Result<ruma::JsOption<RoomAvatarEventContent>> {
services()
.rooms
.state_accessor
.room_state_get(room_id, &StateEventType::RoomAvatar, "")?
.map_or(Ok(JsOption::Undefined), |s| {
.map_or(Ok(ruma::JsOption::Undefined), |s| {
serde_json::from_str(s.content.get())
.map_err(|_| Error::bad_database("Invalid room avatar event in database."))
})