diff --git a/go.mod b/go.mod index 02ff20b4..b6bed92a 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9 github.com/FloatTech/sqlite v1.6.3 github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 - github.com/FloatTech/zbpctrl v1.6.1-0.20240501122621-27fbe564d42a - github.com/FloatTech/zbputils v1.7.1-0.20240504124534-d8208d13abea + github.com/FloatTech/zbpctrl v1.6.1 + github.com/FloatTech/zbputils v1.7.1-0.20240504134720-ce2b1be4b85a github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 github.com/antchfx/htmlquery v1.2.5 @@ -40,7 +40,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/tidwall/gjson v1.14.4 github.com/wcharczuk/go-chart/v2 v2.1.0 - github.com/wdvxdr1123/ZeroBot v1.7.5-0.20240501144516-eb574bbdad32 + github.com/wdvxdr1123/ZeroBot v1.7.5-0.20240504144809-0d0388f8f575 gitlab.com/gomidi/midi/v2 v2.0.25 golang.org/x/image v0.3.0 golang.org/x/sys v0.19.0 diff --git a/go.sum b/go.sum index aacdfbc6..dc0c134c 100644 --- a/go.sum +++ b/go.sum @@ -16,10 +16,10 @@ github.com/FloatTech/sqlite v1.6.3 h1:MQkqBNlkPuCoKQQgoNLuTL/2Ci3tBTFAnVYBdD0Wy4 github.com/FloatTech/sqlite v1.6.3/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY= github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 h1:g4pTnDJUW4VbJ9NvoRfUvdjDrHz/6QhfN/LoIIpICbo= github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= -github.com/FloatTech/zbpctrl v1.6.1-0.20240501122621-27fbe564d42a h1:9HPKT4WuO5nYVxVRie7OTn2kV9cwaktulkZbBbCqXkg= -github.com/FloatTech/zbpctrl v1.6.1-0.20240501122621-27fbe564d42a/go.mod h1:RxqNENMwHUUZz5IazDxhnmyejGV0xQthYpScMU9cWbw= -github.com/FloatTech/zbputils v1.7.1-0.20240504124534-d8208d13abea h1:rJvWRrdgk1+QUy8UxHSSMY21r3U6jxQhTW/AWIGiIaY= -github.com/FloatTech/zbputils v1.7.1-0.20240504124534-d8208d13abea/go.mod h1:caNGFADPaEkZvuaECwGA1I7t6nJuK+TcxNaTjLa4OYs= +github.com/FloatTech/zbpctrl v1.6.1 h1:SilK5R2poO8iUT6JPzpgr/BSzxYAaybBYNZkMyZ8STw= +github.com/FloatTech/zbpctrl v1.6.1/go.mod h1:I+MetM++1sJhNPg3zww1aw04BicYsNohvHC4Jh52XSo= +github.com/FloatTech/zbputils v1.7.1-0.20240504134720-ce2b1be4b85a h1:tjpvpv8Elnj2w+MSE9lu1qrghfpVU1zNw8ngKZS1H4A= +github.com/FloatTech/zbputils v1.7.1-0.20240504134720-ce2b1be4b85a/go.mod h1:drCjiDLLtRIfN9sRJKJneReZmn/LsBGB8TWYgEoWrA0= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 h1:S/ferNiehVjNaBMNNBxUjLtVmP/YWD6Yh79RfPv4ehU= github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w= @@ -196,8 +196,8 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I= github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA= -github.com/wdvxdr1123/ZeroBot v1.7.5-0.20240501144516-eb574bbdad32 h1:GuVwh4uGtDegpKNgSkcqpbISLAn5nCpqoGxXmiEv4iI= -github.com/wdvxdr1123/ZeroBot v1.7.5-0.20240501144516-eb574bbdad32/go.mod h1:J6uHaXS/Am2VsLxF9TcU6il19PbOeC4SvgxHJ1E2jaE= +github.com/wdvxdr1123/ZeroBot v1.7.5-0.20240504144809-0d0388f8f575 h1:98GpzXVAgqNCLF4B7MwmVLW08MDhfyx62Fz6aqCwO3M= +github.com/wdvxdr1123/ZeroBot v1.7.5-0.20240504144809-0d0388f8f575/go.mod h1:J6uHaXS/Am2VsLxF9TcU6il19PbOeC4SvgxHJ1E2jaE= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= diff --git a/plugin/emojimix/emoji.go b/plugin/emojimix/emoji.go index 487ff3ba..b892153b 100644 --- a/plugin/emojimix/emoji.go +++ b/plugin/emojimix/emoji.go @@ -195,55 +195,3 @@ var emojis = map[rune]int64{ 127819: 20210521, // ๐Ÿ‹ lemon 127818: 20211115, // ๐ŸŠ tangerine orange } - -var qqface = map[int]rune{ - 0: 128558, // ๐Ÿ˜ฎ face exhaling - 1: 128556, // ๐Ÿ˜ฌ grimacing face - 2: 128525, // ๐Ÿ˜ smiling face with heart-eyes - 4: 128526, // ๐Ÿ˜Ž smiling face with sunglasses - 5: 128557, // ๐Ÿ˜ญ loudly crying face - 6: 129402, // ๐Ÿฅบ pleading face - 7: 129296, // ๐Ÿค zipper-mouth face - 8: 128554, // ๐Ÿ˜ช sleepy face - 11: 128545, // ๐Ÿ˜ก pouting face - 12: 128539, // ๐Ÿ˜› face with tongue - 13: 128513, // ๐Ÿ˜ beaming face with smiling eyes - 14: 128578, // ๐Ÿ™‚ slightly smiling face - 15: 128577, // ๐Ÿ™ slightly frowning face - 16: 128526, // ๐Ÿ˜Ž smiling face with sunglasses - 19: 129326, // ๐Ÿคฎ face vomiting throw - 20: 129325, // ๐Ÿคญ face with hand over mouth embarrassed - 21: 128522, // ๐Ÿ˜Š smiling face with smiling eyes - 23: 128533, // ๐Ÿ˜• confused face - 24: 128523, // ๐Ÿ˜‹ face savoring food - 27: 128531, // ๐Ÿ˜“ downcast face with sweat - 28: 128516, // ๐Ÿ˜„ grinning face with smiling eyes - 31: 129324, // ๐Ÿคฌ face with symbols on mouth - 32: 129300, // ๐Ÿค” thinking face question hmmm - 33: 129323, // ๐Ÿคซ shushing face quiet whisper - 34: 128565, // ๐Ÿ˜ต face with crossed-out eyes - 35: 128547, // ๐Ÿ˜ฃ persevering face - 37: 128128, // ๐Ÿ’€ skull - 46: 128055, // ๐Ÿท pig face - 53: 127874, // ๐ŸŽ‚ birthday cake - 59: 128169, // ๐Ÿ’ฉ pile of poo - 60: 9749, // โ˜• hot beverage coffee cup tea - 63: 127801, // ๐ŸŒน rose flower - 66: 10084, // โค mending heart - 67: 128148, // ๐Ÿ’” broken heart - 69: 127873, // ๐ŸŽ wrapped-gift - 74: 127774, // ๐ŸŒž sun with face - 75: 127772, // ๐ŸŒœ last quarter moon face - 96: 128517, // ๐Ÿ˜… grinning face with sweat - 104: 129393, // ๐Ÿฅฑ yawning face - 109: 128535, // ๐Ÿ˜— kissing face - 110: 128562, // ๐Ÿ˜ฒ astonished face - 111: 129402, // ๐Ÿฅบ pleading face - 172: 128539, // ๐Ÿ˜› face with tongue - 182: 128514, // ๐Ÿ˜‚ face with tears of joy - 187: 128123, // ๐Ÿ‘ป ghost - 247: 128567, // ๐Ÿ˜ท face with medical mask - 272: 128579, // ๐Ÿ™ƒ upside-down face - 320: 129395, // ๐Ÿฅณ partying face - 325: 128561, // ๐Ÿ˜ฑ face screaming in fear -} diff --git a/plugin/emojimix/mix.go b/plugin/emojimix/mix.go index 2305b892..a73df488 100644 --- a/plugin/emojimix/mix.go +++ b/plugin/emojimix/mix.go @@ -113,7 +113,7 @@ func face2emoji(face message.MessageSegment) rune { if err != nil { return 0 } - if r, ok := qqface[id]; ok { + if r, ok := message.Emoji[id]; ok { return r } return 0 diff --git a/plugin/manager/manager.go b/plugin/manager/manager.go index 25ad2917..4e7b0952 100644 --- a/plugin/manager/manager.go +++ b/plugin/manager/manager.go @@ -407,8 +407,19 @@ func init() { // ๆ’ไปถไธปไฝ“ Handle(func(ctx *zero.Ctx) { msgid := ctx.State["regex_matched"].([]string)[1] face := ctx.State["regex_matched"].([]string)[2] - if len(face) > 0 { - _ = ctx.SetMessageEmojiLike(msgid, face) + if len(face) == 0 { + ctx.SendChain(message.Text("ERROR: ่กจๆƒ…้•ฟๅบฆไธบ 0")) + return + } + x := []rune(face) + if len(x) == 0 { + ctx.SendChain(message.Text("ERROR: ่งฃๆžๅŽ่กจๆƒ…้•ฟๅบฆไธบ 0")) + return + } + err := ctx.SetMessageEmojiLike(msgid, x[0]) + if err != nil { + ctx.SendChain(message.Text("ERROR: ", err)) + return } }) // ๅ…ฅ็พคๆฌข่ฟŽ