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

reply to messages

Browse source
This commit is contained in:
tezlm 2023-10-04 20:13:04 -07:00 • committed by strawberry
parent ebb94341c8
commit b30884c7ac
2 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/service/admin/mod.rs
View file

@ -9,6 +9,7 @@ use clap::{Parser, Subcommand};
use regex::Regex; use regex::Regex;
use ruma::{ use ruma::{
events::{ events::{
relation::InReplyTo,
room::{ room::{
canonical_alias::RoomCanonicalAliasEventContent, canonical_alias::RoomCanonicalAliasEventContent,
create::RoomCreateEventContent, create::RoomCreateEventContent,
@ -16,7 +17,7 @@ use ruma::{
history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent}, history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
join_rules::{JoinRule, RoomJoinRulesEventContent}, join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent}, member::{MembershipState, RoomMemberEventContent},
message::RoomMessageEventContent, message::{Relation::Reply, RoomMessageEventContent},
name::RoomNameEventContent, name::RoomNameEventContent,
power_levels::RoomPowerLevelsEventContent, power_levels::RoomPowerLevelsEventContent,
topic::RoomTopicEventContent, topic::RoomTopicEventContent,
@ -285,7 +286,7 @@ enum ServerCommand {
#[derive(Debug)] #[derive(Debug)]
pub enum AdminRoomEvent { pub enum AdminRoomEvent {
ProcessMessage(String), ProcessMessage(String, Arc<EventId>),
SendMessage(RoomMessageEventContent), SendMessage(RoomMessageEventContent),
} }
@ -333,9 +334,11 @@ impl Service {
loop { loop {
tokio::select! { tokio::select! {
Some(event) = receiver.recv() => { Some(event) = receiver.recv() => {
let message_content = match event { let (mut message_content, reply) = match event {
AdminRoomEvent::SendMessage(content) => content, AdminRoomEvent::SendMessage(content) => (content, None),
AdminRoomEvent::ProcessMessage(room_message) => self.process_admin_message(room_message).await AdminRoomEvent::ProcessMessage(room_message, reply_id) => {
(self.process_admin_message(room_message).await, Some(reply_id))
}
}; };
let mutex_state = Arc::clone( let mutex_state = Arc::clone(
@ -349,20 +352,24 @@ impl Service {
let state_lock = mutex_state.lock().await; let state_lock = mutex_state.lock().await;
services().rooms.timeline.build_and_append_pdu( if let Some(reply) = reply {
PduBuilder { message_content.relates_to = Some(Reply { in_reply_to: InReplyTo { event_id: reply.into() } })
event_type: TimelineEventType::RoomMessage, }
content: to_raw_value(&message_content)
.expect("event is valid, we just created it"), services().rooms.timeline.build_and_append_pdu(
unsigned: None, PduBuilder {
state_key: None, event_type: TimelineEventType::RoomMessage,
redacts: None, content: to_raw_value(&message_content)
}, .expect("event is valid, we just created it"),
&conduit_user, unsigned: None,
&conduit_room, state_key: None,
&state_lock) redacts: None,
.await },
.unwrap(); &conduit_user,
&conduit_room,
&state_lock)
.await
.unwrap();
drop(state_lock); drop(state_lock);
@ -371,9 +378,9 @@ impl Service {
} }
} }
pub fn process_message(&self, room_message: String) { pub fn process_message(&self, room_message: String, event_id: Arc<EventId>) {
self.sender self.sender
.send(AdminRoomEvent::ProcessMessage(room_message)) .send(AdminRoomEvent::ProcessMessage(room_message, event_id))
.unwrap(); .unwrap();
} }

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

@ -483,7 +483,7 @@ impl Service {
&& services().globals.emergency_password().is_none(); && services().globals.emergency_password().is_none();
if to_conduit && !from_conduit && admin_room.as_ref() == Some(&pdu.room_id) { if to_conduit && !from_conduit && admin_room.as_ref() == Some(&pdu.room_id) {
services().admin.process_message(body); services().admin.process_message(body, pdu.event_id.clone());
} }
} }
} }