indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Getting petname

merge-requests/30/head
Bob Mottram 2021-06-30 14:01:51 +01:00
parent 7bff40eb52
commit 4f575e8316
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
petnames.py
View File

@ -75,6 +75,12 @@ def getPetName(baseDir: str, nickname: str, domain: str,
for pet in petnamesList: for pet in petnamesList:
if pet.endswith(' ' + handle): if pet.endswith(' ' + handle):
return pet.replace(' ' + handle, '').strip() return pet.replace(' ' + handle, '').strip()
elif ' ' + handle.lower() + '\n' in petnamesStr.lower():
petnamesList = petnamesStr.split('\n')
handle = handle.lower()
for pet in petnamesList:
if pet.endswith(' ' + handle):
return pet.replace(' ' + handle, '').strip()
return '' return ''

2
webapp_person_options.py
View File

@ -235,7 +235,7 @@ def htmlPersonOptions(defaultTimeline: str,
if authorized: if authorized:
if originPathStr == '/users/' + nickname: if originPathStr == '/users/' + nickname:
if optionsNickname: if optionsNickname:
handle = optionsNickname + '@' + optionsDomainFull # handle = optionsNickname + '@' + optionsDomainFull
petname = getPetName(baseDir, nickname, domain, handle) petname = getPetName(baseDir, nickname, domain, handle)
optionsStr += \ optionsStr += \
' ' + translate['Petname'] + ': \n' + \ ' ' + translate['Petname'] + ': \n' + \