Support multi-line MOTDs natively via a string list in the config#1825
Open
WouterGritter wants to merge 1 commit into
Open
Support multi-line MOTDs natively via a string list in the config#1825WouterGritter wants to merge 1 commit into
WouterGritter wants to merge 1 commit into
Conversation
R00tB33rMan
approved these changes
Jun 18, 2026
4drian3d
reviewed
Jul 10, 2026
| } | ||
| final byte[] forwardingSecret = forwardingSecretString.getBytes(StandardCharsets.UTF_8); | ||
| final String motd = config.getOrElse("motd", "<#09add3>A Velocity Server"); | ||
| final List<String> motd = config.getOrElse("motd", ImmutableList.of("<#09add3>A Velocity Server")); |
Contributor
There was a problem hiding this comment.
I think it would be a good idea to add a validation check in case someone tries to add more than 2 lines
Comment on lines
+36
to
+39
| String motd = config.get("motd"); | ||
| config.set("motd", List.of(motd)); | ||
|
|
||
| config.set("config-version", "2.9"); |
Contributor
There was a problem hiding this comment.
Since the migration will only happen once, it might be a good idea to migrate the use of \n or <newline>/<br> to a new line in the configuration
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
As the title says.
As a bonus, we get rid of the ugly FQDN instead of an import for
ComponentinProxyConfigandVelocityConfig, andProxyConfig#getMotd's javadoc is updated to correctly reflect where the MOTD is actually being used.I had first used a regex in
MotdMultilineMigrationto split onliteral newline,\n<newline>and<br>(MM's newline tags) when migrating, but this seemed too intrusive. In its current state, this PR just migrates the existing string to a string list of size 1 and leaves it up to the user to split out into multiple lines.