TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Add config option for receiving read receipts

Browse source 
Adds an option for ignoring incoming read receipts over federation
This commit is contained in:
Nyaaori 2022-11-26 15:01:12 +01:00
parent ccc5030896
commit 9d4f2884e1
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
3 changed files with 43 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/api/server_server.rs
View file

@ -746,43 +746,45 @@ pub async fn send_transaction_message_route(
match edu { match edu {
Edu::Presence(_) => {} Edu::Presence(_) => {}
Edu::Receipt(receipt) => { Edu::Receipt(receipt) => {
for (room_id, room_updates) in receipt.receipts { if services().globals.allow_receiving_read_receipts() {
for (user_id, user_updates) in room_updates.read { for (room_id, room_updates) in receipt.receipts {
if let Some((event_id, _)) = user_updates for (user_id, user_updates) in room_updates.read {
.event_ids if let Some((event_id, _)) = user_updates
.iter() .event_ids
.filter_map(|id| { .iter()
.filter_map(|id| {
services()
.rooms
.timeline
.get_pdu_count(id)
.ok()
.flatten()
.map(|r| (id, r))
})
.max_by_key(|(_, count)| *count)
{
let mut user_receipts = BTreeMap::new();
user_receipts.insert(user_id.clone(), user_updates.data);
let mut receipts = BTreeMap::new();
receipts.insert(ReceiptType::Read, user_receipts);
let mut receipt_content = BTreeMap::new();
receipt_content.insert(event_id.to_owned(), receipts);
let event = ReceiptEvent {
content: ReceiptEventContent(receipt_content),
room_id: room_id.clone(),
};
services() services()
.rooms .rooms
.timeline .edus
.get_pdu_count(id) .read_receipt
.ok() .readreceipt_update(&user_id, &room_id, event)?;
.flatten() } else {
.map(|r| (id, r)) // TODO fetch missing events
}) info!("No known event ids in read receipt: {:?}", user_updates);
.max_by_key(|(_, count)| *count) }
{
let mut user_receipts = BTreeMap::new();
user_receipts.insert(user_id.clone(), user_updates.data);
let mut receipts = BTreeMap::new();
receipts.insert(ReceiptType::Read, user_receipts);
let mut receipt_content = BTreeMap::new();
receipt_content.insert(event_id.to_owned(), receipts);
let event = ReceiptEvent {
content: ReceiptEventContent(receipt_content),
room_id: room_id.clone(),
};
services()
.rooms
.edus
.read_receipt
.readreceipt_update(&user_id, &room_id, event)?;
} else {
// TODO fetch missing events
info!("No known event ids in read receipt: {:?}", user_updates);
} }
} }
} }

2
src/config/mod.rs
View file

@ -49,6 +49,8 @@ pub struct Config {
#[serde(default = "true_fn")] #[serde(default = "true_fn")]
pub allow_public_read_receipts: bool, pub allow_public_read_receipts: bool,
#[serde(default = "true_fn")] #[serde(default = "true_fn")]
pub allow_receiving_read_receipts: bool,
#[serde(default = "true_fn")]
pub allow_room_creation: bool, pub allow_room_creation: bool,
#[serde(default = "true_fn")] #[serde(default = "true_fn")]
pub allow_unstable_room_versions: bool, pub allow_unstable_room_versions: bool,

4
src/service/globals/mod.rs
View file

@ -238,6 +238,10 @@ impl Service {
self.config.allow_public_read_receipts self.config.allow_public_read_receipts
} }
pub fn allow_receiving_read_receipts(&self) -> bool {
self.config.allow_receiving_read_receipts
}
pub fn allow_room_creation(&self) -> bool { pub fn allow_room_creation(&self) -> bool {
self.config.allow_room_creation self.config.allow_room_creation
} }