Compare commits

..

4 commits

Author SHA1 Message Date
nexy7574
e903390b98
feat: Only inject vias when manual ones aren't provided during join 2025-08-30 16:18:06 +01:00
nexy7574
5f35ebbce0
fix: Make remote leave helper a public fn 2025-08-30 16:18:06 +01:00
nexy7574
af33e40539
feat: Force leave remote rooms admin command 2025-08-30 16:18:06 +01:00
Tom Foster
609e239436 fix(fedora): Correct linting issues in RPM spec file
The Fedora RPM packaging files added in PR #950 weren't passing pre-commit
checks, causing CI failures for any branches rebased after that merge. This
applies prek linting fixes (typo correction, trailing whitespace removal,
and EOF newline) to ensure CI passes for all contributors.
2025-08-30 16:10:41 +01:00
2 changed files with 4 additions and 4 deletions

View file

@ -38,7 +38,7 @@ sed -i 's/^offline = true$//' .cargo/config.toml
%cargo_build
# Here's the one legally required mystery incantation in this file.
# Some of our dependencies have source files which are (for some reason) marked as excutable.
# Some of our dependencies have source files which are (for some reason) marked as executable.
# Files in .cargo/registry/ are copied into /usr/src/ by the debuginfo machinery
# at the end of the build step, and then the BRP shebang mangling script checks
# the entire buildroot to find executable files, and fails the build because
@ -46,7 +46,7 @@ sed -i 's/^offline = true$//' .cargo/config.toml
# So we have to clear the executable bit on all of them before that happens.
find .cargo/registry/ -executable -name "*.rs" -exec chmod -x {} +
# TODO: this fails currently because it's forced to run in offline mode
# TODO: this fails currently because it's forced to run in offline mode
# {cargo_license -- --no-dev} > LICENSE.dependencies
%install
@ -77,4 +77,4 @@ install -Dpm0644 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/con
%systemd_postun_with_restart conduwuit.service
%changelog
{{{ git_repo_changelog }}}
{{{ git_repo_changelog }}}

View file

@ -949,6 +949,6 @@ pub(super) async fn force_leave_remote_room(
.boxed()
.await?;
self.write_str(&format!("{user_id} has been removed from {room_id} via a remote server.",))
self.write_str(&format!("{user_id} has been joined to {room_id}.",))
.await
}