From 3f5f03970529d8518d1293437ad0483fdcae7687 Mon Sep 17 00:00:00 2001
From: eleksir <eleksir@exs-elm.ru>
Date: Wed, 10 Aug 2022 20:07:42 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B0=D1=80=D0=BC=D1=8D=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aleesa-misc-lib.go | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/aleesa-misc-lib.go b/aleesa-misc-lib.go
index 4b7d0a4..3151b15 100644
--- a/aleesa-misc-lib.go
+++ b/aleesa-misc-lib.go
@@ -88,7 +88,9 @@ func msgParser(ctx context.Context, msg string) {
 		// Может быть, это команда модуля phrases?
 		var done = false
 		var cmd = j.Message[len(j.Misc.Csign):]
-		cmds := []string{"friday", "пятница", "proverb", "пословица", "fortune", "фортунка", "f", "ф", "karma", "карма"}
+		cmds := []string{"friday", "пятница", "proverb", "пословица", "fortune", "фортунка", "f", "ф", "karma", "карма",
+			"rum", "ром", "vodka", "водка", "beer", "пиво", "tequila", "текила", "whisky", "виски", "absinthe",
+			"абсент"}
 
 		for _, command := range cmds {
 			if cmd == command {
@@ -133,21 +135,35 @@ func msgParser(ctx context.Context, msg string) {
 			}
 		}
 
-		// Нет? Вдруг это комплексная команда?
+		// Нет? Вдруг это комплексная команда модуля webapp?
 		if !done {
 			cmdLen := len(cmd)
 
-			cmds := []string{"w ", "п ", "погода ", "погодка ", "погадка ", "weather ", "karma ", "карма "}
+			cmds := []string{"w ", "п ", "погода ", "погодка ", "погадка ", "weather "}
 
 			for _, command := range cmds {
 				if cmdLen > len(command) && cmd[0:len(command)] == command {
-					if command == "karma " || command == "карма " {
-						sendTo = "phrases"
+					sendTo = "webapp"
+					done = true
+					break
+				}
+			}
+		}
 
+		// Опять мимо? Давай тогда попытаем удачу в поиске комплексной команды для phrases
+		if !done {
+			cmdLen := len(cmd)
+
+			cmds := []string{"karma ", "карма ", "rum ", "ром ", "vodka ", "водка ", "beer ", "пиво ", "tequila ",
+				"текила ", "whisky ", "виски ", "absinthe ", "абсент "}
+
+			for _, command := range cmds {
+				if cmdLen > len(command) && cmd[0:len(command)] == command {
+					sendTo = "phrases"
+
+					if command == "karma " || command == "карма " {
 						// Костыль для кармы
 						j.Misc.Answer = 1
-					} else {
-						sendTo = "webapp"
 					}
 
 					break