Merge upstream changes #16
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix(typo): security thread -> security threat
chore(indenting): remove extra space
This incorporates the ideas from jammsen#243, but updates the existing `rconcli` script to perform the conversion to non-breaking spaces, instead of using a customised `rcon` command. To make the implementation nicer, in `rconcli` the command and any additional values have been split into separate arguments. The first argument to the script is the desired command (e.g. `broadcast`), and any following arguments will be value (e.g. `Saving done`). The result (from the `rcon` command's perspective) will be: ``` broadcast Saving<nbsp>done ``` The following changes are also included (some from the above PR): * Convert all RCON broadcasts to use spaces, instead of dashes, and make them otherwise look nicer. * Do not remove spaces from player names in broadcasts, as these are now handled correctly. * Add timestamps to all RCON broadcasts, to make it easier to tell when a broadcast was made. * When using the RCON `showplayers` command, redirect `stderr` to `/dev/null` to prevent log errors caused by players with special characters in their names. * Fix typos. * Remove trailing spaces on lines in some files.
This incorporates the ideas from jammsen#243, but updates the existing `rconcli` script to perform the conversion to non-breaking spaces, instead of using a customised `rcon` command. To make the implementation nicer, in `rconcli` the command and any additional values have been split into separate arguments. The first argument to the script is the desired command (e.g. `broadcast`), and any following arguments will be value (e.g. `Saving done`). The result (from the `rcon` command's perspective) will be: ``` broadcast Saving<nbsp>done ``` The following changes are also included (some from the above PR): * Convert all RCON broadcasts to use spaces, instead of dashes, and make them otherwise look nicer. * Do not remove spaces from player names in broadcasts, as these are now handled correctly. * Add timestamps to all RCON broadcasts, to make it easier to tell when a broadcast was made. * When using the RCON `showplayers` command, redirect `stderr` to `/dev/null` to prevent log errors caused by players with special characters in their names. * Fix typos. * Remove trailing spaces on lines in some files.
…dicated-server into Callum027-rcon-spaces
update workflow action cosign
Release 2024-04-04.1
…d-server into develop
Release 2024-04-06.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update fixes for new version, rest api, updated rcon times, backup settings, etc.