From 92a948a7bdd862bd6d88039317e93b7c2be6d5cf Mon Sep 17 00:00:00 2001 From: adminoo Date: Mon, 7 Dec 2020 10:06:44 +0100 Subject: [PATCH] stripping emojis, starting to isolate text logic / decoupling --- core/core_test.go | 21 ++++++++++++++------- core/messages.go | 25 ++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/core/core_test.go b/core/core_test.go index ba5959d..461c58f 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -12,19 +12,26 @@ func TestCreateAudioSimple(t *testing.T) { } } -func TestCreateAudioFuzzedText(t *testing.T) { +func TestPrepareTTSMessageFuzzedText(t *testing.T) { var message string = `would \\ "you like 'some of that \"thing''', \mister?` - _, err, _ := createAudio(message) - if err != nil { + cleanMessage := prepareTTSMessage(message) + if cleanMessage != "would you like some of that thing, mister?" { t.Fail() } } -func TestCreateAudioBigText(t *testing.T) { +func TestPrepareTTSMessageBigText(t *testing.T) { var message string = "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?" - _, err, _ := createAudio(message) - // TODO check what then, file size? - if err != nil { + cleanMessage := prepareTTSMessage(message) + if len(cleanMessage) > 300 { t.Fail() } } + +func TestPrepareTTSEmoji(t *testing.T) { + var message string = "This is awesome!!! :thumbsup: :nerd_face:" + cleanMessage := prepareTTSMessage(message) + if cleanMessage != "This is awesome!!!" { + t.Fail() + } +} diff --git a/core/messages.go b/core/messages.go index 89c63da..870791e 100644 --- a/core/messages.go +++ b/core/messages.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "os/exec" + "regexp" "strings" "time" @@ -35,6 +36,27 @@ func maxString(s string, max int) string { return s } +func stripEmoji(msg string) string { + re := regexp.MustCompile(`:\w+:`) + match := re.FindAll([]byte(msg), -1) + if len(match) > 0 { + s := msg + for i := range match { + s = strings.Replace(s, string(match[i]), "", -1) + } + return s + } else { + return msg + } +} + +func prepareTTSMessage(msg string) string { + t1 := maxString(msg, 300) + t2 := stripEmoji(t1) + t3 := removeCharacters(t2, "-\"'`$();:.\\") + return strings.Trim(t3, " ") +} + func createAudio(msg string) ([]byte, error, string) { curr_time := time.Now().Unix() var filename string = fmt.Sprintf("/tmp/%d.mp3", curr_time) @@ -72,7 +94,8 @@ func MessageAudio(s *discordgo.Session, m *discordgo.MessageCreate) { var prefix string = "/gogodisco audio" if strings.HasPrefix(m.Content, prefix) { var message string = strings.TrimPrefix(m.Content, prefix) - _, _, filename := createAudio(removeCharacters(message, "-\"'`$();:.")) + var cleanMessage string = prepareTTSMessage(message) + _, _, filename := createAudio(cleanMessage) file, _ := os.Open(filename) s.ChannelFileSend(m.ChannelID, filename, file) }