Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions bot/plugins/pronouns.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,21 @@ async def _get_user_pronouns(username: str) -> tuple[str, str] | None:
if user_data is None:
return None

pronoun_data = (await pronouns())[user_data['pronoun_id']]
return (pronoun_data['subject'], pronoun_data['object'])
all_pronouns = await pronouns()
main_pronoun_data = all_pronouns[user_data['pronoun_id']]
maybe_alt_pronoun_id = user_data['alt_pronoun_id']

# first is always main subject
first = main_pronoun_data['subject'].lower()

if maybe_alt_pronoun_id is not None:
# second is alt subject if they have alt pronouns
second = all_pronouns[maybe_alt_pronoun_id]['subject'].lower()
else:
# second is main object if they don't
second = main_pronoun_data['object'].lower()

return (first, second)


@command('!pronouns')
Expand Down