From 78d5915665360b47a23528f3afddd60b3b8dacb0 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 15:14:13 +0400 Subject: [PATCH 1/4] fix: don`t parse short words in `drink` command --- plugins/ai.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/ai.py b/plugins/ai.py index cb56138..d793d2d 100644 --- a/plugins/ai.py +++ b/plugins/ai.py @@ -60,8 +60,7 @@ def AI_RAW(CMD, RAW, RN): for DATE in ddate: DATE_SPLIT = DATE.split() for R in RAW_SPLIT: - if R in DATE_SPLIT: - INIT_DRINK.append(R) + if len(R) >= 3 and R in DATE_SPLIT: INIT_DRINK.append(R) if INIT_DRINK: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True return '', False From b6e13f877209929bb8f821b0691afe091c695fa5 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 15:16:57 +0400 Subject: [PATCH 2/4] fix: don`t parse short words in `drink` command part 2 --- plugins/ai.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ai.py b/plugins/ai.py index d793d2d..b3916e3 100644 --- a/plugins/ai.py +++ b/plugins/ai.py @@ -54,13 +54,13 @@ def AI_RAW(CMD, RAW, RN): for t in DRINK: DRINK_LOCALE = L(t, RN).lower() if DRINK_LOCALE in RAW_SPLIT: INIT_DRINK.append(DRINK_LOCALE) - if len(INIT_DRINK) >= 2: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True + if len(INIT_DRINK) == 2: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True else: ddate = readfile(date_file).decode('UTF').lower().split('\n') for DATE in ddate: DATE_SPLIT = DATE.split() for R in RAW_SPLIT: - if len(R) >= 3 and R in DATE_SPLIT: INIT_DRINK.append(R) + if len(R) > 3 and R in DATE_SPLIT: INIT_DRINK.append(R) if INIT_DRINK: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True return '', False From bf7e0000ea080c654a3e9b5ac1c62fdcbe417d60 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 15:20:46 +0400 Subject: [PATCH 3/4] fix: don`t parse short words in `drink` command part 3 --- plugins/ai.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/ai.py b/plugins/ai.py index b3916e3..e36c40d 100644 --- a/plugins/ai.py +++ b/plugins/ai.py @@ -56,6 +56,7 @@ def AI_RAW(CMD, RAW, RN): if DRINK_LOCALE in RAW_SPLIT: INIT_DRINK.append(DRINK_LOCALE) if len(INIT_DRINK) == 2: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True else: + INIT_DRINK = [] ddate = readfile(date_file).decode('UTF').lower().split('\n') for DATE in ddate: DATE_SPLIT = DATE.split() From 883f8c30d84f27454fbe13ed89edd37e455aede1 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 17:10:28 +0400 Subject: [PATCH 4/4] fix: wrong AI parse with same aliases --- dev-tools/locale_generator/locale_generator.py | 2 +- plugins/ai.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/locale_generator/locale_generator.py b/dev-tools/locale_generator/locale_generator.py index 60a54da..432850f 100644 --- a/dev-tools/locale_generator/locale_generator.py +++ b/dev-tools/locale_generator/locale_generator.py @@ -156,7 +156,7 @@ loc_folder = data_folder % 'locales/%s.txt' log_folder = data_folder % 'conflogs/%s' public_log = log_folder % 'chatlogs/%s' system_log = log_folder % 'syslogs/%s' -gmessage = [] +gactmessage = [] locale_mark = 'NO_TRANSLATE' file_mark = '# file: ' diff --git a/plugins/ai.py b/plugins/ai.py index e36c40d..145a9a7 100644 --- a/plugins/ai.py +++ b/plugins/ai.py @@ -157,4 +157,4 @@ def AI_PARAMETER(body, type, room): return RESULT -gmessage.append(AI_PARSE) +gactmessage.append(AI_PARSE)