From 1edf6ef81a875bdf673491d264068ee2399d207e Mon Sep 17 00:00:00 2001 From: klmp200 Date: Tue, 24 Jul 2018 17:31:17 +0200 Subject: [PATCH] Less cancerous gender command --- commands/gender.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/commands/gender.go b/commands/gender.go index 356ab7a..c6da756 100644 --- a/commands/gender.go +++ b/commands/gender.go @@ -2,7 +2,7 @@ * @Author: Bartuccio Antoine * @Date: 2018-07-24 14:55:33 * @Last Modified by: klmp200 -* @Last Modified time: 2018-07-24 15:10:37 +* @Last Modified time: 2018-07-24 17:26:57 */ package commands @@ -14,8 +14,12 @@ import ( ) func SetGender(m *tb.Message) { - split := strings.Split(m.Text, " ") - data := strings.Join(split[1:], " ") + split := cleanGender(strings.Split(m.Text, " ")[1:]) + if len(split) == 0 { + shared.Bot.Send(m.Chat, "Désolé, mais je n'ai pas compris.") + return + } + data := strings.Join(split, " ") shared.Users.Set(m.Sender.ID, "gender", data) shared.Bot.Send(m.Chat, "Votre genre est enregistré, je vous considère maintenant comme « "+data+" ».") } @@ -28,3 +32,14 @@ func Gender(m *tb.Message) { shared.Bot.Send(m.Chat, data) } } + +func cleanGender(slice []string) []string { + for i, value := range slice { + if strings.HasPrefix(value, "@") { + slice[i] = strings.Replace(value, "@", "@ ", 1) + } else if strings.HasPrefix(value, "/") { + slice[i] = strings.Replace(value, "/", "/ ", 1) + } + } + return slice +}