nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat: federated room directory

Browse source
This commit is contained in:
timokoesters 2020-04-25 11:47:32 +02:00
parent 120b6f4b95
commit 720cc0cffc
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
5 changed files with 43 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/client_server.rs
View file

@ -37,8 +37,8 @@ use ruma_events::{collections::only::Event as EduEvent, EventType};
use ruma_identifiers::{RoomId, UserId};
use serde_json::json;
use std::{
collections::{BTreeMap, HashMap},
convert::{TryFrom, TryInto},
collections::BTreeMap,
convert::TryInto,
path::PathBuf,
time::{Duration, SystemTime},
};
@ -753,10 +753,12 @@ pub async fn get_public_rooms_filtered_route(
})
.collect::<Vec<_>>();
chunk.sort_by(|l, r| r.num_joined_members.cmp(&l.num_joined_members));
chunk.extend_from_slice(
&server_server::send_request(
&data,
"koesters.xyz".to_owned(),
"chat.privacytools.io".to_owned(),
ruma_federation_api::v1::get_public_rooms::Request {
limit: None,
since: None,
@ -768,12 +770,10 @@ pub async fn get_public_rooms_filtered_route(
.unwrap()
.chunk
.into_iter()
.map(|c| serde_json::from_str(&serde_json::to_string(dbg!(&c)).unwrap()).unwrap())
.map(|c| serde_json::from_str(&serde_json::to_string(&c).unwrap()).unwrap())
.collect::<Vec<_>>(),
);
chunk.sort_by(|l, r| r.num_joined_members.cmp(&l.num_joined_members));
let total_room_count_estimate = (chunk.len() as u32).into();
MatrixResult(Ok(get_public_rooms_filtered::Response {
@ -910,10 +910,7 @@ pub fn sync_route(
.unwrap_or(0);
for room_id in joined_roomids {
let pdus = data.pdus_since(&room_id, since);
let room_events = pdus
.into_iter()
.map(|pdu| pdu.to_room_event())
.collect();
let room_events = pdus.into_iter().map(|pdu| pdu.to_room_event()).collect();
let mut edus = data.roomlatests_since(&room_id, since);
edus.extend_from_slice(&data.roomactives_in(&room_id));
@ -945,10 +942,7 @@ pub fn sync_route(
let left_roomids = data.rooms_left(body.user_id.as_ref().expect("user is authenticated"));
for room_id in left_roomids {
let pdus = data.pdus_since(&room_id, since);
let room_events = pdus
.into_iter()
.map(|pdu| pdu.to_room_event())
.collect();
let room_events = pdus.into_iter().map(|pdu| pdu.to_room_event()).collect();
let mut edus = data.roomlatests_since(&room_id, since);
edus.extend_from_slice(&data.roomactives_in(&room_id));