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

revamp appservice registration to ruma's Registration type

Browse source 
squashed from https://gitlab.com/famedly/conduit/-/merge_requests/583

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
Matthias Ahouansou 2024-02-07 17:48:01 -05:00 • committed by June
parent 0e9eb22ee7
commit 784d307425
13 changed files with 203 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/api/client_server/alias.rs
View file

@ -157,20 +157,16 @@ pub(crate) async fn get_alias_helper(
None => {
for (_id, registration) in services().appservice.all()? {
let aliases = registration
.get("namespaces")
.and_then(|ns| ns.get("aliases"))
.and_then(|aliases| aliases.as_sequence())
.map_or_else(Vec::new, |aliases| {
aliases
.iter()
.filter_map(|aliases| Regex::new(aliases.get("regex")?.as_str()?).ok())
.collect::<Vec<_>>()
});
.namespaces
.aliases
.iter()
.filter_map(|alias| Regex::new(alias.regex.as_str()).ok())
.collect::<Vec<_>>();
if aliases
.iter()
.any(|aliases| aliases.is_match(room_alias.as_str()))
&& services()
&& if let Some(opt_result) = services()
.sending
.send_appservice_request(
registration,
@ -179,7 +175,11 @@ pub(crate) async fn get_alias_helper(
},
)
.await
.is_ok()
{
opt_result.is_ok()
} else {
false
}
{
room_id = Some(
services()