mirror of
https://github.com/LamGC/ContentGrabbingJi.git
synced 2025-07-02 05:17:26 +00:00
Compare commits
43 Commits
v2.5.2-202
...
v2.5.2-202
Author | SHA1 | Date | |
---|---|---|---|
4589624b9b | |||
033fd0188b | |||
4318869846 | |||
749b89e668 | |||
9ce18469e6 | |||
e803d2161b | |||
3fbf80f233 | |||
8b8ef7e744 | |||
7fbdf28ec8 | |||
b29482927c | |||
69da2b02ac | |||
eb2de09859 | |||
ef70ac77cb | |||
b4e9fdab7d | |||
5c5827123d | |||
2bfb78304c | |||
637ea46b9a | |||
f5140a7a1e | |||
0fafddc715 | |||
4c03a0f7d9 | |||
ee02072b2d | |||
3f6c87da3c | |||
d45cd8aab5 | |||
598d6ef205 | |||
2190ef1b59 | |||
fcc522c057 | |||
5a81604d94 | |||
376306e404 | |||
0fe69253ed | |||
fe8bf16d3a | |||
99c66babec | |||
cb8b01fd74 | |||
1f48b3ffdc | |||
68feed8d3c | |||
d89711b0b9 | |||
a3376e96ee | |||
33d18cef6b | |||
7aa00ff98b | |||
e956e36584 | |||
8e27221457 | |||
a5fca68ef5 | |||
8edb728fe9 | |||
cc05af8a24 |
26
.github/ISSUE_TEMPLATE/Bug_Report.md
vendored
Normal file
26
.github/ISSUE_TEMPLATE/Bug_Report.md
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
---
|
||||
name: Bug Report
|
||||
about: Use this template to feedback bugs.
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
## Environmental information ##
|
||||
OS(e.g: Windows 10 1909):
|
||||
Java(e.g: Oracle Jdk 8.242):
|
||||
Issue version(versionTag or commitId):
|
||||
|
||||
## Problem description ##
|
||||
// Describe the problem in as much detail as possible here
|
||||
|
||||
## Expected behavior ##
|
||||
// What will this function do under normal circumstances?
|
||||
|
||||
## Actual behavior ##
|
||||
// But what does this feature actually look like?
|
||||
|
||||
## Recurrence steps ##
|
||||
// What can we do to recreate this situation?
|
||||
1.
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -6,7 +6,7 @@
|
||||
|
||||
# Ignore Idea files
|
||||
/.idea/
|
||||
/CGJ_2.iml
|
||||
*.iml
|
||||
|
||||
# Ignore Visual Studio Code files
|
||||
.classpath
|
||||
|
39
README.md
Normal file
39
README.md
Normal file
@ -0,0 +1,39 @@
|
||||
# ContentGrabbingJi
|
||||
Pixiv爬虫一只,同时也是一个机器人/插件!
|
||||
|
||||
## 支持的机器人平台 ##
|
||||
- [Mirai](https://github.com/mamoe/mirai)
|
||||
- [CoolQ](https://cqp.cc)(基于[`SpringCQ`](https://github.com/lz1998/spring-cq), 不支持多账号使用, 需要使用[`CQHttp`](https://cqhttp.cc/)插件)
|
||||
|
||||
## Usage ##
|
||||
> 注意: 运行色图姬前, 你需要准备一个Pixiv账号的会话Cookie存储文件, 否则色图姬将无法运行.
|
||||
> 详见[PixivLoginProxyServer](https://github.com/LamGC/PixivLoginProxyServer)项目的[Readme](https://github.com/LamGC/PixivLoginProxyServer/blob/master/README.md).
|
||||
|
||||
### Arguments ###
|
||||
> ENV参数名为环境变量名, 用于给Docker容器提供设置方式.
|
||||
|
||||
- 通用参数
|
||||
- `-proxy` / `ENV: CGJ_PROXY`: (**可选**) 设置代理
|
||||
- 格式: `协议://地址:端口`
|
||||
- 示例: `socks5://127.0.0.1:1080`
|
||||
- 机器人参数
|
||||
- `-botDataDir` / `ENV: CGJ_BOT_DATA_DIR`: (**可选**) 设置`botMode`运行模式下机器人数据存储目录
|
||||
- 格式: `路径`
|
||||
- 示例: `./data`
|
||||
- 默认: `./`
|
||||
- `-redisAddress` / `ENV: CGJ_REDIS_URI`: (**必填, 计划支持可选**) Redis服务器地址
|
||||
- 格式: `地址:端口`
|
||||
- 示例: `127.0.0.1:6379`
|
||||
|
||||
> 例如以BotMode启动应用: `java -jar CGJ.jar botMode -proxy "socks5://127.0.0.1:1080 -redisAddress 127.0.0.1:6379`
|
||||
|
||||
### Commands ###
|
||||
- `pluginMode`: CoolQ插件模式(依赖[酷Q机器人](https://cqp.cc/), 支持与CoolQ其他插件共存, 性能耗损大)
|
||||
- `botMode`: Mirai独立模式(机器人独立运行, 不支持与其他插件共存, 性能耗损小)
|
||||
- `collectionDownload`: 收藏下载, 以原图画质下载Cookie所属账号的所有收藏作品
|
||||
- `getRecommends`: 将访问主页获得的推荐作品全部以原图画质下载
|
||||
- `getRankingIllust`: 以原图画质下载指定排行榜类型的全部作品
|
||||
- `search`: 搜索指定内容并获取相关作品信息(不下载)
|
||||
|
||||
> 注意: 除去机器人模式外, 其他功能后续可能会出现改动.
|
||||
|
149
documents/interfaces/Pixiv排行榜接口.md
Normal file
149
documents/interfaces/Pixiv排行榜接口.md
Normal file
@ -0,0 +1,149 @@
|
||||
## Pixiv 排行榜获取接口 ##
|
||||
|
||||
### 接口地址 ###
|
||||
```
|
||||
GET https://www.pixiv.net/ranking.php
|
||||
```
|
||||
|
||||
- 需要登录: `是`
|
||||
### 参数 ###
|
||||
> 提示: 该接口参数较为复杂,请结合表格查看
|
||||
|
||||
- `date`: 排行榜时间,与Mode有关 (格式: yyyy-MM-dd)
|
||||
- `mode`: 排行榜模式
|
||||
- `daily`: 每天
|
||||
- `weekly`: 每周
|
||||
- `monthly`: 每月
|
||||
- `rookie`: 新人
|
||||
- `original`: 原创
|
||||
- `male`: 男性偏好
|
||||
- `female`: 女性偏好
|
||||
- `daily_r18`: 每天 - 仅成人内容
|
||||
- `weekly_r18`: 每周 - 仅成人内容
|
||||
- `male_r18`: 男性偏好 - 仅成人内容
|
||||
- `female_r18`: 女性偏好 - 仅成人内容
|
||||
- `content`: 排行榜内容类型
|
||||
- `all`: 全部内容 (实际使用请直接省略`content`参数)
|
||||
- `illust`: 插画
|
||||
- `ugoira`: 动图
|
||||
- `manga`: 漫画
|
||||
- `p`: 排行榜页数 (如超出范围,则返回错误信息)
|
||||
- `format`: 格式
|
||||
- `json`: 以Json返回数据
|
||||
- (留空): 返回完整的排行榜网页
|
||||
|
||||
#### 参数关系表 ####
|
||||
`mode`参数与`content`参数有一些支持关系,并不是所有的`mode`参数都能被所有的`content`参数支持,故附下表。
|
||||
|
||||
参数 |all|illust|ugoira|manga
|
||||
:-: |:-:| :-: | :-: | :-:
|
||||
daily |`√`|`√`|`√`|`√`
|
||||
weekly |`√`|`√`|`√`|`√`
|
||||
monthly |`√`|`√`|×|`√`
|
||||
rookie |`√`|`√`|×|`√`
|
||||
original |`√`|×|×|×
|
||||
male |`√`|×|×|×
|
||||
female |`√`|×|×|×
|
||||
daily_r18 |`√`|`√`|`√`|`√`
|
||||
weekly_r18|`√`|`√`|`√`|`√`
|
||||
male_r18 |`√`|×|×|×
|
||||
female_r18|`√`|×|×|×
|
||||
|
||||
|
||||
### 返回数据 ###
|
||||
#### 数据示例 ####
|
||||
```json
|
||||
{
|
||||
"contents":[
|
||||
{
|
||||
"title":"【伊アオ】髪結い。",
|
||||
"date":"2020年05月31日 14:26",
|
||||
"tags":[
|
||||
"鬼滅の刃",
|
||||
"伊アオ",
|
||||
"嘴平伊之助",
|
||||
"神崎アオイ",
|
||||
"鬼滅の刃1000users入り"
|
||||
],
|
||||
"url":"https:\/\/i.pximg.net\/c\/240x480\/img-master\/img\/2020\/05\/31\/14\/26\/41\/81987309_p0_master1200.jpg",
|
||||
"illust_type":"0",
|
||||
"illust_book_style":"0",
|
||||
"illust_page_count":"1",
|
||||
"user_name":"シロウ",
|
||||
"profile_img":"https:\/\/i.pximg.net\/user-profile\/img\/2020\/05\/01\/02\/18\/18\/18450100_ac34872504959f8cc26f086248066b39_50.png",
|
||||
"illust_content_type":{
|
||||
"sexual":0,
|
||||
"lo":false,
|
||||
"grotesque":false,
|
||||
"violent":false,
|
||||
"homosexual":false,
|
||||
"drug":false,
|
||||
"thoughts":false,
|
||||
"antisocial":false,
|
||||
"religion":false,
|
||||
"original":false,
|
||||
"furry":false,
|
||||
"bl":false,
|
||||
"yuri":false
|
||||
},
|
||||
"illust_series":false,
|
||||
"illust_id":81987309,
|
||||
"width":600,
|
||||
"height":2226,
|
||||
"user_id":174995,
|
||||
"rank":51,
|
||||
"yes_rank":83,
|
||||
"rating_count":707,
|
||||
"view_count":19759,
|
||||
"illust_upload_timestamp":1590902801,
|
||||
"attr":"",
|
||||
"is_bookmarked":false,
|
||||
"bookmarkable":true
|
||||
}, // ....
|
||||
],
|
||||
"mode":"daily",
|
||||
"content":"all",
|
||||
"page":2,
|
||||
"prev":1,
|
||||
"next":3,
|
||||
"date":"20200601",
|
||||
"prev_date":"20200531",
|
||||
"next_date":false,
|
||||
"rank_total":500
|
||||
}
|
||||
```
|
||||
|
||||
#### 参数详解 ####
|
||||
- `contents`: (`Object[]`) 排行榜数组, 最多50行排行榜信息
|
||||
- `illust_id`: (`number`) 作品Id
|
||||
- `title`: (`string`) 作品标题
|
||||
- `attr`: (`string`) 不明?
|
||||
- `tags`: (`string[]`) 原始标签数组
|
||||
- `url`: (`string`) 预览画质的原始尺寸图下载链接(存在防盗链)
|
||||
- `illust_type`: (`string` -> `number`) 作品类型
|
||||
- `illust_book_style`: (`string` -> `number`) 不明?
|
||||
- `illust_page_count`: (`string` -> `number`) 作品页数
|
||||
- `user_name`: (`string`) 画师用户名
|
||||
- `user_id`: (`number`) 画师用户Id
|
||||
- `profile_img`: (`string`) 画师用户头像
|
||||
- `illust_content_type`: (`Object`) 作品内容信息
|
||||
- 待补充
|
||||
- `illust_series`: (`boolean`) 不明?
|
||||
- `width`: (`number`) 作品宽度(建议以原图为准)
|
||||
- `height`: (`number`) 作品高度(建议以原图为准)
|
||||
- `rank`: (`number`) 本期排行榜排名
|
||||
- `yes_rank`: (`number`) 上期同排行榜排名
|
||||
- `rating_count`:
|
||||
- `view_count`: (`number`) 浏览量
|
||||
- `illust_upload_timestamp`: (`number`) 作品上传时间戳(10位)
|
||||
- `is_bookmarked`: (`boolean`) 不明?
|
||||
- `bookmarkable`: (`boolean`) 不明?
|
||||
- `mode`: (`string`) 请求的排行榜模式字段
|
||||
- `content`: (`string`) 请求的内容类型
|
||||
- `page`: (`number`) 当前排行榜页数
|
||||
- `prev`: (`string` / `boolean`) 上一页排行榜页数, 如果该请求的页数为首页, 则为`false`
|
||||
- `next`: (`string` / `boolean`) 下一页排行榜页数, 如果该请求的页数为页尾, 则为`false`
|
||||
- `date`: (`string`) 排行榜日期(格式:`yyyyMMdd`)
|
||||
- `prev_date`: (`string` / `boolean`) 如果存在上一期排行榜, 则该属性为上期排行榜日期字符串, 否则为`false`
|
||||
- `next_date`: (`string` / `boolean`) 如果存在下一期排行榜, 则该属性为下期排行榜日期字符串, 否则为`false`
|
||||
- `rank_total`: (`number`) 该排行榜的总排行数
|
@ -1,9 +1,17 @@
|
||||
## Pixiv内容搜索接口 ##
|
||||
接口地址:
|
||||
### 说明 ###
|
||||
> 注意: 本接口可能会影响Pixiv对账号的行为判断(猜测,不一定会)
|
||||
|
||||
该接口用于在Pixiv搜索内容。
|
||||
|
||||
### 接口地址 ###
|
||||
```
|
||||
GET https://www.pixiv.net/ajax/search/{Type}/{Content}?{参数...}
|
||||
GET https://www.pixiv.net/ajax/search/{Type}/{Content}?{Param...}
|
||||
```
|
||||
变量名:
|
||||
|
||||
- 需要登录: `是`
|
||||
|
||||
### Url参数 ###
|
||||
- `Type`: 内容类型
|
||||
- illustrations(插画)
|
||||
- top(推荐)
|
||||
@ -11,6 +19,40 @@ GET https://www.pixiv.net/ajax/search/{Type}/{Content}?{参数...}
|
||||
- novels(小说)
|
||||
- `Content`: 搜索内容
|
||||
|
||||
### 参数 ###
|
||||
#### 必填 ####
|
||||
- `word`: 与搜索内容一致 (经测试似乎可以省略)
|
||||
- `s_mode`: 匹配模式
|
||||
- `s_tag`: 标签,部分一致
|
||||
- `s_tag_full`: 标签,完全一致
|
||||
- `s_tc`: 标签和说明文字
|
||||
- `type`: 作品类型
|
||||
- `all`: 插画、漫画和动图
|
||||
- `illust_and_ugoira`: 插画和动图
|
||||
- `illust`: 仅插画
|
||||
- `manga`: 仅漫画
|
||||
- `ugoira`: 仅动图
|
||||
- `p`: 指定页数 (当指定页数超出范围后,`body.illust.data`为空数组)
|
||||
- `order`: 排序设置
|
||||
- `date`: 按时间从旧到新
|
||||
- `date_d`: 按时间从新到旧
|
||||
- `(Unknown)`: 未知, 猜测是会员功能的热门搜索
|
||||
- `mode`: 内容分级设置
|
||||
- `all`: 全部内容
|
||||
- `safe`: 排除成人内容
|
||||
- `r18`: 仅成人内容
|
||||
|
||||
#### 选填 ####
|
||||
- `wlt`: 作品最低宽度(px)
|
||||
- `wgt`: 作品最高宽度(px)
|
||||
- `hlt`: 作品最低高度(px)
|
||||
- `hgt`: 作品最高高度(px)
|
||||
- `ratio`: 作品横宽比过滤 (初步测试表明,该参数无法指定横宽比,可能暂不支持该功能)
|
||||
- `0.5`: 仅横图
|
||||
- `-0.5`: 仅纵图
|
||||
- `0`: 仅正方形图
|
||||
- `tool`: 限定作品绘制工具
|
||||
- `scd`: 过滤作品发布时间 - 开始时间(yyyy-MM-dd)
|
||||
- `scd`: 过滤作品发布时间 - 结束时间(yyyy-MM-dd)
|
||||
- `(Unknown)`: 最小收藏数 (该参数为会员限定功能,后续补充)
|
||||
|
||||
参数列表:
|
||||
- `word`
|
||||
|
@ -1,14 +1,16 @@
|
||||
## Pixiv首页数据接口 ##
|
||||
|
||||
说明:
|
||||
该接口涉及用户账户隐私, 不要尝试对该接口返回数据做不安全云端存储, 或未经用户允许的发送出去.
|
||||
### 说明 ###
|
||||
> 注意: 该接口涉及用户账户隐私, 不要尝试对该接口返回数据做不安全云端存储, 或未经用户允许的发送出去.
|
||||
|
||||
接口地址:
|
||||
该接口用于获取Pixiv推荐给账号的首页作品信息,每次调用都会有不同结果。
|
||||
|
||||
### 接口地址 ###
|
||||
```
|
||||
GET https://www.pixiv.net/ajax/top/{type}?mode={mode}&lang={lang}
|
||||
```
|
||||
|
||||
参数:
|
||||
### 参数 ###
|
||||
- `type`: 首页类型
|
||||
- `illust`: 插画
|
||||
- `manga`: 漫画
|
||||
|
4
pom.xml
4
pom.xml
@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>net.lamgc</groupId>
|
||||
<artifactId>ContentGrabbingJi</artifactId>
|
||||
<version>2.5.2-20200520.1-SNAPSHOT</version>
|
||||
<version>2.5.2-20200604.2-SNAPSHOT</version>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
@ -86,7 +86,7 @@
|
||||
<dependency>
|
||||
<groupId>net.lamgc</groupId>
|
||||
<artifactId>java-utils</artifactId>
|
||||
<version>1.2.0_20200514.1-SNAPSHOT</version>
|
||||
<version>1.2.0_20200517.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
@ -7,13 +7,15 @@ import com.google.gson.Gson;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import net.lamgc.cgj.bot.boot.ApplicationBoot;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import net.lamgc.cgj.bot.framework.cli.ConsoleMain;
|
||||
import net.lamgc.cgj.bot.framework.coolq.CQConfig;
|
||||
import net.lamgc.cgj.bot.framework.mirai.MiraiMain;
|
||||
import net.lamgc.cgj.pixiv.PixivDownload;
|
||||
import net.lamgc.cgj.pixiv.PixivSearchBuilder;
|
||||
import net.lamgc.cgj.pixiv.PixivURL;
|
||||
import net.lamgc.plps.PixivLoginProxyServer;
|
||||
import net.lamgc.utils.base.ArgumentsProperties;
|
||||
import net.lamgc.utils.base.runner.Argument;
|
||||
import net.lamgc.utils.base.runner.ArgumentsRunner;
|
||||
import net.lamgc.utils.base.runner.Command;
|
||||
@ -29,7 +31,6 @@ import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
@ -42,48 +43,24 @@ import java.util.zip.ZipOutputStream;
|
||||
@SpringBootApplication
|
||||
public class Main {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(Main.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(Main.class);
|
||||
|
||||
private final static File storeDir = new File("store/");
|
||||
|
||||
public static CookieStore cookieStore;
|
||||
private static CookieStore cookieStore;
|
||||
|
||||
public static HttpHost proxy;
|
||||
private static HttpHost proxy;
|
||||
|
||||
public static void main(String[] args) throws IOException, ClassNotFoundException {
|
||||
log.trace("ContentGrabbingJi 正在启动...");
|
||||
log.debug("Args: {}, LogsPath: {}", Arrays.toString(args), System.getProperty("cgj.logsPath"));
|
||||
log.debug("运行目录: {}", System.getProperty("user.dir"));
|
||||
ArgumentsProperties argsProp = new ArgumentsProperties(args);
|
||||
|
||||
ApplicationBoot.initialApplication(args);
|
||||
log.debug("botDataDir: {}", System.getProperty("cgj.botDataDir"));
|
||||
|
||||
if(!getSettingToSysProp(argsProp, "proxy", null)) {
|
||||
getEnvSettingToSysProp("CGJ_PROXY", "proxy", null);
|
||||
}
|
||||
|
||||
String proxyAddress = System.getProperty("cgj.proxy");
|
||||
if(!Strings.isNullOrEmpty(proxyAddress)) {
|
||||
URL proxyUrl = new URL(proxyAddress);
|
||||
proxy = new HttpHost(proxyUrl.getHost(), proxyUrl.getPort());
|
||||
log.info("已启用Http协议代理:{}", proxy.toHostString());
|
||||
} else {
|
||||
proxy = null;
|
||||
}
|
||||
|
||||
if(!storeDir.exists() && !storeDir.mkdirs()) {
|
||||
log.error("创建文件夹失败!");
|
||||
}
|
||||
|
||||
if(!getSettingToSysProp(argsProp, "botDataDir", "./") &&
|
||||
!getEnvSettingToSysProp("CGJ_BOT_DATA_DIR", "botDataDir", "./")) {
|
||||
log.warn("未设置botDataDir, 当前运行目录将作为酷Q机器人所在目录.");
|
||||
}
|
||||
if(!getSettingToSysProp(argsProp, "redisAddress", "127.0.0.1") &&
|
||||
!getEnvSettingToSysProp("CGJ_REDIS_URI", "redisAddress", "127.0.0.1")) {
|
||||
log.warn("未设置RedisAddress, 将使用默认值连接Redis服务器(127.0.0.1:6379)");
|
||||
}
|
||||
|
||||
File cookieStoreFile = new File(System.getProperty("cgj.botDataDir"), "cookies.store");
|
||||
proxy = BotGlobal.getGlobal().getProxy();
|
||||
File cookieStoreFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
|
||||
if(!cookieStoreFile.exists()) {
|
||||
log.warn("未找到cookies.store文件, 是否启动PixivLoginProxyServer? (yes/no)");
|
||||
try(Scanner scanner = new Scanner(System.in)) {
|
||||
@ -98,43 +75,14 @@ public class Main {
|
||||
}
|
||||
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cookieStoreFile));
|
||||
cookieStore = (CookieStore) ois.readObject();
|
||||
BotGlobal.getGlobal().setCookieStore(cookieStore);
|
||||
ois.close();
|
||||
log.info("已载入CookieStore");
|
||||
|
||||
log.debug("传入参数: {}", Arrays.toString(args));
|
||||
|
||||
ArgumentsRunner.run(Main.class, args);
|
||||
}
|
||||
|
||||
/**
|
||||
* 从ArgumentsProperties获取设置项到System Properties
|
||||
* @param prop ArgumentsProperties对象
|
||||
* @param key 设置项key
|
||||
* @param defaultValue 默认值
|
||||
* @return 如果成功从ArgumentsProperties获得设置项, 返回true, 如未找到(使用了defaultValue或null), 返回false;
|
||||
*/
|
||||
private static boolean getSettingToSysProp(ArgumentsProperties prop, String key, String defaultValue) {
|
||||
if(prop.containsKey(key)) {
|
||||
log.info("{}: {}", key, prop.getValue(key));
|
||||
System.setProperty("cgj." + key, prop.getValue(key));
|
||||
return true;
|
||||
} else {
|
||||
if(defaultValue != null) {
|
||||
System.setProperty("cgj." + key, defaultValue);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean getEnvSettingToSysProp(String envKey, String sysPropKey, String defaultValue) {
|
||||
String env = System.getenv(envKey);
|
||||
if(env != null) {
|
||||
System.setProperty("cgj." + sysPropKey, env);
|
||||
return true;
|
||||
} else if(defaultValue != null) {
|
||||
System.setProperty("cgj." + sysPropKey, defaultValue);
|
||||
}
|
||||
return false;
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
@Command
|
||||
@ -144,12 +92,14 @@ public class Main {
|
||||
main.close();
|
||||
}
|
||||
|
||||
@Command
|
||||
public static void consoleMode() {
|
||||
ConsoleMain.start();
|
||||
}
|
||||
|
||||
@Command
|
||||
public static void pluginMode(@Argument(name = "args", force = false) String argsStr) {
|
||||
if(!System.getProperty("cgj.botDataDir").endsWith("\\") && !System.getProperty("cgj.botDataDir").endsWith("/")) {
|
||||
System.setProperty("cgj.botDataDir", System.getProperty("cgj.botDataDir") + "/");
|
||||
}
|
||||
log.info("酷Q机器人根目录: {}", System.getProperty("cgj.botDataDir"));
|
||||
log.info("酷Q机器人根目录: {}", BotGlobal.getGlobal().getDataStoreDir().getPath());
|
||||
CQConfig.init();
|
||||
Pattern pattern = Pattern.compile("/\\s*(\".+?\"|[^:\\s])+((\\s*:\\s*(\".+?\"|[^\\s])+)|)|(\".+?\"|[^\"\\s])+");
|
||||
Matcher matcher = pattern.matcher(Strings.nullToEmpty(argsStr));
|
||||
@ -165,7 +115,7 @@ public class Main {
|
||||
@Command
|
||||
public static void collectionDownload() throws IOException {
|
||||
PixivDownload pixivDownload = new PixivDownload(Objects.requireNonNull(cookieStore), proxy);
|
||||
File outputFile = new File(storeDir, "collection.zip");
|
||||
File outputFile = new File(getStoreDir(), "collection.zip");
|
||||
if(!outputFile.exists() && !outputFile.createNewFile()) {
|
||||
log.error("文件创建失败: " + outputFile.getAbsolutePath());
|
||||
}
|
||||
@ -192,10 +142,10 @@ public class Main {
|
||||
PixivDownload pixivDownload = new PixivDownload(Objects.requireNonNull(cookieStore), proxy);
|
||||
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
|
||||
int id = 1;
|
||||
File outputFile = new File(storeDir, "recommends-" + date + "-" + id + ".zip");
|
||||
File outputFile = new File(getStoreDir(), "recommends-" + date + "-" + id + ".zip");
|
||||
while(outputFile.exists()) {
|
||||
id++;
|
||||
outputFile = new File(storeDir, "recommends-" + date + "-" + id + ".zip");
|
||||
outputFile = new File(getStoreDir(), "recommends-" + date + "-" + id + ".zip");
|
||||
}
|
||||
|
||||
if(!outputFile.createNewFile()) {
|
||||
@ -259,10 +209,10 @@ public class Main {
|
||||
}
|
||||
|
||||
int id = 1;
|
||||
File outputFile = new File(storeDir, "ranking" + rankingMode.modeParam + "-" + date + "-" + id + ".zip");
|
||||
File outputFile = new File(getStoreDir(), "ranking" + rankingMode.modeParam + "-" + date + "-" + id + ".zip");
|
||||
while(outputFile.exists()) {
|
||||
id++;
|
||||
outputFile = new File(storeDir, "ranking" + rankingMode.modeParam + "-" + date + "-" + id + ".zip");
|
||||
outputFile = new File(getStoreDir(), "ranking" + rankingMode.modeParam + "-" + date + "-" + id + ".zip");
|
||||
}
|
||||
|
||||
if(!outputFile.createNewFile()) {
|
||||
@ -401,7 +351,7 @@ public class Main {
|
||||
|
||||
private static void saveCookieStoreToFile() throws IOException {
|
||||
log.info("正在保存CookieStore...");
|
||||
File outputFile = new File(System.getProperty("cgj.botDataDir"), "cookies.store");
|
||||
File outputFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
|
||||
if(!outputFile.exists() && !outputFile.createNewFile()){
|
||||
log.error("保存CookieStore失败.");
|
||||
return;
|
||||
@ -450,4 +400,11 @@ public class Main {
|
||||
}
|
||||
}
|
||||
|
||||
private static File getStoreDir() {
|
||||
if(!storeDir.exists() && !storeDir.mkdirs()) {
|
||||
log.error("创建文件夹失败!");
|
||||
}
|
||||
return storeDir;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ import java.util.Objects;
|
||||
*/
|
||||
public abstract class AutoSender {
|
||||
|
||||
private MessageSender messageSender;
|
||||
private final MessageSender messageSender;
|
||||
|
||||
/**
|
||||
* 构造一个自动发送器
|
||||
|
@ -5,6 +5,7 @@ import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import net.lamgc.cgj.bot.message.MessageSenderBuilder;
|
||||
import net.lamgc.cgj.bot.message.MessageSource;
|
||||
import net.lamgc.cgj.pixiv.PixivDownload;
|
||||
@ -20,9 +21,9 @@ import java.util.*;
|
||||
|
||||
public class BotAdminCommandProcess {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class);
|
||||
|
||||
private final static File pushListFile = new File(System.getProperty("cgj.botDataDir"), "pushList.json");
|
||||
private final static File pushListFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "pushList.json");
|
||||
|
||||
private final static Hashtable<Long, JsonObject> pushInfoMap = new Hashtable<>();
|
||||
|
||||
@ -182,8 +183,8 @@ public class BotAdminCommandProcess {
|
||||
@Command
|
||||
public static String savePushList() {
|
||||
try {
|
||||
if(!pushListFile.exists()) {
|
||||
pushListFile.createNewFile();
|
||||
if(!pushListFile.exists() && !pushListFile.createNewFile()) {
|
||||
throw new IOException("文件夹创建失败!(Path: " + pushListFile.getPath() + ")");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.error("PushList.json文件创建失败", e);
|
||||
|
@ -4,9 +4,8 @@ import com.google.common.base.Strings;
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.gson.*;
|
||||
import io.netty.handler.codec.http.HttpHeaderNames;
|
||||
import net.lamgc.cgj.Main;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import net.lamgc.cgj.bot.cache.*;
|
||||
import net.lamgc.cgj.bot.event.BotEventHandler;
|
||||
import net.lamgc.cgj.bot.event.BufferMessageEvent;
|
||||
import net.lamgc.cgj.bot.sort.PreLoadDataComparator;
|
||||
import net.lamgc.cgj.pixiv.PixivDownload;
|
||||
@ -29,6 +28,7 @@ import org.slf4j.LoggerFactory;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
@ -36,11 +36,12 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
@SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter", "SameParameterValue"})
|
||||
public class BotCommandProcess {
|
||||
|
||||
private final static PixivDownload pixivDownload = new PixivDownload(Main.cookieStore, Main.proxy);
|
||||
private final static PixivDownload pixivDownload =
|
||||
new PixivDownload(BotGlobal.getGlobal().getCookieStore(), BotGlobal.getGlobal().getProxy());
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class);
|
||||
|
||||
private final static File imageStoreDir = new File(System.getProperty("cgj.botDataDir"), "data/image/cgj/");
|
||||
private final static File imageStoreDir = new File(BotGlobal.getGlobal().getDataStoreDir(), "data/image/cgj/");
|
||||
private final static Gson gson = new GsonBuilder()
|
||||
.serializeNulls()
|
||||
.create();
|
||||
@ -53,38 +54,38 @@ public class BotCommandProcess {
|
||||
* 作品信息缓存 - 不过期
|
||||
*/
|
||||
private final static CacheStore<JsonElement> illustInfoCache =
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "illustInfo", gson);
|
||||
new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "illustInfo", gson);
|
||||
|
||||
/**
|
||||
* 作品信息预加载数据 - 有效期 2 小时, 本地缓存有效期1 ± 0.25
|
||||
*/
|
||||
private final static CacheStore<JsonElement> illustPreLoadDataCache =
|
||||
CacheStoreUtils.hashLocalHotDataStore(
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "illustPreLoadData", gson),
|
||||
new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "illustPreLoadData", gson),
|
||||
3600000, 900000);
|
||||
/**
|
||||
* 搜索内容缓存, 有效期 2 小时
|
||||
*/
|
||||
private final static CacheStore<JsonElement> searchBodyCache =
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "searchBody", gson);
|
||||
new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "searchBody", gson);
|
||||
|
||||
/**
|
||||
* 排行榜缓存, 不过期
|
||||
*/
|
||||
private final static CacheStore<List<JsonObject>> rankingCache =
|
||||
new JsonObjectRedisListCacheStore(BotEventHandler.redisServer, "ranking", gson);
|
||||
new JsonObjectRedisListCacheStore(BotGlobal.getGlobal().getRedisServer(), "ranking", gson);
|
||||
|
||||
/**
|
||||
* 作品页面下载链接缓存 - 不过期
|
||||
*/
|
||||
private final static CacheStore<List<String>> pagesCache =
|
||||
new StringListRedisCacheStore(BotEventHandler.redisServer, "imagePages");
|
||||
new StringListRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "imagePages");
|
||||
|
||||
/**
|
||||
* 作品报告存储 - 不过期
|
||||
*/
|
||||
public final static CacheStore<JsonElement> reportStore =
|
||||
new JsonRedisCacheStore(BotEventHandler.redisServer, "report", gson);
|
||||
new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "report", gson);
|
||||
|
||||
private final static RankingUpdateTimer updateTimer = new RankingUpdateTimer();
|
||||
|
||||
@ -109,34 +110,27 @@ public class BotCommandProcess {
|
||||
|
||||
@Command(defaultCommand = true)
|
||||
public static String help() {
|
||||
StringBuilder helpStrBuilder = new StringBuilder();
|
||||
helpStrBuilder.append("CGJ Bot使用指南").append("\n");
|
||||
helpStrBuilder.append("使用方法:.cgj <命令> [参数...]").append("\n");
|
||||
helpStrBuilder.append("例如查询作品信息功能:").append("\n");
|
||||
helpStrBuilder.append(".cgj info -id 80846159").append("\n");
|
||||
helpStrBuilder.append("目前可用的命令:").append("\n");
|
||||
helpStrBuilder.append("\t").append("ranking - 获取今天或指定日期排行榜的前10名作品").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-date - 指定查询日期(年-月-日)").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-type - 排行榜类型(illust/插画, ugoira/动图, manga/漫画)").append("\n");
|
||||
|
||||
helpStrBuilder.append("\t").append("search - 搜索指定关键词并显示前10个作品").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-content - 搜索内容").append("\n");
|
||||
|
||||
helpStrBuilder.append("\t").append("link - 获取作品的Pixiv页面").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-id - 作品id").append("\n");
|
||||
|
||||
helpStrBuilder.append("\t").append("info - 获取Pixiv作品信息").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-id - 作品id").append("\n");
|
||||
|
||||
helpStrBuilder.append("\t").append("image - 获取指定作品的图片").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-id - 作品id").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-quality - 图片质量(original/原图 regular/预览图)").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-page - 页数").append("\n");
|
||||
|
||||
helpStrBuilder.append("\t").append("report - 报告不当作品").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-id - 作品Id").append("\n");
|
||||
helpStrBuilder.append("\t\t").append("-msg - 报告原因").append("\n");
|
||||
return helpStrBuilder.toString();
|
||||
return "CGJ Bot使用指南" + "\n" +
|
||||
"使用方法:.cgj <命令> [参数...]" + "\n" +
|
||||
"例如查询作品信息功能:" + "\n" +
|
||||
".cgj info -id 80846159" + "\n" +
|
||||
"目前可用的命令:" + "\n" +
|
||||
"\t" + "ranking - 获取今天或指定日期排行榜的前10名作品" + "\n" +
|
||||
"\t\t" + "-date - 指定查询日期(年-月-日)" + "\n" +
|
||||
"\t\t" + "-type - 排行榜类型(illust/插画, ugoira/动图, manga/漫画)" + "\n" +
|
||||
"\t" + "search - 搜索指定关键词并显示前10个作品" + "\n" +
|
||||
"\t\t" + "-content - 搜索内容" + "\n" +
|
||||
"\t" + "link - 获取作品的Pixiv页面" + "\n" +
|
||||
"\t\t" + "-id - 作品id" + "\n" +
|
||||
"\t" + "info - 获取Pixiv作品信息" + "\n" +
|
||||
"\t\t" + "-id - 作品id" + "\n" +
|
||||
"\t" + "image - 获取指定作品的图片" + "\n" +
|
||||
"\t\t" + "-id - 作品id" + "\n" +
|
||||
"\t\t" + "-quality - 图片质量(original/原图 regular/预览图)" + "\n" +
|
||||
"\t\t" + "-page - 页数" + "\n" +
|
||||
"\t" + "report - 报告不当作品" + "\n" +
|
||||
"\t\t" + "-id - 作品Id" + "\n" +
|
||||
"\t\t" + "-msg - 报告原因" + "\n";
|
||||
}
|
||||
|
||||
/**
|
||||
@ -148,7 +142,7 @@ public class BotCommandProcess {
|
||||
@Command(commandName = "info")
|
||||
public static String artworkInfo(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "id") int illustId) {
|
||||
if(illustId <= 0) {
|
||||
return "错误的作品id!";
|
||||
return "这个作品Id是错误的!";
|
||||
}
|
||||
|
||||
try {
|
||||
@ -157,25 +151,24 @@ public class BotCommandProcess {
|
||||
}
|
||||
|
||||
JsonObject illustPreLoadData = getIllustPreLoadData(illustId, false);
|
||||
StringBuilder builder = new StringBuilder("色图姬帮你了解了这个作品的信息!\n");
|
||||
builder.append("---------------- 作品信息 ----------------");
|
||||
builder.append("\n作品Id: ").append(illustId);
|
||||
builder.append("\n作品标题:").append(illustPreLoadData.get("illustTitle").getAsString());
|
||||
builder.append("\n作者(作者Id):").append(illustPreLoadData.get("userName").getAsString())
|
||||
.append("(").append(illustPreLoadData.get("userId").getAsInt()).append(")");
|
||||
builder.append("\n点赞数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt());
|
||||
builder.append("\n收藏数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt());
|
||||
builder.append("\n围观数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt());
|
||||
builder.append("\n评论数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt());
|
||||
builder.append("\n页数:").append(illustPreLoadData.get(PreLoadDataComparator.Attribute.PAGE.attrName).getAsInt()).append("页");
|
||||
builder.append("\n作品链接:").append(artworksLink(fromGroup, illustId)).append("\n");
|
||||
builder.append("---------------- 作品图片 ----------------\n");
|
||||
builder.append(getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1)).append("\n");
|
||||
builder.append("使用 \".cgj image -id ")
|
||||
.append(illustId)
|
||||
.append("\" 获取原图。\n如有不当作品,可使用\".cgj report -id ")
|
||||
.append(illustId).append("\"向色图姬反馈。");
|
||||
return builder.toString();
|
||||
// 在 Java 6 开始, 编译器会将用'+'进行的字符串拼接将自动转换成StringBuilder拼接
|
||||
return "色图姬帮你了解了这个作品的信息!\n" + "---------------- 作品信息 ----------------" +
|
||||
"\n作品Id: " + illustId +
|
||||
"\n作品标题:" + illustPreLoadData.get("illustTitle").getAsString() +
|
||||
"\n作者(作者Id):" + illustPreLoadData.get("userName").getAsString() +
|
||||
"(" + illustPreLoadData.get("userId").getAsInt() + ")" +
|
||||
"\n点赞数:" + illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt() +
|
||||
"\n收藏数:" + illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt() +
|
||||
"\n围观数:" + illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt() +
|
||||
"\n评论数:" + illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt() +
|
||||
"\n页数:" + illustPreLoadData.get(PreLoadDataComparator.Attribute.PAGE.attrName).getAsInt() + "页" +
|
||||
"\n作品链接:" + artworksLink(fromGroup, illustId) + "\n" +
|
||||
"---------------- 作品图片 ----------------\n" +
|
||||
getImageById(fromGroup, illustId, PageQuality.REGULAR, 1) + "\n" +
|
||||
"使用 \".cgj image -id " +
|
||||
illustId +
|
||||
"\" 获取原图。\n如有不当作品,可使用\".cgj report -id " +
|
||||
illustId + "\"向色图姬反馈。";
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@ -299,8 +292,11 @@ public class BotCommandProcess {
|
||||
return "功能未完成";
|
||||
}
|
||||
|
||||
@Command(commandName = "st")
|
||||
public static String r18Image() {
|
||||
/**
|
||||
* 随机获取一副作品
|
||||
*/
|
||||
@Command(commandName = "random")
|
||||
public static String randomImage() {
|
||||
BufferMessageEvent event = new BufferMessageEvent();
|
||||
RandomRankingArtworksSender artworksSender =
|
||||
new RandomRankingArtworksSender(event, 1, 200,
|
||||
@ -466,8 +462,6 @@ public class BotCommandProcess {
|
||||
PixivURL.getPixivRefererLink(illustId)
|
||||
);
|
||||
|
||||
//pageCount
|
||||
|
||||
String imageMsg = getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
|
||||
if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), true)) {
|
||||
log.warn("作品Id {} 为R-18作品, 跳过.", illustId);
|
||||
@ -579,7 +573,7 @@ public class BotCommandProcess {
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.warn("作品信息无法获取!", e);
|
||||
return "发生网络异常,无法获取图片!";
|
||||
return "(发生网络异常,无法获取图片!)";
|
||||
}
|
||||
|
||||
List<String> pagesList;
|
||||
@ -627,10 +621,16 @@ public class BotCommandProcess {
|
||||
}
|
||||
|
||||
try {
|
||||
ImageCacheStore.executeCacheRequest(new ImageCacheObject(imageCache, illustId, downloadLink, imageFile));
|
||||
Throwable throwable = ImageCacheStore.executeCacheRequest(new ImageCacheObject(imageCache, illustId, downloadLink, imageFile));
|
||||
if(throwable != null) {
|
||||
throw throwable;
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
log.warn("图片缓存被中断", e);
|
||||
return "(错误:图片获取超时)";
|
||||
} catch (Throwable e) {
|
||||
log.error("图片 {} 获取失败:\n{}", illustId + "p" + pageIndex, Throwables.getStackTraceAsString(e));
|
||||
return "(错误: 图片获取出错)";
|
||||
}
|
||||
} else {
|
||||
log.debug("图片 {} 缓存命中.", fileName);
|
||||
@ -646,7 +646,7 @@ public class BotCommandProcess {
|
||||
* @return 返回设定好参数的BotCode
|
||||
*/
|
||||
private static BotCode getImageToBotCode(File targetFile, boolean updateCache) {
|
||||
String fileName = targetFile.getName();
|
||||
String fileName = Objects.requireNonNull(targetFile, "targetFile is null").getName();
|
||||
BotCode code = BotCode.parse(CQCode.image(getImageStoreDir().getName() + "/" + fileName));
|
||||
code.addParameter("absolutePath", targetFile.getAbsolutePath());
|
||||
code.addParameter("imageName", fileName.substring(0, fileName.lastIndexOf(".")));
|
||||
@ -661,7 +661,7 @@ public class BotCommandProcess {
|
||||
illustPreLoadDataCache.clear();
|
||||
pagesCache.clear();
|
||||
searchBodyCache.clear();
|
||||
File imageStoreDir = new File(System.getProperty("cgj.botDataDir") + "data/image/cgj/");
|
||||
File imageStoreDir = new File(BotGlobal.getGlobal().getDataStoreDir(), "data/image/cgj/");
|
||||
File[] listFiles = imageStoreDir.listFiles();
|
||||
if (listFiles == null) {
|
||||
log.debug("图片缓存目录为空或内部文件获取失败!");
|
||||
@ -708,13 +708,6 @@ public class BotCommandProcess {
|
||||
return reportStore.exists(String.valueOf(illustId));
|
||||
}
|
||||
|
||||
/*
|
||||
下一目标:
|
||||
添加定时发图
|
||||
定时发图支持设置关注标签
|
||||
标签....标签支持搜索吧
|
||||
*/
|
||||
|
||||
/**
|
||||
* 检查指定作品是否为r18
|
||||
* @param illustId 作品Id
|
||||
@ -722,13 +715,22 @@ public class BotCommandProcess {
|
||||
* @param returnRaw 是否返回原始值
|
||||
* @return 如果为true, 则不为全年龄
|
||||
* @throws IOException 获取数据时发生异常时抛出
|
||||
* @throws NoSuchElementException 当作品不存在时抛出
|
||||
*/
|
||||
public static boolean isNoSafe(int illustId, Properties settingProp, boolean returnRaw) throws IOException {
|
||||
public static boolean isNoSafe(int illustId, Properties settingProp, boolean returnRaw) throws IOException, NoSuchElementException {
|
||||
boolean rawValue = getIllustInfo(illustId, false).getAsJsonArray("tags").contains(new JsonPrimitive("R-18"));
|
||||
return returnRaw || settingProp == null ? rawValue : rawValue && !settingProp.getProperty("image.allowR18", "false").equalsIgnoreCase("true");
|
||||
}
|
||||
|
||||
private static JsonObject getIllustInfo(int illustId, boolean flushCache) throws IOException {
|
||||
/**
|
||||
* 获取作品信息
|
||||
* @param illustId 作品Id
|
||||
* @param flushCache 强制刷新缓存
|
||||
* @return 返回作品信息
|
||||
* @throws IOException 当Http请求发生异常时抛出
|
||||
* @throws NoSuchElementException 当作品未找到时抛出
|
||||
*/
|
||||
private static JsonObject getIllustInfo(int illustId, boolean flushCache) throws IOException, NoSuchElementException {
|
||||
String illustIdStr = buildSyncKey(Integer.toString(illustId));
|
||||
JsonObject illustInfoObj = null;
|
||||
if (!illustInfoCache.exists(illustIdStr) || flushCache) {
|
||||
@ -809,11 +811,19 @@ public class BotCommandProcess {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取图片存储目录.
|
||||
* <p>每次调用都会检查目录是否存在, 如不存在则会抛出异常</p>
|
||||
* @return 返回File对象
|
||||
* @throws RuntimeException 当目录创建失败时将包装{@link IOException}异常并抛出.
|
||||
*/
|
||||
private static File getImageStoreDir() {
|
||||
if(!imageStoreDir.exists() && !imageStoreDir.mkdirs()) {
|
||||
log.warn("酷Q图片缓存目录失效!(Path: {} )", imageStoreDir.getAbsolutePath());
|
||||
throw new RuntimeException(new IOException("文件夹创建失败!"));
|
||||
if(!imageStoreDir.exists() && !Files.isSymbolicLink(imageStoreDir.toPath())) {
|
||||
if(!imageStoreDir.mkdirs()) {
|
||||
log.warn("酷Q图片缓存目录失效!(Path: {} )", imageStoreDir.getAbsolutePath());
|
||||
throw new RuntimeException(new IOException("文件夹创建失败!"));
|
||||
}
|
||||
}
|
||||
return imageStoreDir;
|
||||
}
|
||||
|
@ -26,13 +26,19 @@ public enum MessageEventExecutionDebugger {
|
||||
|
||||
try {
|
||||
rotation = Integer.parseInt(properties.getProperty("debug.pm.rotation", "5"));
|
||||
} catch(NumberFormatException ignored) {}
|
||||
} catch(NumberFormatException e) {
|
||||
log.warn("配置项 {} 值无效, 将使用默认值.({})", "debug.pm.rotation", rotation);
|
||||
}
|
||||
try {
|
||||
number = Integer.parseInt(properties.getProperty("debug.pm.number", "50"));
|
||||
} catch(NumberFormatException ignored) {}
|
||||
} catch(NumberFormatException e) {
|
||||
log.warn("配置项 {} 值无效, 将使用默认值.({})", "debug.pm.number", number);
|
||||
}
|
||||
try {
|
||||
interval = Integer.parseInt(properties.getProperty("debug.pm.interval", "2500"));
|
||||
} catch(NumberFormatException ignored) {}
|
||||
} catch(NumberFormatException e) {
|
||||
log.warn("配置项 {} 值无效, 将使用默认值.({})", "debug.pm.interval", interval);
|
||||
}
|
||||
|
||||
boolean interrupted = false;
|
||||
Thread currentThread = Thread.currentThread();
|
||||
|
@ -13,8 +13,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
||||
*/
|
||||
public class RandomIntervalSendTimer extends TimerTask {
|
||||
|
||||
private final static Timer timer = new Timer("Thread-RIST");
|
||||
private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class.getName());
|
||||
private final static Timer timer = new Timer("Thread-RIST", true);
|
||||
private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class);
|
||||
private final static Map<Long, RandomIntervalSendTimer> timerMap = new HashMap<>();
|
||||
|
||||
private final long timerId;
|
||||
@ -22,7 +22,7 @@ public class RandomIntervalSendTimer extends TimerTask {
|
||||
private final AutoSender sender;
|
||||
private final long time;
|
||||
private final int floatTime;
|
||||
private AtomicBoolean loop = new AtomicBoolean();
|
||||
private final AtomicBoolean loop = new AtomicBoolean();
|
||||
private final AtomicBoolean start = new AtomicBoolean();
|
||||
private final String hashId = Integer.toHexString(this.hashCode());
|
||||
|
||||
@ -98,7 +98,7 @@ public class RandomIntervalSendTimer extends TimerTask {
|
||||
*/
|
||||
public void start(boolean loop) {
|
||||
this.loop.set(loop);
|
||||
long nextDelay = time + timeRandom.nextInt(floatTime);
|
||||
long nextDelay = time + (floatTime <= 0 ? 0 : timeRandom.nextInt(floatTime));
|
||||
Date nextDate = new Date();
|
||||
nextDate.setTime(nextDate.getTime() + nextDelay);
|
||||
log.info("定时器 {} 下一延迟: {}ms ({})", hashId, nextDelay, nextDate);
|
||||
|
@ -7,7 +7,6 @@ import net.lamgc.cgj.pixiv.PixivURL;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@ -92,8 +91,8 @@ public class RandomRankingArtworksSender extends AutoSender {
|
||||
message.append(BotCommandProcess.getImageById(0, illustId, quality, 1));
|
||||
message.append("\n如有不当作品,可使用\".cgj report -id ").append(illustId).append("\"向色图姬反馈。");
|
||||
getMessageSender().sendMessage(message.toString());
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
log.error("发送随机作品时发生异常", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -27,8 +27,9 @@ public class RankingUpdateTimer {
|
||||
Calendar cal = Calendar.getInstance();
|
||||
cal.setTime(firstRunDate == null ? new Date() : firstRunDate);
|
||||
LocalDate currentLocalDate = LocalDate.now();
|
||||
if(cal.get(Calendar.DAY_OF_YEAR) <= currentLocalDate.getDayOfYear() &&
|
||||
cal.get(Calendar.HOUR_OF_DAY) >= 11 && cal.get(Calendar.MINUTE) >= 30) {
|
||||
if(cal.get(Calendar.DAY_OF_YEAR) < currentLocalDate.getDayOfYear() || (
|
||||
cal.get(Calendar.DAY_OF_YEAR) == currentLocalDate.getDayOfYear() &&
|
||||
(cal.get(Calendar.HOUR_OF_DAY) * 60 + cal.get(Calendar.MINUTE) >= 690))) {
|
||||
cal.set(Calendar.DAY_OF_YEAR, currentLocalDate.getDayOfYear() + 1);
|
||||
}
|
||||
cal.set(Calendar.HOUR_OF_DAY, 11);
|
||||
@ -36,7 +37,7 @@ public class RankingUpdateTimer {
|
||||
cal.set(Calendar.SECOND, 0);
|
||||
cal.set(Calendar.MILLISECOND, 0);
|
||||
|
||||
long delay = cal.getTime().getTime() - (System.currentTimeMillis());
|
||||
long delay = cal.getTime().getTime() - System.currentTimeMillis();
|
||||
log.warn("已设置排行榜定时更新, 首次运行时间: {} ({}min)", cal.getTime(), delay / 1000 / 60);
|
||||
timer.schedule(new TimerTask() {
|
||||
@Override
|
||||
|
@ -1,6 +1,7 @@
|
||||
package net.lamgc.cgj.bot;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -10,7 +11,7 @@ import java.util.*;
|
||||
|
||||
public final class SettingProperties {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(SettingProperties.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(SettingProperties.class);
|
||||
|
||||
private final static File globalPropFile = new File(getPropertiesDir(), "global.properties");
|
||||
private final static Properties globalProp = new Properties();
|
||||
@ -157,7 +158,7 @@ public final class SettingProperties {
|
||||
* @return 返回目录File对象.
|
||||
*/
|
||||
private static File getPropertiesDir() {
|
||||
File propDir = new File(System.getProperty("cgj.botDataDir"), "/setting/");
|
||||
File propDir = new File(BotGlobal.getGlobal().getDataStoreDir(), "/setting/");
|
||||
if(!propDir.exists() && !propDir.mkdirs()) {
|
||||
log.warn("Setting文件夹创建失败!");
|
||||
}
|
||||
|
46
src/main/java/net/lamgc/cgj/bot/boot/ApplicationBoot.java
Normal file
46
src/main/java/net/lamgc/cgj/bot/boot/ApplicationBoot.java
Normal file
@ -0,0 +1,46 @@
|
||||
package net.lamgc.cgj.bot.boot;
|
||||
|
||||
import net.lamgc.cgj.bot.event.BotEventHandler;
|
||||
import net.lamgc.cgj.util.PropertiesUtils;
|
||||
import net.lamgc.utils.base.ArgumentsProperties;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public final class ApplicationBoot {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(ApplicationBoot.class);
|
||||
|
||||
private ApplicationBoot() {}
|
||||
|
||||
/**
|
||||
* 初始化应用.
|
||||
* <p>该方法不会初始化机器人, 仅初始化应用所需的配置信息.</p>
|
||||
*/
|
||||
public static void initialApplication(String[] args) {
|
||||
ArgumentsProperties argsProp = new ArgumentsProperties(args);
|
||||
if(!PropertiesUtils.getSettingToSysProp(argsProp, "proxy", null)) {
|
||||
PropertiesUtils.getEnvSettingToSysProp("CGJ_PROXY", "proxy", null);
|
||||
}
|
||||
if(!PropertiesUtils.getSettingToSysProp(argsProp, "botDataDir", "./") &&
|
||||
!PropertiesUtils.getEnvSettingToSysProp("CGJ_BOT_DATA_DIR", "botDataDir", "./")) {
|
||||
log.warn("未设置botDataDir, 当前运行目录将作为酷Q机器人所在目录.");
|
||||
}
|
||||
if(!PropertiesUtils.getSettingToSysProp(argsProp, "redisAddress", "127.0.0.1") &&
|
||||
!PropertiesUtils.getEnvSettingToSysProp("CGJ_REDIS_URI", "redisAddress", "127.0.0.1")) {
|
||||
log.warn("未设置RedisAddress, 将使用默认值连接Redis服务器(127.0.0.1:6379)");
|
||||
}
|
||||
|
||||
// 初始化 BotGlobal
|
||||
//noinspection ResultOfMethodCallIgnored 这里仅仅是加载BotGlobal而已
|
||||
BotGlobal.getGlobal();
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化机器人.
|
||||
* <p>本方法由框架调用.</p>
|
||||
*/
|
||||
public static void initialBot() {
|
||||
BotEventHandler.initial();
|
||||
}
|
||||
|
||||
}
|
91
src/main/java/net/lamgc/cgj/bot/boot/BotGlobal.java
Normal file
91
src/main/java/net/lamgc/cgj/bot/boot/BotGlobal.java
Normal file
@ -0,0 +1,91 @@
|
||||
package net.lamgc.cgj.bot.boot;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import org.apache.http.HttpHost;
|
||||
import org.apache.http.client.CookieStore;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import redis.clients.jedis.JedisPool;
|
||||
|
||||
import java.io.File;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URI;
|
||||
import java.net.URL;
|
||||
|
||||
public final class BotGlobal {
|
||||
|
||||
private final static BotGlobal instance = new BotGlobal();
|
||||
|
||||
public static BotGlobal getGlobal() {
|
||||
if(instance == null) {
|
||||
throw new IllegalStateException("");
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(BotGlobal.class);
|
||||
|
||||
private final URI redisUri;
|
||||
|
||||
/**
|
||||
* 所有缓存共用的JedisPool
|
||||
*/
|
||||
private final JedisPool redisServer;
|
||||
|
||||
private final File dataStoreDir;
|
||||
|
||||
private final HttpHost proxy;
|
||||
|
||||
private CookieStore cookieStore;
|
||||
|
||||
private BotGlobal() {
|
||||
this.redisUri = URI.create("redis://" + System.getProperty("cgj.redisAddress"));
|
||||
this.redisServer = new JedisPool(
|
||||
getRedisUri().getHost(),
|
||||
getRedisUri().getPort() == -1 ? 6379 : getRedisUri().getPort());
|
||||
String dataStoreDirPath = System.getProperty("cgj.botDataDir");
|
||||
this.dataStoreDir = new File((!dataStoreDirPath.endsWith("/") || !dataStoreDirPath.endsWith("\\")) ?
|
||||
dataStoreDirPath + System.getProperty("file.separator") : dataStoreDirPath);
|
||||
|
||||
String proxyAddress = System.getProperty("cgj.proxy");
|
||||
HttpHost temp = null;
|
||||
if(!Strings.isNullOrEmpty(proxyAddress)) {
|
||||
try {
|
||||
URL proxyUrl = new URL(proxyAddress);
|
||||
temp = new HttpHost(proxyUrl.getHost(), proxyUrl.getPort());
|
||||
log.info("已启用Http协议代理:{}", temp.toHostString());
|
||||
} catch (MalformedURLException e) {
|
||||
log.error("Proxy地址解析失败, 代理将不会启用.", e);
|
||||
}
|
||||
}
|
||||
this.proxy = temp;
|
||||
}
|
||||
|
||||
public URI getRedisUri() {
|
||||
return redisUri;
|
||||
}
|
||||
|
||||
public File getDataStoreDir() {
|
||||
if(!dataStoreDir.exists() && !dataStoreDir.mkdirs()) {
|
||||
log.error("DataStoreDir 创建失败, 数据存储可能失效!");
|
||||
}
|
||||
return dataStoreDir;
|
||||
}
|
||||
|
||||
public JedisPool getRedisServer() {
|
||||
return redisServer;
|
||||
}
|
||||
|
||||
public HttpHost getProxy() {
|
||||
return proxy;
|
||||
}
|
||||
|
||||
|
||||
public CookieStore getCookieStore() {
|
||||
return cookieStore;
|
||||
}
|
||||
|
||||
public void setCookieStore(CookieStore cookieStore) {
|
||||
this.cookieStore = cookieStore;
|
||||
}
|
||||
}
|
@ -15,7 +15,7 @@ public class AutoCleanTimer extends TimerTask {
|
||||
|
||||
private final static Timer cleanTimer = new Timer("Thread-AutoClean", true);
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(AutoCleanTimer.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(AutoCleanTimer.class);
|
||||
|
||||
static {
|
||||
cleanTimer.schedule(new AutoCleanTimer(), 100L);
|
||||
|
@ -1,10 +1,13 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
/**
|
||||
* 可清理接口, 实现该接口代表该类拥有清理动作.
|
||||
* 可清理接口, 实现该接口代表该类具有清理动作.
|
||||
*/
|
||||
public interface Cleanable {
|
||||
|
||||
/**
|
||||
* 该方法需要CacheStore完成对过期Entry的清除.
|
||||
*/
|
||||
void clean() throws Exception;
|
||||
|
||||
}
|
||||
|
@ -26,8 +26,9 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
|
||||
* @param expireTime 本地缓存库的缓存项过期时间, 单位毫秒;
|
||||
* 该时间并不是所有缓存项的最终过期时间, 还需要根据expireFloatRange的设定随机设置, 公式:
|
||||
* {@code expireTime + new Random().nextInt(expireFloatRange)}
|
||||
* @param expireFloatRange 过期时间的浮动范围(单位毫秒), 用于防止短时间内大量缓存项失效导致的缓存雪崩
|
||||
* @param autoClean 是否交由{@link AutoCleanTimer}自动执行清理
|
||||
* @param expireFloatRange 过期时间的浮动范围(单位毫秒), 用于防止短时间内大量缓存项失效导致的缓存雪崩,
|
||||
* 如设置为0或负数, 则不启用浮动范围.
|
||||
* @param autoClean 是否交由{@link AutoCleanTimer}自动执行清理, 启用后, AutoCleanTimer会自动检查过期Key并进行删除.
|
||||
*/
|
||||
public HotDataCacheStore(CacheStore<T> parent, CacheStore<T> current, long expireTime, int expireFloatRange, boolean autoClean) {
|
||||
this.parent = parent;
|
||||
@ -38,7 +39,8 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
|
||||
AutoCleanTimer.add(this);
|
||||
}
|
||||
|
||||
log.debug("HotDataCacheStore初始化完成. (Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {}, autoClean: {})",
|
||||
log.debug("HotDataCacheStore初始化完成. " +
|
||||
"(Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {}, autoClean: {})",
|
||||
parent, current, expireTime, expireFloatRange, autoClean);
|
||||
}
|
||||
|
||||
@ -68,7 +70,8 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
|
||||
return null;
|
||||
}
|
||||
log.debug("Parent缓存命中, 正在更新Current缓存库...");
|
||||
current.update(key, parentResult, expireTime + random.nextInt(expireFloatRange));
|
||||
current.update(key, parentResult,
|
||||
expireTime + (expireFloatRange <= 0 ? 0 : random.nextInt(expireFloatRange)));
|
||||
log.debug("Current缓存库更新完成.");
|
||||
result = parentResult;
|
||||
} else {
|
||||
@ -119,14 +122,21 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
|
||||
|
||||
@Override
|
||||
public boolean supportedPersistence() {
|
||||
// 由于Current的缓存数据会更新到Parent上,
|
||||
// 所以只要任意一边支持持久化, 那么该缓存库就支持持久化
|
||||
return current.supportedPersistence() || parent.supportedPersistence();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportedList() {
|
||||
return false;
|
||||
// 只有两边都支持List, 该缓存库才会支持持久化
|
||||
return current.supportedList() && parent.supportedList();
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查并清理已过期的Entry.
|
||||
* <p>该方法仅清理Current缓存库, 不会对上游缓存库造成影响.</p>
|
||||
*/
|
||||
@Override
|
||||
public void clean() {
|
||||
for(String key : this.current.keys()) {
|
||||
|
@ -1,6 +1,7 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
import net.lamgc.cgj.Main;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
|
||||
import net.lamgc.cgj.pixiv.PixivURL;
|
||||
import net.lamgc.cgj.util.URLs;
|
||||
import net.lamgc.utils.event.EventHandler;
|
||||
@ -21,9 +22,11 @@ import java.util.Set;
|
||||
|
||||
public class ImageCacheHandler implements EventHandler {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(ImageCacheHandler.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(ImageCacheHandler.class);
|
||||
|
||||
private final static HttpClient httpClient = HttpClientBuilder.create().setProxy(Main.proxy).build();
|
||||
private final static HttpClient httpClient = HttpClientBuilder.create()
|
||||
.setProxy(BotGlobal.getGlobal().getProxy())
|
||||
.build();
|
||||
|
||||
private final static Set<ImageCacheObject> cacheQueue = Collections.synchronizedSet(new HashSet<>());
|
||||
|
||||
@ -60,8 +63,9 @@ public class ImageCacheHandler implements EventHandler {
|
||||
throw e;
|
||||
}
|
||||
if(response.getStatusLine().getStatusCode() != 200) {
|
||||
log.warn("Http请求异常:{}", response.getStatusLine());
|
||||
throw new IOException("Http Response Error: " + response.getStatusLine());
|
||||
HttpRequestException requestException = new HttpRequestException(response);
|
||||
log.warn("Http请求异常:{}", requestException.getStatusLine());
|
||||
throw requestException;
|
||||
}
|
||||
|
||||
log.debug("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
|
||||
|
@ -1,9 +1,14 @@
|
||||
package net.lamgc.cgj.bot.cache;
|
||||
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
|
||||
|
||||
import java.util.Hashtable;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.*;
|
||||
@ -12,7 +17,7 @@ import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
public final class ImageCacheStore {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class);
|
||||
|
||||
private final static Map<ImageCacheObject, Task> cacheMap = new Hashtable<>();
|
||||
|
||||
@ -28,35 +33,42 @@ public final class ImageCacheStore {
|
||||
|
||||
private final static ImageCacheHandler handler = new ImageCacheHandler();
|
||||
|
||||
static {
|
||||
Thread shutdownThread = new Thread(imageCacheExecutor::shutdownNow);
|
||||
shutdownThread.setName("Thread-ImageCacheShutdown");
|
||||
Runtime.getRuntime().addShutdownHook(shutdownThread);
|
||||
}
|
||||
|
||||
private ImageCacheStore() {}
|
||||
|
||||
/**
|
||||
* 传递图片缓存任务, 并等待缓存完成.
|
||||
* @param cacheObject 缓存任务组
|
||||
*/
|
||||
public static void executeCacheRequest(ImageCacheObject cacheObject) throws InterruptedException {
|
||||
public static Throwable executeCacheRequest(ImageCacheObject cacheObject) throws InterruptedException {
|
||||
Task task = getTaskState(cacheObject);
|
||||
if(task.taskState.get() == TaskState.COMPLETE) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
boolean locked = false;
|
||||
try {
|
||||
if(task.taskState.get() == TaskState.COMPLETE) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
task.lock.lock();
|
||||
locked = true;
|
||||
// 双重检查
|
||||
if(task.taskState.get() == TaskState.COMPLETE) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
// 置任务状态
|
||||
task.taskState.set(TaskState.RUNNING);
|
||||
|
||||
Throwable throwable = null;
|
||||
try {
|
||||
Throwable throwable = imageCacheExecutor.submit(() -> {
|
||||
throwable = imageCacheExecutor.submit(() -> {
|
||||
try {
|
||||
handler.getImageToCache(cacheObject);
|
||||
} catch (Throwable e) {
|
||||
@ -73,6 +85,7 @@ public final class ImageCacheStore {
|
||||
} catch (ExecutionException e) {
|
||||
log.error("执行图片缓存任务时发生异常", e);
|
||||
}
|
||||
return throwable;
|
||||
} finally {
|
||||
if(locked) {
|
||||
task.lock.unlock();
|
||||
@ -88,6 +101,23 @@ public final class ImageCacheStore {
|
||||
return cacheMap.get(cacheObject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取错误信息
|
||||
*/
|
||||
public static String getErrorMessageFromThrowable(Throwable throwable, boolean onlyRequestException) {
|
||||
if(throwable == null) {
|
||||
return "";
|
||||
} else if(!(throwable instanceof HttpRequestException)) {
|
||||
if(onlyRequestException) {
|
||||
return "";
|
||||
}
|
||||
return throwable.getMessage();
|
||||
}
|
||||
JsonObject result = new Gson()
|
||||
.fromJson(((HttpRequestException) throwable).getContent(), JsonObject.class);
|
||||
return result.get("msg").getAsString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 任务状态
|
||||
*/
|
||||
|
44
src/main/java/net/lamgc/cgj/bot/cache/exception/HttpRequestException.java
vendored
Normal file
44
src/main/java/net/lamgc/cgj/bot/cache/exception/HttpRequestException.java
vendored
Normal file
@ -0,0 +1,44 @@
|
||||
package net.lamgc.cgj.bot.cache.exception;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Objects;
|
||||
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.StatusLine;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
|
||||
public class HttpRequestException extends IOException {
|
||||
|
||||
private static final long serialVersionUID = -2229221075943552798L;
|
||||
|
||||
private final StatusLine statusLine;
|
||||
|
||||
private final String content;
|
||||
|
||||
public HttpRequestException(HttpResponse response) throws IOException {
|
||||
this(response.getStatusLine(), EntityUtils.toString(response.getEntity()));
|
||||
}
|
||||
|
||||
public HttpRequestException(StatusLine statusLine, String content) {
|
||||
super("Http Response Error: " + Objects.requireNonNull(statusLine, "statusLine is null") +
|
||||
", Response Content: " + (content == null ? "null" : '\'' + content + '\''));
|
||||
this.statusLine = statusLine;
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取Http状态行
|
||||
*/
|
||||
public StatusLine getStatusLine() {
|
||||
return statusLine;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取Response内容
|
||||
* @return 如果没有返回, 则返回null
|
||||
*/
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
|
||||
}
|
@ -17,12 +17,11 @@ import net.lamgc.utils.base.runner.exception.NoSuchCommandException;
|
||||
import net.lamgc.utils.base.runner.exception.ParameterNoFoundException;
|
||||
import net.lamgc.utils.event.*;
|
||||
import net.lamgc.utils.event.EventObject;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import redis.clients.jedis.JedisPool;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.URI;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
@ -39,16 +38,10 @@ public class BotEventHandler implements EventHandler {
|
||||
private final ArgumentsRunner processRunner;
|
||||
private final ArgumentsRunner adminRunner;
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class);
|
||||
|
||||
private final static Map<Long, AtomicBoolean> muteStateMap = new Hashtable<>();
|
||||
|
||||
/**
|
||||
* 所有缓存共用的JedisPool
|
||||
*/
|
||||
private final static URI redisServerUri = URI.create("redis://" + System.getProperty("cgj.redisAddress"));
|
||||
public final static JedisPool redisServer = new JedisPool(redisServerUri.getHost(), redisServerUri.getPort() == -1 ? 6379 : redisServerUri.getPort());
|
||||
|
||||
/**
|
||||
* 消息事件执行器
|
||||
*/
|
||||
@ -65,10 +58,10 @@ public class BotEventHandler implements EventHandler {
|
||||
));
|
||||
|
||||
private static boolean initialled = false;
|
||||
static {
|
||||
initial();
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化BotEventHandler
|
||||
*/
|
||||
public synchronized static void initial() {
|
||||
if(initialled) {
|
||||
Logger logger = LoggerFactory.getLogger("BotEventHandler@<init>");
|
||||
@ -91,25 +84,19 @@ public class BotEventHandler implements EventHandler {
|
||||
});
|
||||
try {
|
||||
executor.addHandler(new BotEventHandler());
|
||||
Thread shutdownThread = new Thread(() -> executor.shutdown(true));
|
||||
shutdownThread.setName("Thread-EventHandlerShutdown");
|
||||
Runtime.getRuntime().addShutdownHook(shutdownThread);
|
||||
} catch (IllegalAccessException e) {
|
||||
LoggerFactory.getLogger("BotEventHandler@Static").error("添加Handler时发生异常", e);
|
||||
}
|
||||
initialled = true;
|
||||
}
|
||||
|
||||
private final static AtomicBoolean preLoaded = new AtomicBoolean();
|
||||
/**
|
||||
* 预加载
|
||||
*/
|
||||
public synchronized static void preLoad() {
|
||||
if(preLoaded.get()) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
BotAdminCommandProcess.loadPushList();
|
||||
} finally {
|
||||
preLoaded.set(true);
|
||||
} catch(Throwable e) {
|
||||
log.error("加载推送列表失败", e);
|
||||
}
|
||||
initialled = true;
|
||||
}
|
||||
|
||||
private BotEventHandler() {
|
||||
@ -158,7 +145,7 @@ public class BotEventHandler implements EventHandler {
|
||||
public void processMessage(MessageEvent event) {
|
||||
String msg = event.getMessage();
|
||||
log.debug(event.toString());
|
||||
if(!match(msg)) {
|
||||
if(mismatch(msg)) {
|
||||
return;
|
||||
} else if(isMute(event.getFromGroup())) {
|
||||
log.debug("机器人已被禁言, 忽略请求.");
|
||||
@ -215,18 +202,26 @@ public class BotEventHandler implements EventHandler {
|
||||
} catch(ParameterNoFoundException e) {
|
||||
result = "命令缺少参数: " + e.getParameterName();
|
||||
} catch(DeveloperRunnerException e) {
|
||||
if (!(e.getCause() instanceof InterruptedException)) {
|
||||
log.error("执行命令时发生异常", e);
|
||||
result = "色图姬在执行命令时遇到了一个错误!";
|
||||
} else {
|
||||
Throwable cause = e.getCause();
|
||||
if (cause instanceof InterruptedException) {
|
||||
log.error("命令执行超时, 终止执行.");
|
||||
result = "色图姬发现这个命令的处理时间太久了!所以打断了这个命令。";
|
||||
} else if(cause instanceof NoSuchElementException && cause.getMessage().startsWith("No work found: ")) {
|
||||
String message = cause.getMessage();
|
||||
log.error("指定作品不存在.(Id: {})", message.substring(message.lastIndexOf(": ") + 2));
|
||||
result = "色图姬找不到这个作品!";
|
||||
} else {
|
||||
log.error("执行命令时发生异常", e);
|
||||
result = "色图姬在执行命令时遇到了一个错误!";
|
||||
}
|
||||
}
|
||||
long processTime = System.currentTimeMillis() - time;
|
||||
if(!Objects.isNull(result) && result instanceof String && !isMute(event.getFromGroup())) {
|
||||
try {
|
||||
event.sendMessage((String) result);
|
||||
int sendResult = event.sendMessage((String) result);
|
||||
if(sendResult < 0) {
|
||||
log.warn("消息发送失败, Sender {} 返回错误代码: {}", event.getClass().getName(), sendResult);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("发送消息时发生异常", e);
|
||||
}
|
||||
@ -244,8 +239,8 @@ public class BotEventHandler implements EventHandler {
|
||||
* @param message 要检查的消息
|
||||
* @return 如果为true则提交
|
||||
*/
|
||||
public static boolean match(String message) {
|
||||
return message.startsWith(COMMAND_PREFIX) || message.startsWith(ADMIN_COMMAND_PREFIX);
|
||||
public static boolean mismatch(String message) {
|
||||
return !message.startsWith(COMMAND_PREFIX) && !message.startsWith(ADMIN_COMMAND_PREFIX);
|
||||
}
|
||||
|
||||
private static boolean isMute(long groupId) {
|
||||
|
@ -4,9 +4,9 @@ import java.util.Objects;
|
||||
|
||||
public class BufferMessageEvent extends MessageEvent {
|
||||
|
||||
StringBuffer buffer = new StringBuffer();
|
||||
private final StringBuffer buffer = new StringBuffer();
|
||||
|
||||
public final MessageEvent parent;
|
||||
private final MessageEvent parent;
|
||||
|
||||
/**
|
||||
* 以空消息空Id生成BufferMessageEvent
|
||||
@ -25,6 +25,17 @@ public class BufferMessageEvent extends MessageEvent {
|
||||
parent = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 提供消息内容构和Id信息造BufferMessageEvent
|
||||
* @param groupId 群组Id
|
||||
* @param qqId 发送者Id
|
||||
* @param message 传入的消息内容
|
||||
*/
|
||||
public BufferMessageEvent(int groupId, int qqId, String message) {
|
||||
super(groupId, qqId, message);
|
||||
parent = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 使用事件构造BufferMessageEvent
|
||||
* @param parentEvent 父级消息事件对象
|
||||
|
@ -19,9 +19,10 @@ public abstract class MessageEvent implements EventObject, MessageSender {
|
||||
* 发送消息
|
||||
* @param message 消息内容
|
||||
* @return 成功返回MessageId, 如没有MessageId则返回0, 失败返回负数错误码
|
||||
* @throws Exception 该方法根据不同实现, 可能会抛出不同异常, 详见实现所标识的文档内容.
|
||||
*/
|
||||
@Override
|
||||
public abstract int sendMessage(final String message);
|
||||
public abstract int sendMessage(final String message) throws Exception;
|
||||
|
||||
/**
|
||||
* 获取图片下载地址.
|
||||
|
@ -0,0 +1,30 @@
|
||||
package net.lamgc.cgj.bot.framework.cli;
|
||||
|
||||
import net.lamgc.cgj.bot.boot.ApplicationBoot;
|
||||
import net.lamgc.cgj.bot.event.BotEventHandler;
|
||||
import net.lamgc.cgj.bot.message.MessageSenderBuilder;
|
||||
|
||||
import java.util.Scanner;
|
||||
|
||||
public class ConsoleMain {
|
||||
|
||||
public static void start() {
|
||||
MessageSenderBuilder.setCurrentMessageSenderFactory(new ConsoleMessageSenderFactory());
|
||||
ApplicationBoot.initialBot();
|
||||
Scanner scanner = new Scanner(System.in);
|
||||
boolean isGroup = false;
|
||||
do {
|
||||
String input = scanner.nextLine();
|
||||
if(input.equalsIgnoreCase("#exit")) {
|
||||
System.out.println("退出应用...");
|
||||
break;
|
||||
} else if(input.equalsIgnoreCase("#setgroup")) {
|
||||
isGroup = !isGroup;
|
||||
System.out.println("System: 群模式状态已变更: " + isGroup);
|
||||
continue;
|
||||
}
|
||||
BotEventHandler.executeMessageEvent(new ConsoleMessageEvent(input, isGroup));
|
||||
} while(true);
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,23 @@
|
||||
package net.lamgc.cgj.bot.framework.cli;
|
||||
|
||||
import net.lamgc.cgj.bot.event.MessageEvent;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class ConsoleMessageEvent extends MessageEvent {
|
||||
|
||||
public ConsoleMessageEvent(String message, boolean isGroup) {
|
||||
super(isGroup ? 1 : 0, 1, message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int sendMessage(String message) {
|
||||
System.out.println(new Date() + " Bot: " + message);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getImageUrl(String image) {
|
||||
return null;
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package net.lamgc.cgj.bot.framework.cli;
|
||||
|
||||
import net.lamgc.cgj.bot.message.MessageSender;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class ConsoleMessageSender implements MessageSender {
|
||||
@Override
|
||||
public synchronized int sendMessage(String message) {
|
||||
System.out.println(new Date() + " Bot: " + message);
|
||||
return 0;
|
||||
}
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
package net.lamgc.cgj.bot.framework.cli;
|
||||
|
||||
import net.lamgc.cgj.bot.message.MessageSender;
|
||||
import net.lamgc.cgj.bot.message.MessageSenderFactory;
|
||||
import net.lamgc.cgj.bot.message.MessageSource;
|
||||
|
||||
public class ConsoleMessageSenderFactory implements MessageSenderFactory {
|
||||
|
||||
private final static ConsoleMessageSender sender = new ConsoleMessageSender();
|
||||
|
||||
@Override
|
||||
public MessageSender createMessageSender(MessageSource source, long id) {
|
||||
return sender;
|
||||
}
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
package net.lamgc.cgj.bot.framework.coolq;
|
||||
|
||||
import net.lamgc.cgj.bot.boot.ApplicationBoot;
|
||||
import net.lamgc.cgj.bot.event.BotEventHandler;
|
||||
import net.lamgc.cgj.bot.framework.coolq.message.SpringCQMessageEvent;
|
||||
import net.lamgc.utils.event.EventHandler;
|
||||
@ -17,8 +18,9 @@ public class CQPluginMain extends CQPlugin implements EventHandler {
|
||||
|
||||
public CQPluginMain() {
|
||||
// TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder
|
||||
BotEventHandler.preLoad();
|
||||
LoggerFactory.getLogger(CQPluginMain.class.getName())
|
||||
// MessageSenderBuilder.setCurrentMessageSenderFactory(new SpringCQMessageSenderFactory());
|
||||
ApplicationBoot.initialBot();
|
||||
LoggerFactory.getLogger(CQPluginMain.class)
|
||||
.info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX);
|
||||
}
|
||||
|
||||
@ -37,8 +39,14 @@ public class CQPluginMain extends CQPlugin implements EventHandler {
|
||||
return processMessage(cq, event);
|
||||
}
|
||||
|
||||
public int processMessage(CoolQ cq, CQMessageEvent event) {
|
||||
if(!BotEventHandler.match(event.getMessage())) {
|
||||
/**
|
||||
* 处理消息
|
||||
* @param cq CoolQ机器人对象
|
||||
* @param event 消息事件
|
||||
* @return 是否拦截消息
|
||||
*/
|
||||
private static int processMessage(CoolQ cq, CQMessageEvent event) {
|
||||
if(BotEventHandler.mismatch(event.getMessage())) {
|
||||
return MESSAGE_IGNORE;
|
||||
}
|
||||
BotEventHandler.executeMessageEvent(new SpringCQMessageEvent(cq, event));
|
||||
|
@ -36,7 +36,7 @@ public class SpringCQMessageEvent extends MessageEvent {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int sendMessage(final String message) {
|
||||
public int sendMessage(final String message) throws Exception {
|
||||
return messageSender.sendMessage(message);
|
||||
}
|
||||
|
||||
|
@ -5,16 +5,14 @@ import net.lamgc.cgj.bot.message.MessageSenderFactory;
|
||||
import net.lamgc.cgj.bot.message.MessageSource;
|
||||
import net.lz1998.cq.robot.CoolQ;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class SpringCQMessageSenderFactory implements MessageSenderFactory {
|
||||
|
||||
private final CoolQ coolQ;
|
||||
|
||||
public SpringCQMessageSenderFactory(CoolQ coolQ) {
|
||||
this.coolQ = coolQ;
|
||||
}
|
||||
|
||||
private final static ThreadLocal<CoolQ> threadCoolQ = new ThreadLocal<>();
|
||||
@Override
|
||||
public MessageSender createMessageSender(MessageSource source, long id) {
|
||||
return new SpringCQMessageSender(coolQ, source, id);
|
||||
return new SpringCQMessageSender(
|
||||
Objects.requireNonNull(threadCoolQ.get(), "CoolQ object is not included in ThreadLocal"), source, id);
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,7 @@
|
||||
package net.lamgc.cgj.bot.framework.mirai;
|
||||
|
||||
import net.lamgc.cgj.bot.boot.ApplicationBoot;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import net.lamgc.cgj.bot.event.BotEventHandler;
|
||||
import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageEvent;
|
||||
import net.lamgc.cgj.bot.message.MessageSenderBuilder;
|
||||
@ -20,7 +22,7 @@ import java.util.Properties;
|
||||
|
||||
public class MiraiMain implements Closeable {
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(MiraiMain.class.getName());
|
||||
private final Logger log = LoggerFactory.getLogger(MiraiMain.class);
|
||||
|
||||
private Bot bot;
|
||||
|
||||
@ -35,7 +37,7 @@ public class MiraiMain implements Closeable {
|
||||
return;
|
||||
}
|
||||
|
||||
File botPropFile = new File(System.getProperty("cgj.botDataDir"), "./bot.properties");
|
||||
File botPropFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "./bot.properties");
|
||||
try (Reader reader = new BufferedReader(new FileReader(botPropFile))) {
|
||||
botProperties.load(reader);
|
||||
} catch (IOException e) {
|
||||
@ -48,13 +50,14 @@ public class MiraiMain implements Closeable {
|
||||
bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")), Base64.decodeBase64(botProperties.getProperty("bot.password", "")), configuration);
|
||||
Events.subscribeAlways(GroupMessageEvent.class, this::executeMessageEvent);
|
||||
Events.subscribeAlways(FriendMessageEvent.class, this::executeMessageEvent);
|
||||
Events.subscribeAlways(TempMessageEvent.class, this::executeMessageEvent);
|
||||
Events.subscribeAlways(BotMuteEvent.class,
|
||||
event -> BotEventHandler.setMuteState(event.getGroup().getId(), true));
|
||||
Events.subscribeAlways(BotUnmuteEvent.class,
|
||||
event -> BotEventHandler.setMuteState(event.getGroup().getId(), false));
|
||||
bot.login();
|
||||
MessageSenderBuilder.setCurrentMessageSenderFactory(new MiraiMessageSenderFactory(bot));
|
||||
BotEventHandler.preLoad();
|
||||
ApplicationBoot.initialBot();
|
||||
bot.join();
|
||||
}
|
||||
|
||||
@ -70,13 +73,13 @@ public class MiraiMain implements Closeable {
|
||||
((GroupMessageEvent) message).getGroup().getBotMuteRemaining() != 0);
|
||||
}
|
||||
}
|
||||
BotEventHandler.executeMessageEvent(new MiraiMessageEvent(message));
|
||||
BotEventHandler.executeMessageEvent(MiraiMessageEvent.covertEventObject(message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭机器人
|
||||
*/
|
||||
public void close() {
|
||||
public synchronized void close() {
|
||||
if(bot == null) {
|
||||
return;
|
||||
}
|
||||
|
@ -2,8 +2,11 @@ package net.lamgc.cgj.bot.framework.mirai.message;
|
||||
|
||||
import net.lamgc.cgj.bot.message.MessageSender;
|
||||
import net.lamgc.cgj.bot.message.MessageSource;
|
||||
import net.mamoe.mirai.message.FriendMessageEvent;
|
||||
import net.mamoe.mirai.message.GroupMessageEvent;
|
||||
import net.mamoe.mirai.message.MessageEvent;
|
||||
import net.mamoe.mirai.message.TempMessageEvent;
|
||||
import net.mamoe.mirai.message.data.MessageChain;
|
||||
import net.mamoe.mirai.message.data.MessageUtils;
|
||||
|
||||
import java.util.Objects;
|
||||
@ -13,6 +16,13 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
|
||||
private final MessageEvent messageObject;
|
||||
private final MessageSender messageSender;
|
||||
|
||||
/**
|
||||
* 通过Mirai的MessageEvent转换成应用支持的MessageEvent.
|
||||
* @deprecated 请使用 {@link #covertEventObject(MessageEvent)}方法转换.
|
||||
* @param message 消息对象
|
||||
* @see #covertEventObject(MessageEvent)
|
||||
*/
|
||||
@Deprecated
|
||||
public MiraiMessageEvent(MessageEvent message) {
|
||||
super(message instanceof GroupMessageEvent ? ((GroupMessageEvent) message).getGroup().getId() : 0,
|
||||
message.getSender().getId(), getMessageBodyWithoutSource(message.getMessage().toString()));
|
||||
@ -24,6 +34,44 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过解析好的信息构造MessageEvent
|
||||
* @param messageObject 消息原始对象
|
||||
* @param groupId 群组Id, 非群聊或无需使用群聊时, 该参数为0
|
||||
* @param qqId 发送者Id, 不能为0
|
||||
* @param message 原始消息内容对象, 由构造方法内部解析
|
||||
*/
|
||||
private MiraiMessageEvent(MessageEvent messageObject, long groupId, long qqId, MessageChain message) {
|
||||
super(groupId, qqId, getMessageBodyWithoutSource(message.toString()));
|
||||
this.messageObject = Objects.requireNonNull(messageObject, "messageObject is null");
|
||||
if(groupId != 0) {
|
||||
this.messageSender = new MiraiMessageSender(((GroupMessageEvent) messageObject).getGroup(), MessageSource.Group);
|
||||
} else {
|
||||
this.messageSender = new MiraiMessageSender(messageObject.getSender(), MessageSource.Group);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将Mirai原始MessageEvent转换成应用支持的MessageEvent对象
|
||||
* @param event 原始消息对象
|
||||
* @return 原始消息对象所对应的应用MessageEvent对象.
|
||||
* @throws IllegalArgumentException 当出现不支持的Mirai {@link MessageEvent}实现时将抛出异常.
|
||||
* @see MessageEvent 原始消息对象
|
||||
* @see net.lamgc.cgj.bot.event.MessageEvent 应用消息对象
|
||||
*/
|
||||
public static MiraiMessageEvent covertEventObject(MessageEvent event) throws IllegalArgumentException {
|
||||
if(event instanceof GroupMessageEvent) {
|
||||
return new MiraiMessageEvent(event,
|
||||
((GroupMessageEvent) event).getGroup().getId(), event.getSender().getId(), event.getMessage());
|
||||
} else if(event instanceof FriendMessageEvent) {
|
||||
return new MiraiMessageEvent(event, 0, event.getSender().getId(), event.getMessage());
|
||||
} else if(event instanceof TempMessageEvent) {
|
||||
return new MiraiMessageEvent(event, 0, event.getSender().getId(), event.getMessage());
|
||||
} else {
|
||||
throw new IllegalArgumentException("Unsupported event type: " + event.toString());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将ContactMessage获得的消息内容删除 Mirai:source 并返回.
|
||||
* <p>该做法比较保守, 防止Mirai:source位置出现变动.</p>
|
||||
@ -38,7 +86,7 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int sendMessage(final String message) {
|
||||
public int sendMessage(final String message) throws Exception {
|
||||
return messageSender.sendMessage(message);
|
||||
}
|
||||
|
||||
|
@ -2,11 +2,11 @@ package net.lamgc.cgj.bot.framework.mirai.message;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import net.lamgc.cgj.bot.BotCode;
|
||||
import net.lamgc.cgj.bot.boot.BotGlobal;
|
||||
import net.lamgc.cgj.bot.cache.CacheStore;
|
||||
import net.lamgc.cgj.bot.cache.HotDataCacheStore;
|
||||
import net.lamgc.cgj.bot.cache.LocalHashCacheStore;
|
||||
import net.lamgc.cgj.bot.cache.StringRedisCacheStore;
|
||||
import net.lamgc.cgj.bot.event.BotEventHandler;
|
||||
import net.lamgc.cgj.bot.message.MessageSender;
|
||||
import net.lamgc.cgj.bot.message.MessageSource;
|
||||
import net.mamoe.mirai.Bot;
|
||||
@ -26,9 +26,9 @@ public class MiraiMessageSender implements MessageSender {
|
||||
|
||||
private final Contact member;
|
||||
private final MessageSource source;
|
||||
private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class);
|
||||
private final static CacheStore<String> imageIdCache = new HotDataCacheStore<>(
|
||||
new StringRedisCacheStore(BotEventHandler.redisServer, "mirai.imageId"),
|
||||
new StringRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "mirai.imageId"),
|
||||
new LocalHashCacheStore<>(),
|
||||
5400000, 1800000, true);
|
||||
|
||||
@ -77,7 +77,7 @@ public class MiraiMessageSender implements MessageSender {
|
||||
.replaceAll("&38", "&")
|
||||
.split("\\|");
|
||||
|
||||
MessageChain messages = MessageUtils.newChain().plus("");
|
||||
MessageChain messages = MessageUtils.newChain();
|
||||
int codeIndex = 0;
|
||||
for(String text : texts) {
|
||||
if(text.equals("{BotCode}")) {
|
||||
|
@ -9,7 +9,8 @@ public interface MessageSender {
|
||||
* 返回0则发送器不支持消息Id,
|
||||
* 返回非0正整数则为消息Id,
|
||||
* 返回负数则为错误.
|
||||
* @throws Exception 该方法根据不同实现, 可能会抛出不同异常, 详见实现所标识的文档内容.
|
||||
*/
|
||||
int sendMessage(final String message);
|
||||
int sendMessage(final String message) throws Exception;
|
||||
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ public interface AdultContentDetector {
|
||||
* @param pageIndex 指定页数, 设为0或负数则视为单页面作品
|
||||
* @return 如果为true则为成人作品, 该方法将由检测器决定如何为成人作品.
|
||||
*/
|
||||
boolean isAdultContent(int illustId, boolean isUgoira, int pageIndex) throws Exception;
|
||||
boolean isAdultContent(int illustId, boolean isUgoira, int pageIndex) throws Exception;
|
||||
|
||||
/**
|
||||
* 检查某一作品是否为成人内容
|
||||
@ -26,8 +26,8 @@ public interface AdultContentDetector {
|
||||
* @param isUgoira 是否为动图
|
||||
* @param pageIndex 指定页数, 设为0或负数则视为单页面作品
|
||||
* @param threshold 指数阀值, 当等于或大于该阀值时返回true.
|
||||
* @return 如果为true则为成人作品, 该方法将由 threshold 参数决定是否为成人作品.
|
||||
* @return 如果为true则为成人作品, 该方法将由 threshold 参数决定是否为成人作品(如果超过阈值, 则为true).
|
||||
*/
|
||||
boolean isAdultContent(int illustId, boolean isUgoira, int pageIndex, double threshold) throws Exception;
|
||||
boolean isAdultContent(int illustId, boolean isUgoira, int pageIndex, double threshold) throws Exception;
|
||||
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ import java.util.function.BiConsumer;
|
||||
|
||||
public class PixivDownload {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(PixivDownload.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(PixivDownload.class);
|
||||
|
||||
private final HttpClient httpClient;
|
||||
|
||||
@ -542,8 +542,9 @@ public class PixivDownload {
|
||||
* }
|
||||
* </pre>
|
||||
* @throws IOException 当请求发生异常, 或接口返回错误信息时抛出.
|
||||
* @throws NoSuchElementException 当该作品不存在时抛出异常
|
||||
*/
|
||||
public JsonObject getIllustInfoByIllustId(int illustId) throws IOException {
|
||||
public JsonObject getIllustInfoByIllustId(int illustId) throws IOException, NoSuchElementException {
|
||||
HttpGet request = createHttpGetRequest(PixivURL.getPixivIllustInfoAPI(illustId));
|
||||
HttpResponse response = httpClient.execute(request);
|
||||
String responseStr = EntityUtils.toString(response.getEntity());
|
||||
@ -558,7 +559,7 @@ public class PixivDownload {
|
||||
if(illustsArray.size() == 1) {
|
||||
return illustsArray.get(0).getAsJsonObject();
|
||||
} else {
|
||||
return null;
|
||||
throw new NoSuchElementException("No work found: " + illustId);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -27,21 +27,30 @@ public class PixivURL {
|
||||
|
||||
/**
|
||||
* P站搜索请求url
|
||||
* @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
|
||||
* @see PixivSearchBuilder
|
||||
*/
|
||||
@Deprecated
|
||||
private static final String PIXIV_SEARCH_URL = "https://www.pixiv.net/search.php";
|
||||
|
||||
/**
|
||||
* P站搜索用户url
|
||||
* 需要替换的参数:
|
||||
* {nick} - 用户昵称、部分名称
|
||||
* @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
|
||||
* @see PixivSearchBuilder
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String PIXIV_SEARCH_USER_URL = PIXIV_SEARCH_URL + "?s_mode=s_usr&nick={nick}";
|
||||
|
||||
/**
|
||||
* P站搜索插画url
|
||||
* 需要替换的参数:
|
||||
* {word} - 插画相关文本
|
||||
* @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
|
||||
* @see PixivSearchBuilder
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String PIXIV_SEARCH_TAG_URL = PIXIV_SEARCH_URL + "?s_mode=s_tag&word={word}";
|
||||
|
||||
/**
|
||||
@ -164,6 +173,7 @@ public class PixivURL {
|
||||
/**
|
||||
* 查询用户收藏.<br/>
|
||||
* 该URL返回HTML页面,需要进行解析.<br/>
|
||||
* <p>注意: 该接口需要登陆</p>
|
||||
* 需要替换的文本:<br/>
|
||||
* {pageIndex} - 页数, 超出了则结果为空<br/>
|
||||
*/
|
||||
@ -336,6 +346,7 @@ public class PixivURL {
|
||||
* @param mode 要检查的RankingMode项
|
||||
* @return 如果支持返回true
|
||||
*/
|
||||
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
|
||||
public boolean isSupportedMode(RankingMode mode) {
|
||||
return Arrays.binarySearch(supportedMode, mode) >= 0;
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ import java.util.List;
|
||||
*/
|
||||
public class PixivAccessProxyServer {
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class.getName());
|
||||
private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class);
|
||||
|
||||
private final HttpProxyServer proxyServer;
|
||||
|
||||
|
51
src/main/java/net/lamgc/cgj/util/PropertiesUtils.java
Normal file
51
src/main/java/net/lamgc/cgj/util/PropertiesUtils.java
Normal file
@ -0,0 +1,51 @@
|
||||
package net.lamgc.cgj.util;
|
||||
|
||||
import net.lamgc.utils.base.ArgumentsProperties;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public final class PropertiesUtils {
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(PropertiesUtils.class);
|
||||
|
||||
private PropertiesUtils() {}
|
||||
|
||||
/**
|
||||
* 从ArgumentsProperties获取设置项到System Properties
|
||||
* @param prop ArgumentsProperties对象
|
||||
* @param key 设置项key
|
||||
* @param defaultValue 默认值
|
||||
* @return 如果成功从ArgumentsProperties获得设置项, 返回true, 如未找到(使用了defaultValue或null), 返回false;
|
||||
*/
|
||||
public static boolean getSettingToSysProp(ArgumentsProperties prop, String key, String defaultValue) {
|
||||
if(prop.containsKey(key)) {
|
||||
log.info("{}: {}", key, prop.getValue(key));
|
||||
System.setProperty("cgj." + key, prop.getValue(key));
|
||||
return true;
|
||||
} else {
|
||||
if(defaultValue != null) {
|
||||
System.setProperty("cgj." + key, defaultValue);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将环境变量的值读取并存入System Properties.
|
||||
* @param envKey 待获取的环境变量Key
|
||||
* @param sysPropKey 要设置的System Properties Key值
|
||||
* @param defaultValue 默认值, 可选
|
||||
* @return 如果设置成功, 返回true, 否则返回false
|
||||
*/
|
||||
public static boolean getEnvSettingToSysProp(String envKey, String sysPropKey, String defaultValue) {
|
||||
String env = System.getenv(envKey);
|
||||
if(env != null) {
|
||||
System.setProperty("cgj." + sysPropKey, env);
|
||||
return true;
|
||||
} else if(defaultValue != null) {
|
||||
System.setProperty("cgj." + sysPropKey, defaultValue);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
@ -28,32 +28,29 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
|
||||
|
||||
public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue) {
|
||||
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
|
||||
setInitialTime(0, executeLimitTime);
|
||||
setInitialTime(executeLimitTime);
|
||||
timeoutCheckThread.start();
|
||||
}
|
||||
|
||||
public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory) {
|
||||
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory);
|
||||
setInitialTime(0, executeLimitTime);
|
||||
setInitialTime(executeLimitTime);
|
||||
timeoutCheckThread.start();
|
||||
}
|
||||
|
||||
public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, RejectedExecutionHandler handler) {
|
||||
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, handler);
|
||||
setInitialTime(0, executeLimitTime);
|
||||
setInitialTime(executeLimitTime);
|
||||
timeoutCheckThread.start();
|
||||
}
|
||||
|
||||
public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory, RejectedExecutionHandler handler) {
|
||||
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
|
||||
setInitialTime(0, executeLimitTime);
|
||||
setInitialTime(executeLimitTime);
|
||||
timeoutCheckThread.start();
|
||||
}
|
||||
|
||||
private void setInitialTime(long checkInterval, long executeLimitTime) {
|
||||
if(checkInterval > 0) {
|
||||
timeoutCheckInterval.set(checkInterval);
|
||||
}
|
||||
private void setInitialTime(long executeLimitTime) {
|
||||
if(executeLimitTime > 0) {
|
||||
executeTimeLimit.set(executeLimitTime);
|
||||
}
|
||||
|
@ -31,9 +31,9 @@ public class PixivDownloadTest {
|
||||
|
||||
private static CookieStore cookieStore;
|
||||
|
||||
private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class.getName());
|
||||
private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class);
|
||||
|
||||
private static HttpHost proxy = new HttpHost("127.0.0.1", 1001);
|
||||
private static final HttpHost proxy = new HttpHost("127.0.0.1", 1001);
|
||||
|
||||
@BeforeClass
|
||||
public static void before() throws IOException, ClassNotFoundException {
|
||||
|
Reference in New Issue
Block a user