删除#来份吊图添加半次元话题增加#椰奶群管菜单

2022-10-27 14:42:53 +08:00
parent f9290a2e0a
commit ccb153ca69
6 changed files with 193 additions and 94 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 * 增加`#查看热门tag`
 * 增加`#uid搜图`用画师的**uid**或**画师名**进行搜索
 * 增加`#同意|拒绝全部好友申请`
+* 增加`#半次元话题`
+* 增加`#椰奶群管帮助`

 # 1.0.2

--- a/apps/fun.js
+++ b/apps/fun.js
@@ -54,13 +54,13 @@ export class example extends plugin {
          reg: heisiwreg,
          fnc: 'heisiwu'
        },
-        {
-          reg: '^#?来份(屌|弔|吊)图$',
-          fnc: 'jandan'
-        },
        {
          reg: '^#?铃声搜索.*$',
          fnc: 'lingsheng'
+        },
+        {
+          reg: '^#?半次元话题$',
+          fnc: 'bcy_topic'
        }
      ]
    })
@@ -254,23 +254,6 @@ export class example extends plugin {
    Cfg.getCDsendMsg(e, imglist, false)
  }

-  //来份吊图
-  async jandan(e) {
-    let api = "http://jandan.net/pic"
-    let res = await fetch(api).then(res => res.text()).catch(err => console.error(err))
-    if (!res) return e.reply("接口失效辣！！！")
-    let reg = /<img src(.*?)jpg/g
-    let img = res.match(reg)
-    let imgreg = /src="(.*)/
-    let imglist = [];
-    for (let i of img) {
-      imglist.push(
-        imgreg.exec(i)[1]
-      )
-    }
-    e.reply(segment.image("http:" + lodash.sample(imglist)))
-  }
-
  //铃声多多
  async lingsheng(e) {
    let msg = e.msg.replace(/#|铃声搜索/g, "")
@@ -285,4 +268,16 @@ export class example extends plugin {
    ])
    await e.reply(await uploadRecord(res.aac, 0, false))
  }
+  /**半次元话题 */
+  async bcy_topic(e) {
+    let api = 'https://xiaobai.klizi.cn/API/other/bcy_topic.php'
+    let res = await fetch(api).then(res => res.json()).catch(err => console.log(err))
+    if (!res) return e.reply("接口失效")
+    let msg = [];
+    for (let i of res.data) {
+      msg.push(i.title);
+      msg.push(i.image.map(item => segment.image(item)))
+    }
+    Cfg.getforwardMsg(e, msg)
+  }
 }
--- a/apps/group_admin.js
+++ b/apps/group_admin.js
@@ -11,10 +11,6 @@ export class Basics extends plugin {
            event: 'message.group',
            priority: 500,
            rule: [
-                {
-                    reg: '^#群管帮助$',
-                    fnc: 'help'
-                },
                {
                    reg: '^#禁言.*$',
                    fnc: 'Taboo'
@@ -87,32 +83,6 @@ export class Basics extends plugin {
            ]
        })
    }
-    async help(e) {
-        if (!e.isMaster && !e.member.is_owner && !e.member.is_admin) return
-        let msg = [[
-            "#禁言 <@QQ> <时间> \n",
-            "#解禁 <@QQ> \n",
-            "#全体禁言 \n",
-            "#全体解禁 \n",
-            "#允许匿名 \n",
-            "#禁止匿名 \n",
-            "#踢 <@QQ> \n",
-            "#我要自闭 <时间> \n",
-            "#设置管理 <@QQ> \n",
-            "#取消管理 <@QQ> \n",
-            "#发群公告 <内容> \n",
-            "#查群公告 \n",
-            "#删群公告 <序号> \n",
-            "#申请头衔 <头衔>\n",
-            "#修改头衔 <@QQ> <头衔>\n",
-            "#幸运字符列表\n",
-            "#抽幸运字符\n",
-            "#替换幸运字符+(id)\n",
-            "#开启|关闭幸运字符\n",
-            "Tip:@群员可以用QQ号代替"
-        ]]
-        Cfg.getforwardMsg(e, msg)
-    }
    /**禁言 */
    async Taboo(e) {

--- a/apps/help.js
+++ b/apps/help.js
@@ -11,7 +11,7 @@ export class yenai_help extends plugin {
      priority: 2000,
      rule: [
        {
-          reg: '^#?椰奶(插件)?(帮助|菜单|功能)$',
+          reg: '^#?椰奶(插件)?(群管)?(帮助|菜单|功能)$',
          fnc: 'message'
        }
      ]
@@ -27,9 +27,13 @@ export class yenai_help extends plugin {
 async function help(e) {
  let custom = {}
  let help = {}
-
  let { diyCfg, sysCfg } = await Data.importCfg('help')

+  if (/群管/.test(e.msg)) {
+    diyCfg = await (await Data.importCfg('groupadmin')).diyCfg
+    sysCfg = await (await Data.importCfg('groupadmin')).sysCfg
+  }
+
  custom = help

  let helpConfig = lodash.defaults(diyCfg.helpCfg || {}, custom.helpCfg, sysCfg.helpCfg)
--- a/config/system/groupadmin_system.js
+++ b/config/system/groupadmin_system.js
@@ -0,0 +1,117 @@
+/*
+* 此配置文件为系统使用，请勿修改，否则可能无法正常使用
+*
+* 如需自定义配置请复制修改上一级help_default.js
+*
+* */
+
+export const helpCfg = {
+  title: '椰奶群管帮助',
+  subTitle: 'Yunzai-Bot & Yenai-Plugin',
+  columnCount: 3,
+  colWidth: 265,
+  theme: 'all',
+  themeExclude: ['default'],
+  style: {
+    fontColor: '#ceb78b',
+    descColor: '#eee',
+    contBgColor: 'rgba(6, 21, 31, .5)',
+    contBgBlur: 3,
+    headerBgColor: 'rgba(6, 21, 31, .4)',
+    rowBgColor1: 'rgba(6, 21, 31, .2)',
+    rowBgColor2: 'rgba(6, 21, 31, .35)'
+  }
+}
+
+export const helpList = [{
+  "group": "基础功能",
+  "list": [{
+    "icon": 1,
+    "title": "#禁言 <@QQ> <时间>",
+    "desc": "=-="
+  },
+  {
+    "icon": 2,
+    "title": "#解禁 <@QQ>",
+    "desc": "=-="
+  },
+  {
+    "icon": 3,
+    "title": "#全体禁言",
+    "desc": "顾名思义"
+  },
+  {
+    "icon": 4,
+    "title": "#全体解禁",
+    "desc": "顾名思义"
+  },
+  {
+    "icon": 5,
+    "title": "#允许匿名",
+    "desc": "顾名思义"
+  },
+  {
+    "icon": 6,
+    "title": "#禁止匿名",
+    "desc": "顾名思义"
+  },
+  {
+    "title": "#踢 <@QQ>",
+    "desc": "顾名思义",
+    "icon": 7
+  }, {
+    "title": "#我要自闭 <时间>",
+    "desc": "自闭一会",
+    "icon": 20
+  }]
+}, {
+  "group": "字符",
+  "list": [
+    {
+      "title": "#幸运字符列表",
+      "desc": "查看现有字符",
+      "icon": 16
+    },
+    {
+      "title": "#替换幸运字符+(id)",
+      "desc": "用列表获取id",
+      "icon": 3
+    },
+    {
+      "title": "#抽幸运字符",
+      "desc": "bot抽取字符",
+      "icon": 4
+    },
+    {
+      "title": "#开启|关闭幸运字符",
+      "desc": "=-=",
+      "icon": 5
+    },
+  ]
+}, {
+  "group": "Bot为群主可用",
+  "auth": "master",
+  "list": [
+    {
+      "title": "#设置管理 <@QQ>",
+      "desc": "增加管理",
+      "icon": 8
+    },
+    {
+      "title": "#取消管理 <@QQ> ",
+      "desc": "=-=",
+      "icon": 9
+    },
+    {
+      "title": "#申请头衔 <头衔>",
+      "desc": "群员自己设置",
+      "icon": 19
+    },
+    {
+      "title": "#修改头衔 <@QQ> <头衔>",
+      "desc": "主人给别人设置",
+      "icon": 10
+    }]
+}]
+
+export const isSys = true
--- a/config/system/help_system.js
+++ b/config/system/help_system.js
@@ -25,6 +25,7 @@ export const helpCfg = {

 export const helpList = [{
  "group": "Bot相关",
+  "auth": "master",
  "list": [{
    "icon": 1,
    "title": "#发好友 <QQ> <消息>", "desc": "给好友发送一条涩涩的消息"
@@ -127,6 +128,7 @@ export const helpList = [{
 },
 {
  "group": "通知相关",
+  "auth": "master",
  "list": [{
    "icon": 5,
    "title": "#椰奶设置 xx 开启/关闭",
@@ -146,46 +148,55 @@ export const helpList = [{
 },
 {
  "group": "娱乐功能",
-  "list": [{
-    "icon": 20,
-    "title": "#唱歌",
-    "desc": "随机唱鸭"
-  },
-  {
-    "icon": 13,
-    "title": "#赞我",
-    "desc": "给你点一个大大的赞"
-  },
-  {
-    "icon": 7,
-    "title": "#椰羊收益曲线",
-    "desc": "查看角色收益曲线"
-  },
-  {
-    "icon": 9,
-    "title": "#收益曲线帮助",
-    "desc": "=-="
-  }, {
-    "icon": 15,
-    "title": "#支付宝到账<数字>",
-    "desc": "听到账爽一下"
-  }, {
-    "icon": 17,
-    "title": "#翻译",
-    "desc": "有道翻译"
-  }, {
-    "icon": 9,
-    "title": "#搜索菜单",
-    "desc": "各大引擎搜索"
-  }, {
-    "icon": 15,
-    "title": "#coser",
-    "desc": "养眼=-="
-  }, {
-    "icon": 1,
-    "title": "#waifu",
-    "desc": "=-="
-  }]
+  "list": [
+    {
+      "icon": 7,
+      "title": "#椰羊收益曲线",
+      "desc": "查看角色收益曲线"
+    },
+    {
+      "icon": 9,
+      "title": "#收益曲线帮助",
+      "desc": "=-="
+    }, {
+      "icon": 20,
+      "title": "#唱歌",
+      "desc": "随机唱鸭"
+    },
+    {
+      "icon": 13,
+      "title": "#赞我",
+      "desc": "给你点一个大大的赞"
+    },
+    {
+      "icon": 15,
+      "title": "#支付宝到账<数字>",
+      "desc": "听到账爽一下"
+    }, {
+      "icon": 17,
+      "title": "#翻译",
+      "desc": "有道翻译"
+    }, {
+      "icon": 9,
+      "title": "#搜索菜单",
+      "desc": "各大引擎搜索"
+    }, {
+      "icon": 15,
+      "title": "#coser",
+      "desc": "养眼=-="
+    }, {
+      "icon": 1,
+      "title": "#waifu",
+      "desc": "=-="
+    }, {
+      "icon": 1,
+      "title": "#半次元话题",
+      "desc": "=-="
+    }, {
+      "icon": 7,
+      "title": "#铃声搜索",
+      "desc": "铃声多多"
+    }]
 },
 {
  "group": "其他功能",
@@ -204,7 +215,7 @@ export const helpList = [{
  }]
 },
 {
-  "group": "管理命令，仅管理员可用",
+  "group": "设置，版本相关",
  "auth": "master",
  "list": [{
    "icon": 8,