Skip to content

Commit 90af8b8

Browse files
committed
Update dependencies
1 parent 959fd37 commit 90af8b8

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

bukkit/src/main/java/io/wdsj/asw/bukkit/AdvancedSensitiveWords.java

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.github.houbb.sensitive.word.api.IWordResultCondition;
1111
import com.github.houbb.sensitive.word.bs.SensitiveWordBs;
1212
import com.github.houbb.sensitive.word.support.allow.WordAllows;
13+
import com.github.houbb.sensitive.word.support.check.WordChecks;
1314
import com.github.houbb.sensitive.word.support.deny.WordDenys;
1415
import com.github.houbb.sensitive.word.support.resultcondition.WordResultConditions;
1516
import com.github.houbb.sensitive.word.support.tag.WordTags;
@@ -233,7 +234,27 @@ public void doInitTasks() {
233234
} else {
234235
wD.set(WordDenys.chains(new WordDeny(), new ExternalWordDeny(this)));
235236
}
236-
sensitiveWordBs = SensitiveWordBs.newInstance().ignoreCase(settingsManager.getProperty(PluginSettings.IGNORE_CASE)).ignoreWidth(settingsManager.getProperty(PluginSettings.IGNORE_WIDTH)).ignoreNumStyle(settingsManager.getProperty(PluginSettings.IGNORE_NUM_STYLE)).ignoreChineseStyle(settingsManager.getProperty(PluginSettings.IGNORE_CHINESE_STYLE)).ignoreEnglishStyle(settingsManager.getProperty(PluginSettings.IGNORE_ENGLISH_STYLE)).ignoreRepeat(settingsManager.getProperty(PluginSettings.IGNORE_REPEAT)).enableNumCheck(settingsManager.getProperty(PluginSettings.ENABLE_NUM_CHECK)).enableEmailCheck(settingsManager.getProperty(PluginSettings.ENABLE_EMAIL_CHECK)).enableUrlCheck(settingsManager.getProperty(PluginSettings.ENABLE_URL_CHECK)).enableWordCheck(settingsManager.getProperty(PluginSettings.ENABLE_WORD_CHECK)).wordResultCondition(condition).wordDeny(wD.get()).wordAllow(wA).numCheckLen(settingsManager.getProperty(PluginSettings.NUM_CHECK_LEN)).wordReplace(new WordReplace()).wordTag(WordTags.none()).charIgnore(new CharIgnore()).enableIpv4Check(settingsManager.getProperty(PluginSettings.ENABLE_IP_CHECK)).init();
237+
sensitiveWordBs = SensitiveWordBs.newInstance()
238+
.ignoreCase(settingsManager.getProperty(PluginSettings.IGNORE_CASE))
239+
.ignoreWidth(settingsManager.getProperty(PluginSettings.IGNORE_WIDTH))
240+
.ignoreNumStyle(settingsManager.getProperty(PluginSettings.IGNORE_NUM_STYLE))
241+
.ignoreChineseStyle(settingsManager.getProperty(PluginSettings.IGNORE_CHINESE_STYLE))
242+
.ignoreEnglishStyle(settingsManager.getProperty(PluginSettings.IGNORE_ENGLISH_STYLE))
243+
.ignoreRepeat(settingsManager.getProperty(PluginSettings.IGNORE_REPEAT))
244+
.enableNumCheck(settingsManager.getProperty(PluginSettings.ENABLE_NUM_CHECK))
245+
.enableEmailCheck(settingsManager.getProperty(PluginSettings.ENABLE_EMAIL_CHECK))
246+
.enableUrlCheck(settingsManager.getProperty(PluginSettings.ENABLE_URL_CHECK))
247+
.enableWordCheck(settingsManager.getProperty(PluginSettings.ENABLE_WORD_CHECK))
248+
.wordResultCondition(condition)
249+
.wordCheckUrl(settingsManager.getProperty(PluginSettings.URL_CHECK_NO_PREFIX) ? WordChecks.urlNoPrefix() : WordChecks.url())
250+
.wordDeny(wD.get())
251+
.wordAllow(wA)
252+
.numCheckLen(settingsManager.getProperty(PluginSettings.NUM_CHECK_LEN))
253+
.wordReplace(new WordReplace())
254+
.wordTag(WordTags.none())
255+
.charIgnore(new CharIgnore())
256+
.enableIpv4Check(settingsManager.getProperty(PluginSettings.ENABLE_IP_CHECK))
257+
.init();
237258
isInitialized = true;
238259
});
239260
}

bukkit/src/main/java/io/wdsj/asw/bukkit/setting/PluginSettings.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ public class PluginSettings implements SettingsHolder {
255255
"Whether to enable URL checks (http://xxx.xxx)"})
256256
public static final Property<Boolean> ENABLE_URL_CHECK = newProperty("Plugin.enableUrlCheck", true);
257257

258+
@Comment({"网址检测是否不需要https前缀",
259+
"Whether to detect urls without https prefix"})
260+
public static final Property<Boolean> URL_CHECK_NO_PREFIX = newProperty("Plugin.urlCheckNoPrefix", false);
261+
258262
@Comment({"启用敏感英文单词检测",
259263
"Whether to enable sensitive English word checks"})
260264
public static final Property<Boolean> ENABLE_WORD_CHECK = newProperty("Plugin.enableWordCheck", true);

bukkit/src/main/kotlin/io/wdsj/asw/bukkit/util/cache/BookCache.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ object BookCache {
6262
/**
6363
* Inner class to encapsulate the processed book content and its list of sensitive words.
6464
*/
65-
private class BookCacheEntry(val processedContent: String, val sensitiveWordList: List<String>)
65+
private data class BookCacheEntry(val processedContent: String, val sensitiveWordList: List<String>)
6666
}

0 commit comments

Comments
 (0)