[Fix] SettingProperties 修复在初次设置群组配置时未创建该群组所属Properties导致NPE的问题;

[Update] BotAdminCommandProcess 更新日志内容及命令返回信息;
[Change] BotCommandProcess 调整配置项key格式;
This commit is contained in:
2020-05-06 10:55:32 +08:00
parent b969bb29b2
commit cb42aadb15
3 changed files with 16 additions and 6 deletions

View File

@ -218,7 +218,7 @@ public class BotCommandProcess {
try {
int index = 0;
int itemLimit = 10;
String itemLimitPropertyKey = "ranking.ItemCountLimit";
String itemLimitPropertyKey = "ranking.itemCountLimit";
try {
itemLimit = Integer.parseInt(SettingProperties
.getProperty(SettingProperties.GLOBAL, itemLimitPropertyKey, "10"));
@ -379,7 +379,7 @@ public class BotCommandProcess {
int limit = 8;
try {
limit = Integer.parseInt(SettingProperties.
getProperty(SettingProperties.GLOBAL, "search.ItemCountLimit", "8"));
getProperty(SettingProperties.GLOBAL, "search.itemCountLimit", "8"));
} catch (Exception e) {
log.warn("参数转换异常!将使用默认值(" + limit + ")", e);
}
@ -424,7 +424,7 @@ public class BotCommandProcess {
//pageCount
String imageMsg = getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
if (isNoSafe(illustId, SettingProperties.getProperties(SettingProperties.GLOBAL), true)) {
if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), true)) {
log.warn("作品Id {} 为R-18作品, 跳过.", illustId);
continue;
} else if(isReported(illustId)) {