chickliu/Sillyv2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x

Browse Source
This commit is contained in:
1-6
2023-07-18 22:01:48 +08:00
parent f1551af77e
commit f94012bd9d
7 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/adapter.go
+22 -3
View File
@@ -319,7 +319,7 @@ func (f *Factory) Destroy() {
}() }()
} }
func (f *Factory) Push(msg map[string]string) (string, error) { func (f *Factory) Push(msg map[string]string) map[string]string {
var demo = *f.demo var demo = *f.demo
var sender = &demo var sender = &demo
fsps := &common.FakerSenderParams{ fsps := &common.FakerSenderParams{
@@ -327,7 +327,12 @@ func (f *Factory) Push(msg map[string]string) (string, error) {
ChatID: msg[CHAT_ID], ChatID: msg[CHAT_ID],
} }
sender.SetFsps(fsps) sender.SetFsps(fsps)
return sender.Reply(msg[CONETNT], PUSH(""))
message_id, err := sender.Reply(msg[CONETNT], PUSH(""))
return map[string]string{
"message_id": message_id,
"error": ErrStr(err),
}
} }
func (f *Factory) SetReplyHandler(function func(map[string]interface{}) string) { func (f *Factory) SetReplyHandler(function func(map[string]interface{}) string) {
@@ -525,12 +530,26 @@ func (f *Factory) SetIsAdmin(function func(string) bool) {
} }
} }
func (f *Factory) Sender() *CustomSender { func (f *Factory) Sender2() *CustomSender {
var demo = *f.demo var demo = *f.demo
sender := &demo sender := &demo
return sender return sender
} }
func (f *Factory) Sender() interface{} {
var demo = *f.demo
sender := &demo
return &SenderJsIplm{
Message: sender,
Vm: f.vm,
Private: "private",
Group: "group",
Routine: "routine",
Persistent: "persistent",
UUID: f.uuid,
}
}
func (f *Factory) Receive(wt interface{}) *CustomSender { func (f *Factory) Receive(wt interface{}) *CustomSender {
var demo = *f.demo var demo = *f.demo
sender := &demo sender := &demo
core/admin/index.html
+1 -1
View File
@@ -8,6 +8,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="/admin/umi.9e8057c6.js"></script> <script src="/admin/umi.4cb92728.js"></script>
</body></html> </body></html>
core/admin/umi.9e8057c6.js → core/admin/umi.4cb92728.js
+9 -9
View File
File diff suppressed because one or more lines are too long
core/carry.go
+4 -4
View File
@@ -63,7 +63,7 @@ func initCarry() {
q := value.(*Queue) q := value.(*Queue)
for _, qm := range q.GetValues() { for _, qm := range q.GetValues() {
if qm.From != nil && qm.From.GetMessageID() == event["message_id"] { if qm.From != nil && qm.From.GetMessageID() == event["message_id"] {
qm.To.Sender().RecallMessage(qm.MessageID) qm.To.Sender2().RecallMessage(qm.MessageID)
} }
} }
return true return true
@@ -247,12 +247,12 @@ func initCarry() {
To: adapter, To: adapter,
} }
_ = q.Enqueue(qm) _ = q.Enqueue(qm)
message_id, err := adapter.Push(map[string]string{ v := adapter.Push(map[string]string{
CONETNT: content, CONETNT: content,
CHAT_ID: chat_id, CHAT_ID: chat_id,
}) })
if err == nil { if v["error"] == "" {
qm.MessageID = message_id qm.MessageID = v["message_id"]
} }
} }
} }
core/init.go
+4 -2
View File
@@ -211,7 +211,9 @@ func Init() {
time.Sleep(time.Second) time.Sleep(time.Second)
utils.Daemon("ready") utils.Daemon("ready")
}() }()
return nil return &storage.Final{
Message: "1秒重启升级！",
}
} else { } else {
console.Debug("正在删除旧程序错误...") console.Debug("正在删除旧程序错误...")
if err = os.RemoveAll(filename); err != nil { if err = os.RemoveAll(filename); err != nil {
@@ -246,7 +248,7 @@ func Init() {
utils.Daemon() utils.Daemon()
}() }()
return &storage.Final{ return &storage.Final{
Message: "马上重启！", Message: "1秒重启！",
} }
} }
return nil return nil
core/node_bucket.go
+21 -12
View File
@@ -5,6 +5,13 @@ import (
"github.com/dop251/goja" "github.com/dop251/goja"
) )
func ErrStr(err error) string {
if err == nil {
return ""
}
return err.Error()
}
func MakeBucketObject(vm *goja.Runtime, uuid string, on_start bool, bucket storage.Bucket) *goja.Object { func MakeBucketObject(vm *goja.Runtime, uuid string, on_start bool, bucket storage.Bucket) *goja.Object {
obj := vm.NewObject() obj := vm.NewObject()
obj.Set("get", func(v ...interface{}) interface{} { obj.Set("get", func(v ...interface{}) interface{} {
@@ -19,25 +26,27 @@ func MakeBucketObject(vm *goja.Runtime, uuid string, on_start bool, bucket stora
return rt return rt
}) })
obj.Set("set", func(key, value interface{}) interface{} { obj.Set("set", func(key, value interface{}) interface{} {
msg, _, err := SetBucketKeyValue(bucket, key, value) msg, changed, err := SetBucketKeyValue(bucket, key, value)
if err != nil { return map[string]interface{}{
panic(Error(vm, err)) "message": msg,
"error": ErrStr(err),
"changed": changed,
} }
return msg
}) })
obj.Set("set2", func(key, value interface{}) interface{} { obj.Set("set2", func(key, value interface{}) interface{} {
msg, _, err := SetBucketKeyValue2(bucket, key, value) msg, changed, err := SetBucketKeyValue2(bucket, key, value)
if err != nil { return map[string]interface{}{
panic(Error(vm, err)) "message": msg,
"error": ErrStr(err),
"changed": changed,
} }
return msg
}) })
obj.Set("delete", func(key interface{}) error { obj.Set("delete", func(key interface{}) string {
_, _, err := bucket.Set(key, "") _, _, err := bucket.Set(key, "")
return err return ErrStr(err)
}) })
obj.Set("deleteAll", func() error { obj.Set("deleteAll", func() string {
return bucket.Delete() return ErrStr(bucket.Delete())
}) })
obj.Set("keys", func() []string { obj.Set("keys", func() []string {
keys, err := bucket.Keys() keys, err := bucket.Keys()
core/task.go
+1 -1
View File
@@ -55,7 +55,7 @@ func RegistTasks(pt *Tasks) {
for _, meta := range pt.Senders { for _, meta := range pt.Senders {
adapter, _ := GetAdapter(meta.Platfrom, meta.BotID) adapter, _ := GetAdapter(meta.Platfrom, meta.BotID)
if adapter != nil { if adapter != nil {
sender := adapter.Sender() sender := adapter.Sender2()
sender.SetFsps(&common.FakerSenderParams{ sender.SetFsps(&common.FakerSenderParams{
Content: content, Content: content,
ChatID: meta.ChatID, ChatID: meta.ChatID,