Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Combine local & remote force join

Browse Source
This commit is contained in:
timedout
2026-05-25 18:01:08 +01:00
parent 1d172be503
commit c1a6e649da
4 changed files with 32 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service/rooms/event_handler/upgrade_outlier_pdu.rs
+6 -6
View File
@@ -1,17 +1,17 @@
use std::{borrow::Borrow, collections::BTreeMap, sync::Arc, time::Instant};
use conduwuit::{
debug, debug_info, debug_warn, err, implement, is_equal_to, matrix::{state_res, Event, EventTypeExt, PduEvent, StateKey}, trace,
Err, Result, debug, debug_info, debug_warn, err, implement, is_equal_to,
matrix::{Event, EventTypeExt, PduEvent, StateKey, state_res},
trace,
utils::{
stream::{BroadbandExt, ReadyExt},
IterStream,
stream::{BroadbandExt, ReadyExt},
},
warn,
Err,
Result,
};
use futures::{future::ready, FutureExt, StreamExt};
use ruma::{events::StateEventType, CanonicalJsonValue, RoomId, ServerName};
use futures::{FutureExt, StreamExt, future::ready};
use ruma::{CanonicalJsonValue, RoomId, ServerName, events::StateEventType};
use tokio::join;
use super::get_room_version_rules;