[Version] 更新版本(2.5.1 -> 2.5.2-20200517.1-SNAPSHOT);

[Add] MiraiMessageSender 增加对默认表情的支持;
Merge branch 'mirai'
2025-07-02 05:17:26 +00:00 · 2020-05-17 17:45:06 +08:00 · 2020-05-12 15:25:29 +08:00 · 2020-05-12 15:14:58 +08:00 · 2020-05-12 15:14:28 +08:00 · 2020-05-12 15:03:08 +08:00
13 changed files with 223 additions and 51 deletions
--- a/documents/interfaces/Pixiv接口标准返回格式.md
+++ b/documents/interfaces/Pixiv接口标准返回格式.md
@ -0,0 +1,18 @@
+## Pixiv接口标准返回格式 ##
+Pixiv大部分接口在返回数据时都会遵循以下格式：
+```json
+{
+    "error": false,
+    "message": "",
+    "body": {
+
+    }
+}
+```
+大部分是如此(部分接口比较特别, 不是这个格式)  
+
+属性|类型|说明
+---|---|---
+error|Boolean|如果接口返回错误信息, 该属性为`true`
+message|String|如果`error`属性为`true`, 则该属性不为空字符串
+body|Object/Array|如果`error`不为`true`, 该属性有数据, 否则属性可能不存在
--- a/documents/interfaces/Pixiv搜索接口.md
+++ b/documents/interfaces/Pixiv搜索接口.md
@ -0,0 +1,16 @@
+## Pixiv内容搜索接口 ##
+接口地址: 
+```
+GET https://www.pixiv.net/ajax/search/{Type}/{Content}?{参数...}
+```
+变量名:
+- `Type`: 内容类型
+    - illustrations(插画)
+    - top(推荐)
+    - manga(漫画)
+    - novels(小说)
+- `Content`: 搜索内容
+
+
+参数列表:
+- `word`
--- a/documents/interfaces/Pixiv首页数据接口.md
+++ b/documents/interfaces/Pixiv首页数据接口.md
@ -0,0 +1,127 @@
+## Pixiv首页数据接口 ##
+
+说明：  
+该接口涉及用户账户隐私, 不要尝试对该接口返回数据做不安全云端存储, 或未经用户允许的发送出去.
+
+接口地址：
+```
+GET https://www.pixiv.net/ajax/top/{type}?mode={mode}&lang={lang}
+```
+
+参数：
+- `type`: 首页类型
+    - `illust`: 插画
+    - `manga`: 漫画
+    - `novel`: 小说
+- `mode`: 内容类型
+    - `all`: 不限类型
+    - `r18`: 成人内容
+- `lang`: 语言(只写几个)
+    - `zh`: 中文
+
+> 是否需要登录: `是`  
+> 是否为Pixiv接口标准返回格式: `是`  
+> 是否需要Referer请求头: `未知`
+
+请求Url示例:
+```
+GET https://www.pixiv.net/ajax/top/illust?mode=all&lang=zh
+```
+
+响应示例:
+```
+(内容过长, 略)
+```
+
+返回内容(Json):
+- `page`: 网页相关内容
+    - `tags`: (`Object[]`) 热门标签
+        - `tag`: (`String`) 标签名
+        - `count`: (`Number`) 作品数量?
+        - `lev`: (`Number`) 不明?
+        - `ids`: (`Number[]`) 作品数组
+    - `follow`: (`Number[]`) 已关注作者的作品推荐
+    - `mypixiv`: (`?[]`) 不明
+    - `recommend`: (`String[]`  -> `Number[]`) 推荐作品的Id?
+    - `recommendByTag`: (`Object[]`) 标签的推荐作品
+        - `tag`: (`String`) 标签名
+        - `ids`: ((`String[]`  -> `Number[]`) 作品Id数组
+    - `ranking`: (`Object`) 排行榜前100名数据
+        - `date`: (`String`) 排行榜日期(`yyyyMMdd`)
+        - `items`: (`Object[]`) 排行榜简略数据
+            - `rank`: (`String` -> `Number`) 排行榜名次
+            - `id`: (`String` -> `Number`) 作品Id 
+    - `pixivision`: (`Object[]`) Pixiv的推荐文章
+        - `id`: (`String` -> `Number`) 文章Id
+        - `title`: (`String`) 文章标题
+        - `thumbnailUrl`: (`String`) 文章封面图的Url地址
+        - `abtestId`: (`String` -> `Number`) pixivision文章地址的参数`utm_content`的值
+    - `recommendUser`: (`Object[]`) 推荐用户及其作品
+        - `id`: (`Number`) 用户Id
+        - `illustIds`: (`String[]` -> `Number[]`) 插画作品Id
+        - `novelIds`: (`String[]` -> `Number[]`) 小说作品Id
+    - `contestOngoing`: (`Object[]`) 进行中的比赛活动(没找到更多信息了, 先这么说着)
+        - (待完善)
+    - `contestResult`: (`Object[]`) 比赛结果信息
+        - `slug`: (`String`) 比赛代号?
+        - `type`: (`String`) 比赛作品类型?
+        - `name`: (`String`) 比赛名
+        - `url`: (`String`) 结果公布链接
+        - `iconUrl`: (`String`) 图标链接(不明意义的图标)
+    - `editorRecommend`: (`Object[]`) 编辑推荐(小说), 后续可能会删除, 这个应该是配合活动出的数据
+        - (待完善)
+    - `boothFollowItemIds`: (`String[]` -> `Number[]`) 已关注用户的最新商品
+    - `sketchLiveFollowIds`: (`?[]`) 不明?
+    - `sketchLivePopularIds`: (`String[]` -> `Number[]`) 不明?
+    - `myFavoriteTags`: (`?[]`) 关注的标签
+    - `newPost`: (`String[]` -> `Number[]`) 不明?
+- `thumbnails`: (`Object`) 已关注用户的作品
+    - `illust`: (`Object[]`) 插画作品
+        - `illustId`: (`String` -> `Number`) 作品Id(或者准确来讲是 插画Id?)
+        - `illustTitle`: (`String`) 插画标题
+        - `id`: (`String` -> `Number`) 作品Id
+        - `title`: (`String`) 作品标题
+        - `illustType`: (`Number`) 作品类型
+        - `xRestrict`: (`Number`) 不明?
+        - `restrict`: (`Number`) 不明?
+        - `sl`: (`Number`) 不明?
+        - `url`: (`String`) 作品在主页的封面图Url
+        - `description`: (`String`) 作品说明?
+        - `tags`: (`String[]`) 标签原始名数组(不带翻译的原始名称)
+        - `userId`: (`String` -> `Number`) 用户Id
+        - `userName`: (`String`) 用户名
+        - `width`: (`Number`) 作品宽度
+        - `height`: (`Number`) 作品高度
+        - `pageCount`: (`Number`) 作品页数
+        - `isBookmarkable`: (`Boolean`) 不明?
+        - `bookmarkData`: (`?`) 不明?
+        - `alt`: (`String`) 简略信息
+        - `isAdContainer`: (`Boolean`) 广告标识?
+        - `titleCaptionTranslation`: (`Object`) 不明?
+            - (待完善)
+        - `urls`: (`Object`) 其他封面图尺寸的链接
+            - (略)
+        - `seriesId`: (`?`) 不明?
+        - `seriesTitle`: (`?`) 不明?
+        - `profileImageUrl`: (`String`) 用户头像图链接
+    - `users`: (`Object[]`) 用户信？
+        - `userId`: (`String` -> `Number`) 用户Id
+        - `name`: (`String`) 用户名
+        - `image`: (`String`) 用户头像图链接
+        - `imageBig`: (`String`) 用户大尺寸头像图链接
+        - `premium`: (`Boolean`) 是否为Pixiv高级会员
+        - `isFollowed`: (`Boolean`) 是否关注
+        - `isMypixiv`: (`Boolean`) 不明?
+        - `isBlocking`: (`Boolean`) 是否为黑名单?
+        - `background`: (`?`) 不明?
+        - `partial`: (`Number`) 不明?
+    - `tagTranslation`: 标签翻译名
+        - `key=${标签原始名}`: (`Object`) 标签翻译信息
+            - `${语言代码}`: (`String`) 对应语言代码的翻译, 不一定有
+    - `boothItems`: (`Object[]`) 商品信息
+        - (待完善)
+    - `sketchLives`: (`Object[]`) 不明?
+        - (待完善)
+    - `zoneConfig`: (`Object`) 不明?
+        - (待完善)
+
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

    <groupId>net.lamgc</groupId>
    <artifactId>ContentGrabbingJi</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.2-20200517.1-SNAPSHOT</version>

    <repositories>
        <repository>
@ -19,7 +19,7 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <mirai.CoreVersion>0.39.4</mirai.CoreVersion>
+        <mirai.CoreVersion>1.0-RC2-1</mirai.CoreVersion>
        <mirai.JaptVersion>1.1.1</mirai.JaptVersion>
        <kotlin.version>1.3.71</kotlin.version>
        <ktor.version>1.3.2</ktor.version>
@ -86,7 +86,7 @@
        <dependency>
            <groupId>net.lamgc</groupId>
            <artifactId>java-utils</artifactId>
-            <version>1.2.0_20200505.1-SNAPSHOT</version>
+            <version>1.2.0_20200514.1-SNAPSHOT</version>
        </dependency>
        
        <dependency>
--- a/src/main/java/net/lamgc/cgj/Main.java
+++ b/src/main/java/net/lamgc/cgj/Main.java
@ -398,7 +398,7 @@ public class Main {
    private static void saveCookieStoreToFile() throws IOException {
        log.info("正在保存CookieStore...");
        File outputFile = new File(System.getProperty("cgj.botDataDir"), "cookies.store");
-        if(!outputFile.exists() && !outputFile.delete() && !outputFile.createNewFile()){
+        if(!outputFile.exists() && !outputFile.createNewFile()){
            log.error("保存CookieStore失败.");
            return;
        }
--- a/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java
+++ b/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java
@ -245,7 +245,7 @@ public class BotCommandProcess {
            String itemLimitPropertyKey = "ranking.itemCountLimit";
            try {
                itemLimit = Integer.parseInt(SettingProperties
-                        .getProperty(SettingProperties.GLOBAL, itemLimitPropertyKey, "10"));
+                        .getProperty(fromGroup, itemLimitPropertyKey, "10"));
            } catch(NumberFormatException e) {
                log.warn("配置项 {} 的参数值格式有误!", itemLimitPropertyKey);
            }
@ -254,7 +254,7 @@ public class BotCommandProcess {
            String imageLimitPropertyKey = "ranking.imageCountLimit";
            try {
                imageLimit = Integer.parseInt(
-                        SettingProperties.getProperty(SettingProperties.GLOBAL, imageLimitPropertyKey, "3"));
+                        SettingProperties.getProperty(fromGroup, imageLimitPropertyKey, "3"));
            } catch(NumberFormatException e) {
                log.warn("配置项 {} 的参数值格式有误!", imageLimitPropertyKey);
            }
@ -408,7 +408,7 @@ public class BotCommandProcess {
        int limit = 8;
        try {
            limit = Integer.parseInt(SettingProperties.
-                    getProperty(SettingProperties.GLOBAL, "search.itemCountLimit", "8"));
+                    getProperty(fromGroup, "search.itemCountLimit", "8"));
        } catch (Exception e) {
            log.warn("参数转换异常!将使用默认值(" + limit + ")", e);
        }
--- a/src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java
+++ b/src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java
@ -27,7 +27,8 @@ 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) >= 12) {
+        if(cal.get(Calendar.DAY_OF_YEAR) <= currentLocalDate.getDayOfYear() &&
+                cal.get(Calendar.HOUR_OF_DAY) >= 11 && cal.get(Calendar.MINUTE) >= 30) {
            cal.set(Calendar.DAY_OF_YEAR, currentLocalDate.getDayOfYear() + 1);
        }
        cal.set(Calendar.HOUR_OF_DAY, 11);
@ -35,13 +36,14 @@ public class RankingUpdateTimer {
        cal.set(Calendar.SECOND, 0);
        cal.set(Calendar.MILLISECOND, 0);

-        log.warn("已设置排行榜定时更新, 首次运行时间: {}", cal.getTime());
+        long delay = cal.getTime().getTime() - (System.currentTimeMillis());
+        log.warn("已设置排行榜定时更新, 首次运行时间: {} ({}min)", cal.getTime(), delay / 1000 / 60);
        timer.schedule(new TimerTask() {
            @Override
            public void run() {
                now(null);
            }
-        }, cal.getTime(), 86400000); // 1 Day
+        }, delay, 86400000); // 1 Day
    }

    public void now(Date queryDate) {
--- a/src/main/java/net/lamgc/cgj/bot/SettingProperties.java
+++ b/src/main/java/net/lamgc/cgj/bot/SettingProperties.java
@ -10,7 +10,7 @@ import java.util.*;

 public final class SettingProperties {

-    private final static Logger log = LoggerFactory.getLogger("SettingProperties");
+    private final static Logger log = LoggerFactory.getLogger(SettingProperties.class.getName());

    private final static File globalPropFile = new File(getPropertiesDir(), "global.properties");
    private final static Properties globalProp = new Properties();
@ -95,7 +95,7 @@ public final class SettingProperties {

    private static void saveGroupProperties(Long groupId, Properties properties) throws IOException {
        File groupPropFile = new File(getPropertiesDir(), "group." + groupId + ".properties");
-        if((!groupPropFile.exists() || !groupPropFile.isFile()) && (!groupPropFile.delete() || !groupPropFile.createNewFile())) {
+        if(!groupPropFile.exists() && !groupPropFile.createNewFile()) {
            log.error("群组 {} 配置文件创建失败!", groupId);
            return;
        }
@ -122,7 +122,7 @@ public final class SettingProperties {
     */
    private static void saveGlobalProperties() {
        try {
-            if((!globalPropFile.exists() || !globalPropFile.isFile()) && (!globalPropFile.delete() || !globalPropFile.createNewFile())) {
+            if(!globalPropFile.exists() && !globalPropFile.createNewFile()) {
                log.error("创建全局配置文件失败.");
                return;
            }
@ -158,7 +158,7 @@ public final class SettingProperties {
     */
    private static File getPropertiesDir() {
        File propDir = new File(System.getProperty("cgj.botDataDir"), "/setting/");
-        if((!propDir.exists() || !propDir.isDirectory()) && (!propDir.delete() || !propDir.mkdirs())) {
+        if(!propDir.exists() && !propDir.mkdirs()) {
            log.warn("Setting文件夹创建失败!");
        }
        return propDir;
--- a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
@ -12,7 +12,7 @@ public abstract class MessageEvent implements EventObject, MessageSender {
    public MessageEvent(long fromGroup, long fromQQ, String message) {
        this.fromGroup = fromGroup;
        this.fromQQ = fromQQ;
-        this.message = message;
+        this.message = message.trim();
    }

    /**
--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
@ -9,9 +9,7 @@ import net.mamoe.mirai.BotFactoryJvm;
 import net.mamoe.mirai.event.events.BotMuteEvent;
 import net.mamoe.mirai.event.events.BotUnmuteEvent;
 import net.mamoe.mirai.japt.Events;
-import net.mamoe.mirai.message.ContactMessage;
-import net.mamoe.mirai.message.FriendMessage;
-import net.mamoe.mirai.message.GroupMessage;
+import net.mamoe.mirai.message.*;
 import net.mamoe.mirai.utils.BotConfiguration;
 import org.apache.commons.net.util.Base64;
 import org.slf4j.Logger;
@ -45,9 +43,11 @@ public class MiraiMain implements Closeable {
            return;
        }

-        bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")), Base64.decodeBase64(botProperties.getProperty("bot.password", "")), new BotConfiguration());
-        Events.subscribeAlways(GroupMessage.class, this::executeMessageEvent);
-        Events.subscribeAlways(FriendMessage.class, this::executeMessageEvent);
+        BotConfiguration configuration = new BotConfiguration();
+        configuration.setProtocol(BotConfiguration.MiraiProtocol.ANDROID_PAD);
+        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(BotMuteEvent.class,
                event -> BotEventHandler.setMuteState(event.getGroup().getId(), true));
        Events.subscribeAlways(BotUnmuteEvent.class,
@ -62,20 +62,27 @@ public class MiraiMain implements Closeable {
     * 处理消息事件
     * @param message 消息事件对象
     */
-    private void executeMessageEvent(ContactMessage message) {
-        if(message instanceof GroupMessage) {
-            GroupMessage groupMessage = (GroupMessage) message;
-            if(BotEventHandler.isMute(groupMessage.getGroup().getId(), true) == null) {
-                BotEventHandler.setMuteState(groupMessage.getGroup().getId(),
-                        ((GroupMessage) message).getGroup().getBotMuteRemaining() != 0);
+    private void executeMessageEvent(MessageEvent message) {
+        if(message instanceof GroupMessageEvent) {
+            GroupMessageEvent GroupMessageEvent = (GroupMessageEvent) message;
+            if(BotEventHandler.isMute(GroupMessageEvent.getGroup().getId(), true) == null) {
+                BotEventHandler.setMuteState(GroupMessageEvent.getGroup().getId(),
+                        ((GroupMessageEvent) message).getGroup().getBotMuteRemaining() != 0);
            }
        }
        BotEventHandler.executeMessageEvent(new MiraiMessageEvent(message));
    }

+    /**
+     * 关闭机器人
+     */
    public void close() {
+        if(bot == null) {
+            return;
+        }
        log.warn("正在关闭机器人...");
        bot.close(null);
+        bot = null;
        log.warn("机器人已关闭.");
    }

--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
@ -1,29 +1,27 @@
 package net.lamgc.cgj.bot.framework.mirai.message;

-import net.lamgc.cgj.bot.event.MessageEvent;
 import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSource;
-import net.mamoe.mirai.message.ContactMessage;
-import net.mamoe.mirai.message.GroupMessage;
+import net.mamoe.mirai.message.GroupMessageEvent;
+import net.mamoe.mirai.message.MessageEvent;
 import net.mamoe.mirai.message.data.MessageUtils;

 import java.util.Objects;

-public class MiraiMessageEvent extends MessageEvent {
+public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {

-    private final ContactMessage messageObject;
+    private final MessageEvent messageObject;
    private final MessageSender messageSender;

-    public MiraiMessageEvent(ContactMessage message) {
-        super(message instanceof GroupMessage ? ((GroupMessage) message).getGroup().getId() : 0,
+    public MiraiMessageEvent(MessageEvent message) {
+        super(message instanceof GroupMessageEvent ? ((GroupMessageEvent) message).getGroup().getId() : 0,
                message.getSender().getId(), getMessageBodyWithoutSource(message.getMessage().toString()));
        this.messageObject = Objects.requireNonNull(message);
-        if(message instanceof GroupMessage) {
-            messageSender = new MiraiMessageSender(((GroupMessage) message).getGroup(), MessageSource.Group);
+        if(message instanceof GroupMessageEvent) {
+            messageSender = new MiraiMessageSender(((GroupMessageEvent) message).getGroup(), MessageSource.Group);
        } else {
            messageSender = new MiraiMessageSender(message.getSender(), MessageSource.Private);
        }
-
    }

    /**
--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
@ -11,10 +11,7 @@ import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSource;
 import net.mamoe.mirai.Bot;
 import net.mamoe.mirai.contact.Contact;
-import net.mamoe.mirai.message.data.Image;
-import net.mamoe.mirai.message.data.Message;
-import net.mamoe.mirai.message.data.MessageChain;
-import net.mamoe.mirai.message.data.MessageUtils;
+import net.mamoe.mirai.message.data.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@ -60,7 +57,7 @@ public class MiraiMessageSender implements MessageSender {
    public int sendMessage(final String message) {
        log.debug("处理前的消息内容:\n{}", message);
        Message msgBody = processMessage(Objects.requireNonNull(message));
-        log.debug("处理后的消息内容(可能出现乱序的情况, 但实际上顺序是没问题的):\n{}", msgBody);
+        log.debug("处理后的消息内容(可能出现乱序的情况, 但实际上顺序是没问题的):\n{}", msgBody.contentToString());
        member.sendMessage(msgBody);
        return 0;
    }
@ -117,6 +114,15 @@ public class MiraiMessageSender implements MessageSender {
                } else {
                    return img;
                }
+            case "face":
+                if(!code.containsParameter("id")) {
+                    return MessageUtils.newChain("(无效的表情Id)");
+                }
+                int faceId = Integer.parseInt(code.getParameter("id"));
+                if(faceId <= 0) {
+                    return MessageUtils.newChain("(无效的表情Id)");
+                }
+                return new Face(faceId);
            default:
                log.warn("解析到不支持的BotCode: {}", code);
                return MessageUtils.newChain("(不支持的BotCode)");
--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSenderFactory.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSenderFactory.java
@ -5,6 +5,8 @@ import net.lamgc.cgj.bot.message.MessageSenderFactory;
 import net.lamgc.cgj.bot.message.MessageSource;
 import net.mamoe.mirai.Bot;

+import java.util.Objects;
+
 public class MiraiMessageSenderFactory implements MessageSenderFactory {

    private final Bot bot;
@ -14,15 +16,11 @@ public class MiraiMessageSenderFactory implements MessageSenderFactory {
    }

    @Override
-    public MessageSender createMessageSender(MessageSource source, long id) throws Exception {
-        switch(source) {
-            case Group:
-            case Discuss:
-                return new MiraiMessageSender(bot.getGroup(id), source);
-            case Private:
-                return new MiraiMessageSender(bot.getFriend(id), source);
-            default:
-                throw new NoSuchFieldException(source.toString());
+    public MessageSender createMessageSender(MessageSource source, long id) {
+        Objects.requireNonNull(source);
+        if(id <= 0) {
+            throw new IllegalArgumentException("id cannot be 0 or negative: " + id);
        }
+        return new MiraiMessageSender(bot, source, id);
    }
 }
Author	SHA1	Message	Date
LamGC	04c1753c22	[Version] 更新版本(2.5.1 -> 2.5.2-20200517.1-SNAPSHOT);	2020-05-17 17:45:06 +08:00
LamGC	d993e9d719	[Add] MiraiMessageSender 增加对默认表情的支持;	2020-05-12 15:25:29 +08:00
LamGC	60e91987d1	Merge branch 'mirai'	2020-05-12 15:14:58 +08:00
LamGC	65392fc2fe	[Fix] net.mamoe:mirai-core, net.mamoe:mirai-core-qqandroid 更新Mirai-Core版本号以修复VerifyError问题(1.0-RC2 -> 1.0-RC2-1); [Fix] MiraiMessageSender 调整日志输出, 以修复日志打印处理后消息顺序混乱的问题;	2020-05-12 15:14:28 +08:00
LamGC	d38934a0f4	[Change] RankingUpdateTimer 调整时间补齐的阀值(12:00 -> 11:30); [Add] documents/interfaces/* 整理部分Pixiv接口的文档;	2020-05-12 15:03:08 +08:00
LamGC	7943357d96	[Fix] MiraiMain 修复未登录时异常退出, 抛出NPE的问题;	2020-05-11 12:16:35 +08:00
LamGC	a170ff040b	[Update] net.mamoe:mirai-core, net.mamoe:mirai-core-qqandroid 更新依赖项版本(0.39.4 -> 1.0-RC2); [Update] MiraiMain, MiraiMessageEvent 适配mirai新版本; [Change] MiraiMessageSenderFactory 增加参数检查并优化过程; [Change] MiraiMain 显性指定Mirai所用协议为'BotConfiguration.MiraiProtocol.ANDROID_PAD';	2020-05-11 11:36:37 +08:00
LamGC	cb2ebfdb73	[Change] MessageEvent 对消息内容删除首尾空格以提高用户体验性;	2020-05-09 23:13:53 +08:00
LamGC	66b22c543a	[Fix] SettingProperties 修复了配置文件无法创建, 导致无法保存配置的问题; [Fix] Main 修复了潜在的文件创建失败的问题;	2020-05-09 22:54:32 +08:00
LamGC	6bace4b048	[Version] 更新版本(2.5.0 -> 2.5.1);	2020-05-09 22:35:46 +08:00
LamGC	597aac4e95	[Fix] BotCommandProcess 修复部分指令无法使用群组配置的问题;	2020-05-09 22:35:21 +08:00