studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Migrate additional names in src/

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-05-14 03:04:11 +00:00
parent 75e92a01c7
commit 0463b962fd
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/client/media_legacy.rs
View File

@@ -33,7 +33,7 @@ pub(crate) async fn get_media_config_legacy_route(
/// # `GET /_matrix/media/v1/config`
///
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
/// clients may call. conduwuit adds these for compatibility purposes.
/// clients may call. Tuwunel adds these for compatibility purposes.
/// See <https://spec.matrix.org/legacy/legacy/#id27>
///
/// Returns max upload size.
@@ -92,7 +92,7 @@ pub(crate) async fn get_media_preview_legacy_route(
/// # `GET /_matrix/media/v1/preview_url`
///
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
/// clients may call. conduwuit adds these for compatibility purposes.
/// clients may call. Tuwunel adds these for compatibility purposes.
/// See <https://spec.matrix.org/legacy/legacy/#id27>
///
/// Returns URL preview.
@@ -111,7 +111,7 @@ pub(crate) async fn get_media_preview_legacy_legacy_route(
/// Permanently save media in the server.
///
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
/// clients may call. conduwuit adds these for compatibility purposes.
/// clients may call. Tuwunel adds these for compatibility purposes.
/// See <https://spec.matrix.org/legacy/legacy/#id27>
///
/// - Some metadata will be saved in the database
@@ -199,7 +199,7 @@ pub(crate) async fn get_content_legacy_route(
/// Load media from our server or over federation.
///
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
/// clients may call. conduwuit adds these for compatibility purposes.
/// clients may call. Tuwunel adds these for compatibility purposes.
/// See <https://spec.matrix.org/legacy/legacy/#id27>
///
/// - Only allows federation if `allow_remote` is true
@@ -290,7 +290,7 @@ pub(crate) async fn get_content_as_filename_legacy_route(
/// Load media from our server or over federation, permitting desired filename.
///
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
/// clients may call. conduwuit adds these for compatibility purposes.
/// clients may call. Tuwunel adds these for compatibility purposes.
/// See <https://spec.matrix.org/legacy/legacy/#id27>
///
/// - Only allows federation if `allow_remote` is true
@@ -381,7 +381,7 @@ pub(crate) async fn get_content_thumbnail_legacy_route(
/// Load media thumbnail from our server or over federation.
///
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
/// clients may call. conduwuit adds these for compatibility purposes.
/// clients may call. Tuwunel adds these for compatibility purposes.
/// See <https://spec.matrix.org/legacy/legacy/#id27>
///
/// - Only allows federation if `allow_remote` is true

12
src/api/client/membership/join.rs
View File

@@ -354,7 +354,7 @@ async fn join_room_by_id_helper_remote(
info!("make_join finished");
let Some(room_version_id) = make_join_response.room_version else {
return Err!(BadServerResponse("Remote room version is not supported by conduwuit"));
return Err!(BadServerResponse("Remote room version is not supported by tuwunel"));
};
if !services
@@ -362,7 +362,7 @@ async fn join_room_by_id_helper_remote(
.supported_room_version(&room_version_id)
{
return Err!(BadServerResponse(
"Remote room version {room_version_id} is not supported by conduwuit"
"Remote room version {room_version_id} is not supported by tuwunel"
));
}
@@ -810,7 +810,7 @@ async fn join_room_by_id_helper_local(
};
let Some(room_version_id) = make_join_response.room_version else {
return Err!(BadServerResponse("Remote room version is not supported by conduwuit"));
return Err!(BadServerResponse("Remote room version is not supported by tuwunel"));
};
if !services
@@ -818,7 +818,7 @@ async fn join_room_by_id_helper_local(
.supported_room_version(&room_version_id)
{
return Err!(BadServerResponse(
"Remote room version {room_version_id} is not supported by conduwuit"
"Remote room version {room_version_id} is not supported by tuwunel"
));
}
@@ -975,11 +975,11 @@ async fn make_join_request(
if incompatible_room_version_count > 15 {
info!(
"15 servers have responded with M_INCOMPATIBLE_ROOM_VERSION or \
M_UNSUPPORTED_ROOM_VERSION, assuming that conduwuit does not support the \
M_UNSUPPORTED_ROOM_VERSION, assuming that tuwunel does not support the \
room version {room_id}: {e}"
);
make_join_response_and_server =
Err!(BadServerResponse("Room version is not supported by Conduwuit"));
Err!(BadServerResponse("Room version is not supported by tuwunel"));
return make_join_response_and_server;
}

6
src/api/client/state.rs
View File

@@ -228,7 +228,7 @@ async fn allowed_to_send_state_event(
return Err!(Request(BadJson(debug_warn!(
?room_id,
"Sending an ACL event with an empty allow key will permanently \
brick the room for non-conduwuit's as this equates to no servers \
brick the room for non-tuwunel's as this equates to no servers \
being allowed to participate in this room."
))));
}
@@ -237,8 +237,8 @@ async fn allowed_to_send_state_event(
return Err!(Request(BadJson(debug_warn!(
?room_id,
"Sending an ACL event with a deny and allow key value of \"*\" will \
permanently brick the room for non-conduwuit's as this equates to \
no servers being allowed to participate in this room."
permanently brick the room for non-tuwunel's as this equates to no \
servers being allowed to participate in this room."
))));
}

2
src/api/client/user_directory.rs
View File

@@ -11,7 +11,7 @@ use tuwunel_core::{
use crate::Ruma;
// conduwuit can handle a lot more results than synapse
// Tuwunel can handle a lot more results than synapse
const LIMIT_MAX: usize = 500;
const LIMIT_DEFAULT: usize = 10;

14
src/core/matrix/state_res/benches.rs
View File

@@ -1,4 +1,4 @@
#[cfg(conduwuit_bench)]
#[cfg(tuwunel_bench)]
extern crate test;
use std::{
@@ -32,8 +32,8 @@ use crate::{
static SERVER_TIMESTAMP: AtomicU64 = AtomicU64::new(0);
#[cfg(conduwuit_bench)]
#[cfg_attr(conduwuit_bench, bench)]
#[cfg(tuwunel_bench)]
#[cfg_attr(tuwunel_bench, bench)]
fn lexico_topo_sort(c: &mut test::Bencher) {
let graph = hashmap! {
event_id("l") => hashset![event_id("o")],
@@ -50,8 +50,8 @@ fn lexico_topo_sort(c: &mut test::Bencher) {
});
}
#[cfg(conduwuit_bench)]
#[cfg_attr(conduwuit_bench, bench)]
#[cfg(tuwunel_bench)]
#[cfg_attr(tuwunel_bench, bench)]
fn resolution_shallow_auth_chain(c: &mut test::Bencher) {
let mut store = TestStore(hashmap! {});
@@ -87,8 +87,8 @@ fn resolution_shallow_auth_chain(c: &mut test::Bencher) {
});
}
#[cfg(conduwuit_bench)]
#[cfg_attr(conduwuit_bench, bench)]
#[cfg(tuwunel_bench)]
#[cfg_attr(tuwunel_bench, bench)]
fn resolve_deeper_event_set(c: &mut test::Bencher) {
let mut inner = INITIAL_EVENTS();
let ban = BAN_STATE_SET();

2
src/service/admin/console.rs
View File

@@ -96,7 +96,7 @@ impl Console {
debug!("session starting");
self.output
.print_inline(&format!("**conduwuit {}** admin console\n", tuwunel_core::version()));
.print_inline(&format!("**tuwunel {}** admin console\n", tuwunel_core::version()));
self.output
.print_text("\"help\" for help, ^D to exit the console, ^\\ to stop the server\n");

4
src/service/admin/create.rs
View File

@@ -22,7 +22,7 @@ use crate::Services;
/// Create the admin room.
///
/// Users in this room are considered admins by conduwuit, and the room can be
/// Users in this room are considered admins by tuwunel, and the room can be
/// used to issue admin commands by talking to the server user inside it.
pub async fn create_admin_room(services: &Services) -> Result {
let room_id = RoomId::new(services.globals.server_name());
@@ -168,7 +168,7 @@ pub async fn create_admin_room(services: &Services) -> Result {
.timeline
.build_and_append_pdu(
PduBuilder::state(String::new(), &RoomTopicEventContent {
topic: format!("Manage {} | Run commands prefixed with `!admin` | Run `!admin -h` for help | Documentation: https://conduwuit.puppyirl.gay/", services.config.server_name),
topic: format!("Manage {} | Run commands prefixed with `!admin` | Run `!admin -h` for help | Documentation: https://github.com/matrix-construct/tuwunel/", services.config.server_name),
}),
server_user,
&room_id,

4
src/service/admin/grant.rs
View File

@@ -16,7 +16,7 @@ use tuwunel_core::{
Err, Result, debug_info, debug_warn, error, implement, matrix::pdu::PduBuilder,
};
/// Invite the user to the conduwuit admin room.
/// Invite the user to the tuwunel admin room.
///
/// This is equivalent to granting server admin privileges.
#[implement(super::Service)]
@@ -143,7 +143,7 @@ pub async fn make_user_admin(&self, user_id: &UserId) -> Result {
if self.services.server.config.admin_room_notices {
let welcome_message = String::from(
"## Thank you for trying out conduwuit!\n\nconduwuit is technically a hard fork of Conduit, which is in Beta. The Beta status initially was inherited from Conduit, however overtime this Beta status is rapidly becoming less and less relevant as our codebase significantly diverges more and more. conduwuit is quite stable and very usable as a daily driver and for a low-medium sized homeserver. There is still a lot of more work to be done, but it is in a far better place than the project was in early 2024.\n\nHelpful links:\n> GitHub Repo: https://github.com/girlbossceo/conduwuit\n> Documentation: https://conduwuit.puppyirl.gay/\n> Report issues: https://github.com/girlbossceo/conduwuit/issues\n\nFor a list of available commands, send the following message in this room: `!admin --help`\n\nHere are some rooms you can join (by typing the command into your client) -\n\nconduwuit space: `/join #conduwuit-space:puppygock.gay`\nconduwuit main room (Ask questions and get notified on updates): `/join #conduwuit:puppygock.gay`\nconduwuit offtopic room: `/join #conduwuit-offtopic:puppygock.gay`",
"## Thank you for trying out tuwunel!\n\nTuwunel is a continuation of conduwuit which was technically a hard fork of Conduit.\n\nHelpful links:\n> GitHub Repo: https://github.com/matrix-construct/tuwunel\n> Documentation: https://github.com/matrix-construct/tuwunel\n> Report issues: https://github.com/matri-construct/tuwunel/issues\n\nFor a list of available commands, send the following message in this room: `!admin --help`"
);
// Send welcome message

2
src/service/migrations.rs
View File

@@ -150,7 +150,7 @@ async fn migrate(services: &Services) -> Result<()> {
assert_eq!(
services.globals.db.database_version().await,
DATABASE_VERSION,
"Failed asserting local database version {} is equal to known latest conduwuit database \
"Failed asserting local database version {} is equal to known latest tuwunel database \
version {}",
services.globals.db.database_version().await,
DATABASE_VERSION,