perf: 修改包路径

feat: 支持官方qq接口的Q群消息

.github/workflows/docker-image.yml

@@ -14,6 +14,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Build image
         run: |
+          git clone https://github.com/Soulter/AstrBot
+          cd AstrBot
           docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest .
       - name: Publish image
         run: |

.gitignore

@@ -8,5 +8,5 @@ configs/config.yaml
 temp
 cmd_config.json
 addons/plugins/
-data/
+data/*
 cookies.json

addons/dashboard/dist/assets/BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js

@@ -1 +1 @@
-import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as c,b as t,t as u,ad as p,B as n,ae as o,j as f}from"./index-9075b0bb.js";const b={class:"text-h3"},h={class:"d-flex align-center"},g={class:"d-flex align-center"},V=i({__name:"BaseBreadcrumb",props:{title:String,breadcrumbs:Array,icon:String},setup(d){const r=d;return(x,B)=>(l(),_(c,{class:"page-breadcrumb mb-1 mt-1"},{default:s(()=>[e(a,{cols:"12",md:"12"},{default:s(()=>[e(m,{variant:"outlined",elevation:"0",class:"px-4 py-3 withbg"},{default:s(()=>[e(c,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(r.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:r.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};
+import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as c,b as t,t as u,ad as p,B as n,ae as o,j as f}from"./index-dc96e1be.js";const b={class:"text-h3"},h={class:"d-flex align-center"},g={class:"d-flex align-center"},V=i({__name:"BaseBreadcrumb",props:{title:String,breadcrumbs:Array,icon:String},setup(d){const r=d;return(x,B)=>(l(),_(c,{class:"page-breadcrumb mb-1 mt-1"},{default:s(()=>[e(a,{cols:"12",md:"12"},{default:s(()=>[e(m,{variant:"outlined",elevation:"0",class:"px-4 py-3 withbg"},{default:s(()=>[e(c,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(r.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:r.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};

addons/dashboard/dist/assets/BlankLayout-1694b31c.js

@@ -1 +1 @@
-import{x as e,o as a,c as t,w as o,a as s,B as n,Z as r,W as c}from"./index-9075b0bb.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};
+import{x as e,o as a,c as t,w as o,a as s,B as n,Z as r,W as c}from"./index-dc96e1be.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};

addons/dashboard/dist/assets/ColorPage-757221a5.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as p,D as a,o as r,s,a as e,w as t,f as o,V as i,F as n,u as g,c as h,a0 as b,e as x,t as y}from"./index-9075b0bb.js";const P=p({__name:"ColorPage",setup(C){const c=a({title:"Colors Page"}),d=a([{title:"Utilities",disabled:!1,href:"#"},{title:"Colors",disabled:!0,href:"#"}]),u=a(["primary","lightprimary","secondary","lightsecondary","info","success","accent","warning","error","darkText","lightText","borderLight","inputBorder","containerBg"]);return(V,k)=>(r(),s(n,null,[e(m,{title:c.value.title,breadcrumbs:d.value},null,8,["title","breadcrumbs"]),e(i,null,{default:t(()=>[e(o,{cols:"12",md:"12"},{default:t(()=>[e(_,{title:"Color Palette"},{default:t(()=>[e(i,null,{default:t(()=>[(r(!0),s(n,null,g(u.value,(l,f)=>(r(),h(o,{md:"3",cols:"12",key:f},{default:t(()=>[e(b,{rounded:"md",class:"align-center justify-center d-flex",height:"100",width:"100%",color:l},{default:t(()=>[x("class: "+y(l),1)]),_:2},1032,["color"])]),_:2},1024))),128))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{P as default};
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as p,D as a,o as r,s,a as e,w as t,f as o,V as i,F as n,u as g,c as h,a0 as b,e as x,t as y}from"./index-dc96e1be.js";const P=p({__name:"ColorPage",setup(C){const c=a({title:"Colors Page"}),d=a([{title:"Utilities",disabled:!1,href:"#"},{title:"Colors",disabled:!0,href:"#"}]),u=a(["primary","lightprimary","secondary","lightsecondary","info","success","accent","warning","error","darkText","lightText","borderLight","inputBorder","containerBg"]);return(V,k)=>(r(),s(n,null,[e(m,{title:c.value.title,breadcrumbs:d.value},null,8,["title","breadcrumbs"]),e(i,null,{default:t(()=>[e(o,{cols:"12",md:"12"},{default:t(()=>[e(_,{title:"Color Palette"},{default:t(()=>[e(i,null,{default:t(()=>[(r(!0),s(n,null,g(u.value,(l,f)=>(r(),h(o,{md:"3",cols:"12",key:f},{default:t(()=>[e(b,{rounded:"md",class:"align-center justify-center d-flex",height:"100",width:"100%",color:l},{default:t(()=>[x("class: "+y(l),1)]),_:2},1032,["color"])]),_:2},1024))),128))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{P as default};

addons/dashboard/dist/assets/ConfigDetailCard-8467c848.js

@@ -1 +1 @@
-import{o as l,s as o,u as c,c as n,w as u,Q as g,b as s,R as k,F as t,ab as h,O as p,t as m,a as V,ac as f,i as C,q as x,k as v,A as U}from"./index-9075b0bb.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";const S={__name:"ConfigDetailCard",props:{config:Array},setup(d){return(y,B)=>(l(!0),o(t,null,c(d.config,r=>(l(),n(w,{key:r.name,title:r.name,style:{"margin-bottom":"16px"}},{default:u(()=>[g(s("a",null,"No data",512),[[k,d.config.length===0]]),(l(!0),o(t,null,c(r.body,e=>(l(),o(t,null,[e.config_type==="item"?(l(),o(t,{key:0},[e.val_type==="bool"?(l(),n(h,{key:0,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="str"?(l(),n(p,{key:1,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(l(),n(p,{key:2,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(l(),o(t,{key:3},[s("span",null,m(e.name),1),V(f,{modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:u(({attrs:a,item:i,select:b,selected:_})=>[V(C,x(a,{"model-value":_,closable:"",onClick:b,"onClick:close":D=>y.remove(i)}),{default:u(()=>[s("strong",null,m(i),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):v("",!0)],64)):e.config_type==="divider"?(l(),n(U,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):v("",!0)],64))),256))]),_:2},1032,["title"]))),128))}};export{S as _};
+import{o as l,s as o,u as c,c as n,w as u,Q as g,b as s,R as k,F as t,ab as h,O as p,t as m,a as V,ac as f,i as C,q as x,k as v,A as U}from"./index-dc96e1be.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";const S={__name:"ConfigDetailCard",props:{config:Array},setup(d){return(y,B)=>(l(!0),o(t,null,c(d.config,r=>(l(),n(w,{key:r.name,title:r.name,style:{"margin-bottom":"16px"}},{default:u(()=>[g(s("a",null,"No data",512),[[k,d.config.length===0]]),(l(!0),o(t,null,c(r.body,e=>(l(),o(t,null,[e.config_type==="item"?(l(),o(t,{key:0},[e.val_type==="bool"?(l(),n(h,{key:0,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="str"?(l(),n(p,{key:1,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(l(),n(p,{key:2,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(l(),o(t,{key:3},[s("span",null,m(e.name),1),V(f,{modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:u(({attrs:a,item:i,select:b,selected:_})=>[V(C,x(a,{"model-value":_,closable:"",onClick:b,"onClick:close":D=>y.remove(i)}),{default:u(()=>[s("strong",null,m(i),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):v("",!0)],64)):e.config_type==="divider"?(l(),n(U,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):v("",!0)],64))),256))]),_:2},1032,["title"]))),128))}};export{S as _};

addons/dashboard/dist/assets/ConfigPage-164b73e7.js

@@ -1 +1 @@
-import{_ as y}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as h,o,c as u,w as t,a,a8 as b,b as c,K as x,e as f,t as g,G as V,A as w,L as S,a9 as $,J as B,s as _,d as v,F as d,u as p,f as G,V as T,aa as j,T as l}from"./index-9075b0bb.js";import{_ as m}from"./ConfigDetailCard-d45b9ca7.js";const D={class:"d-sm-flex align-center justify-space-between"},C=h({__name:"ConfigGroupCard",props:{title:String},setup(e){const s=e;return(i,n)=>(o(),u(B,{variant:"outlined",elevation:"0",class:"withbg",style:{width:"50%"}},{default:t(()=>[a(b,{style:{padding:"10px 20px"}},{default:t(()=>[c("div",D,[a(x,null,{default:t(()=>[f(g(s.title),1)]),_:1}),a(V)])]),_:1}),a(w),a(S,null,{default:t(()=>[$(i.$slots,"default")]),_:3})]),_:3}))}}),I={style:{display:"flex","flex-direction":"row","justify-content":"space-between","align-items":"center","margin-bottom":"12px"}},N={style:{display:"flex","flex-direction":"row"}},R={style:{"margin-right":"10px",color:"black"}},F={style:{color:"#222"}},k=h({__name:"ConfigGroupItem",props:{title:String,desc:String,btnRoute:String,namespace:String},setup(e){const s=e;return(i,n)=>(o(),_("div",I,[c("div",N,[c("h3",R,g(s.title),1),c("p",F,g(s.desc),1)]),a(v,{to:s.btnRoute,color:"primary",class:"ml-2",style:{"border-radius":"10px"}},{default:t(()=>[f("配置")]),_:1},8,["to"])]))}}),L={style:{display:"flex","flex-direction":"row",padding:"16px",gap:"16px",width:"100%"}},P={name:"ConfigPage",components:{UiParentCard:y,ConfigGroupCard:C,ConfigGroupItem:k,ConfigDetailCard:m},data(){return{config_data:[],config_base:[],save_message_snack:!1,save_message:"",save_message_success:"",config_outline:[],namespace:""}},mounted(){this.getConfig()},methods:{switchConfig(e){l.get("/api/configs?namespace="+e).then(s=>{this.namespace=e,this.config_data=s.data.data,console.log(this.config_data)}).catch(s=>{save_message=s,save_message_snack=!0,save_message_success="error"})},getConfig(){l.get("/api/config_outline").then(e=>{this.config_outline=e.data.data,console.log(this.config_outline)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"}),l.get("/api/configs").then(e=>{this.config_base=e.data.data,console.log(this.config_data)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"})},updateConfig(){l.post("/api/configs",{base_config:this.config_base,config:this.config_data,namespace:this.namespace}).then(e=>{e.data.status==="success"?(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="error")}).catch(e=>{this.save_message=e,this.save_message_snack=!0,this.save_message_success="error"})}}},J=Object.assign(P,{setup(e){return(s,i)=>(o(),_(d,null,[a(T,null,{default:t(()=>[c("div",L,[(o(!0),_(d,null,p(s.config_outline,n=>(o(),u(C,{key:n.name,title:n.name},{default:t(()=>[(o(!0),_(d,null,p(n.body,r=>(o(),u(k,{title:r.title,desc:r.desc,namespace:r.namespace,onClick:U=>s.switchConfig(r.namespace)},null,8,["title","desc","namespace","onClick"]))),256))]),_:2},1032,["title"]))),128))]),a(G,{cols:"12",md:"12"},{default:t(()=>[a(m,{config:s.config_data},null,8,["config"]),a(m,{config:s.config_base},null,8,["config"])]),_:1})]),_:1}),a(v,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),a(j,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":i[0]||(i[0]=n=>s.save_message_snack=n)},{default:t(()=>[f(g(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};
+import{_ as y}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as h,o,c as u,w as t,a,a8 as b,b as c,K as x,e as f,t as g,G as V,A as w,L as S,a9 as $,J as B,s as _,d as v,F as d,u as p,f as G,V as T,aa as j,T as l}from"./index-dc96e1be.js";import{_ as m}from"./ConfigDetailCard-8467c848.js";const D={class:"d-sm-flex align-center justify-space-between"},C=h({__name:"ConfigGroupCard",props:{title:String},setup(e){const s=e;return(i,n)=>(o(),u(B,{variant:"outlined",elevation:"0",class:"withbg",style:{width:"50%"}},{default:t(()=>[a(b,{style:{padding:"10px 20px"}},{default:t(()=>[c("div",D,[a(x,null,{default:t(()=>[f(g(s.title),1)]),_:1}),a(V)])]),_:1}),a(w),a(S,null,{default:t(()=>[$(i.$slots,"default")]),_:3})]),_:3}))}}),I={style:{display:"flex","flex-direction":"row","justify-content":"space-between","align-items":"center","margin-bottom":"12px"}},N={style:{display:"flex","flex-direction":"row"}},R={style:{"margin-right":"10px",color:"black"}},F={style:{color:"#222"}},k=h({__name:"ConfigGroupItem",props:{title:String,desc:String,btnRoute:String,namespace:String},setup(e){const s=e;return(i,n)=>(o(),_("div",I,[c("div",N,[c("h3",R,g(s.title),1),c("p",F,g(s.desc),1)]),a(v,{to:s.btnRoute,color:"primary",class:"ml-2",style:{"border-radius":"10px"}},{default:t(()=>[f("配置")]),_:1},8,["to"])]))}}),L={style:{display:"flex","flex-direction":"row",padding:"16px",gap:"16px",width:"100%"}},P={name:"ConfigPage",components:{UiParentCard:y,ConfigGroupCard:C,ConfigGroupItem:k,ConfigDetailCard:m},data(){return{config_data:[],config_base:[],save_message_snack:!1,save_message:"",save_message_success:"",config_outline:[],namespace:""}},mounted(){this.getConfig()},methods:{switchConfig(e){l.get("/api/configs?namespace="+e).then(s=>{this.namespace=e,this.config_data=s.data.data,console.log(this.config_data)}).catch(s=>{save_message=s,save_message_snack=!0,save_message_success="error"})},getConfig(){l.get("/api/config_outline").then(e=>{this.config_outline=e.data.data,console.log(this.config_outline)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"}),l.get("/api/configs").then(e=>{this.config_base=e.data.data,console.log(this.config_data)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"})},updateConfig(){l.post("/api/configs",{base_config:this.config_base,config:this.config_data,namespace:this.namespace}).then(e=>{e.data.status==="success"?(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="error")}).catch(e=>{this.save_message=e,this.save_message_snack=!0,this.save_message_success="error"})}}},J=Object.assign(P,{setup(e){return(s,i)=>(o(),_(d,null,[a(T,null,{default:t(()=>[c("div",L,[(o(!0),_(d,null,p(s.config_outline,n=>(o(),u(C,{key:n.name,title:n.name},{default:t(()=>[(o(!0),_(d,null,p(n.body,r=>(o(),u(k,{title:r.title,desc:r.desc,namespace:r.namespace,onClick:U=>s.switchConfig(r.namespace)},null,8,["title","desc","namespace","onClick"]))),256))]),_:2},1032,["title"]))),128))]),a(G,{cols:"12",md:"12"},{default:t(()=>[a(m,{config:s.config_data},null,8,["config"]),a(m,{config:s.config_base},null,8,["config"])]),_:1})]),_:1}),a(v,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),a(j,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":i[0]||(i[0]=n=>s.save_message_snack=n)},{default:t(()=>[f(g(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};

addons/dashboard/dist/assets/Error404Page-06f6396d.js

@@ -1 +1 @@
-import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{o,c,w as s,V as i,a as r,b as e,d as l,e as a,f as d}from"./index-9075b0bb.js";const n="/assets/img-error-bg-ab6474a0.svg",_="/assets/img-error-blue-2675a7a9.svg",m="/assets/img-error-text-a6aebfa0.svg",g="/assets/img-error-purple-edee3fbc.svg";const p={},u={class:"text-center"},f=e("div",{class:"CardMediaWrapper"},[e("img",{src:n,alt:"grid",class:"w-100"}),e("img",{src:_,alt:"grid",class:"CardMediaParts"}),e("img",{src:m,alt:"build",class:"CardMediaBuild"}),e("img",{src:g,alt:"build",class:"CardMediaBuild"})],-1),h=e("h1",{class:"text-h1"},"Something is wrong",-1),v=e("p",null,[e("small",null,[a("The page you are looking was moved, removed, "),e("br"),a("renamed, or might never exist! ")])],-1);function x(b,V){return o(),c(i,{"no-gutters":"",class:"h-100vh"},{default:s(()=>[r(d,{class:"d-flex align-center justify-center"},{default:s(()=>[e("div",u,[f,h,v,r(l,{variant:"flat",color:"primary",class:"mt-4",to:"/","prepend-icon":"mdi-home"},{default:s(()=>[a(" Home")]),_:1})])]),_:1})]),_:1})}const C=t(p,[["render",x]]);export{C as default};
+import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{o,c,w as s,V as i,a as r,b as e,d as l,e as a,f as d}from"./index-dc96e1be.js";const n="/assets/img-error-bg-ab6474a0.svg",_="/assets/img-error-blue-2675a7a9.svg",m="/assets/img-error-text-a6aebfa0.svg",g="/assets/img-error-purple-edee3fbc.svg";const p={},u={class:"text-center"},f=e("div",{class:"CardMediaWrapper"},[e("img",{src:n,alt:"grid",class:"w-100"}),e("img",{src:_,alt:"grid",class:"CardMediaParts"}),e("img",{src:m,alt:"build",class:"CardMediaBuild"}),e("img",{src:g,alt:"build",class:"CardMediaBuild"})],-1),h=e("h1",{class:"text-h1"},"Something is wrong",-1),v=e("p",null,[e("small",null,[a("The page you are looking was moved, removed, "),e("br"),a("renamed, or might never exist! ")])],-1);function x(b,V){return o(),c(i,{"no-gutters":"",class:"h-100vh"},{default:s(()=>[r(d,{class:"d-flex align-center justify-center"},{default:s(()=>[e("div",u,[f,h,v,r(l,{variant:"flat",color:"primary",class:"mt-4",to:"/","prepend-icon":"mdi-home"},{default:s(()=>[a(" Home")]),_:1})])]),_:1})]),_:1})}const C=t(p,[["render",x]]);export{C as default};

addons/dashboard/dist/assets/LoginPage-71a6cb60.js

@@ -1,4 +1,4 @@
-import{_ as _t}from"./LogoDark.vue_vue_type_script_setup_true_lang-b3521e6c.js";import{x as ke,af as we,r as Ot,ag as Vt,D as A,ah as Ne,a2 as P,B as I,ai as Q,aj as St,I as Be,ak as Ie,al as Et,am as jt,an as At,ao as G,y as wt,o as Re,c as tt,w as C,a as j,O as He,b as ge,ap as Ft,d as Pt,e as Ge,s as Ct,aq as Tt,t as Nt,k as Bt,U as It,f as Fe,N as Rt,V as Pe,J as Ye,L as kt}from"./index-9075b0bb.js";import{a as Mt}from"./md5-48eb25f3.js";/**
+import{_ as _t}from"./LogoDark.vue_vue_type_script_setup_true_lang-7df35c25.js";import{x as ke,af as we,r as Ot,ag as Vt,D as A,ah as Ne,a2 as P,B as I,ai as Q,aj as St,I as Be,ak as Ie,al as Et,am as jt,an as At,ao as G,y as wt,o as Re,c as tt,w as C,a as j,O as He,b as ge,ap as Ft,d as Pt,e as Ge,s as Ct,aq as Tt,t as Nt,k as Bt,U as It,f as Fe,N as Rt,V as Pe,J as Ye,L as kt}from"./index-dc96e1be.js";import{a as Mt}from"./md5-45627dcb.js";/**
   * vee-validate v4.11.3
   * (c) 2023 Abdelrahman Awad
   * @license MIT

addons/dashboard/dist/assets/LogoDark.vue_vue_type_script_setup_true_lang-7df35c25.js

@@ -1 +1 @@
-import{av as _,x as d,D as n,o as c,s as m,a as f,w as p,Q as r,b as a,R as o,B as t,aw as h}from"./index-9075b0bb.js";const s={Sidebar_drawer:!0,Customizer_drawer:!1,mini_sidebar:!1,fontTheme:"Roboto",inputBg:!1},l=_({id:"customizer",state:()=>({Sidebar_drawer:s.Sidebar_drawer,Customizer_drawer:s.Customizer_drawer,mini_sidebar:s.mini_sidebar,fontTheme:"Poppins",inputBg:s.inputBg}),getters:{},actions:{SET_SIDEBAR_DRAWER(){this.Sidebar_drawer=!this.Sidebar_drawer},SET_MINI_SIDEBAR(e){this.mini_sidebar=e},SET_FONT(e){this.fontTheme=e}}}),u={class:"logo",style:{display:"flex","align-items":"center"}},b={style:{"font-size":"24px","font-weight":"1000"}},w={style:{"font-size":"20px","font-weight":"1000"}},S={style:{"font-size":"20px"}},z=d({__name:"LogoDark",setup(e){n("rgb(var(--v-theme-primary))"),n("rgb(var(--v-theme-secondary))");const i=l();return(g,B)=>(c(),m("div",u,[f(t(h),{to:"/",style:{"text-decoration":"none",color:"black"}},{default:p(()=>[r(a("span",b,"AstrBot 仪表盘",512),[[o,!t(i).mini_sidebar]]),r(a("span",w,"Astr",512),[[o,t(i).mini_sidebar]]),r(a("span",S,"Bot",512),[[o,t(i).mini_sidebar]])]),_:1})]))}});export{z as _,l as u};
+import{av as _,x as d,D as n,o as c,s as m,a as f,w as p,Q as r,b as a,R as o,B as t,aw as h}from"./index-dc96e1be.js";const s={Sidebar_drawer:!0,Customizer_drawer:!1,mini_sidebar:!1,fontTheme:"Roboto",inputBg:!1},l=_({id:"customizer",state:()=>({Sidebar_drawer:s.Sidebar_drawer,Customizer_drawer:s.Customizer_drawer,mini_sidebar:s.mini_sidebar,fontTheme:"Poppins",inputBg:s.inputBg}),getters:{},actions:{SET_SIDEBAR_DRAWER(){this.Sidebar_drawer=!this.Sidebar_drawer},SET_MINI_SIDEBAR(e){this.mini_sidebar=e},SET_FONT(e){this.fontTheme=e}}}),u={class:"logo",style:{display:"flex","align-items":"center"}},b={style:{"font-size":"24px","font-weight":"1000"}},w={style:{"font-size":"20px","font-weight":"1000"}},S={style:{"font-size":"20px"}},z=d({__name:"LogoDark",setup(e){n("rgb(var(--v-theme-primary))"),n("rgb(var(--v-theme-secondary))");const i=l();return(g,B)=>(c(),m("div",u,[f(t(h),{to:"/",style:{"text-decoration":"none",color:"black"}},{default:p(()=>[r(a("span",b,"AstrBot 仪表盘",512),[[o,!t(i).mini_sidebar]]),r(a("span",w,"Astr",512),[[o,t(i).mini_sidebar]]),r(a("span",S,"Bot",512),[[o,t(i).mini_sidebar]])]),_:1})]))}});export{z as _,l as u};

addons/dashboard/dist/assets/MaterialIcons-fc2671ff.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as n,D as a,o as c,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-9075b0bb.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as n,D as a,o as c,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-dc96e1be.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/RegisterPage-03654257.js

@@ -1 +1 @@
-import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-b3521e6c.js";import{x as y,D as o,o as b,s as U,a as e,w as a,b as n,B as $,d as u,f as d,A as _,e as f,V as r,O as m,ap as A,au as E,F,c as T,N as q,J as V,L as P}from"./index-9075b0bb.js";const z="/assets/social-google-a359a253.svg",N=["src"],S=n("span",{class:"ml-2"},"Sign up with Google",-1),D=n("h5",{class:"text-h5 text-center my-4 mb-8"},"Sign up with Email address",-1),G={class:"d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold"},L=n("a",{href:"#",class:"ml-1 text-lightText"},"Terms and Condition",-1),O={class:"mt-5 text-right"},j=y({__name:"AuthRegister",setup(w){const c=o(!1),i=o(!1),p=o(""),v=o(""),g=o(),h=o(""),x=o(""),k=o([s=>!!s||"Password is required",s=>s&&s.length<=10||"Password must be less than 10 characters"]),C=o([s=>!!s||"E-mail is required",s=>/.+@.+\..+/.test(s)||"E-mail must be valid"]);function R(){g.value.validate()}return(s,l)=>(b(),U(F,null,[e(u,{block:"",color:"primary",variant:"outlined",class:"text-lightText googleBtn"},{default:a(()=>[n("img",{src:$(z),alt:"google"},null,8,N),S]),_:1}),e(r,null,{default:a(()=>[e(d,{class:"d-flex align-center"},{default:a(()=>[e(_,{class:"custom-devider"}),e(u,{variant:"outlined",class:"orbtn",rounded:"md",size:"small"},{default:a(()=>[f("OR")]),_:1}),e(_,{class:"custom-devider"})]),_:1})]),_:1}),D,e(E,{ref_key:"Regform",ref:g,"lazy-validation":"",action:"/dashboards/analytical",class:"mt-7 loginForm"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:h.value,"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Firstname"},null,8,["modelValue"])]),_:1}),e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:x.value,"onUpdate:modelValue":l[1]||(l[1]=t=>x.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Lastname"},null,8,["modelValue"])]),_:1})]),_:1}),e(m,{modelValue:v.value,"onUpdate:modelValue":l[2]||(l[2]=t=>v.value=t),rules:C.value,label:"Email Address / Username",class:"mt-4 mb-4",required:"",density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary"},null,8,["modelValue","rules"]),e(m,{modelValue:p.value,"onUpdate:modelValue":l[3]||(l[3]=t=>p.value=t),rules:k.value,label:"Password",required:"",density:"comfortable",variant:"outlined",color:"primary","hide-details":"auto","append-icon":i.value?"mdi-eye":"mdi-eye-off",type:i.value?"text":"password","onClick:append":l[4]||(l[4]=t=>i.value=!i.value),class:"pwdInput"},null,8,["modelValue","rules","append-icon","type"]),n("div",G,[e(A,{modelValue:c.value,"onUpdate:modelValue":l[5]||(l[5]=t=>c.value=t),rules:[t=>!!t||"You must agree to continue!"],label:"Agree with?",required:"",color:"primary",class:"ms-n2","hide-details":""},null,8,["modelValue","rules"]),L]),e(u,{color:"secondary",block:"",class:"mt-2",variant:"flat",size:"large",onClick:l[6]||(l[6]=t=>R())},{default:a(()=>[f("Sign Up")]),_:1})]),_:1},512),n("div",O,[e(_),e(u,{variant:"plain",to:"/auth/login",class:"mt-2 text-capitalize mr-n2"},{default:a(()=>[f("Already have an account?")]),_:1})])],64))}});const I={class:"pa-7 pa-sm-12"},J=n("h2",{class:"text-secondary text-h2 mt-8"},"Sign up",-1),Y=n("h4",{class:"text-disabled text-h4 mt-3"},"Enter credentials to continue",-1),M=y({__name:"RegisterPage",setup(w){return(c,i)=>(b(),T(r,{class:"h-100vh","no-gutters":""},{default:a(()=>[e(d,{cols:"12",class:"d-flex align-center bg-lightprimary"},{default:a(()=>[e(q,null,{default:a(()=>[n("div",I,[e(r,{justify:"center"},{default:a(()=>[e(d,{cols:"12",lg:"10",xl:"6",md:"7"},{default:a(()=>[e(V,{elevation:"0",class:"loginBox"},{default:a(()=>[e(V,{variant:"outlined"},{default:a(()=>[e(P,{class:"pa-9"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",class:"text-center"},{default:a(()=>[e(B),J,Y]),_:1})]),_:1}),e(j)]),_:1})]),_:1})]),_:1})]),_:1})]),_:1})])]),_:1})]),_:1})]),_:1}))}});export{M as default};
+import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-7df35c25.js";import{x as y,D as o,o as b,s as U,a as e,w as a,b as n,B as $,d as u,f as d,A as _,e as f,V as r,O as m,ap as A,au as E,F,c as T,N as q,J as V,L as P}from"./index-dc96e1be.js";const z="/assets/social-google-a359a253.svg",N=["src"],S=n("span",{class:"ml-2"},"Sign up with Google",-1),D=n("h5",{class:"text-h5 text-center my-4 mb-8"},"Sign up with Email address",-1),G={class:"d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold"},L=n("a",{href:"#",class:"ml-1 text-lightText"},"Terms and Condition",-1),O={class:"mt-5 text-right"},j=y({__name:"AuthRegister",setup(w){const c=o(!1),i=o(!1),p=o(""),v=o(""),g=o(),h=o(""),x=o(""),k=o([s=>!!s||"Password is required",s=>s&&s.length<=10||"Password must be less than 10 characters"]),C=o([s=>!!s||"E-mail is required",s=>/.+@.+\..+/.test(s)||"E-mail must be valid"]);function R(){g.value.validate()}return(s,l)=>(b(),U(F,null,[e(u,{block:"",color:"primary",variant:"outlined",class:"text-lightText googleBtn"},{default:a(()=>[n("img",{src:$(z),alt:"google"},null,8,N),S]),_:1}),e(r,null,{default:a(()=>[e(d,{class:"d-flex align-center"},{default:a(()=>[e(_,{class:"custom-devider"}),e(u,{variant:"outlined",class:"orbtn",rounded:"md",size:"small"},{default:a(()=>[f("OR")]),_:1}),e(_,{class:"custom-devider"})]),_:1})]),_:1}),D,e(E,{ref_key:"Regform",ref:g,"lazy-validation":"",action:"/dashboards/analytical",class:"mt-7 loginForm"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:h.value,"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Firstname"},null,8,["modelValue"])]),_:1}),e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:x.value,"onUpdate:modelValue":l[1]||(l[1]=t=>x.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Lastname"},null,8,["modelValue"])]),_:1})]),_:1}),e(m,{modelValue:v.value,"onUpdate:modelValue":l[2]||(l[2]=t=>v.value=t),rules:C.value,label:"Email Address / Username",class:"mt-4 mb-4",required:"",density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary"},null,8,["modelValue","rules"]),e(m,{modelValue:p.value,"onUpdate:modelValue":l[3]||(l[3]=t=>p.value=t),rules:k.value,label:"Password",required:"",density:"comfortable",variant:"outlined",color:"primary","hide-details":"auto","append-icon":i.value?"mdi-eye":"mdi-eye-off",type:i.value?"text":"password","onClick:append":l[4]||(l[4]=t=>i.value=!i.value),class:"pwdInput"},null,8,["modelValue","rules","append-icon","type"]),n("div",G,[e(A,{modelValue:c.value,"onUpdate:modelValue":l[5]||(l[5]=t=>c.value=t),rules:[t=>!!t||"You must agree to continue!"],label:"Agree with?",required:"",color:"primary",class:"ms-n2","hide-details":""},null,8,["modelValue","rules"]),L]),e(u,{color:"secondary",block:"",class:"mt-2",variant:"flat",size:"large",onClick:l[6]||(l[6]=t=>R())},{default:a(()=>[f("Sign Up")]),_:1})]),_:1},512),n("div",O,[e(_),e(u,{variant:"plain",to:"/auth/login",class:"mt-2 text-capitalize mr-n2"},{default:a(()=>[f("Already have an account?")]),_:1})])],64))}});const I={class:"pa-7 pa-sm-12"},J=n("h2",{class:"text-secondary text-h2 mt-8"},"Sign up",-1),Y=n("h4",{class:"text-disabled text-h4 mt-3"},"Enter credentials to continue",-1),M=y({__name:"RegisterPage",setup(w){return(c,i)=>(b(),T(r,{class:"h-100vh","no-gutters":""},{default:a(()=>[e(d,{cols:"12",class:"d-flex align-center bg-lightprimary"},{default:a(()=>[e(q,null,{default:a(()=>[n("div",I,[e(r,{justify:"center"},{default:a(()=>[e(d,{cols:"12",lg:"10",xl:"6",md:"7"},{default:a(()=>[e(V,{elevation:"0",class:"loginBox"},{default:a(()=>[e(V,{variant:"outlined"},{default:a(()=>[e(P,{class:"pa-9"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",class:"text-center"},{default:a(()=>[e(B),J,Y]),_:1})]),_:1}),e(j)]),_:1})]),_:1})]),_:1})]),_:1})]),_:1})])]),_:1})]),_:1})]),_:1}))}});export{M as default};

addons/dashboard/dist/assets/ShadowPage-fb617452.js

@@ -1 +1 @@
-import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as m,D as s,o as l,s as r,a as e,w as a,f as i,V as o,F as d,u as _,J as p,X as b,b as h,t as g}from"./index-9075b0bb.js";const v=m({__name:"ShadowPage",setup(w){const n=s({title:"Shadow Page"}),u=s([{title:"Utilities",disabled:!1,href:"#"},{title:"Shadow",disabled:!0,href:"#"}]);return(V,x)=>(l(),r(d,null,[e(c,{title:n.value.title,breadcrumbs:u.value},null,8,["title","breadcrumbs"]),e(o,null,{default:a(()=>[e(i,{cols:"12",md:"12"},{default:a(()=>[e(f,{title:"Basic Shadow"},{default:a(()=>[e(o,{justify:"center"},{default:a(()=>[(l(),r(d,null,_(25,t=>e(i,{key:t,cols:"auto"},{default:a(()=>[e(p,{height:"100",width:"100",class:b(["mb-5",["d-flex justify-center align-center bg-primary",`elevation-${t}`]])},{default:a(()=>[h("div",null,g(t-1),1)]),_:2},1032,["class"])]),_:2},1024)),64))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{v as default};
+import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as m,D as s,o as l,s as r,a as e,w as a,f as i,V as o,F as d,u as _,J as p,X as b,b as h,t as g}from"./index-dc96e1be.js";const v=m({__name:"ShadowPage",setup(w){const n=s({title:"Shadow Page"}),u=s([{title:"Utilities",disabled:!1,href:"#"},{title:"Shadow",disabled:!0,href:"#"}]);return(V,x)=>(l(),r(d,null,[e(c,{title:n.value.title,breadcrumbs:u.value},null,8,["title","breadcrumbs"]),e(o,null,{default:a(()=>[e(i,{cols:"12",md:"12"},{default:a(()=>[e(f,{title:"Basic Shadow"},{default:a(()=>[e(o,{justify:"center"},{default:a(()=>[(l(),r(d,null,_(25,t=>e(i,{key:t,cols:"auto"},{default:a(()=>[e(p,{height:"100",width:"100",class:b(["mb-5",["d-flex justify-center align-center bg-primary",`elevation-${t}`]])},{default:a(()=>[h("div",null,g(t-1),1)]),_:2},1032,["class"])]),_:2},1024)),64))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/TablerIcons-3ae5dd43.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as c,D as a,o as i,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-9075b0bb.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as c,D as a,o as i,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-dc96e1be.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};

addons/dashboard/dist/assets/TypographyPage-7d559339.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as f,o as i,c as g,w as e,a,a8 as y,K as b,e as w,t as d,A as C,L as V,a9 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,X as H,V as T}from"./index-9075b0bb.js";const s=f({__name:"UiChildCard",props:{title:String},setup(r){const l=r;return(n,c)=>(i(),g(_,{variant:"outlined"},{default:e(()=>[a(y,{class:"py-3"},{default:e(()=>[a(b,{class:"text-h5"},{default:e(()=>[w(d(l.title),1)]),_:1})]),_:1}),a(C),a(V,null,{default:e(()=>[L(n.$slots,"default")]),_:3})]),_:3}))}}),D={class:"d-flex flex-column gap-1"},S={class:"text-caption pa-2 bg-lightprimary"},z=t("div",{class:"text-grey"},"Class",-1),N={class:"font-weight-medium"},$=t("div",null,[t("p",{class:"text-left"},"Left aligned on all viewport sizes."),t("p",{class:"text-center"},"Center aligned on all viewport sizes."),t("p",{class:"text-right"},"Right aligned on all viewport sizes."),t("p",{class:"text-sm-left"},"Left aligned on viewports SM (small) or wider."),t("p",{class:"text-right text-md-left"},"Left aligned on viewports MD (medium) or wider."),t("p",{class:"text-right text-lg-left"},"Left aligned on viewports LG (large) or wider."),t("p",{class:"text-right text-xl-left"},"Left aligned on viewports XL (extra-large) or wider.")],-1),M=t("div",{class:"d-flex justify-space-between flex-row"},[t("a",{href:"#",class:"text-decoration-none"},"Non-underlined link"),t("div",{class:"text-decoration-line-through"},"Line-through text"),t("div",{class:"text-decoration-overline"},"Overline text"),t("div",{class:"text-decoration-underline"},"Underline text")],-1),O=t("div",null,[t("p",{class:"text-high-emphasis"},"High-emphasis has an opacity of 87% in light theme and 100% in dark."),t("p",{class:"text-medium-emphasis"},"Medium-emphasis text and hint text have opacities of 60% in light theme and 70% in dark."),t("p",{class:"text-disabled"},"Disabled text has an opacity of 38% in light theme and 50% in dark.")],-1),j=f({__name:"TypographyPage",setup(r){const l=o({title:"Typography Page"}),n=o([["Heading 1","text-h1"],["Heading 2","text-h2"],["Heading 3","text-h3"],["Heading 4","text-h4"],["Heading 5","text-h5"],["Heading 6","text-h6"],["Subtitle 1","text-subtitle-1"],["Subtitle 2","text-subtitle-2"],["Body 1","text-body-1"],["Body 2","text-body-2"],["Button","text-button"],["Caption","text-caption"],["Overline","text-overline"]]),c=o([{title:"Utilities",disabled:!1,href:"#"},{title:"Typography",disabled:!0,href:"#"}]);return(U,F)=>(i(),h(x,null,[a(m,{title:l.value.title,breadcrumbs:c.value},null,8,["title","breadcrumbs"]),a(T,null,{default:e(()=>[a(k,{cols:"12",md:"12"},{default:e(()=>[a(v,{title:"Basic Typography"},{default:e(()=>[a(s,{title:"Heading"},{default:e(()=>[t("div",D,[(i(!0),h(x,null,B(n.value,([p,u])=>(i(),g(_,{variant:"outlined",key:p,class:"my-4"},{default:e(()=>[t("div",{class:H([u,"pa-2"])},d(p),3),t("div",S,[z,t("div",N,d(u),1)])]),_:2},1024))),128))])]),_:1}),a(s,{title:"Text-alignment",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[M]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[O]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{j as default};
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-e31f96f8.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js";import{x as f,o as i,c as g,w as e,a,a8 as y,K as b,e as w,t as d,A as C,L as V,a9 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,X as H,V as T}from"./index-dc96e1be.js";const s=f({__name:"UiChildCard",props:{title:String},setup(r){const l=r;return(n,c)=>(i(),g(_,{variant:"outlined"},{default:e(()=>[a(y,{class:"py-3"},{default:e(()=>[a(b,{class:"text-h5"},{default:e(()=>[w(d(l.title),1)]),_:1})]),_:1}),a(C),a(V,null,{default:e(()=>[L(n.$slots,"default")]),_:3})]),_:3}))}}),D={class:"d-flex flex-column gap-1"},S={class:"text-caption pa-2 bg-lightprimary"},z=t("div",{class:"text-grey"},"Class",-1),N={class:"font-weight-medium"},$=t("div",null,[t("p",{class:"text-left"},"Left aligned on all viewport sizes."),t("p",{class:"text-center"},"Center aligned on all viewport sizes."),t("p",{class:"text-right"},"Right aligned on all viewport sizes."),t("p",{class:"text-sm-left"},"Left aligned on viewports SM (small) or wider."),t("p",{class:"text-right text-md-left"},"Left aligned on viewports MD (medium) or wider."),t("p",{class:"text-right text-lg-left"},"Left aligned on viewports LG (large) or wider."),t("p",{class:"text-right text-xl-left"},"Left aligned on viewports XL (extra-large) or wider.")],-1),M=t("div",{class:"d-flex justify-space-between flex-row"},[t("a",{href:"#",class:"text-decoration-none"},"Non-underlined link"),t("div",{class:"text-decoration-line-through"},"Line-through text"),t("div",{class:"text-decoration-overline"},"Overline text"),t("div",{class:"text-decoration-underline"},"Underline text")],-1),O=t("div",null,[t("p",{class:"text-high-emphasis"},"High-emphasis has an opacity of 87% in light theme and 100% in dark."),t("p",{class:"text-medium-emphasis"},"Medium-emphasis text and hint text have opacities of 60% in light theme and 70% in dark."),t("p",{class:"text-disabled"},"Disabled text has an opacity of 38% in light theme and 50% in dark.")],-1),j=f({__name:"TypographyPage",setup(r){const l=o({title:"Typography Page"}),n=o([["Heading 1","text-h1"],["Heading 2","text-h2"],["Heading 3","text-h3"],["Heading 4","text-h4"],["Heading 5","text-h5"],["Heading 6","text-h6"],["Subtitle 1","text-subtitle-1"],["Subtitle 2","text-subtitle-2"],["Body 1","text-body-1"],["Body 2","text-body-2"],["Button","text-button"],["Caption","text-caption"],["Overline","text-overline"]]),c=o([{title:"Utilities",disabled:!1,href:"#"},{title:"Typography",disabled:!0,href:"#"}]);return(U,F)=>(i(),h(x,null,[a(m,{title:l.value.title,breadcrumbs:c.value},null,8,["title","breadcrumbs"]),a(T,null,{default:e(()=>[a(k,{cols:"12",md:"12"},{default:e(()=>[a(v,{title:"Basic Typography"},{default:e(()=>[a(s,{title:"Heading"},{default:e(()=>[t("div",D,[(i(!0),h(x,null,B(n.value,([p,u])=>(i(),g(_,{variant:"outlined",key:p,class:"my-4"},{default:e(()=>[t("div",{class:H([u,"pa-2"])},d(p),3),t("div",S,[z,t("div",N,d(u),1)])]),_:2},1024))),128))])]),_:1}),a(s,{title:"Text-alignment",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[M]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[O]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{j as default};

addons/dashboard/dist/assets/UiParentCard.vue_vue_type_script_setup_true_lang-f2b2db58.js

@@ -1 +1 @@
-import{x as n,o,c as i,w as e,a,a8 as d,b as c,K as u,e as p,t as _,a9 as s,A as f,L as V,J as m}from"./index-9075b0bb.js";const C={class:"d-sm-flex align-center justify-space-between"},h=n({__name:"UiParentCard",props:{title:String},setup(l){const r=l;return(t,x)=>(o(),i(m,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(d,null,{default:e(()=>[c("div",C,[a(u,null,{default:e(()=>[p(_(r.title),1)]),_:1}),s(t.$slots,"action")])]),_:3}),a(f),a(V,null,{default:e(()=>[s(t.$slots,"default")]),_:3})]),_:3}))}});export{h as _};
+import{x as n,o,c as i,w as e,a,a8 as d,b as c,K as u,e as p,t as _,a9 as s,A as f,L as V,J as m}from"./index-dc96e1be.js";const C={class:"d-sm-flex align-center justify-space-between"},h=n({__name:"UiParentCard",props:{title:String},setup(l){const r=l;return(t,x)=>(o(),i(m,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(d,null,{default:e(()=>[c("div",C,[a(u,null,{default:e(()=>[p(_(r.title),1)]),_:1}),s(t.$slots,"action")])]),_:3}),a(f),a(V,null,{default:e(()=>[s(t.$slots,"default")]),_:3})]),_:3}))}});export{h as _};

addons/dashboard/dist/assets/md5-45627dcb.js

@@ -1,4 +1,4 @@
-import{ar as K,as as Y,at as V}from"./index-9075b0bb.js";var C={exports:{}};const $={},k=Object.freeze(Object.defineProperty({__proto__:null,default:$},Symbol.toStringTag,{value:"Module"})),z=K(k);/**
+import{ar as K,as as Y,at as V}from"./index-dc96e1be.js";var C={exports:{}};const $={},k=Object.freeze(Object.defineProperty({__proto__:null,default:$},Symbol.toStringTag,{value:"Module"})),z=K(k);/**
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5

addons/dashboard/dist/index.html

@@ -11,7 +11,7 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Poppins:wght@400;500;600;700&family=Roboto:wght@400;500;700&display=swap"
     />
     <title>AstrBot - 仪表盘</title>
-    <script type="module" crossorigin src="/assets/index-9075b0bb.js"></script>
+    <script type="module" crossorigin src="/assets/index-dc96e1be.js"></script>
     <link rel="stylesheet" href="/assets/index-0f1523f3.css">
   </head>
   <body>

addons/dashboard/helper.py

@@ -100,6 +100,14 @@ class DashBoardHelper():
                         value=config['direct_message_mode'],
                         path="direct_message_mode",
                     ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="是否接收QQ群消息",
+                        description="需要机器人有相应的群消息接收权限。在 q.qq.com 上查看。",
+                        value=config['qqofficial_enable_group_message'],
+                        path="qqofficial_enable_group_message",
+                    ),
                 ]
             )
             qq_gocq_platform_group = DashBoardConfig(

addons/dashboard/server.py

@@ -7,7 +7,7 @@ import logging
 from cores.database.conn import dbConn
 from util.cmd_config import CmdConfig
 from util.updator import check_update, update_project, request_release_info
-from cores.qqbot.types import *
+from cores.astrbot.types import *
 import util.plugin_util as putil
 import websockets
 import json
@@ -262,9 +262,8 @@ class AstrBotDashBoard():
                 version = ''
             else:
                 latest = False
-                version = request.json["version"]
             try:
-                update_project(request_release_info(), latest=latest, version=version)
+                update_project(request_release_info(latest), latest=latest, version=version)
                 threading.Thread(target=self.shutdown_bot, args=(3,)).start()
                 return Response(
                     status="success",

cores/astrbot/core.py

@@ -22,7 +22,6 @@ from nakuru import (
 from nakuru.entities.components import Plain, At, Image
 
 from addons.baidu_aip_judge import BaiduJudge
-from model.platform._nakuru_translation_layer import NakuruGuildMessage
 from model.provider.provider import Provider
 from model.command.command import Command
 from util import general_utils as gu
@@ -44,7 +43,7 @@ frequency_time = 60
 frequency_count = 10
 
 # 版本
-version = '3.1.7'
+version = '3.1.11'
 
 # 语言模型
 REV_CHATGPT = 'rev_chatgpt'
@@ -244,7 +243,7 @@ def run_qqchan_bot(cfg: dict, global_object: GlobalObject):
     try:
         from model.platform.qq_official import QQOfficial
         qqchannel_bot = QQOfficial(cfg=cfg, message_handler=oper_msg, global_object=global_object)
-        global_object.platforms.append(RegisteredPlatform(platform_name="qq_official", platform_instance=qqchannel_bot, origin="internal"))
+        global_object.platforms.append(RegisteredPlatform(platform_name="qqchan", platform_instance=qqchannel_bot, origin="internal"))
         qqchannel_bot.run()
     except BaseException as e:
         logger.log("启动QQ频道机器人时出现错误, 原因如下: " + str(e), gu.LEVEL_CRITICAL, tag="QQ频道")
@@ -307,7 +306,7 @@ async def record_message(platform: str, session_id: str):
     db_inst.increment_stat_platform(curr_ts, platform, 1)
     _global_object.cnt_total += 1
 
-async def oper_msg(message: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage],
+async def oper_msg(message: AstrBotMessage,
              session_id: str,
              role: str = 'member',
              platform: str = None,
@@ -346,7 +345,7 @@ async def oper_msg(message: Union[GroupMessage, FriendMessage, GuildMessage, Nak
         return MessageResult("Hi~")
     
     # 检查发言频率
-    if not check_frequency(message.user_id):
+    if not check_frequency(message.sender.user_id):
         return MessageResult(f'你的发言超过频率限制(╯▔皿▔)╯。\n管理员设置{frequency_time}秒内只能提问{frequency_count}次。')
     
     # 检查是否是更换语言模型的请求

cores/astrbot/types.py

@@ -1,4 +1,3 @@
-from model.platform.qq_official import NakuruGuildMessage
 from model.provider.provider import Provider as LLMProvider
 from model.platform._platfrom import Platform
 from nakuru import (
@@ -6,11 +5,40 @@ from nakuru import (
     FriendMessage,
     GuildMessage,
 )
+from nakuru.entities.components import BaseMessageComponent
 from typing import Union, List, ClassVar
 from types import ModuleType
 from enum import Enum
 from dataclasses import dataclass
 
+class MessageType(Enum):
+    GROUP_MESSAGE = 'GroupMessage' # 群组形式的消息
+    FRIEND_MESSAGE = 'FriendMessage' # 私聊、好友等单聊消息
+    GUILD_MESSAGE = 'GuildMessage' # 频道消息
+
+@dataclass    
+class MessageMember():
+    user_id: str # 发送者id
+    nickname: str = None
+
+class AstrBotMessage():
+    '''
+    AstrBot 的消息对象
+    '''
+    tag: str # 消息来源标签
+    type: MessageType # 消息类型
+    self_id: str # 机器人的识别id
+    session_id: str # 会话id
+    message_id: str # 消息id
+    sender: MessageMember # 发送者
+    message: List[BaseMessageComponent] # 消息链使用 Nakuru 的消息链格式
+    message_str: str # 最直观的纯文本消息字符串
+    raw_message: object
+    timestamp: int # 消息时间戳
+    
+    def __str__(self) -> str:
+        return str(self.__dict__)
+
 class PluginType(Enum):
     PLATFORM = 'platfrom' # 平台类插件。
     LLM = 'llm' # 大语言模型类插件
@@ -107,14 +135,14 @@ class AstrMessageEvent():
     '''
     context: GlobalObject # 一些公用数据
     message_str: str # 纯消息字符串
-    message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage] # 消息对象
+    message_obj: AstrBotMessage # 消息对象
     platform: RegisteredPlatform # 来源平台
     role: str # 基本身份。`admin` 或 `member`
     session_id: int # 会话 id
 
     def __init__(self, 
                  message_str: str, 
-                 message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage], 
+                 message_obj: AstrBotMessage, 
                  platform: RegisteredPlatform, 
                  role: str,
                  context: GlobalObject,

data/config/astrbot_plugin_llms.json

@@ -1,26 +0,0 @@
-{
-  "llms_claude_cookie": {
-    "config_type": "item",
-    "name": "llms_claude_cookie",
-    "description": "Claude 的 Cookie",
-    "path": "llms_claude_cookie",
-    "value": "hihi",
-    "val_type": "str"
-  },
-  "llms_huggingchat_email": {
-    "config_type": "item",
-    "name": "llms_huggingchat_email",
-    "description": "HuggingChat 的邮箱",
-    "path": "llms_huggingchat_email",
-    "value": "",
-    "val_type": "str"
-  },
-  "llms_huggingchat_psw": {
-    "config_type": "item",
-    "name": "llms_huggingchat_psw",
-    "description": "HuggingChat 的密码",
-    "path": "llms_huggingchat_psw",
-    "value": "",
-    "val_type": "str"
-  }
-}

main.py

@@ -10,7 +10,7 @@ abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 def main():
     # config.yaml 配置文件加载和环境确认
     try:
-        import cores.qqbot.core as qqBot
+        import cores.astrbot.core as qqBot
         import yaml
         import util.general_utils as gu
         ymlfile =  open(abs_path+"configs/config.yaml", 'r', encoding='utf-8')

model/command/command.py

@@ -14,7 +14,7 @@ from util import general_utils as gu
 from model.provider.provider import Provider
 from util.cmd_config import CmdConfig as cc
 from util.general_utils import Logger
-from cores.qqbot.types import (
+from cores.astrbot.types import (
     GlobalObject,
     AstrMessageEvent,
     PluginType,
@@ -95,6 +95,8 @@ class Command:
             return True, self.get_my_id(message_obj, platform)
         if self.command_start_with(message, "web"): # 网页搜索
             return True, self.web_search(message)
+        if self.command_start_with(message, "update"):
+            return True, self.update(message, role)
         if not self.provider and self.command_start_with(message, "help"):
             return True, await self.help()
         

model/command/openai_official.py

@@ -1,7 +1,7 @@
 from model.command.command import Command
 from model.provider.openai_official import ProviderOpenAIOfficial
-from cores.qqbot.personality import personalities
-from cores.qqbot.types import GlobalObject
+from util.personality import personalities
+from cores.astrbot.types import GlobalObject
 
 class CommandOpenAIOfficial(Command):
     def __init__(self, provider: ProviderOpenAIOfficial, global_object: GlobalObject):
@@ -49,7 +49,7 @@ class CommandOpenAIOfficial(Command):
         elif self.command_start_with(message, "update"):
             return True, self.update(message, role)
         elif self.command_start_with(message, "画", "draw"):
-            return True, self.draw(message)
+            return True, await self.draw(message)
         elif self.command_start_with(message, "key"):
             return True, self.key(message)
         elif self.command_start_with(message, "switch"):
@@ -256,7 +256,7 @@ class CommandOpenAIOfficial(Command):
                 self.personality_str = message
                 return True, f"自定义人格已设置。 \n人格信息: {ps}", "set"
             
-    def draw(self, message):
+    async def draw(self, message):
         if self.provider is None:
             return False, "未启用 OpenAI 官方 API", "draw"
         if message.startswith("/画"):
@@ -265,7 +265,7 @@ class CommandOpenAIOfficial(Command):
             message = message[1:]
         try:
             # 画图模式传回3个参数
-            img_url = self.provider.image_chat(message)
+            img_url = await self.provider.image_chat(message)
             return True, img_url, "draw"
         except Exception as e:
             if 'exceeded' in str(e):

model/command/rev_chatgpt.py

@@ -1,7 +1,7 @@
 from model.command.command import Command
 from model.provider.rev_chatgpt import ProviderRevChatGPT
-from cores.qqbot.personality import personalities
-from cores.qqbot.types import GlobalObject
+from util.personality import personalities
+from cores.astrbot.types import GlobalObject
 
 class CommandRevChatGPT(Command):
     def __init__(self, provider: ProviderRevChatGPT, global_object: GlobalObject):

model/platform/_message_parse.py

@@ -0,0 +1,104 @@
+from nakuru.entities.components import Plain, At, Image, BaseMessageComponent
+from nakuru import (
+    GuildMessage,
+    GroupMessage,
+    FriendMessage
+)
+import botpy.message
+from cores.astrbot.types import MessageType, AstrBotMessage, MessageMember
+from typing import List, Union
+import time
+
+# QQ官方消息类型转换
+def qq_official_message_parse(message: List[BaseMessageComponent]):
+    plain_text = ""
+    image_path = None # only one img supported
+    for i in message:
+        if isinstance(i, Plain):
+            plain_text += i.text
+        elif isinstance(i, Image) and image_path == None:
+            if i.path is not None:
+                image_path = i.path
+            else:
+                image_path = i.file
+    return plain_text, image_path
+
+# QQ官方消息类型 2 AstrBotMessage
+def qq_official_message_parse_rev(message: Union[botpy.message.Message, botpy.message.GroupMessage],
+                                  message_type: MessageType) -> AstrBotMessage:
+    abm = AstrBotMessage()
+    abm.type = message_type
+    abm.timestamp = int(time.time())
+    abm.raw_message = message
+    abm.message_id = message.id
+    abm.tag = "qqchan"
+    msg: List[BaseMessageComponent] = []
+    
+    if message_type == MessageType.GROUP_MESSAGE:
+        abm.sender = MessageMember(
+            message.author.member_openid,
+            ""
+        )
+        abm.message_str = message.content.strip()
+        abm.self_id = "unknown_selfid"
+        
+        msg.append(Plain(abm.message_str))
+        if message.attachments:
+            for i in message.attachments:
+                if i.content_type.startswith("image"):
+                    url = i.url
+                    if not url.startswith("http"):
+                        url = "https://"+url
+                    img = Image.fromURL(url)
+                    msg.append(img)
+        abm.message = msg
+        
+    elif message_type == MessageType.GUILD_MESSAGE or message_type == MessageType.FRIEND_MESSAGE:
+        # 目前对于 FRIEND_MESSAGE 只处理频道私聊
+        try:
+            abm.self_id = str(message.mentions[0].id)
+        except:
+            abm.self_id = ""
+        
+        plain_content = message.content.replace("<@!"+str(abm.self_id)+">", "").strip()
+        msg.append(Plain(plain_content))
+        if message.attachments:
+            for i in message.attachments:
+                if i.content_type.startswith("image"):
+                    url = i.url
+                    if not url.startswith("http"):
+                        url = "https://"+url
+                    img = Image.fromURL(url)
+                    msg.append(img)
+        abm.message = msg
+        abm.message_str = plain_content
+        abm.sender = MessageMember(
+            str(message.author.id),
+            str(message.author.username)
+        )
+    else:
+        raise ValueError(f"Unknown message type: {message_type}")
+    return abm
+
+def nakuru_message_parse_rev(message: Union[GuildMessage, GroupMessage, FriendMessage]) -> AstrBotMessage:
+    abm = AstrBotMessage()
+    abm.type = MessageType(message.type)
+    abm.timestamp = int(time.time())
+    abm.raw_message = message
+    abm.message_id = message.message_id
+    
+    plain_content = ""
+    for i in message.message:
+        if isinstance(i, Plain):
+            plain_content += i.text
+    abm.message_str = plain_content
+    
+    abm.self_id = str(message.self_id)
+    abm.sender = MessageMember(
+        str(message.sender.user_id),
+        str(message.sender.nickname)
+    )
+    abm.tag = "gocq"
+    abm.message = message.message
+    
+    return abm

model/platform/_nakuru_translation_layer.py

@@ -1,77 +0,0 @@
-from nakuru.entities.components import Plain, At, Image
-from botpy.message import Message, DirectMessage
-
-class NakuruGuildMember():
-    tiny_id: int # 发送者识别号
-    user_id: int # 发送者识别号
-    title: str 
-    nickname: str # 昵称
-    role: int # 角色
-    icon_url: str # 头像url
-
-class NakuruGuildMessage():
-    type: str = "GuildMessage"
-    self_id: int # bot的qq号
-    self_tiny_id: int # bot的qq号
-    sub_type: str # 消息类型
-    message_id: str # 消息id
-    guild_id: int # 频道号 
-    channel_id: int # 子频道号
-    user_id: int # 发送者qq号
-    message: list # 消息内容
-    sender: NakuruGuildMember # 发送者信息
-    raw_message: Message
-
-    def __str__(self) -> str:
-        return str(self.__dict__)
-
-# gocq-频道SDK兼容层（发）
-def gocq_compatible_send(gocq_message_chain: list):
-    plain_text = ""
-    image_path = None # only one img supported
-    for i in gocq_message_chain:
-        if isinstance(i, Plain):
-            plain_text += i.text
-        elif isinstance(i, Image) and image_path == None:
-            if i.path is not None:
-                image_path = i.path
-            else:
-                image_path = i.file
-    return plain_text, image_path
-
-# gocq-频道SDK兼容层（收）
-def gocq_compatible_receive(message: Message) -> NakuruGuildMessage:
-    ngm = NakuruGuildMessage()
-    try:
-        ngm.self_id = message.mentions[0].id
-        ngm.self_tiny_id = message.mentions[0].id
-    except:
-        ngm.self_id = 0
-        ngm.self_tiny_id = 0
-
-    ngm.sub_type = "normal"
-    ngm.message_id = message.id
-    ngm.guild_id = int(message.guild_id)
-    ngm.channel_id = int(message.channel_id)
-    ngm.user_id = int(message.author.id)
-    msg = []
-    plain_content = message.content.replace("<@!"+str(ngm.self_id)+">", "").strip()
-    msg.append(Plain(plain_content))
-    if message.attachments:
-        for i in message.attachments:
-            if i.content_type.startswith("image"):
-                url = i.url
-                if not url.startswith("http"):
-                    url = "https://"+url
-                img = Image.fromURL(url)
-                msg.append(img)
-    ngm.message = msg
-    ngm.sender = NakuruGuildMember()
-    ngm.sender.tiny_id = int(message.author.id)
-    ngm.sender.user_id = int(message.author.id)
-    ngm.sender.title = ""
-    ngm.sender.nickname = message.author.username
-    ngm.sender.role = 0
-    ngm.sender.icon_url = message.author.avatar
-    ngm.raw_message = message
-    return ngm

model/platform/_platfrom.py

@@ -5,9 +5,6 @@ from nakuru import (
     GroupMessage,
     FriendMessage,
 )
-from ._nakuru_translation_layer import (
-    NakuruGuildMessage,
-)
 from nakuru.entities.components import Plain, At, Image
 
 

model/platform/qq_gocq.py

@@ -14,6 +14,8 @@ from typing import Union
 import time
 
 from ._platfrom import Platform
+from ._message_parse import nakuru_message_parse_rev
+from cores.astrbot.types import MessageType, AstrBotMessage, MessageMember
 
 
 class FakeSource:
@@ -57,52 +59,58 @@ class QQGOCQ(Platform):
         @gocq_app.receiver("GroupMessage")
         async def _(app: CQHTTP, source: GroupMessage):
             if self.cc.get("gocq_react_group", True):
+                abm = nakuru_message_parse_rev(source)
                 if isinstance(source.message[0], Plain):
-                    await self.handle_msg(source, True)
+                    await self.handle_msg(abm)
                 elif isinstance(source.message[0], At):
                     if source.message[0].qq == source.self_id:
-                        await self.handle_msg(source, True)
+                        await self.handle_msg(abm)
                 else:
                     return
             
         @gocq_app.receiver("FriendMessage")
         async def _(app: CQHTTP, source: FriendMessage):
             if self.cc.get("gocq_react_friend", True):
+                abm = nakuru_message_parse_rev(source)
                 if isinstance(source.message[0], Plain):
-                    await self.handle_msg(source, False)
+                    await self.handle_msg(abm)
                 else:
                     return
             
         @gocq_app.receiver("GroupMemberIncrease")
         async def _(app: CQHTTP, source: GroupMemberIncrease):
             if self.cc.get("gocq_react_group_increase", True):
-
                 await app.sendGroupMessage(source.group_id, [
                     Plain(text = self.announcement)
                 ])
 
-        @gocq_app.receiver("Notify")
-        async def _(app: CQHTTP, source: Notify):
-            print(source)
-            if source.sub_type == "poke" and source.target_id == source.self_id:
-                await self.handle_msg(source, False)
+        # @gocq_app.receiver("Notify")
+        # async def _(app: CQHTTP, source: Notify):
+        #     print(source)
+        #     if source.sub_type == "poke" and source.target_id == source.self_id:
+        #         await self.handle_msg(source)
 
         @gocq_app.receiver("GuildMessage")
         async def _(app: CQHTTP, source: GuildMessage):
             if self.cc.get("gocq_react_guild", True):
+                abm = nakuru_message_parse_rev(source)
                 if isinstance(source.message[0], Plain):
-                    await self.handle_msg(source, True)
+                    await self.handle_msg(abm)
                 elif isinstance(source.message[0], At):
                     if source.message[0].qq == source.self_tiny_id:
-                        await self.handle_msg(source, True)
+                        await self.handle_msg(abm)
                 else:
                     return
         
     def run(self):
         self.client.run()
                 
-    async def handle_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, Notify], is_group: bool):
-        self.logger.log(f"{message.user_id} -> {self.parse_message_outline(message)}", tag="QQ_GOCQ")
+    async def handle_msg(self, message: AstrBotMessage):
+        self.logger.log(f"{message.sender.nickname}/{message.sender.user_id} -> {self.parse_message_outline(message)}", tag="QQ_GOCQ")
+        
+        assert isinstance(message.raw_message, (GroupMessage, FriendMessage, GuildMessage))
+        is_group = message.type != MessageType.FRIEND_MESSAGE
+        
         # 判断是否响应消息
         resp = False
         if not is_group:
@@ -111,7 +119,7 @@ class QQGOCQ(Platform):
             for i in message.message:
                 if isinstance(i, At):
                     if message.type == "GuildMessage":
-                        if i.qq == message.user_id or i.qq == message.self_tiny_id:
+                        if i.qq == message.raw_message.user_id or i.qq == message.raw_message.self_tiny_id:
                             resp = True
                     if message.type == "FriendMessage":
                         if i.qq == message.self_id:
@@ -129,16 +137,18 @@ class QQGOCQ(Platform):
         
         # 解析 session_id
         if self.unique_session or not is_group:
-            session_id = message.user_id
-        elif message.type == "GroupMessage":
-            session_id = message.group_id
-        elif message.type == "GuildMessage":
-            session_id = message.channel_id
+            session_id = message.raw_message.user_id
+        elif message.type == MessageType.GROUP_MESSAGE:
+            session_id = message.raw_message.group_id
+        elif message.type == MessageType.GUILD_MESSAGE:
+            session_id = message.raw_message.channel_id
         else:
-            session_id = message.user_id
+            session_id = message.raw_message.user_id
+            
+        message.session_id = session_id
 
         # 解析 role
-        sender_id = str(message.user_id)
+        sender_id = str(message.raw_message.user_id)
         if sender_id == self.cc.get('admin_qq', '') or \
         sender_id in self.cc.get('other_admins', []):
             role = 'admin'
@@ -163,12 +173,16 @@ class QQGOCQ(Platform):
             self.waiting[session_id] = message
 
     async def reply_msg(self,
-                        message: Union[GroupMessage, FriendMessage, GuildMessage, Notify],
+                        message: Union[AstrBotMessage, GuildMessage, GroupMessage, FriendMessage],
                         result_message: list):
         """
         插件开发者请使用send方法, 可以不用直接调用这个方法。
         """
-        source = message
+        if isinstance(message, AstrBotMessage):
+            source = message.raw_message
+        else:
+            source = message
+        
         res = result_message
         
         self.logger.log(f"{source.user_id} <- {self.parse_message_outline(res)}", tag="QQ_GOCQ")
@@ -233,7 +247,7 @@ class QQGOCQ(Platform):
                 await self.client.sendGroupMessage(source.group_id, res)
                 return
 
-    async def send_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, Notify], result_message: list):
+    async def send_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, AstrBotMessage], result_message: list):
         '''
         提供给插件的发送QQ消息接口。
         参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。

model/platform/qq_official.py

@@ -1,7 +1,7 @@
 import io
 import botpy
 from PIL import Image as PILImage
-from botpy.message import Message, DirectMessage
+import botpy.message
 import re
 import asyncio
 import aiohttp
@@ -11,29 +11,34 @@ from botpy.types.message import Reference
 from botpy import Client
 import time
 from ._platfrom import Platform
-from ._nakuru_translation_layer import(
-    NakuruGuildMessage, 
-    gocq_compatible_receive, 
-    gocq_compatible_send
+from ._message_parse import(
+    qq_official_message_parse_rev,
+    qq_official_message_parse
 )
-from typing import Union
+from cores.astrbot.types import MessageType, AstrBotMessage, MessageMember
+from typing import Union, List
+from nakuru.entities.components import BaseMessageComponent
 
 # QQ 机器人官方框架
 class botClient(Client):
     def set_platform(self, platform: 'QQOfficial'):
         self.platform = platform
+        
+    async def on_group_at_message_create(self, message: botpy.message.GroupMessage):
+        abm = qq_official_message_parse_rev(message, MessageType.GROUP_MESSAGE)
+        await self.platform.handle_msg(abm)
 
     # 收到频道消息
-    async def on_at_message_create(self, message: Message):
+    async def on_at_message_create(self, message: botpy.message.Message):
         # 转换层
-        nakuru_guild_message = gocq_compatible_receive(message)
-        await self.platform.handle_msg(nakuru_guild_message, True)
+        abm = qq_official_message_parse_rev(message, MessageType.GUILD_MESSAGE)
+        await self.platform.handle_msg(abm)
 
     # 收到私聊消息
-    async def on_direct_message_create(self, message: DirectMessage):
+    async def on_direct_message_create(self, message: botpy.message.DirectMessage):
         # 转换层
-        nakuru_guild_message = gocq_compatible_receive(message)
-        await self.platform.handle_msg(nakuru_guild_message, False)
+        abm = qq_official_message_parse_rev(message, MessageType.FRIEND_MESSAGE)
+        await self.platform.handle_msg(abm)
 
 class QQOfficial(Platform):
 
@@ -51,15 +56,24 @@ class QQOfficial(Platform):
         self.secret = cfg['qqbot_secret']
         self.unique_session = cfg['uniqueSessionMode']
         self.logger: gu.Logger = global_object.logger
-
-        self.intents = botpy.Intents(
-            public_guild_messages=True,
-            direct_message=cfg['direct_message_mode']
-        )
+        qq_group = cfg['qqofficial_enable_group_message']
+        
+        if qq_group:
+            self.intents = botpy.Intents(
+                public_messages=True,
+                public_guild_messages=True,
+                direct_message=cfg['direct_message_mode']
+            )
+        else:
+            self.intents = botpy.Intents(
+                public_guild_messages=True,
+                direct_message=cfg['direct_message_mode']
+            )
         self.client = botClient(
             intents=self.intents,
             bot_log=False
         )
+
         self.client.set_platform(self)
 
     def run(self):
@@ -80,17 +94,27 @@ class QQOfficial(Platform):
                 token=self.token
             )
 
-    async def handle_msg(self, message: NakuruGuildMessage, is_group: bool):
+    async def handle_msg(self, message: AstrBotMessage):
+        assert isinstance(message.raw_message, (botpy.message.Message, botpy.message.GroupMessage, botpy.message.DirectMessage))
+        is_group = message.type != MessageType.FRIEND_MESSAGE
+        
         _t = "/私聊" if not is_group else ""
-        self.logger.log(f"{message.sender.nickname}({message.sender.tiny_id}{_t}) -> {self.parse_message_outline(message)}", tag="QQ_OFFICIAL")
+        self.logger.log(f"{message.sender.nickname}({message.sender.user_id}{_t}) -> {self.parse_message_outline(message)}", tag="QQ_OFFICIAL")
+        
         # 解析出 session_id
         if self.unique_session or not is_group:
             session_id = message.sender.user_id
         else:
-            session_id = message.channel_id
+            if message.type == MessageType.GUILD_MESSAGE:
+                session_id = message.raw_message.channel_id
+            elif message.type == MessageType.GROUP_MESSAGE:
+                session_id = str(message.raw_message.group_openid)
+            else:
+                session_id = str(message.raw_message.author.id)
+        message.session_id = session_id
 
         # 解析出 role
-        sender_id = str(message.sender.tiny_id)
+        sender_id = message.sender.user_id
         if sender_id == self.cfg['admin_qqchan'] or \
         sender_id in self.cfg['other_admins']:
             role = 'admin'
@@ -107,7 +131,7 @@ class QQOfficial(Platform):
         if message_result is None:
             return
 
-        await self.reply_msg(is_group, message, message_result.result_message)
+        await self.reply_msg(message, message_result.result_message)
         if message_result.callback is not None:
             message_result.callback()
 
@@ -116,20 +140,24 @@ class QQOfficial(Platform):
             self.waiting[session_id] = message
 
     async def reply_msg(self, 
-                is_group: bool,
-                message: NakuruGuildMessage, 
+                message: Union[botpy.message.Message, botpy.message.GroupMessage, botpy.message.DirectMessage, AstrBotMessage],
                 res: Union[str, list]):
         '''
         回复频道消息
         '''
-        self.logger.log(f"{message.sender.nickname}({message.sender.tiny_id}) <- {self.parse_message_outline(res)}", tag="QQ_OFFICIAL")
+        if isinstance(message, AstrBotMessage):
+            source = message.raw_message
+        else:
+            source = message 
+        assert isinstance(source, (botpy.message.Message, botpy.message.GroupMessage, botpy.message.DirectMessage))
+        self.logger.log(f"{message.sender.nickname}({message.sender.user_id}) <- {self.parse_message_outline(res)}", tag="QQ_OFFICIAL")
 
         plain_text = ''
         image_path = ''
         msg_ref = None
 
         if isinstance(res, list):
-            plain_text, image_path = gocq_compatible_send(res)
+            plain_text, image_path = qq_official_message_parse(res)
         elif isinstance(res, str):
             plain_text = res
             
@@ -154,8 +182,8 @@ class QQOfficial(Platform):
                                 image = PILImage.open(io.BytesIO(await response.read()))
                                 image_path = gu.save_temp_img(image)
 
-        if message.raw_message is not None and image_path == '': # file_image与message_reference不能同时传入
-            msg_ref = Reference(message_id=message.raw_message.id, ignore_get_message_error=False)
+        if source is not None and image_path == '': # file_image与message_reference不能同时传入
+            msg_ref = Reference(message_id=source.id, ignore_get_message_error=False)
         
         # 到这里，我们得到了 plain_text，image_path，msg_ref
         data = {
@@ -163,10 +191,15 @@ class QQOfficial(Platform):
             'msg_id': message.message_id,
             'message_reference': msg_ref
         }
-        if is_group:
-            data['channel_id'] = str(message.channel_id)
+        if message.type == MessageType.GROUP_MESSAGE:
+            data['group_openid'] = str(source.group_openid)
+        elif message.type == MessageType.GUILD_MESSAGE:
+            data['channel_id'] = source.channel_id
+        elif message.type == MessageType.FRIEND_MESSAGE:
+            # 目前只处理频道私聊
+            data['guild_id'] = source.guild_id
         else:
-            data['guild_id'] = str(message.guild_id)
+            raise ValueError(f"未知的消息类型: {message.type}")
         if image_path != '':
             data['file_image'] = image_path
 
@@ -200,27 +233,48 @@ class QQOfficial(Platform):
                         await self._send_wrapper(**data)
  
     async def _send_wrapper(self, **kwargs):
-        if 'channel_id' in kwargs:
+        if 'group_openid' in kwargs:
+            # QQ群组消息
+            media = None
+            # qq群组消息需要自行上传，暂时不处理
+            # if 'file_image' in kwargs:
+            #     file_image_path = kwargs['file_image']
+            #     if file_image_path != "":
+            #         media = await self.upload_img(file_image_path, kwargs['group_openid'])
+            #         del kwargs['file_image']
+            #     if media is not None:
+            #         kwargs['msg_type'] = 7 # 富媒体
+            await self.client.api.post_group_message(media=media, **kwargs)
+        elif 'channel_id' in kwargs:
+            # 频道消息
+            if 'file_image' in kwargs:
+                kwargs['file_image'] = kwargs['file_image'].replace("file://", "")
             await self.client.api.post_message(**kwargs)
         else:
+            # 频道私聊消息
+            if 'file_image' in kwargs:
+                kwargs['file_image'] = kwargs['file_image'].replace("file://", "")
             await self.client.api.post_dms(**kwargs)
 
-    async def send_msg(self, channel_id: int, message_chain: list, message_id: int = None):
+    async def send_msg(self,
+                       message_obj: Union[botpy.message.Message, botpy.message.GroupMessage, botpy.message.DirectMessage, AstrBotMessage],
+                       message_chain: List[BaseMessageComponent],
+                ):
         '''
-        推送消息, 如果有 message_id，那么就是回复消息。
-        '''
-        _n = NakuruGuildMessage()
-        _n.channel_id = channel_id
-        _n.message_id = message_id
-        await self.reply_msg(_n, message_chain)
-
-    async def send(self, message_obj, message_chain: list):
-        '''
-        发送信息。内容同 reply_msg。
+        发送消息。目前只支持被动回复消息（即拥有一个 botpy Message 类型的 message_obj 传入）
         '''
         await self.reply_msg(message_obj, message_chain)
 
-    def wait_for_message(self, channel_id: int) -> NakuruGuildMessage:
+    async def send(self,
+                       message_obj: Union[botpy.message.Message, botpy.message.GroupMessage, botpy.message.DirectMessage, AstrBotMessage],
+                       message_chain: List[BaseMessageComponent],
+                ):
+        '''
+        发送消息。目前只支持被动回复消息（即拥有一个 botpy Message 类型的 message_obj 传入）
+        '''
+        await self.reply_msg(message_obj, message_chain)
+
+    def wait_for_message(self, channel_id: int) -> AstrBotMessage:
         '''
         等待指定 channel_id 的下一条信息，超时 300s 后抛出异常
         '''
@@ -235,4 +289,4 @@ class QQOfficial(Platform):
             cnt += 1
             if cnt > 300:
                 raise Exception("等待消息超时。")
-            time.sleep(1)
+            time.sleep(1)()

util/cmd_config.py

@@ -102,6 +102,7 @@ def init_astrbot_config_items():
     cc.init_attributes("other_admins", [])
     cc.init_attributes("CHATGPT_BASE_URL", "")
     cc.init_attributes("qqbot_secret", "")
+    cc.init_attributes("qqofficial_enable_group_message", False)
     cc.init_attributes("admin_qq", "")
     cc.init_attributes("nick_qq", ["!", "！", "ai"])
     cc.init_attributes("admin_qqchan", "")

util/general_utils.py

@@ -7,7 +7,7 @@ import re
 import requests
 from util.cmd_config import CmdConfig
 import socket
-from cores.qqbot.types import GlobalObject
+from cores.astrbot.types import GlobalObject
 import platform
 import logging
 import json

util/plugin_dev/api/v1/bot.py

@@ -1,4 +1,4 @@
-from cores.qqbot.types import (
+from cores.astrbot.types import (
     PluginMetadata,
     RegisteredLLM,
     RegisteredPlugin,

util/plugin_dev/api/v1/message.py

@@ -1,5 +1,5 @@
-from cores.qqbot.core import oper_msg
-from cores.qqbot.types import AstrMessageEvent, CommandResult
+from cores.astrbot.core import oper_msg
+from cores.astrbot.types import AstrMessageEvent, CommandResult
 from model.platform._message_result import MessageResult
 
 '''

util/plugin_dev/api/v1/register.py

@@ -5,7 +5,7 @@
 '''
 from model.provider.provider import Provider as LLMProvider
 from model.platform._platfrom import Platform
-from cores.qqbot.types import GlobalObject, RegisteredPlatform, RegisteredLLM
+from cores.astrbot.types import GlobalObject, RegisteredPlatform, RegisteredLLM
 
 def register_platform(platform_name: str, platform_instance: Platform, context: GlobalObject) -> None:
     '''

util/plugin_dev/api/v1/types.py

@@ -2,4 +2,4 @@
 插件类型
 '''
 
-from cores.qqbot.types import PluginType
+from cores.astrbot.types import PluginType

util/plugin_util.py

@@ -15,7 +15,7 @@ import traceback
 from types import ModuleType
 from typing import List
 from pip._internal import main as pipmain
-from cores.qqbot.types import (
+from cores.astrbot.types import (
     PluginMetadata,
     PluginType,
     RegisteredPlugin,

util/updator.py

@@ -119,6 +119,7 @@ def update_project(update_data: list,
     else:
         # 更新到指定版本
         flag = False
+        print(f"请求更新到指定版本: {version}")
         for data in update_data:
             if data['tag_name'] == version:
                 try:
@@ -128,8 +129,6 @@ def update_project(update_data: list,
                     if reboot: _reboot()
                 except BaseException as e:
                     raise e
-            else:
-                continue
         if not flag:
             raise Exception("未找到指定版本。")