mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2025-09-11 20:33:02 +02:00
Compare commits
25 commits
2106e4e9f4
...
6e7a3cf6cb
Author | SHA1 | Date | |
---|---|---|---|
|
6e7a3cf6cb | ||
|
845a64b73d | ||
|
91fed80d4f | ||
|
423ca4e664 | ||
|
e2995df505 | ||
|
a0bde96494 | ||
|
0e6b7f6d5f | ||
|
f8b86e4598 | ||
|
c4f6d1ed09 | ||
|
d5039bd72f | ||
|
76b9b88ece | ||
|
4308db5e30 | ||
|
0f78f77991 | ||
|
c628f31ad2 | ||
|
10dd534def | ||
|
ed6426ea95 | ||
|
307a0bd627 | ||
|
528f63dfbc | ||
|
38c26181f8 | ||
|
31bc7457d6 | ||
|
f857440a56 | ||
|
43ce4625b8 | ||
|
0eb9db8e71 | ||
|
d15eba2920 | ||
|
35e9220284 |
2 changed files with 18 additions and 21 deletions
|
@ -306,14 +306,12 @@ impl super::Service {
|
||||||
|
|
||||||
#[tracing::instrument(name = "srv", level = "debug", skip(self))]
|
#[tracing::instrument(name = "srv", level = "debug", skip(self))]
|
||||||
async fn query_srv_record(&self, hostname: &'_ str) -> Result<Option<FedDest>> {
|
async fn query_srv_record(&self, hostname: &'_ str) -> Result<Option<FedDest>> {
|
||||||
let hostnames =
|
|
||||||
[format!("_matrix-fed._tcp.{hostname}."), format!("_matrix._tcp.{hostname}.")];
|
|
||||||
|
|
||||||
for hostname in hostnames {
|
|
||||||
self.services.server.check_running()?;
|
self.services.server.check_running()?;
|
||||||
|
|
||||||
debug!("querying SRV for {hostname:?}");
|
debug!("querying SRV for {hostname:?}");
|
||||||
let hostname = hostname.trim_end_matches('.');
|
|
||||||
|
let hostname_suffix = format!("_matrix-fed._tcp.{hostname}.");
|
||||||
|
let hostname = hostname_suffix.trim_end_matches('.');
|
||||||
match self.resolver.resolver.srv_lookup(hostname).await {
|
match self.resolver.resolver.srv_lookup(hostname).await {
|
||||||
| Err(e) => Self::handle_resolve_error(&e, hostname)?,
|
| Err(e) => Self::handle_resolve_error(&e, hostname)?,
|
||||||
| Ok(result) => {
|
| Ok(result) => {
|
||||||
|
@ -328,7 +326,6 @@ impl super::Service {
|
||||||
}));
|
}));
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,7 +123,7 @@ where
|
||||||
|
|
||||||
// The original create event must be in the auth events
|
// The original create event must be in the auth events
|
||||||
if !auth_events.contains_key(&(StateEventType::RoomCreate, String::new().into())) {
|
if !auth_events.contains_key(&(StateEventType::RoomCreate, String::new().into())) {
|
||||||
return Err!(Request(InvalidParam("Incoming event refers to wrong create event. event_id={event_id}")));
|
return Err!(Request(InvalidParam("Incoming event refers to wrong create event.")));
|
||||||
}
|
}
|
||||||
|
|
||||||
let state_fetch = |ty: &StateEventType, sk: &str| {
|
let state_fetch = |ty: &StateEventType, sk: &str| {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue