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

Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon

main
Bob Mottram 2021-06-30 14:41:55 +01:00
parent ca2da7b6a4 36303ab578
commit a41c7749a0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
petnames.py
View File

@ -75,6 +75,13 @@ def getPetName(baseDir: str, nickname: str, domain: str,
for pet in petnamesList:
if pet.endswith(' ' + handle):
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.lower().endswith(' ' + handle):
handle2 = pet.split(' ')[-1]
return pet.replace(' ' + handle2, '').strip()
return ''

2
webapp_person_options.py
View File

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