mirror of
https://github.com/c9s/bbgo.git
synced 2024-11-26 00:35:15 +00:00
fix: extract split string by length as a function
This commit is contained in:
parent
097860af6b
commit
9cce165aa5
|
@ -5,8 +5,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
"unicode/utf8"
|
|
||||||
|
|
||||||
|
"github.com/c9s/bbgo/pkg/util"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"golang.org/x/time/rate"
|
"golang.org/x/time/rate"
|
||||||
"gopkg.in/tucnak/telebot.v2"
|
"gopkg.in/tucnak/telebot.v2"
|
||||||
|
@ -68,14 +68,13 @@ type TelegramReply struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *TelegramReply) Send(message string) {
|
func (r *TelegramReply) Send(message string) {
|
||||||
var left, right int
|
splits := util.StringSplitByLength(message, maxMessageSize)
|
||||||
for left, right = 0, maxMessageSize; right < len(message); left, right = right, right+maxMessageSize {
|
for _, split := range splits {
|
||||||
for !utf8.RuneStart(message[right]) {
|
if err := sendLimiter.Wait(ctx); err != nil {
|
||||||
right--
|
log.WithError(err).Errorf("telegram send limit exceeded")
|
||||||
}
|
}
|
||||||
checkSendErr(r.bot.Send(r.session.Chat, message[left:right]))
|
checkSendErr(r.bot.Send(r.session.Chat, split))
|
||||||
}
|
}
|
||||||
checkSendErr(r.bot.Send(r.session.Chat, message[left:]))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *TelegramReply) Message(message string) {
|
func (r *TelegramReply) Message(message string) {
|
||||||
|
@ -171,23 +170,17 @@ func (tm *Telegram) Start(ctx context.Context) {
|
||||||
if reply.set {
|
if reply.set {
|
||||||
reply.build()
|
reply.build()
|
||||||
if len(reply.message) > 0 || reply.menu != nil {
|
if len(reply.message) > 0 || reply.menu != nil {
|
||||||
var left, right int
|
splits := util.StringSplitByLength(reply.message, maxMessageSize)
|
||||||
for left, right = 0, maxMessageSize; right < len(reply.message); left, right = right, right+maxMessageSize {
|
for i, split := range splits {
|
||||||
for !utf8.RuneStart(reply.message[right]) {
|
|
||||||
right--
|
|
||||||
}
|
|
||||||
if err := sendLimiter.Wait(ctx); err != nil {
|
if err := sendLimiter.Wait(ctx); err != nil {
|
||||||
log.WithError(err).Errorf("telegram send limit exceeded")
|
log.WithError(err).Errorf("telegram send limit exceeded")
|
||||||
}
|
}
|
||||||
checkSendErr(tm.Bot.Send(m.Chat, reply.message[left:right]))
|
if i == len(splits)-1 {
|
||||||
|
// only set menu on the last message
|
||||||
}
|
checkSendErr(tm.Bot.Send(m.Chat, split, reply.menu))
|
||||||
if left < len(reply.message) {
|
} else {
|
||||||
if err := sendLimiter.Wait(ctx); err != nil {
|
checkSendErr(tm.Bot.Send(m.Chat, split))
|
||||||
log.WithError(err).Errorf("telegram send limit exceeded")
|
|
||||||
}
|
}
|
||||||
// only set menu on the last message
|
|
||||||
checkSendErr(tm.Bot.Send(m.Chat, reply.message[left:], reply.menu))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package util
|
package util
|
||||||
|
|
||||||
import "strings"
|
import (
|
||||||
|
"strings"
|
||||||
|
"unicode/utf8"
|
||||||
|
)
|
||||||
|
|
||||||
func StringSliceContains(slice []string, needle string) bool {
|
func StringSliceContains(slice []string, needle string) bool {
|
||||||
for _, s := range slice {
|
for _, s := range slice {
|
||||||
|
@ -27,3 +30,17 @@ func MaskKey(key string) string {
|
||||||
maskKey += key[len(key)-h:]
|
maskKey += key[len(key)-h:]
|
||||||
return maskKey
|
return maskKey
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func StringSplitByLength(s string, length int) (result []string) {
|
||||||
|
var left, right int
|
||||||
|
for left, right = 0, length; right < len(s); left, right = right, right+length {
|
||||||
|
for !utf8.RuneStart(s[right]) {
|
||||||
|
right--
|
||||||
|
}
|
||||||
|
result = append(result, s[left:right])
|
||||||
|
}
|
||||||
|
if len(s)-left > 0 {
|
||||||
|
result = append(result, s[left:])
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
package util
|
package util
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
func TestMaskKey(t *testing.T) {
|
func TestMaskKey(t *testing.T) {
|
||||||
type args struct {
|
type args struct {
|
||||||
|
@ -40,3 +44,10 @@ func TestMaskKey(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStringSplitByLength(t *testing.T) {
|
||||||
|
result := StringSplitByLength("1234567890", 3)
|
||||||
|
assert.Equal(t, result, []string{"123", "456", "789", "0"})
|
||||||
|
result = StringSplitByLength("123許456", 4)
|
||||||
|
assert.Equal(t, result, []string{"123", "許4", "56"})
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user