Fix alias resolution logic; element-web v1.11.111 compat
element-hq/element-web#30641 element-hq/element-web#30611 Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -11,7 +11,9 @@ use std::{
|
||||
use async_trait::async_trait;
|
||||
use data::Data;
|
||||
use regex::RegexSet;
|
||||
use ruma::{OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedUserId, ServerName, UserId};
|
||||
use ruma::{
|
||||
OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedUserId, RoomAliasId, ServerName, UserId,
|
||||
};
|
||||
use tuwunel_core::{Result, Server, error, utils::bytes::pretty};
|
||||
|
||||
use crate::service;
|
||||
@@ -250,6 +252,12 @@ impl Service {
|
||||
self.server_is_ours(user_id.server_name())
|
||||
}
|
||||
|
||||
#[inline]
|
||||
#[must_use]
|
||||
pub fn alias_is_local(&self, alias: &RoomAliasId) -> bool {
|
||||
self.server_is_ours(alias.server_name())
|
||||
}
|
||||
|
||||
#[inline]
|
||||
#[must_use]
|
||||
pub fn server_is_ours(&self, server_name: &ServerName) -> bool {
|
||||
|
||||
Reference in New Issue
Block a user