- Add support for channels.yml's with legacy channelTag keys. (#59)

TownyAdvanced · Feb 19, 2024 · ba695ae · ba695ae
1 parent e8166d4
commit ba695ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.palmergames.bukkit</groupId>
     <artifactId>TownyChat</artifactId>
     <packaging>jar</packaging>
-    <version>0.114</version>
+    <version>0.115</version>
 
     <licenses>
         <license>

diff --git a/resources/changelog.txt b/resources/changelog.txt
@@ -488,4 +488,6 @@ v0.113:
   - Fix channelTag not parsing properly.
     - Closes https://github.com/TownyAdvanced/Towny/issues/7239.
 v0.114:
-  - Actually fix {channelTag} not parsing properly.
+  - Actually fix {channelTag} not parsing properly.
+v0.115:
+  - Add support for channels.yml's with legacy channelTag keys.
diff --git a/src/com/palmergames/bukkit/TownyChat/config/ChannelsSettings.java b/src/com/palmergames/bukkit/TownyChat/config/ChannelsSettings.java
@@ -27,6 +27,7 @@ public class ChannelsSettings {
 	private final static List<String> DEFAULT_CHANNELS = Arrays.asList("general","town","nation","alliance","admin","mod","local");
 
 	private static final String CHANNEL_TAG = "channeltag";
+	private static final String LEGACY_CHANNEL_TAG = "channelTag";
 	private static final String SPAM_TIME = "spam_time";
 	private static final String RANGE = "range";
 	private static final String DEFAULT = "default";
@@ -321,11 +322,12 @@ public String getType() {
 		}
 
 		public boolean hasChannelTag() {
-			return channelSettingsMap.containsKey(CHANNEL_TAG);
+			return channelSettingsMap.containsKey(CHANNEL_TAG) || channelSettingsMap.containsKey(LEGACY_CHANNEL_TAG);
 		}
 
 		public String getChannelTag() {
-			return (String) channelSettingsMap.getOrDefault(CHANNEL_TAG, "");
+			String slug = channelSettingsMap.containsKey(LEGACY_CHANNEL_TAG) ? LEGACY_CHANNEL_TAG : CHANNEL_TAG;
+			return (String) channelSettingsMap.getOrDefault(slug, "");
 		}
 
 		public boolean hasMessageColour() {