From abe61016e756a0cacc34037e63837a0b75fe7582 Mon Sep 17 00:00:00 2001 From: Matthieu Lalonde Date: Wed, 27 Jan 2021 18:32:48 +0000 Subject: [PATCH] Moving utils file to it's own pkg, exporting TruncateString... --- pkg/bot/handlers.go | 5 +++-- pkg/bot/utils.go | 9 --------- pkg/utils/utils.go | 10 ++++++++++ 3 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 pkg/bot/utils.go create mode 100644 pkg/utils/utils.go diff --git a/pkg/bot/handlers.go b/pkg/bot/handlers.go index da917cd..f7295f6 100644 --- a/pkg/bot/handlers.go +++ b/pkg/bot/handlers.go @@ -10,6 +10,7 @@ import ( "strings" "git.lalonde.me/matth/AltVRBot/pkg/discord/mux" + "git.lalonde.me/matth/AltVRBot/pkg/utils" "github.com/bwmarrin/discordgo" ) @@ -82,7 +83,7 @@ func (b *Type) handleSendMessage(ds *discordgo.Session, dm *discordgo.Message, c au := b.avr.GetFriend(u.AltVRUserID) c = au.GetDisplayName() + ": " + c cl := len([]rune(c)) - c = truncateString(c, 140) + c = utils.TruncateString(c, 140) if err := b.avr.PostNewConversation(uu.AltVRUserID, c); err != nil { log.Printf("Error while sending message: %+v\n", err) b.dg.Session.ChannelMessageSendReply(dm.ChannelID, @@ -133,7 +134,7 @@ func (b *Type) handleMessageReplies(ds *discordgo.Session, mc *discordgo.Message au := b.avr.GetFriend(u.AltVRUserID) msg := au.GetDisplayName() + ": " + mc.Content cl := len([]rune(msg)) - msg = truncateString(msg, 140) + msg = utils.TruncateString(msg, 140) if err := b.avr.PostNewConversation(b.convos[mc.MessageReference.MessageID], msg); err != nil { log.Printf("Error while replying to message: %+v\n", err) b.dg.Session.ChannelMessageSendReply(mc.ChannelID, diff --git a/pkg/bot/utils.go b/pkg/bot/utils.go deleted file mode 100644 index 29617bf..0000000 --- a/pkg/bot/utils.go +++ /dev/null @@ -1,9 +0,0 @@ -package bot - -func truncateString(s string, i int) string { - runes := []rune(s) - if len(runes) > i { - return string(runes[:i]) - } - return s -} diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go new file mode 100644 index 0000000..5fa7ff7 --- /dev/null +++ b/pkg/utils/utils.go @@ -0,0 +1,10 @@ +package utils + +// TruncateString UTF8 truncation of string to `i` length +func TruncateString(s string, i int) string { + runes := []rune(s) + if len(runes) > i { + return string(runes[:i]) + } + return s +}