Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 12:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'name-formatting' into 'v2.9.x'

Browse Source 
Name formatter fixes

See merge request allianceauth/allianceauth!1321
This commit is contained in:
Ariel Rin 2021-06-29 03:15:02 +00:00
commit 8874eceb5f
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
allianceauth/services/hooks.py
View File

@ -175,25 +175,47 @@ class NameFormatter:
:return: str Generated name
"""
format_data = self.get_format_data()
return Formatter().vformat(self.string_formatter, args=[], kwargs=format_data)
return Formatter().vformat(self.string_formatter, args=[], kwargs=format_data).strip()
def get_format_data(self):
main_char = getattr(self.user.profile, 'main_character', None)
try:
character_name = self.user.profile.main_character.character_name
character_id = self.user.profile.main_character.character_id
corp_name = self.user.profile.main_character.corporation_name
corp_id = self.user.profile.main_character.corporation_id
corp_ticker = self.user.profile.main_character.corporation_ticker
alliance_name = self.user.profile.main_character.alliance_name
alliance_id = self.user.profile.main_character.alliance_id
alliance_ticker = self.user.profile.main_character.alliance_ticker
except (AttributeError, ObjectDoesNotExist):
character_name = self.user.username if self._default_to_username else ""
character_id = ""
corp_name = ""
corp_id = ""
corp_ticker = ""
alliance_name = ""
alliance_id = ""
alliance_ticker = ""
format_data = {
'character_name': getattr(main_char, 'character_name', self.user.username if self._default_to_username else None),
'character_id': getattr(main_char, 'character_id', None),
'corp_ticker': getattr(main_char, 'corporation_ticker', None),
'corp_name': getattr(main_char, 'corporation_name', None),
'corp_id': getattr(main_char, 'corporation_id', None),
'alliance_name': getattr(main_char, 'alliance_name', None),
'alliance_id': getattr(main_char, 'alliance_id', None),
'alliance_ticker': getattr(main_char, 'alliance_ticker', None),
'character_name': character_name,
'character_id': character_id if character_id else "",
'corp_ticker': corp_ticker if corp_ticker else "",
'corp_name': corp_name if corp_name else "",
'corp_id': corp_id if corp_id else "",
'alliance_name': alliance_name if alliance_name else "",
'alliance_id': alliance_id if alliance_id else "",
'alliance_ticker': alliance_ticker if alliance_ticker else "",
'username': self.user.username,
}
format_data['alliance_or_corp_name'] = format_data['alliance_name'] or format_data['corp_name']
format_data['alliance_or_corp_ticker'] = format_data['alliance_ticker'] or format_data['corp_ticker']
return format_data
@cached_property