@@ -27,7 +27,7 @@ services:
|
||||
#TUWUNEL_CONFIG: '/etc/tuwunel.toml' # Uncomment if you mapped config toml above
|
||||
|
||||
# We need some way to serve the client and server .well-known json. The simplest way is via the TUWUNEL_WELL_KNOWN
|
||||
# variable / config option, there are multiple ways to do this, e.g. in the tuwunel.toml file, and in a seperate
|
||||
# variable / config option, there are multiple ways to do this, e.g. in the tuwunel.toml file, and in a separate
|
||||
# see the override file for more information about delegation
|
||||
TUWUNEL_WELL_KNOWN: |
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@ services:
|
||||
# TUWUNEL_NEW_USER_DISPLAYNAME_SUFFIX = "🏳<200d>⚧"
|
||||
|
||||
# We need some way to serve the client and server .well-known json. The simplest way is via the TUWUNEL_WELL_KNOWN
|
||||
# variable / config option, there are multiple ways to do this, e.g. in the tuwunel.toml file, and in a seperate
|
||||
# variable / config option, there are multiple ways to do this, e.g. in the tuwunel.toml file, and in a separate
|
||||
# reverse proxy, but since you do not have a reverse proxy and following this guide, this example is included
|
||||
TUWUNEL_WELL_KNOWN: |
|
||||
{
|
||||
|
||||
@@ -71,7 +71,7 @@ related to WAL tracking.
|
||||
|
||||
The only safe files that can be deleted are the `LOG` files (all caps). These
|
||||
are the real RocksDB telemetry/log files, however conduwuit has already
|
||||
configured to only store up to 3 RocksDB `LOG` files due to generall being
|
||||
configured to only store up to 3 RocksDB `LOG` files due to generally being
|
||||
useless for average users unless troubleshooting something low-level. If you
|
||||
would like to store nearly none at all, see the `rocksdb_max_log_files`
|
||||
config option.
|
||||
|
||||
@@ -15,7 +15,7 @@ use crate::Ruma;
|
||||
|
||||
/// # `GET /_matrix/client/v3/capabilities`
|
||||
///
|
||||
/// Get information on the supported feature set and other relevent capabilities
|
||||
/// Get information on the supported feature set and other relevant capabilities
|
||||
/// of this server.
|
||||
pub(crate) async fn get_capabilities_route(
|
||||
State(services): State<crate::State>,
|
||||
|
||||
@@ -75,7 +75,7 @@ pub(crate) async fn well_known_support(
|
||||
return Err(Error::BadRequest(ErrorKind::NotFound, "Not found."));
|
||||
}
|
||||
|
||||
// TOOD: support defining multiple contacts in the config
|
||||
// TODO: support defining multiple contacts in the config
|
||||
let mut contacts: Vec<Contact> = vec![];
|
||||
|
||||
if let Some(role) = role {
|
||||
|
||||
@@ -36,7 +36,7 @@ const MAIN_MANIFEST: &'static str = ();
|
||||
/// For *enabled* features see the info::rustc module instead.
|
||||
static FEATURES: OnceLock<Vec<String>> = OnceLock::new();
|
||||
|
||||
/// Processed list of dependencies. This is generated from the datas captured in
|
||||
/// Processed list of dependencies. This is generated from the data captured in
|
||||
/// the MANIFEST.
|
||||
static DEPENDENCIES: OnceLock<DepsSet> = OnceLock::new();
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@ use crate::{Result, error};
|
||||
/// pulling in a version of tracing that's incompatible with the rest of our
|
||||
/// deps.
|
||||
///
|
||||
/// To work around this, we define an trait without the S paramter that forwards
|
||||
/// to the reload::Handle::reload method, and then store the handle as a trait
|
||||
/// object.
|
||||
/// To work around this, we define an trait without the S parameter that
|
||||
/// forwards to the reload::Handle::reload method, and then store the handle as
|
||||
/// a trait object.
|
||||
///
|
||||
/// [1]: <https://github.com/tokio-rs/tracing/pull/1035/commits/8a87ea52425098d3ef8f56d92358c2f6c144a28f>
|
||||
pub trait ReloadHandle<L> {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
type Delim<'a> = (&'a str, &'a str);
|
||||
|
||||
/// Slice a string between a pair of delimeters.
|
||||
/// Slice a string between a pair of delimiters.
|
||||
pub trait Between<'a> {
|
||||
/// Extract a string between the delimeters. If the delimeters were not
|
||||
/// Extract a string between the delimiters. If the delimiters were not
|
||||
/// found None is returned, otherwise the first extraction is returned.
|
||||
fn between(&self, delim: Delim<'_>) -> Option<&'a str>;
|
||||
|
||||
/// Extract a string between the delimeters. If the delimeters were not
|
||||
/// Extract a string between the delimiters. If the delimiters were not
|
||||
/// found the original string is returned; take note of this behavior,
|
||||
/// if an empty slice is desired for this case use the fallible version and
|
||||
/// unwrap to EMPTY.
|
||||
|
||||
@@ -194,7 +194,7 @@ fn get_cache(ctx: &Context, desc: &Descriptor) -> Option<Cache> {
|
||||
return None;
|
||||
}
|
||||
|
||||
// Some cache capacities are overriden by server config in a strange but
|
||||
// Some cache capacities are overridden by server config in a strange but
|
||||
// legacy-compat way
|
||||
let config = &ctx.server.config;
|
||||
let cap = match desc.name {
|
||||
|
||||
@@ -74,7 +74,7 @@ async fn async_main(server: &Arc<Server>) -> Result<(), Error> {
|
||||
.lock()
|
||||
.await
|
||||
.take()
|
||||
.expect("services initialied"),
|
||||
.expect("services initialized"),
|
||||
)
|
||||
.await
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@ pub(super) fn restart() -> ! {
|
||||
// We can (and do) prevent that panic by checking the result of current_exe()
|
||||
// prior to committing to restart, returning an error to the user without any
|
||||
// unexpected shutdown. In a nutshell that is the execuse for this unsafety.
|
||||
// Nevertheless, we still want a way to override the restart preventation (i.e.
|
||||
// Nevertheless, we still want a way to override the restart presentation (i.e.
|
||||
// admin server restart --force).
|
||||
let exe = unsafe { utils::sys::current_exe().expect("program path must be available") };
|
||||
let envs = env::vars();
|
||||
|
||||
@@ -30,7 +30,7 @@ pub(super) async fn console_auto_stop(&self) {
|
||||
/// Execute admin commands after startup
|
||||
#[implement(super::Service)]
|
||||
pub(super) async fn startup_execute(&self) -> Result {
|
||||
// List of comamnds to execute
|
||||
// List of commands to execute
|
||||
let commands = &self.services.server.config.admin_execute;
|
||||
|
||||
// Determine if we're running in smoketest-mode which will change some behaviors
|
||||
@@ -74,7 +74,7 @@ pub(super) async fn startup_execute(&self) -> Result {
|
||||
/// Execute admin commands after signal
|
||||
#[implement(super::Service)]
|
||||
pub(super) async fn signal_execute(&self) -> Result {
|
||||
// List of comamnds to execute
|
||||
// List of commands to execute
|
||||
let commands = self
|
||||
.services
|
||||
.server
|
||||
|
||||
@@ -172,7 +172,7 @@ impl Service {
|
||||
.map_err(|e| err!("Failed to enqueue admin command: {e:?}"))
|
||||
}
|
||||
|
||||
/// Dispatches a comamnd to the processor on the current task and waits for
|
||||
/// Dispatches a command to the processor on the current task and waits for
|
||||
/// completion.
|
||||
pub async fn command_in_place(
|
||||
&self,
|
||||
|
||||
@@ -26,7 +26,7 @@ impl NamespaceRegex {
|
||||
false
|
||||
}
|
||||
|
||||
/// Checks if this namespace has exlusive rights to a namespace
|
||||
/// Checks if this namespace has exclusive rights to a namespace
|
||||
#[inline]
|
||||
#[must_use]
|
||||
pub fn is_exclusive_match(&self, heystack: &str) -> bool {
|
||||
|
||||
@@ -350,7 +350,7 @@ fn handle_federation_error(
|
||||
return fallback();
|
||||
}
|
||||
|
||||
// Reached for 5xx errors. This is where we don't fallback given the likelyhood
|
||||
// Reached for 5xx errors. This is where we don't fallback given the likelihood
|
||||
// the other endpoint will also be a 5xx and we're wasting time.
|
||||
error
|
||||
}
|
||||
@@ -368,7 +368,7 @@ pub async fn fetch_remote_thumbnail_legacy(
|
||||
|
||||
self.check_legacy_freeze()?;
|
||||
self.check_fetch_authorized(&mxc)?;
|
||||
let reponse = self
|
||||
let response = self
|
||||
.services
|
||||
.sending
|
||||
.send_federation_request(mxc.server_name, media::get_content_thumbnail::v3::Request {
|
||||
@@ -385,10 +385,17 @@ pub async fn fetch_remote_thumbnail_legacy(
|
||||
.await?;
|
||||
|
||||
let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;
|
||||
self.upload_thumbnail(&mxc, None, None, reponse.content_type.as_deref(), &dim, &reponse.file)
|
||||
.await?;
|
||||
self.upload_thumbnail(
|
||||
&mxc,
|
||||
None,
|
||||
None,
|
||||
response.content_type.as_deref(),
|
||||
&dim,
|
||||
&response.file,
|
||||
)
|
||||
.await?;
|
||||
|
||||
Ok(reponse)
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
#[implement(super::Service)]
|
||||
|
||||
@@ -308,7 +308,7 @@ impl super::Service {
|
||||
expire: CachedOverride::default_expire(),
|
||||
overriding: (hostname != untername)
|
||||
.then_some(hostname.into())
|
||||
.inspect(|_| debug_info!("{untername:?} overriden by {hostname:?}")),
|
||||
.inspect(|_| debug_info!("{untername:?} overridden by {hostname:?}")),
|
||||
});
|
||||
|
||||
Ok(())
|
||||
|
||||
@@ -443,7 +443,7 @@ async fn get_room_summary(
|
||||
Ok(summary)
|
||||
}
|
||||
|
||||
/// With the given identifier, checks if a room is accessable
|
||||
/// With the given identifier, checks if a room is accessible
|
||||
#[implement(Service)]
|
||||
async fn is_accessible_child<'a, I>(
|
||||
&self,
|
||||
|
||||
Reference in New Issue
Block a user