magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: keep track of remote profiles for user directory and local requests

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-01-11 20:39:37 -05:00 • committed by June
parent ef8dcdfe3c
commit b28a2fad97
6 changed files with 110 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/service/rooms/timeline/mod.rs
View file

@ -18,7 +18,9 @@ use ruma::{
events::{
push_rules::PushRulesEvent,
room::{
create::RoomCreateEventContent, encrypted::Relation, member::MembershipState,
create::RoomCreateEventContent,
encrypted::Relation,
member::{MembershipState, RoomMemberEventContent},
power_levels::RoomPowerLevelsEventContent,
},
GlobalAccountDataEventType, StateEventType, TimelineEventType,
@ -453,17 +455,15 @@ impl Service {
}
TimelineEventType::RoomMember => {
if let Some(state_key) = &pdu.state_key {
#[derive(Deserialize)]
struct ExtractMembership {
membership: MembershipState,
}
// if the state_key fails
let target_user_id = UserId::parse(state_key.clone())
.expect("This state_key was previously validated");
let content = serde_json::from_str::<ExtractMembership>(pdu.content.get())
.map_err(|_| Error::bad_database("Invalid content in pdu."))?;
let content = serde_json::from_str::<RoomMemberEventContent>(pdu.content.get())
.map_err(|e| {
error!("Invalid room member event content in pdu: {e}");
Error::bad_database("Invalid room member event content in pdu.")
})?;
let invite_state = match content.membership {
MembershipState::Invite => {
@ -481,7 +481,7 @@ impl Service {
.update_membership(
&pdu.room_id,
&target_user_id,
content.membership,
content,
&pdu.sender,
invite_state,
true,