mirror of https://gitlab.com/bashrc2/epicyon
Snake case
parent
ba6320e3f5
commit
467c5831a4
|
@ -264,7 +264,7 @@ from utils import isLocalNetworkAddress
|
|||
from utils import permitted_dir
|
||||
from utils import is_account_dir
|
||||
from utils import getOccupationSkills
|
||||
from utils import getOccupationName
|
||||
from utils import get_occupation_name
|
||||
from utils import set_occupation_name
|
||||
from utils import loadTranslationsFromFile
|
||||
from utils import getLocalNetworkAddresses
|
||||
|
@ -5473,7 +5473,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
actorChanged = True
|
||||
|
||||
# Other accounts (alsoKnownAs)
|
||||
occupationName = getOccupationName(actor_json)
|
||||
occupationName = get_occupation_name(actor_json)
|
||||
if fields.get('occupationName'):
|
||||
fields['occupationName'] = \
|
||||
removeHtml(fields['occupationName'])
|
||||
|
|
16
utils.py
16
utils.py
|
@ -2743,24 +2743,24 @@ def getOccupationSkills(actor_json: {}) -> []:
|
|||
return []
|
||||
|
||||
|
||||
def getOccupationName(actor_json: {}) -> str:
|
||||
def get_occupation_name(actor_json: {}) -> str:
|
||||
"""Returns the occupation name an actor
|
||||
"""
|
||||
if not actor_json.get('hasOccupation'):
|
||||
return ""
|
||||
if not isinstance(actor_json['hasOccupation'], list):
|
||||
return ""
|
||||
for occupationItem in actor_json['hasOccupation']:
|
||||
if not isinstance(occupationItem, dict):
|
||||
for occupation_item in actor_json['hasOccupation']:
|
||||
if not isinstance(occupation_item, dict):
|
||||
continue
|
||||
if not occupationItem.get('@type'):
|
||||
if not occupation_item.get('@type'):
|
||||
continue
|
||||
if occupationItem['@type'] != 'Occupation':
|
||||
if occupation_item['@type'] != 'Occupation':
|
||||
continue
|
||||
if not occupationItem.get('name'):
|
||||
if not occupation_item.get('name'):
|
||||
continue
|
||||
if isinstance(occupationItem['name'], str):
|
||||
return occupationItem['name']
|
||||
if isinstance(occupation_item['name'], str):
|
||||
return occupation_item['name']
|
||||
break
|
||||
return ""
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ from webfinger import webfingerHandle
|
|||
from utils import getDisplayName
|
||||
from utils import is_group_account
|
||||
from utils import has_object_dict
|
||||
from utils import getOccupationName
|
||||
from utils import get_occupation_name
|
||||
from utils import get_locked_account
|
||||
from utils import get_full_domain
|
||||
from utils import is_artist
|
||||
|
@ -824,7 +824,7 @@ def htmlProfile(signing_priv_key_pem: str,
|
|||
joinedDate = profile_json['published']
|
||||
occupationName = None
|
||||
if profile_json.get('hasOccupation'):
|
||||
occupationName = getOccupationName(profile_json)
|
||||
occupationName = get_occupation_name(profile_json)
|
||||
|
||||
avatarUrl = profile_json['icon']['url']
|
||||
# use alternate path for local avatars to avoid any caching issues
|
||||
|
@ -2008,7 +2008,7 @@ def _htmlEditProfileMain(base_dir: str, displayNickname: str, bioStr: str,
|
|||
|
||||
occupationName = ''
|
||||
if actor_json.get('hasOccupation'):
|
||||
occupationName = getOccupationName(actor_json)
|
||||
occupationName = get_occupation_name(actor_json)
|
||||
|
||||
editProfileForm += \
|
||||
editTextField(translate['Occupation'], 'occupationName',
|
||||
|
|
Loading…
Reference in New Issue