[1mdiff --git a/model.py b/model.py[m
[1mindex 7e03236..33cd1ac 100644[m
[1m--- a/model.py[m
[1m+++ b/model.py[m
[36m@@ -364,54 +364,52 @@[m [mclass User:[m
and the output is formatted onto multiple lines instead[m
of being a single line.[m
"""[m
[31m- if not user_flair.strip():[m
[31m- return ''[m
[31m-[m
out = ''[m
has_abbrev = False[m
[m
[31m- for flair in User.parse_flair(user_flair):[m
[31m- #print(user_flair, icon, label, scope)[m
[31m-[m
[31m- if long_form:[m
[31m- # Show everything in the long form.[m
[31m- if flair.icon():[m
[31m- out += flair.icon() + ' '[m
[31m- if flair.scope:[m
[31m- subspace = db.get_subspace(id=flair.scope)[m
[31m- if subspace:[m
[31m- scope = f" (in {subspace.title()})"[m
[32m+[m[32m if user_flair.strip():[m
[32m+[m[32m for flair in User.parse_flair(user_flair):[m
[32m+[m[32m #print(user_flair, icon, label, scope)[m
[32m+[m
[32m+[m[32m if long_form:[m
[32m+[m[32m # Show everything in the long form.[m
[32m+[m[32m if flair.icon():[m
[32m+[m[32m out += flair.icon() + ' '[m
[32m+[m[32m if flair.scope:[m
[32m+[m[32m subspace = db.get_subspace(id=flair.scope)[m
[32m+[m[32m if subspace:[m
[32m+[m[32m scope = f" (in {subspace.title()})"[m
[32m+[m[32m else:[m
[32m+[m[32m scope = " (in a deleted subspace)"[m
else:[m
[31m- scope = " (in a deleted subspace)"[m
[31m- else:[m
[31m- scope = ''[m
[31m- if flair.icon():[m
[31m- out += f"{flair.description()}: "[m
[31m- elif not scope and flair.is_admin_assigned:[m
[31m- out += '📛 Assigned flair: '[m
[31m- else:[m
[31m- out += '📛 Personal flair: '[m
[31m- out += f"{flair.label}{scope}{' (set by admin)' if flair.is_admin_assigned else ''}\n"[m
[31m-[m
[31m- elif flair.scope == 0 or (context and flair.scope == context.id):[m
[31m- if abbreviate:[m
[31m- if not flair.icon() or flair.type == Flair.SELF_DESCRIPTION:[m
[31m- has_abbrev = True[m
[31m- continue[m
[31m- # Just showing icons and "...".[m
[31m- out += flair.icon()[m
[31m- # elif flair.label:[m
[31m- # has_abbrev = True[m
[31m- else:[m
[31m- # Showing icons and labels.[m
[31m- if len(out):[m
[31m- out += ', '[m
[31m-[m
[31m- icon = flair.icon() if flair.type != Flair.SELF_DESCRIPTION else ''[m
[31m- out += icon[m
[31m- if flair.label:[m
[31m- if icon: out += ' '[m
[31m- out += flair.label[m
[32m+[m[32m scope = ''[m
[32m+[m[32m if flair.icon():[m
[32m+[m[32m out += f"{flair.description()}: "[m
[32m+[m[32m elif not scope and flair.is_admin_assigned:[m
[32m+[m[32m out += '📛 Assigned flair: '[m
[32m+[m[32m else:[m
[32m+[m[32m out += '📛 Personal flair: '[m
[32m+[m[32m out += f"{flair.label}{scope}{' (set by admin)' if flair.is_admin_assigned else ''}\n"[m
[32m+[m
[32m+[m[32m elif flair.scope == 0 or (context and flair.scope == context.id):[m
[32m+[m[32m if abbreviate:[m
[32m+[m[32m if not flair.icon() or flair.type == Flair.SELF_DESCRIPTION:[m
[32m+[m[32m has_abbrev = True[m
[32m+[m[32m continue[m
[32m+[m[32m # Just showing icons and "...".[m
[32m+[m[32m out += flair.icon()[m
[32m+[m[32m # elif flair.label:[m
[32m+[m[32m # has_abbrev = True[m
[32m+[m[32m else:[m
[32m+[m[32m # Showing icons and labels.[m
[32m+[m[32m if len(out):[m
[32m+[m[32m out += ', '[m
[32m+[m
[32m+[m[32m icon = flair.icon() if flair.type != Flair.SELF_DESCRIPTION else ''[m
[32m+[m[32m out += icon[m
[32m+[m[32m if flair.label:[m
[32m+[m[32m if icon: out += ' '[m
[32m+[m[32m out += flair.label[m
[m
if not long_form:[m
if user_op or user_mod:[m
text/plain
This content has been proxied by September (3851b).