diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 104fa333..9ee11cef 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,6 +27,8 @@ jobs: run: | cd ./plugins/ npm ci --prod + rm package.json + rm package-lock.json cd .. - name: Install PKG Tool @@ -47,5 +49,4 @@ jobs: ./README.md ./LICENSE ./chatdacs.exe - ./文件路径不得存在非英文字符 if-no-files-found: error diff --git a/README.md b/README.md index 10ce2d6f..be609e11 100644 --- a/README.md +++ b/README.md @@ -46,13 +46,15 @@ ## 😘 写在最前面 Hi -在线体验地址：[沙雕Ai聊天系统](http://110.42.221.72/) +**`功能指令介绍` 以及 `私人部署教程` 请点击跳转至 👉 [星野夜蝶 使用文档](http://docs.giftia.moe/)** -如有任何疑问、建议或者需要联系我，请加官方 QQ 群 120243247：点击链接加入群聊【星野夜蝶 粉丝群】：https://jq.qq.com/?_wv=1027&k=ovqyydCe +在线体验地址：[沙雕 Ai 聊天系统](http://110.42.221.72/) + +如有任何疑问、建议或者需要联系我，请加群 [【星野夜蝶 粉丝群】 QQ 群 120243247 ](https://jq.qq.com/?_wv=1027&k=ovqyydCe) 对于普通用户，推荐您直接使用官方免费的公共小夜 QQ 账号：1648468212（不定时会被疼讯封号 7 天），邀请小夜入群即可，我会不定期批准请求。 -你也可以加入交流群，群里有不少群友自发个人部署的第三方小夜，你可以申请使用群友搭建的小夜。 +你也可以加入粉丝群，群里有不少群友自发个人部署的第三方小夜，你可以申请使用群友搭建的小夜。 但更推荐您使用私人部署，私人部署的好处都有啥： @@ -62,309 +64,21 @@ - 减轻我的服务器负担，让公共小夜活得更久，可循环利用 - 通过搭建流程体验，学习一门先进的技术，很 cool，很极客 -私人部署教程请点击跳转至下方的 [快速启动](#%EF%B8%8F-快速启动-quick-start) 章节 ↓ - -## ✔ 功能介绍 Orders - -- 在 web 端、qq 端、哔哩哔哩直播端 都通用的功能： - - - [x] 聊天回复率 `1%`，随机复读率 `1%` - - 大家随心所欲地聊天吧~小夜会随时准备好嘴臭的！还有概率会随机复读噢。在消息里成功 `@小夜` 的时候，小夜回复几率会提高。 - - - [x] 复读机 - - 当某条消息重复 `2` 次时小夜会跟风复读一次。 - - - [x] `/help` 或 `帮助` 或 `菜单` 或 `插件列表` 或 `说明` - - 会回复系统当前可用插件列表，描述插件版本和对应的触发指令正则表达式。[体验正则表达式](https://regex101.com/) - - - [x] `/ping` - - 测试指令，用于测试小夜的连通性。 - - - [x] `问：关键词 答：小夜的回答` - - 调教小夜说话吧！在优秀的聊天算法加成下，帮助养成由数万用户调教练就的嘴臭词库。当小夜收到含有关键词的语句时便会有几率触发回复，若该关键词有多个回复将会随机选择一个回复。支持图片问答。注意！冒号是中文全角的：，而不是英文半角的:，并且在 关键词 和 答：之间有一个空格。注意注意！如果像这样 “问：小夜的主人到底是谁呀 答：是你呀” 直接教完整的一句话的话是很难有效触发的，这就很考验你应该如何选择关键词了噢。像上面那个例子的话建议改成这样噢：“问：主人 答：是你呀”。 - - 使用例：`问：HELLO 答：WORLD` - - - [x] `/说不出话 文字或者图片` - - 教给小夜一些比较通用的回复。对于一些难以回复的对话，小夜的词库中没有搜索到回复的时候，小夜会随机回复这些回复，非常敷衍，回复了，但完全没有回复的意义。 - - - [x] `/status` 或 `/状态` - - 查询小夜的版本以及小夜的相关信息。 - - - [x] `/吠 你好谢谢小笼包再见` - - 让小夜开口说话吧。小夜使用基于大数据的情感幼女语音合成技术，能吠出更自然的发音、更丰富的情感和更强大的表现力。可以插入一些棒读音以提高生草效果。 - - 使用例：`/吠 太好听了吧啊，你唱歌真的好嗷好听啊，简直就是天岸籁，我刚才听到你唱歌了，我们以后一起唱好不好，一起唱昂，一起做学园偶像昂` - - - [x] `/嘴臭 对话` - - 小夜会通过语音来回应你的对话噢，还是要注意指令和对话之间要有个空格。 - - - [x] `/prpr 想pr的人` - - 让小夜帮你舔 ta 吧。 - - - [x] `/今日不带套` - - 七夕节快乐，让小夜帮你计算今天不带套的结果。 - - - [x] `/画师算命` - - 一个简单的 avg 小说，可以自由二次扩展开发。 - - - [x] `/迫害 [迫害对象] (迫害文字)` - - 让小夜来制作缺德的迫害表情包吧。现在可以迫害的对象：["唐可可", "上原步梦", "猛男狗", "令和", "鸭鸭", "陈睿"] - - 使用例：`/迫害 上原步梦 是我，是我先，明明都是我先来的……接吻也好，拥抱也好，还是喜欢上那家伙也好。` - - - [x] `/cp 攻 受` - - 让小夜生成一段简单的 cp 文。简简单单，就是最好的爱。 - - 使用例：`/cp 小夜 小雫` - - - [x] `赛博朋克` - - 非常赛博朋克的百科知识问答题。 - - - [x] `/报错 (报错内容)` - - 向小夜开发组反馈消息，消息会实时转达到小夜开发成员。 - - - [x] `qr (内容)` - - 让小夜帮你快速生成一个二维码。 - - - [x] `/黑白图 (图片) (第一排文字) (第二排文字)` - - 让小夜帮你生成一张黑白生草图。 - - - [ ] `人生重开` - - 风靡全球的人生重开小游戏，数据来自 https://github.com/VickScarlet/lifeRestart 。还没写好。 - - - [x] `/roll` - - 随机 roll 出 0 到 1000000 的随机数，可以自行跟随参数。 - - - [x] `BV19q4y1c7K4` - - 哔哩哔哩BV解析，返回av号和标题。 - - - [x] `提醒我晚上手冲` - - 将指定格式的消息推送至微信息知指定频道，适合传送消息至微信。 - - - [x] `弹窗 该手冲了` - - 会在小夜宿主电脑上弹出一条消息通知。 - - - [x] `cos图` 或 `cosplay` - - 在普通限度的尺度下让小夜发一张合法的 cos 图。 - - - [x] `买家秀` 或 `福利姬` - - 在无限度的尺度下让小夜发一张非法的买家秀福利图，危险注意！ - - - [x] `二次元` - - 在普通限度的尺度下让小夜发一张合法的二次元图。 - - - [x] `r18` 或 `可以色色` 或 `色、涩、瑟图` - - 在无限度的尺度下让小夜发一张非法的二次元图，超危险注意！ - - - [x] `来点xx` 或 `来点好的xx` 或 `来点坏的xx` - - 让小夜搜索一张指定tag的二次元图，xx 即你想搜索的 tag。 - - `好的` 代表正常尺度，`坏的` 代表🈲，超危险注意！ - - - [x] `让我看看` 或 `图来` - - 从本地图片文件夹随机发送图片，默认使用其他插件自动下载保存的图库文件夹。 - - - [x] `随机网图` - - 发送一张从随机网络图源获取的图片，图源可以自定义，网上很多。 - - - [x] `猫语 阿巴巴` - - 可以将文本加密为 `喵嗷呜` 格式的喵语，也可将喵语解密成原始文本。原作 https://github.com/ezshine/chrome-extension-catroom - - 解密不需要猫语前缀，直接发送即可。 - -- 仅在 qq 中生效的功能： - - - [x] `张菊@小夜` 与 `闭菊` - - 小夜的群服务开关。如果觉得小夜太吵了，想让小夜安静一会，那么在群里发 `闭菊` 即可关闭群内小夜的服务。`张菊@小夜` 为启用指定小夜的群服务。请勿光速一开一合调整菊部呼吸导致呼吸困难。 - - - [x] `戳一戳` - - 戳一戳小夜有利于身心健康。连续戳小夜 `3` 下就会生气把你禁言。 - - - [x] `/孤寡 @孤寡对象` - - 七夕节快乐，小夜收到了你的孤寡订单，现在就开始孤寡 ta 辣！ - - - [x] `我有个朋友说(我有个朋友)[@谁]` - - 小夜会 P 一张你朋友说的图。 - - 使用例：`我有个朋友说我好了@Giftina` - - - [x] `/强制迫害 (@对象) (说了什么) (小夜说了什么)` - - 小夜转发了一段来自平行世界的对话，适度娱乐噢。 - - - QQ 地 雷 战（需小夜是群管理时有效） - - - [x] `埋地雷` - - 一个有趣的小游戏，在群内埋下一坨极不稳定的地雷，有 30%的几率是掺了沙子的哑雷。在接下来的发言群员中会有一名幸运群友一脚踩到地雷，将会被炸伤 0 到 120 秒（禁言）。 - - [x] `踩地雷` - - 觉得手雷和地雷都伤不到你，自带主角光环？还是说想当排雷步兵？不如来试试踩地雷吧！一脚踩到群友埋的地雷上，对你造成 60 到 240 秒的暴击伤害。 - - [x] `一个手雷 @被害者` - - 一个有趣的小游戏，向@被害者丢出一个手雷，一位幸运玩家将会被炸伤 0 到 120 秒（禁言）。有千分之一的概率手雷会转化为神圣手雷（Holly Hand Grenade），将会炸伤所有无辜群友（全体禁言）。 - - [x] `希望的花 @希望目标` - - 团长，你在做什么啊！团长！朝 @希望目标 丢出一朵希望的花，救活目标（解除禁言），但是团长自己会被炸成重伤，造成 60 到 600 秒的暴击伤害。 - - [x] `击鼓传雷` - - 小夜会传给你一个手雷，你必须在 60 秒内尽快正确回答一个问题，不然就会在你手上爆炸噢。在回答正确之后，小夜会随机抽取一名幸运群友，把手雷传给 ta，ta 的回答时间将会是前一个玩家回答之后所剩的时间，依次类推，直到手雷在某个不幸群友手上爆炸才结束。这是一个只有死亡才能结束的游戏，做好准备了吗。 - --- ## ✨ 功能与特性 Features -- [x] 完善的 web端 聊天界面与各种奇奇怪怪的功能 `Nice H5 UI and some funny functions` +- [x] 完善的 web 端聊天界面与各种奇奇怪怪的功能 `Nice H5 UI and some funny functions` - [x] 无限制的在线聊天 `Unlimited chatroom` - [x] 与经过 2w+ 用户调教养成的人工智能机器人小夜实时聊天 `Chat with Ai Xiaoye` - [x] 令人激动的、实用的在线涩图功能 `🈲` - [x] web 端图片、视频与文件分享 `Share your images, videos and files on webEnd` - [x] 与 go-cqhttp 对接，实现了 qq 机器人小夜 `Connectable with go-cqhttp` - [x] 简单好用的插件系统 `Easy Use Plugins System` -- [ ] 自定义表情包 `Use your own stickers` -- [ ] 私聊 `Private chat` - ---- - -## ⚡️ 快速启动 Quick Start - -来试试快速启动吧，`一`键运行，`一`分钟运行`一`个属于自己的小夜： - -首先点击进入自动化部署工作流 `Actions` https://github.com/Giftia/ChatDACS/actions ， - -点击最新成功构建的工作流 `Compile ChatDACS for Windows` ， - -在页面下方的产品 `Artifacts` 里点击下载自动构建好的 `ChatDACS` 压缩包， - -解压 `ChatDACS` 压缩包，直接运行 `chatdacs.exe` 就可以辣。 - -如果在操作过程中有任何问题的话，请进 QQ 群 `120243247` 来问问题吧，有问必答噢。 - -⚠ 注意 1：开箱即用，若想使用更完善的功能，请访问以下申请地址，申请自己的接口密钥后，修改 `config` 文件夹内的 `config.yml` 文件: - -- 天行接口，用于 随机昵称 与 舔狗 功能，申请地址 https://www.tianapi.com/ -- 卡特实验室接口，用于 随机买家秀 功能，申请地址 https://api.sumt.cn/ -- 息知频道 key，用于 微信息知频道消息推送 功能，申请地址 https://xz.qqoq.net/ - -⚠ 注意 2：建议使用注册久点的 QQ 号作为机器人登陆使用，不容易被封号，新号很容易因为疼讯检测到突然频繁发言而被风控。 - -⚠ 注意 3：请避免在程序窗口中点击或者拖动，否则会由于触发窗口的文字选择，导致程序时停。如果观察到程序左上角出现了 `选择` 字样，说明已经进入了时停，请在窗口内 `黑色背景区域` 右键一下以退出时停，才可以继续运行。 - -⚠ 注意 4：如果程序时停过长，解除时停后会将所有时停期间的消息进行瞬间处理，有可能会导致伤害过大导致小夜猛烈输出。这种时候建议选择右上角 X 掉，重新启动。 - -⚠ 注意 5：如果想要切换机器人使用的 QQ 账号，请先关闭两个程序窗口，进入 `plugins` 文件夹里的 `go-cqhttp` 文件夹，删除 `device.json` 和 `session.token` 这两个文件，随后重新启动 `chatdacs.exe` 即可重新扫码登陆。 - -⚠ 注意 6：若想跳过 qq 扫码登陆，保持 qq 持久化登录，请先关闭两个程序窗口，请进入 `plugins` 文件夹里的 `go-cqhttp` 文件夹，修改第 4、5 行的 uin 和 password 为 qq账号和密码，以后的启动都会保持登陆。 - ---- - -## 🛠 手动编译 Manual Compile - -**该流程需要一定的编码和debug基础，不建议新手操作** - -如果自动化部署工作流 `Actions` 年久失修，没有更新， - -若您的操作系统和架构并不是常见的 Windows OS x64， - -或者是在快速启动、部署过程出现了错误， - -亦或者是想要了解小夜背后的 nodejs 是如何构建出小夜的， - -请按如下操作进行手动编译： - -1. 首先去 https://nodejs.org/zh-cn/ 下载安装 LTS(长期支持版) Node.js， - -2. 然后下载最新代码压缩包 https://github.com/Giftia/ChatDACS/archive/refs/heads/master.zip ，解压之， - -3. 打开系统的 `shell` ，如 `Bash`、`CMD`、`PowerShell` 等，用 `cd` 命令进入代码根目录运行： - -```bash -npm install -g cnpm --registry=https://registry.npm.taobao.org -``` - -4. 等待进度完成后运行： - -```bash -cnpm ci -``` - -5. 等待进度完成后运行： - -```bash -node index.js -``` - -好了，它应该已经启动了 🎉。更详细的部署和配置说明请查看 `index.js` 文件。插件位于 `plugins` 文件夹。 - -如果想要手动生成适合您的系统的可执行文件，可以使用手动打包指令： - -```bash -npm install pkg -g -npm pkg -``` - ---- - -## 😘 赞助者致谢名单：https://afdian.net/@xiaoye_bot - -| 用户名 | 金额/人民币 | 留言： | -| ------------------ | :--------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 爱发电用户\_8AP6 | 30 | | -| 可莉 | 15 请我喝 3 杯奶茶 | | -| 缤瑶 | 170 小夜挂件立牌 \* 10 | 加油喔！ | -| 卖萌傲娇萝莉赛高 | 50 | 夜爹真心对不住，我有个群友手贱举报了，把夜爹封了，已经踢出群了，赞助一下就当赎罪券了 | -| 小恩 | 30 定制专属小夜 | | -| 这是一只可爱的蛆呢 | 5 | 很好玩的 bot 啦 | -| 缤瑶 | 30 | 加油喔 | -| 爱发电用户\_ERJy | 30 | 永远滴神 1 1 1 | -| 缤瑶 | 0.91 | | -| Ai-Ding | 3 | | -| 缤瑶 | 30 | 加油！ | -| 缤瑶 | 30 | 加油喔，希望小夜出道！ | -| 爱发电用户\_AeSn | 5 | | -| 缤瑶 | 30 | 加油鸭 | -| 缤瑶 | 30 | 加油很喜欢小夜嘴臭的样子 | -| 卖萌傲娇萝莉赛高 | 30 | 很好玩的 bot，加油 | -| 眠眠打破\_ | 13.14 | 初次遇见小夜应该是 18 年初的时候 那时还在备战高考 今天的我正式走上了工作岗位 看到小夜复出 很感动 请 p 主喝杯奶茶 希望能在炎炎夏日为您带来一点糖分 愿 p 主和小夜的故事能够长远书写下去 | -| xian_yui | 10 | 夜爹冲鸭 | -| On my own. | 10 | 好耶 | -| 冰菓 | 15.21 | 缇娜加油奥，在学代码了，等我学成归来了和你一块干 小夜 | -| 爱发电用户\_vcFq | 30 | 为什么没有连续包月折扣！！ | -| 爱发电用户\_TWAG | 10 | -| kono 豆豆 da！ | 5 | 奶茶可以灌在膀胱里么嘤（bushi） | -| 砂糖酱 | 50 | -| 爱发电用户\_VhfC | 10 | -| 咕咕子 | 10 | -| 爱发电用户\_7jHF | 10 | -| 十八 | 5 | 夜爸爸加油 | -| 棒棒槌子 | 5 | -| 砂糖酱 | 50 | -| 棒棒槌子 | 5 | -| 砂糖酱 | 66 | 嗯 加点油 | -| 爱发电用户\_Jc5b | 30 | -| 玫瑰陨星之忆 | 5 | -| 玫瑰陨星之忆 | 6.66 | -| 爱发电用户\_WJPF | 5 | -| 滑小稽 | 5 | -| Yui | 10 | -| 多芒小丸子 | 10 | -| 爱发电用户\_wScP | 6 | -| 昀翳 | 50 | -| 爱发电用户\_KGMa | 10 | -| 余薪 | 10 | 不知道做不做得出 ai 思考性行为... | -| 爱发电用户\_qr83 | 10 | xxxx)hhjjiskejeududnn3kssioskwnssj | - -### 对本项目提供帮助的致谢名单（排名不分先后）： -- https://niconi.co.ni/ -- https://www.layuion.com/ -- https://lceda.cn/ -- https://www.dnspod.cn/ -- https://blog.csdn.net/qq_40715266 -- http://blog.luckly-mjw.cn/tool-show/iconfont-preview/index.html -- https://ihateregex.io/ -- https://www.maoken.com/ -- https://uptimerobot.com/ -- https://shields.io/ -- https://ctf.bugku.com/ -- https://hostker.com/ -- https://www.tianapi.com/ -- https://api.sumt.cn/ -- https://github.com/Mrs4s/go-cqhttp -- https://colorhunt.co/ -- https://gitee.com/ -- https://github.com/windrises/dialogue.moe -- https://github.com/ssp97 -- https://github.com/mxh-mini-apps/mxh-cp-stories -- https://github.com/Sora233/DDBOT -- 以及感谢我的花花儿、朋友们，以及倾心分享知识的各位。 +- [x] 支持接入哔哩哔哩直播间 `Support Bilibili Live` +- [x] 支持接入 QQ 频道 `Support QQ Guild` +- [ ] 支持接入 Telegram `Support Telegram` +- [ ] 哔哩哔哩直播互动游戏 `Bilibili Live Game` --- @@ -373,4 +87,5 @@ npm pkg 本项目使用 GPLv3 开源协议，一经使用则视为同意该协议，意味着你可以原封不动地运行本项目，并向你的用户提供服务。但如果对项目进行了任何修改，则需要 fork 本仓库并开源，至少需要将你修改后的版本对你的用户开源。出现的一切事故意外，请自行处理，与我无关。禁止任何形式的倒卖转售。 ## 免责声明 Disclaimer + 若本项目涉及任何侵权、违规、违法情况，请联系我： `admin@giftia.moe` ，我将第一时间进行处理。 diff --git a/config/constants.js b/config/constants.js index 9a7e8abc..e6493047 100644 --- a/config/constants.js +++ b/config/constants.js @@ -2,7 +2,7 @@ module.exports = Object.freeze({ //正则表达式 change_reply_probability_reg: new RegExp("^/回复率 [0-9]*"), //匹配修改qqBot小夜回复率 change_fudu_probability_reg: new RegExp("^/复读率 [0-9]*"), //匹配修改qqBot小夜复读率 - isImage_reg: new RegExp("\\[CQ:image,file:"), //匹配qq图片消息 + isImage_reg: new RegExp("\\[CQ:image,file"), //匹配qq图片消息 img_url_reg: new RegExp("https(.*term=3)"), //匹配图片地址 isVideo_reg: new RegExp("\\[CQ:video,file:"), //匹配qq视频消息 video_url_reg: new RegExp("http(.*term:unknow)"), //匹配视频地址 @@ -20,7 +20,7 @@ module.exports = Object.freeze({ gugua_reg: new RegExp("^/孤寡.*"), //匹配孤寡指令 fake_forward_reg: new RegExp("^/强制迫害.*"), //匹配伪造转发指令 approve_group_invite_reg: new RegExp("^/批准 (.*)"), //匹配批准加群指令 - test_reply_reg: new RegExp("\\[CQ:reply,id:.*复读"), //匹配回复测试指令 + reply_reg: new RegExp("\\[CQ:reply,id=.*复读"), //匹配回复测试指令 //全局常量 TTS_FILE_RECV_PATH: "./static/xiaoye/live_latest_reply.txt", //哔哩哔哩字幕文件存储路径 diff --git a/index.js b/index.js index 790d1085..6791121b 100644 --- a/index.js +++ b/index.js @@ -18,7 +18,7 @@ if (_cn_reg.test(process.cwd())) { /** * 声明依赖与配置 */ -const versionNumber = "v3.5.3"; //版本号 +const versionNumber = "v3.5.4"; //版本号 const version = `ChatDACS ${versionNumber}`; //系统版本，会显示在web端标题栏 const utils = require("./plugins/system/utils.js"); //载入系统通用模块 const Constants = require("./config/constants.js"); //系统常量 @@ -54,7 +54,7 @@ require.all = require("require.all"); //插件加载器 const { KeepLiveTCP } = require("bilibili-live-ws"); const yaml = require("yaml"); //使用yaml解析配置文件 const voicePlayer = require("play-sound")({ - player: path.join(process.cwd(), "plugins", "cmdmp3win.exe"), + player: path.join(process.cwd(), "plugins", "mpg123", "mpg123.exe"), }); //mp3静默播放工具，用于直播时播放语音 const ipTranslator = require("lib-qqwry")(true); //lib-qqwry是一个高效纯真IP库(qqwry.dat)引擎，传参 true 是将IP库文件读入内存中以提升效率 const { createOpenAPI, createWebsocket } = require("qq-guild-bot"); //QQ频道SDK @@ -708,23 +708,10 @@ function StartQQBot() { `@有人对线说 ${message}，小夜要嘴臭了`, ); ChatProcess(message) - .then((resolve) => { - let reply = resolve; - plugins.tts(reply) - .then((resolve) => { - let tts_file = `[CQ:record,file=http://127.0.0.1:${WEB_PORT}${resolve.file},url=http://127.0.0.1:${WEB_PORT}${resolve.file}]`; - res.send({ reply: tts_file }); - }) - .catch((reject) => { - console.log(`TTS错误: ${reject}`.error); - }); - }) - .catch((reject) => { - //如果没有匹配到回复，那就回复一句默认语音 - console.log(`${reject}，语音没有回复`.warn); - plugins.tts() + .then((reply) => { + plugins.tts.execute(`吠 ${reply}`) .then((resolve) => { - let tts_file = `[CQ:record,file=http://127.0.0.1:${WEB_PORT}${resolve.file},url=http://127.0.0.1:${WEB_PORT}${resolve.file}]`; + const tts_file = `[CQ:record,file=http://127.0.0.1:${WEB_PORT}${resolve.file},url=http://127.0.0.1:${WEB_PORT}${resolve.file}]`; res.send({ reply: tts_file }); }) .catch((reject) => { @@ -1619,21 +1606,20 @@ function StartQQBot() { return 0; } - //测试: 将指定的回复进行操作 - if (Constants.test_reply_reg.test(req.body.message)) { - //从 [CQ:reply,id=265936982] [CQ:at,qq=38263547] 复读 消息里获取id + //手动复读，复读回复中指定的消息 + if (Constants.reply_reg.test(req.body.message)) { + //从 [CQ:reply,id=-1982767585][CQ:at,qq=1005056803] 复读 消息里获取id - let msg_in = req.body.message.split("id=")[1]; - let id = msg_in.split("] [")[0].trim(); - id = msg_in.split("][")[0].trim(); + const msgID = req.body.message.split("id=")[1].split("]")[0].trim(); + logger.info(`收到手动复读指令，消息id: ${msgID}`.log); request( - `http://${GO_CQHTTP_SERVICE_API_URL}/get_msg?message_id=${id}`, + `http://${GO_CQHTTP_SERVICE_API_URL}/get_msg?message_id=${msgID}`, function (error, _response, body) { body = JSON.parse(body); if (!error) { logger.info(`复读历史消息: ${body.data.message}`.log); - res.send({ reply: `${body.data.message}` }); + res.send({ reply: body.data.message }); } }, ); @@ -1642,7 +1628,7 @@ function StartQQBot() { //群欢迎 if (req.body.notice_type === "group_increase") { - let final = `[CQ:at,qq=${req.body.user_id}] 你好呀，我是本群RBQ担当小夜!小夜的说明书在这里 https://gitee.com/Giftina/ChatDACS 噢，请问主人是要先吃饭呢，还是先洗澡呢，还是先*我呢~`; + const final = `[CQ:at,qq=${req.body.user_id}] 你好呀，我是本群RBQ担当小夜!小夜的说明书在这里 http://docs.giftia.moe/ 噢，请问主人是要先吃饭呢，还是先洗澡呢，还是先*我呢~`; request( `http://${GO_CQHTTP_SERVICE_API_URL}/send_group_msg?group_id=${req.body.group_id }&message=${encodeURI(final)}`, @@ -1658,7 +1644,7 @@ function StartQQBot() { } //管理员功能: 提醒停止服务的群启用小夜 - if (req.body.message === "/admin alert_open") { + if (req.body.message === "/提醒启用小夜") { for (let i in QQBOT_ADMIN_LIST) { if (req.body.user_id == QQBOT_ADMIN_LIST[i]) { logger.info("管理员启动了提醒任务".log); @@ -1764,37 +1750,6 @@ function StartQQBot() { io.emit("system", `@小夜回复: ${resolve}`); res.send({ reply: resolve }); return 0; - }) - .catch((reject) => { - //无匹配则随机回复balabala废话 - utils.GetBalabalaList() - .then((resolve) => { - let random_balabala = - resolve[Math.floor(Math.random() * resolve.length)] - .balabala; - res.send({ reply: random_balabala }); - io.emit( - "system", - `@小夜觉得${random_balabala}`, - ); - logger.info( - `${reject}，小夜觉得${random_balabala}`.log, - ); - return 0; - }) - .catch((reject) => { - logger.info( - `小夜试图balabala但出错了: ${reject}`.error, - ); - res.send({ - reply: `小夜试图balabala但出错了: ${reject}`, - }); - io.emit( - "system", - `@小夜试图balabala但出错了: ${reject}`, - ); - return 0; - }); }); } else { res.send(); //相当于严格模式，如果有多条res.send将会报错 @@ -1823,25 +1778,6 @@ function StartQQBot() { logger.info(`小夜回复 ${resolve}`.log); io.emit("system", `@小夜回复: ${resolve}`); res.send({ reply: resolve }); - }) - .catch((reject) => { - //无匹配则随机回复balabala废话 - utils.GetBalabalaList() - .then((resolve) => { - let random_balabala = - resolve[Math.floor(Math.random() * resolve.length)].balabala; - res.send({ reply: random_balabala }); - io.emit("system", `@小夜觉得${random_balabala}`); - logger.info(`${reject}，小夜觉得${random_balabala}`.log); - }) - .catch((reject) => { - logger.info(`小夜试图balabala但出错了: ${reject}`.error); - res.send({ reply: `小夜试图balabala但出错了: ${reject}` }); - io.emit( - "system", - `@小夜试图balabala但出错了: ${reject}`, - ); - }); }); return 0; } else { @@ -1880,10 +1816,10 @@ function StartQQBot() { */ function StartLive() { const live = new KeepLiveTCP(BILIBILI_LIVE_ROOM_ID); - live.on("open", () => logger.info("直播间连接成功".log)); + live.on("open", () => logger.info(`哔哩哔哩直播间 ${BILIBILI_LIVE_ROOM_ID} 连接成功`.log)); live.on("live", () => { - live.on("heartbeat", (online) => logger.info(`心跳包成功，直播间在线人数: ${online}`.log)); + live.on("heartbeat", (online) => logger.info(`直播间在线人数: ${online}`.log)); live.on("DANMU_MSG", async (data) => { const danmu = { @@ -1892,6 +1828,8 @@ function StartLive() { userName: data.info[2][1] }; + console.log(`${danmu.userName} 说: ${danmu.content}`.log); + //哔哩哔哩端插件应答器 const pluginsReply = await ProcessExecute(danmu.content, danmu.userId, danmu.userName) ?? ""; let replyToBiliBili = ""; @@ -1903,94 +1841,36 @@ function StartLive() { const chatReply = await ChatProcess(danmu.content); if (chatReply) { replyToBiliBili = chatReply; - } else { - //如果没有匹配到回复，那就随机回复balabala废话 - const balaBalaList = await utils.GetBalabalaList(); - const randBalaBala = balaBalaList[Math.floor(Math.random() * balaBalaList.length)].balabala; - replyToBiliBili = randBalaBala; } } fs.writeFileSync(Constants.TTS_FILE_RECV_PATH, `@${danmu.userName} ${replyToBiliBili}`); - const chatReplyToTTS = await plugins.tts(replyToBiliBili); - const ttsFile = `${process.cwd()}/static${chatReplyToTTS.file}`; - voicePlayer.play(ttsFile, function (err) { - if (err) throw err; - }); + const chatReplyToTTS = await plugins.tts.execute(`吠 ${replyToBiliBili}`); + + //如果语音合成成功的话，直接播放 + if (chatReplyToTTS.content.file) { + const ttsFile = `${process.cwd()}/static${chatReplyToTTS.content.file}`; + voicePlayer.play(ttsFile, function (err) { + if (err) { + console.log("播放失败：", err); + } + }); + } }); live.on("SEND_GIFT", (data) => { const gift = data.data; - console.log(`${gift.uname}送了${gift.num}个${gift.giftName}`.log); - if (gift.num > 1) { - console.log(`${gift.uname}送了${gift.num}个${gift.giftName}`.log); - console.log(`${gift.uname}送了${gift.num}个${gift.giftName}`.log); - } - }); - - live.on("GUARD_BUY", (data) => { - const guard = data.data; - console.log(`${guard.username}购买了${guard.num}个${guard.item}`.log); + console.log(`${gift.uname}送了 ${gift.num} 个 ${gift.giftName}`.log); }); live.on("WELCOME", (data) => { const welcome = data.data; - console.log(`${welcome.uname}进入直播间`.log); + console.log(`${welcome.uname} 进入直播间`.log); }); live.on("WELCOME_GUARD", (data) => { const welcome = data.data; - console.log(`${welcome.uname}进入直播间`.log); - }); - - live.on("ROOM_BLOCK_MSG", (data) => { - const block = data.data; - console.log(`${block.uname}禁言了${block.time}秒`.log); - }); - - live.on("ROOM_UNBLOCK_MSG", (data) => { - const block = data.data; - console.log(`${block.uname}解除禁言`.log); - }); - - live.on("ROOM_BLOCK_ALL", (data) => { - const block = data.data; - console.log(`${block.uname}禁言了`.log); - }); - - live.on("ROOM_UNBLOCK_ALL", (data) => { - const block = data.data; - console.log(`${block.uname}解除禁言`.log); - }); - - live.on("ROOM_BLOCK_USER", (data) => { - const block = data.data; - console.log(`${block.uname}禁言了`.log); - }); - - live.on("ROOM_UNBLOCK_USER", (data) => { - const block = data.data; - console.log(`${block.uname}解除禁言`.log); - }); - - live.on("SYS_MSG", (data) => { - const msg = data.data; - console.log(`${msg.msg}`.log); - }); - - live.on("SYS_GIFT", (data) => { - const msg = data.data; - console.log(`${msg.msg}`.log); - }); - - live.on("SYS_MSG_IN", (data) => { - const msg = data.data; - console.log(`${msg.msg}`.log); - }); - - live.on("SYS_GIFT_IN", (data) => { - const msg = data.data; - console.log(`${msg.msg}`.log); + console.log(`${welcome.uname} 进入直播间`.log); }); }); } diff --git a/package-lock.json b/package-lock.json index fdfc08a7..e6b32ec5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -201,6 +201,12 @@ "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", "optional": true }, + "@types/json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==", + "optional": true + }, "@types/keyv": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", @@ -453,9 +459,9 @@ } }, "bilibili-live-ws": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/bilibili-live-ws/-/bilibili-live-ws-6.1.0.tgz", - "integrity": "sha512-hIgqTKbyaqnybR9hBFEvxWskOiI8sykpfxgL5eJmw+vtM7HuyYhlxqVZsIKVZB0Xr3SEnUDG6vLaLTqlfA0Szw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/bilibili-live-ws/-/bilibili-live-ws-6.2.0.tgz", + "integrity": "sha512-3CfljK7mFnaQWMaPOI5NL14xUgr6qicTQ5T+ktRAcQpKdlPPpGVjz/lpv/ksQ0GnBy6XHomr9UI2kkfUu8iG/g==", "requires": { "array-flat-polyfill": "^1.0.1", "got": "^11.1.4", @@ -760,6 +766,16 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, + "compress-brotli": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz", + "integrity": "sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==", + "optional": true, + "requires": { + "@types/json-buffer": "~3.0.0", + "json-buffer": "~3.0.1" + } + }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -1626,9 +1642,9 @@ } }, "got": { - "version": "11.8.3", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", - "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==", + "version": "11.8.5", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", + "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==", "optional": true, "requires": { "@sindresorhus/is": "^4.0.0", @@ -2060,11 +2076,12 @@ } }, "keyv": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz", - "integrity": "sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.3.0.tgz", + "integrity": "sha512-C30Un9+63J0CsR7Wka5quXKqYZsT6dcRQ2aOwGcSc3RiQ4HGWpTAHlCA+puNfw2jA/s11EsxA1nCXgZRuRKMQQ==", "optional": true, "requires": { + "compress-brotli": "^1.3.8", "json-buffer": "3.0.1" } }, diff --git a/package.json b/package.json index 0faea9c0..c2fd06c3 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "axios": "^0.26.1", - "bilibili-live-ws": "^6.1.0", + "bilibili-live-ws": "^6.2.0", "canvas": "^2.9.1", "colors": "^1.4.0", "compression": "^1.7.4", diff --git a/plugins/cmdmp3win.exe b/plugins/cmdmp3win.exe deleted file mode 100644 index b4ba9d91..00000000 Binary files a/plugins/cmdmp3win.exe and /dev/null differ diff --git a/plugins/mpg123/COPYING.txt b/plugins/mpg123/COPYING.txt new file mode 100644 index 00000000..14e14f01 --- /dev/null +++ b/plugins/mpg123/COPYING.txt @@ -0,0 +1,772 @@ +This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package. + +Main message, to include in "About ..." boxes, etc: + + Copyright (c) 1995-2020 by Michael Hipp and others, + free software under the terms of the LGPL v2.1 + +There is an attempt to cover the actual list of authors in the AUTHORS file. +Project maintainer since 2006 is Thomas Orgis and many people have contributed +since the Michael Hipp era, but he stays the initial source and it would +be impractical to count them all individually, so it's "and others". +Source files contain the phrase "the mpg123 project" to the same effect +in their license boilerplate; especially those that were added after +maintainership changed. The person mainly responsible for the first version +is usually named in the phrase "initially written by ...". + +All files in the distribution that don't carry a license note on their own are +licensed under the terms of the LGPL 2.1; exceptions may apply, especially to +files not in the official distribution but in the revision control repository. + +The formal license text follows. + +======================= +1. The LGPL version 2.1 +======================= + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + +==================== +2. The GPL version 2 +==================== + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/plugins/mpg123/mpg123.exe b/plugins/mpg123/mpg123.exe new file mode 100644 index 00000000..7b3f1319 Binary files /dev/null and b/plugins/mpg123/mpg123.exe differ diff --git a/plugins/randomPicture.js b/plugins/randomPicture.js index 0da1c88e..784b9bb4 100644 --- a/plugins/randomPicture.js +++ b/plugins/randomPicture.js @@ -1,7 +1,7 @@ module.exports = { 插件名: "随机网图插件", 指令: "^[/!]?随机网图$", - 版本: "2.0", + 版本: "2.1", 作者: "Giftina", 描述: "从随机网络图源下载图片后发送图片。", 使用示例: "随机网图", @@ -15,11 +15,9 @@ module.exports = { /** * 其他可用随机图源： - * https://api.nmb.show/xiaojiejie1.php - * https://api.btstu.cn/sjbz/?m_lx=suiji * https://api.btstu.cn/sjbz/zsy.php */ -const 随机图源 = "http://api.nmb.show/xiaojiejie2.php"; +const 随机图源 = "https://api.btstu.cn/sjbz/?m_lx=suiji"; const request = require("request"); const fs = require("fs"); diff --git a/plugins/system/utils.js b/plugins/system/utils.js index 15331786..8fd2d1b4 100644 --- a/plugins/system/utils.js +++ b/plugins/system/utils.js @@ -1,7 +1,7 @@ /** * @name 系统工具类 * @description 各种公用函数和系统底层函数 - * @version 1.12 + * @version 1.13 */ module.exports = { /** @@ -211,20 +211,6 @@ module.exports = { }); }, - //获取balabala - GetBalabalaList() { - return new Promise((resolve, reject) => { - db.all("SELECT * FROM balabala;", (err, sql) => { - if (!err && sql[0]) { - let balabala = sql; - resolve(balabala); - } else { - reject("获取balabala错误。错误原因: " + err + ", sql:" + sql); - } - }); - }); - }, - //随机延时提醒闭菊的群 DelayAlert(serviceStoppedList) { const alertMsg = [ diff --git a/plugins/tts.js b/plugins/tts.js index 923c8a33..095ae1b0 100644 --- a/plugins/tts.js +++ b/plugins/tts.js @@ -1,14 +1,21 @@ module.exports = { 插件名: "语音合成插件", 指令: "^[/!]?吠(.*)", - 版本: "2.0", + 版本: "2.1", 作者: "Giftina", 描述: "让小夜开口说话吧。小夜使用基于大数据的情感幼女语音合成技术，能吠出更自然的发音、更丰富的情感和更强大的表现力。可以插入一些棒读音以提高生草效果。语速、语调、声线可调，自由度比较好。", 使用示例: "/吠 太好听了吧啊，你唱歌真的好嗷好听啊，简直就是天岸籁，我刚才听到你唱歌了，我们以后一起唱好不好，一起唱昂，一起做学园偶像昂", 预期返回: "[唐可可中文语音]", execute: async function (msg, userId, userName, groupId, groupName, options) { - const ttsFile = await TTS(msg); + const ttsContextFromIncomingMessage = new RegExp(module.exports.指令).exec(msg)[1]; + const ttsContent = ttsContextFromIncomingMessage || "你好谢谢小笼包再见!"; + //如果有图片回复，则不合成语音 + if (Constants.isImage_reg.test(ttsContent)) { + return ""; + } + + const ttsFile = await TTS(ttsContent); return { type: "audio", content: ttsFile }; }, }; @@ -16,11 +23,10 @@ module.exports = { const axios = require("axios").default; const fs = require("fs"); const utils = require("./system/utils.js"); +const Constants = require("../config/constants.js"); //扒的百度臻品音库-度米朵 -async function TTS(msg) { - const ttsContextFromIncomingMessage = new RegExp(module.exports.指令).exec(msg)[1]; - const ttsContent = ttsContextFromIncomingMessage ? msg.split("/吠")[1] : "你好谢谢小笼包再见!"; +async function TTS(ttsContent) { const ttsResult = await axios({ url: "https://ai.baidu.com/aidemo", method: "POST", @@ -39,8 +45,8 @@ async function TTS(msg) { */ spd: "7", //语速，取值0-15，默认为5中语速 pit: "10", //音调，取值0-15，默认为5中语调 - vol: "9", //音量，取值0-9，默认为5中音量 - aue: "3", //格式, 3：mp3(default) 4： pcm-16k 5： pcm-8k 6. wav + vol: "9", //音量，取值0-15，默认为5中音量 + aue: "3", //格式, 3：mp3(default) 4： pcm-16k 5： pcm-8k 6. wav 注：这个接口会无视该参数，生成mp3格式 tex: encodeURI(ttsContent) }, }) diff --git "a/\346\226\207\344\273\266\350\267\257\345\276\204\344\270\215\345\276\227\345\255\230\345\234\250\351\235\236\350\213\261\346\226\207\345\255\227\347\254\246" "b/\346\226\207\344\273\266\350\267\257\345\276\204\344\270\215\345\276\227\345\255\230\345\234\250\351\235\236\350\213\261\346\226\207\345\255\227\347\254\246" deleted file mode 100644 index e69de29b..00000000