studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

de-global server_is_ours / user_is_local

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2024-07-22 07:43:51 +00:00
parent 010e4ee35a
commit 59efabbbc2
34 changed files with 179 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/service/sending/mod.rs
View File

@@ -13,7 +13,7 @@ use ruma::{
};
use tokio::sync::Mutex;
use crate::{account_data, client, globals, presence, pusher, resolver, rooms, server_is_ours, users, Dep};
use crate::{account_data, client, globals, presence, pusher, resolver, rooms, users, Dep};
pub struct Service {
server: Arc<Server>,
@@ -136,7 +136,7 @@ impl Service {
.state_cache
.room_servers(room_id)
.filter_map(Result::ok)
.filter(|server_name| !server_is_ours(server_name));
.filter(|server_name| !self.services.globals.server_is_ours(server_name));
self.send_pdu_servers(servers, pdu_id)
}
@@ -185,7 +185,7 @@ impl Service {
.state_cache
.room_servers(room_id)
.filter_map(Result::ok)
.filter(|server_name| !server_is_ours(server_name));
.filter(|server_name| !self.services.globals.server_is_ours(server_name));
self.send_edu_servers(servers, serialized)
}
@@ -222,7 +222,7 @@ impl Service {
.state_cache
.room_servers(room_id)
.filter_map(Result::ok)
.filter(|server_name| !server_is_ours(server_name));
.filter(|server_name| !self.services.globals.server_is_ours(server_name));
self.flush_servers(servers)
}

7
src/service/sending/sender.rs
View File

@@ -29,7 +29,6 @@ use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
use tokio::time::sleep_until;
use super::{appservice, Destination, Msg, SendingEvent, Service};
use crate::user_is_local;
#[derive(Debug)]
enum TransactionStatus {
@@ -264,7 +263,7 @@ impl Service {
.users
.keys_changed(room_id.as_ref(), since, None)
.filter_map(Result::ok)
.filter(|user_id| user_is_local(user_id)),
.filter(|user_id| self.services.globals.user_is_local(user_id)),
);
if self.server.config.allow_outgoing_read_receipts
@@ -306,7 +305,7 @@ impl Service {
for (user_id, count, presence_bytes) in self.services.presence.presence_since(since) {
*max_edu_count = cmp::max(count, *max_edu_count);
if !user_is_local(&user_id) {
if !self.services.globals.user_is_local(&user_id) {
continue;
}
@@ -358,7 +357,7 @@ impl Service {
let (user_id, count, read_receipt) = r?;
*max_edu_count = cmp::max(count, *max_edu_count);
if !user_is_local(&user_id) {
if !self.services.globals.user_is_local(&user_id) {
continue;
}