char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Style (cargo fmt, reordering import).

master
Denis Kasak 2020-07-10 11:14:10 +02:00
parent e70929317a
commit 24d2aa8078
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
matrix_sdk_base/src/models/room.rs
View File

@ -17,6 +17,8 @@ use std::borrow::Cow;
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use std::convert::TryFrom; use std::convert::TryFrom;
use serde::{Deserialize, Serialize};
#[cfg(feature = "messages")] #[cfg(feature = "messages")]
use super::message::MessageQueue; use super::message::MessageQueue;
use super::RoomMember; use super::RoomMember;
@ -42,7 +44,7 @@ use crate::events::room::message::MessageEvent;
use crate::identifiers::{RoomAliasId, RoomId, UserId}; use crate::identifiers::{RoomAliasId, RoomId, UserId};
use crate::js_int::{Int, UInt}; use crate::js_int::{Int, UInt};
use serde::{Deserialize, Serialize};
#[derive(Debug, Default, PartialEq, Serialize, Deserialize, Clone)] #[derive(Debug, Default, PartialEq, Serialize, Deserialize, Clone)]
/// `RoomName` allows the calculation of a text room name. /// `RoomName` allows the calculation of a text room name.
pub struct RoomName { pub struct RoomName {
@ -467,6 +469,7 @@ impl Room {
inclusive: bool, inclusive: bool,
) -> HashMap<UserId, String> { ) -> HashMap<UserId, String> {
let users_with_same_name = self.shares_displayname_with(member, inclusive); let users_with_same_name = self.shares_displayname_with(member, inclusive);
let disambiguate_with = |members: Vec<RoomMember>, f: fn(&RoomMember) -> String| { let disambiguate_with = |members: Vec<RoomMember>, f: fn(&RoomMember) -> String| {
members members
.into_iter() .into_iter()
@ -831,7 +834,11 @@ impl Room {
/// ///
/// * `event` - The power level event to process. /// * `event` - The power level event to process.
/// * `max_power` - Maximum power level allowed. /// * `max_power` - Maximum power level allowed.
pub fn update_member_power(member: &mut RoomMember, event: &PowerLevelsEvent, max_power: Int) -> bool { pub fn update_member_power(
member: &mut RoomMember,
event: &PowerLevelsEvent,
max_power: Int,
) -> bool {
let changed; let changed;
if let Some(user_power) = event.content.users.get(&member.user_id) { if let Some(user_power) = event.content.users.get(&member.user_id) {
@ -843,7 +850,8 @@ impl Room {
} }
if max_power > Int::from(0) { if max_power > Int::from(0) {
member.power_level_norm = Some((member.power_level.unwrap() * Int::from(100)) / max_power); member.power_level_norm =
Some((member.power_level.unwrap() * Int::from(100)) / max_power);
} }
changed changed
@ -963,7 +971,6 @@ mod test {
.add_custom_joined_event(&room_id, member2_join_event, RoomEvent::RoomMember) .add_custom_joined_event(&room_id, member2_join_event, RoomEvent::RoomMember)
.build_sync_response(); .build_sync_response();
// Test that `user` is either joined or invited to `room` but not both. // Test that `user` is either joined or invited to `room` but not both.
async fn invited_or_joined_but_not_both(client: &BaseClient, room: &RoomId, user: &UserId) { async fn invited_or_joined_but_not_both(client: &BaseClient, room: &RoomId, user: &UserId) {
let room = client.get_joined_room(&room).await.unwrap(); let room = client.get_joined_room(&room).await.unwrap();
@ -1172,7 +1179,11 @@ mod test {
.build_sync_response(); .build_sync_response();
let mut member2_rejoins_when_invited_sync_response = event_builder let mut member2_rejoins_when_invited_sync_response = event_builder
.add_custom_joined_event(&room_id, member1_invites_member2_event, RoomEvent::RoomMember) .add_custom_joined_event(
&room_id,
member1_invites_member2_event,
RoomEvent::RoomMember,
)
.add_custom_joined_event(&room_id, member2_join_event, RoomEvent::RoomMember) .add_custom_joined_event(&room_id, member2_join_event, RoomEvent::RoomMember)
.build_sync_response(); .build_sync_response();