From 4e0013cd1fc9afcee52cb5348ea04ce262ca8bb2 Mon Sep 17 00:00:00 2001
From: Chuck Sneed <sneed@formerlychucks.net>
Date: Wed, 21 Jun 2023 18:21:45 -0500
Subject: [PATCH] Fix username collisions

---
 files/helpers/regex.py |  1 +
 files/routes/awards.py | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/files/helpers/regex.py b/files/helpers/regex.py
index 0abf9a04d..d2ef66e58 100644
--- a/files/helpers/regex.py
+++ b/files/helpers/regex.py
@@ -69,6 +69,7 @@ torture_regex = re.compile('(^|\s)(i|me)($|\s)', flags=re.I|re.A)
 torture_regex2 = re.compile("(^|\s)(i'm)($|\s)", flags=re.I|re.A)
 torture_regex3 = re.compile("(^|\s)(my|mine)($|\s)", flags=re.I|re.A)
 
+#matches ". ", does not match "..." or a.b
 sentence_ending_regex = re.compile('(?<!\.)(\.)(?=$|\n|\s)', flags=re.I|re.A)
 normal_punctuation_regex = re.compile('(\"|\')', flags=re.I|re.A)
 more_than_one_comma_regex = re.compile('\,\,+', flags=re.I|re.A)
diff --git a/files/routes/awards.py b/files/routes/awards.py
index 5c005ea5d..6591c4b06 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -329,12 +329,15 @@ def award_thing(v, thing_type, id):
 			abort(409, f"{safe_username} is under the effect of a conflicting award: OwOify award!")
 
 		if not author.queen:
-
-			adjective = GIRL_NAME_ADJECTIVE[author.id%20].capitalize()
-			noun = GIRL_NAME_NOUN[(int(author.id/20))%20].capitalize()
-			prefix = GIRL_NAME_PREFIX[(int((id/20)/20))%8]
+			number_of_adjectives = len(GIRL_NAME_ADJECTIVE)
+			number_of_nouns = len(GIRL_NAME_NOUN)
+			number_of_prefix = len(GIRL_NAME_PREFIX)
+			numbers = get_number_tuple(author.id, [number_of_adjectives, number_of_nouns, number_of_prefix])
+			adjective = GIRL_NAME_ADJECTIVE[numbers[0]].capitalize()
+			noun = GIRL_NAME_NOUN[numbers[1]].capitalize()
+			prefix = GIRL_NAME_PREFIX[numbers[2]]
 			prefix = prefix[0].upper() + prefix[1:]
-			number = int(((author.id/20)/20)/8)
+			number = numbers[3]
 
 			new_name = f"{prefix}{adjective}{noun}"+ (str(number) if number > 0 else "")
 
@@ -551,3 +554,18 @@ def award_thing(v, thing_type, id):
 
 	return {"message": f"{AWARDS[kind]['title']} award given to {thing_type} successfully!"}
 
+def shift_number_down(input, mod):
+    if input <= 0:
+        return 0, 0
+    number = (input%mod)
+    input -= number
+    input /= mod
+    return int(number), int(input)
+
+def get_number_tuple(input, mods):
+    results = []
+    for mod in mods:
+        result, input = shift_number_down(input, mod)
+        results.append(result)
+    results.append(input)
+    return results
\ No newline at end of file