mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2025-09-11 17:53:01 +02:00
Compare commits
25 commits
6e7a3cf6cb
...
2106e4e9f4
Author | SHA1 | Date | |
---|---|---|---|
|
2106e4e9f4 | ||
|
8c8c023120 | ||
|
5f2a24d7b2 | ||
|
1934711276 | ||
|
1807643371 | ||
|
6d6593c5eb | ||
|
63ee2dacea | ||
|
b8ead96d3e | ||
|
7d9b514696 | ||
|
4baf48e214 | ||
|
6483e984ce | ||
|
697e7aa2cd | ||
|
081487a413 | ||
|
3e9cf3f494 | ||
|
1e4cf59ab8 | ||
|
008d90b118 | ||
|
54eab4775a | ||
|
0a74dfe5a5 | ||
|
ecdce68ae3 | ||
|
43574118aa | ||
|
e7399409b4 | ||
|
1d97861332 | ||
|
e8bba3ba37 | ||
|
a57df9af37 | ||
|
45301d4e41 |
2 changed files with 21 additions and 18 deletions
|
@ -306,25 +306,28 @@ impl super::Service {
|
|||
|
||||
#[tracing::instrument(name = "srv", level = "debug", skip(self))]
|
||||
async fn query_srv_record(&self, hostname: &'_ str) -> Result<Option<FedDest>> {
|
||||
self.services.server.check_running()?;
|
||||
let hostnames =
|
||||
[format!("_matrix-fed._tcp.{hostname}."), format!("_matrix._tcp.{hostname}.")];
|
||||
|
||||
debug!("querying SRV for {hostname:?}");
|
||||
for hostname in hostnames {
|
||||
self.services.server.check_running()?;
|
||||
|
||||
let hostname_suffix = format!("_matrix-fed._tcp.{hostname}.");
|
||||
let hostname = hostname_suffix.trim_end_matches('.');
|
||||
match self.resolver.resolver.srv_lookup(hostname).await {
|
||||
| Err(e) => Self::handle_resolve_error(&e, hostname)?,
|
||||
| Ok(result) => {
|
||||
return Ok(result.iter().next().map(|result| {
|
||||
FedDest::Named(
|
||||
result.target().to_string().trim_end_matches('.').to_owned(),
|
||||
format!(":{}", result.port())
|
||||
.as_str()
|
||||
.try_into()
|
||||
.unwrap_or_else(|_| FedDest::default_port()),
|
||||
)
|
||||
}));
|
||||
},
|
||||
debug!("querying SRV for {hostname:?}");
|
||||
let hostname = hostname.trim_end_matches('.');
|
||||
match self.resolver.resolver.srv_lookup(hostname).await {
|
||||
| Err(e) => Self::handle_resolve_error(&e, hostname)?,
|
||||
| Ok(result) => {
|
||||
return Ok(result.iter().next().map(|result| {
|
||||
FedDest::Named(
|
||||
result.target().to_string().trim_end_matches('.').to_owned(),
|
||||
format!(":{}", result.port())
|
||||
.as_str()
|
||||
.try_into()
|
||||
.unwrap_or_else(|_| FedDest::default_port()),
|
||||
)
|
||||
}));
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Ok(None)
|
||||
|
|
|
@ -123,7 +123,7 @@ where
|
|||
|
||||
// The original create event must be in the auth events
|
||||
if !auth_events.contains_key(&(StateEventType::RoomCreate, String::new().into())) {
|
||||
return Err!(Request(InvalidParam("Incoming event refers to wrong create event.")));
|
||||
return Err!(Request(InvalidParam("Incoming event refers to wrong create event. event_id={event_id}")));
|
||||
}
|
||||
|
||||
let state_fetch = |ty: &StateEventType, sk: &str| {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue