diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 28ba32be2..0262c70ec 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -120,62 +120,6 @@ GIRL_PHRASES = [ "$ *sips tea*", "$ PERIODT" ] -GIRL_NAME_PREFIX = [ - 'the', - 'a', - 'another', - 'justA', - 'one', - 'that', - 'itsA', - 'theOnly' -] -GIRL_NAME_ADJECTIVE = [ - 'starry', - 'serene', - 'sweet', - 'pretty', - 'cute', - 'chonky', - 'fuzzy', - 'bitchy', - 'slutty', - 'lovely', - 'comfy', - 'hot', - 'funky', - 'polite', - 'cute', - 'sexy', - 'silver', - 'juicy', - 'magical', - 'nice', - 'normal' -] -GIRL_NAME_NOUN = [ - 'crown', - 'throne', - 'lake', - 'tree', - 'candy', - 'gal', - 'idol', - 'teddy', - 'queen', - 'girl', - 'woman', - 'lady', - 'ghost', - 'friend', - 'doll', - 'bear', - 'witch', - 'bitch', - 'duck', - 'cottage', - 'fairy', -] SLURS = { "(? 0 else "") - - if not valid_username_regex.fullmatch(new_name): - new_name = f"SomeWeirdGirl{random.randrange(100000)}" - - existing = get_user(new_name, graceful=True) - if existing and existing.id != author.id: - if len(new_name) < 23: - new_name = f"{new_name}_{random.randrange(pow(10, 23-len(new_name)))}" - else: - new_name = f"SomeQuirkyGirl{random.randrange(100000)}" + name_index = g.db.query(User).filter(User.queen != None).count() + + while True: + new_name = GIRL_NAMES[name_index] + existing = get_user(new_name, graceful=True) + if not existing: break + name_index += 1 if not author.prelock_username: author.prelock_username = author.username