Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-01 08:39:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Less strict channel lookup

Browse Source
This commit is contained in:
Vankka 2022-04-12 11:20:42 +03:00
parent 0eb255fd33
commit da8ba3d3a6
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/src/main/java/com/discordsrv/common/channel/ChannelConfigHelper.java
View File

@ -123,6 +123,21 @@ public class ChannelConfigHelper {
return discordSRV.config().channels;
}
private BaseChannelConfig findChannel(String key) {
Map<String, BaseChannelConfig> channels = channels();
BaseChannelConfig byExact = channels.get(key);
if (byExact != null) {
return byExact;
}
for (Map.Entry<String, BaseChannelConfig> entry : channels().entrySet()) {
if (entry.getKey().equalsIgnoreCase(key)) {
return entry.getValue();
}
}
return null;
}
private BaseChannelConfig getDefault() {
return channels().computeIfAbsent(ChannelConfig.DEFAULT_KEY, key -> new BaseChannelConfig());
}
@ -147,6 +162,14 @@ public class ChannelConfigHelper {
public OrDefault<BaseChannelConfig> orDefault(String ownerName, String channelName) {
BaseChannelConfig defaultConfig = getDefault();
if (ownerName == null && channelName.contains(":")) {
String[] parts = channelName.split(":", 2);
if (parts.length == 2) {
ownerName = parts[0];
channelName = parts[1];
}
}
return new OrDefault<>(
get(ownerName, channelName),
defaultConfig
@ -159,14 +182,15 @@ public class ChannelConfigHelper {
public BaseChannelConfig get(String ownerName, String channelName) {
if (ownerName != null) {
BaseChannelConfig config = channels().get(ownerName + ":" + channelName);
ownerName = ownerName.toLowerCase(Locale.ROOT);
BaseChannelConfig config = findChannel(ownerName + ":" + channelName);
if (config != null) {
return config;
}
GameChannel gameChannel = nameToChannelCache.get(channelName);
if (gameChannel != null && gameChannel.getOwnerName().equals(ownerName)) {
config = channels().get(channelName);
config = findChannel(channelName);
return config;
}
return null;