Dev

adapter/ob11/message.go

@@ -44,8 +44,8 @@ func CustomNode(nickname string, userID int64, content interface{}) message.Mess
 	switch c := content.(type) {
 	case string:
 		str = c
-	case message.Message:
-		str =Message(c).String()
+	case []message.MessageSegment:
+		str = Message(c).String()
 	default:
 		b, _ := json.Marshal(content)
 		str = tool.BytesToString(b)

main.go

@@ -17,11 +17,13 @@ import (
 	//插件注册
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/chatgpt"
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/fhl"
+	//_ "github.com/lianhong2758/RosmBot-MUL/plugins/dish"
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/gscore"
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/lc"
 	//_ "github.com/lianhong2758/RosmBot-MUL/plugins/liuyao"
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/onplugin"
-	//	_ "github.com/lianhong2758/RosmBot-MUL/plugins/phi"
+	//_ "github.com/lianhong2758/RosmBot-MUL/plugins/phi"
+	_ "github.com/lianhong2758/RosmBot-MUL/plugins/pixiv"
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/score"
 	//_ "github.com/lianhong2758/RosmBot-MUL/plugins/tarot"
 	_ "github.com/lianhong2758/RosmBot-MUL/plugins/test"

plugins/onplugin/on&off.go

@@ -19,7 +19,7 @@ var en = rosm.Register(&rosm.PluginData{
 })
 
 func init() {
-	en.OnRex(`^/启用\s*(.*)`).Handle(func(ctx *rosm.Ctx) {
+	en.OnRex(`^/启用\s*(.*)`).SetRule(rosm.NoAtForOther()).Handle(func(ctx *rosm.Ctx) {
 		name := ctx.Being.ResultWord[1]
 		if _, ok := rosm.GetPlugins()[name]; !ok {
 			ctx.Send(message.Text("未找到插件: ", name))
@@ -32,7 +32,7 @@ func init() {
 		}
 		ctx.Send(message.Text(name, "已启用..."))
 	})
-	en.OnRex(`^/禁用\s*(.*)`).Handle(func(ctx *rosm.Ctx) {
+	en.OnRex(`^/禁用\s*(.*)`).SetRule(rosm.NoAtForOther()).Handle(func(ctx *rosm.Ctx) {
 		name := ctx.Being.ResultWord[1]
 		if _, ok := rosm.GetPlugins()[name]; !ok {
 			ctx.Send(message.Text("未找到插件: ", name))
@@ -45,7 +45,7 @@ func init() {
 		}
 		ctx.Send(message.Text(name, "已禁用..."))
 	})
-	en.OnRex(`^/用法\s*(.*)`).Handle(func(ctx *rosm.Ctx) {
+	en.OnRex(`^/用法\s*(.*)`).SetRule(rosm.NoAtForOther()).Handle(func(ctx *rosm.Ctx) {
 		name := ctx.Being.ResultWord[1]
 		plugin, ok := rosm.GetPlugins()[name]
 		if !ok {
@@ -67,7 +67,7 @@ func init() {
 		msg.WriteString(strings.Repeat("*", 20))
 		ctx.Send(message.Text(msg.String()))
 	})
-	en.OnWord(`早安`).SetRule(rosm.OnlyAtMe()).Handle(func(ctx *rosm.Ctx) {
+	en.OnWord(`早安`).SetRule(rosm.OnlyMaster()).Handle(func(ctx *rosm.Ctx) {
 		on := rosm.PluginIsOn(rosm.GetBoten())(ctx)
 		if !on {
 			err := rosm.PluginDB.InsertOff(rosm.GetBoten().Name, tool.MergePadString(ctx.Being.GroupID, ctx.Being.GuildID), false)
@@ -81,7 +81,7 @@ func init() {
 			ctx.Send(message.Text("早安,", rosm.GetRandBotName(), "已经在认真工作了喵~"))
 		}
 	})
-	en.OnWord(`晚安`).SetRule(rosm.OnlyAtMe()).Handle(func(ctx *rosm.Ctx) {
+	en.OnWord(`晚安`).SetRule(rosm.OnlyMaster()).Handle(func(ctx *rosm.Ctx) {
 		on := rosm.PluginIsOn(rosm.GetBoten())(ctx)
 		if on {
 			err := rosm.PluginDB.InsertOff(rosm.GetBoten().Name, tool.MergePadString(ctx.Being.GroupID, ctx.Being.GuildID), true)

plugins/pixiv/main.go

@@ -32,7 +32,7 @@ func init() {
 		_ = os.MkdirAll(en.DataFolder+"cache", 0755)
 	}
 
-	en.OnRex(`^/搜图\s*(\d+)$`).MUL("ob11").Handle(func(ctx *rosm.Ctx) {
+	en.OnRex(`^/搜图\s*(\d+)$`).MUL(ob11.BotType).Handle(func(ctx *rosm.Ctx) {
 		id, _ := strconv.ParseInt(ctx.Being.ResultWord[1], 10, 64)
 		ctx.Send(message.Text("雪儿正在寻找中......"))
 		// 获取P站插图信息
@@ -88,7 +88,7 @@ func init() {
 			ctx.Send(message.Text("图片不存在呜..."))
 		}
 	})
-	en.OnWord("以图搜图", "以图识图").MUL("ob11").Handle(func(ctx *rosm.Ctx) {
+	en.OnWord("以图搜图", "以图识图").MUL(ob11.BotType).Handle(func(ctx *rosm.Ctx) {
 		pics := GetMustPic(ctx)
 		if len(pics) == 0 {
 			ctx.Send(message.Text("雪儿没有收到图片唔..."))

plugins/test/help.go

@@ -13,7 +13,7 @@ func init() {
 		Name: "帮助菜单",
 		Help: "- /help\n",
 	})
-	en.OnWord("/help", "/帮助").Handle(func(ctx *rosm.Ctx) {
+	en.OnWord("/help", "/帮助").SetRule(rosm.OnlyAtMe()).Handle(func(ctx *rosm.Ctx) {
 		var msg strings.Builder
 		msg.WriteString("****RosmBot菜单*****")
 		for _, v := range rosm.GetPlugins() {