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

Show other accounts on person options

merge-requests/9/merge
Bob Mottram 2021-01-22 20:35:14 +00:00
parent 4489cf143a
commit 67e5cb990a
17 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.py
View File

@ -5359,6 +5359,7 @@ class PubServer(BaseHTTPRequestHandler):
ssbAddress = None
emailAddress = None
lockedAccount = False
alsoKnownAs = None
movedTo = ''
actorJson = getPersonFromCache(baseDir,
optionsActor,
@ -5379,6 +5380,8 @@ class PubServer(BaseHTTPRequestHandler):
emailAddress = getEmailAddress(actorJson)
PGPpubKey = getPGPpubKey(actorJson)
PGPfingerprint = getPGPfingerprint(actorJson)
if actorJson.get('alsoKnownAs'):
alsoKnownAs = actorJson['alsoKnownAs']
msg = htmlPersonOptions(self.server.defaultTimeline,
self.server.cssCache,
self.server.translate,
@ -5398,7 +5401,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.dormantMonths,
backToPath,
lockedAccount,
movedTo).encode('utf-8')
movedTo, alsoKnownAs).encode('utf-8')
msglen = len(msg)
self._set_headers('text/html', msglen,
cookie, callingDomain)

3
translations/ar.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "ترددات الكلمات",
"New account": "حساب جديد",
"Moved to new account address": "انتقل إلى عنوان الحساب الجديد",
"Yet another Epicyon Instance": "مثال آخر Epicyon"
"Yet another Epicyon Instance": "مثال آخر Epicyon",
"Other accounts": "حسابات أخرى"
}

3
translations/ca.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Freqüències de paraules",
"New account": "Compte nou",
"Moved to new account address": "S'ha mogut a l'adreça del compte nova",
"Yet another Epicyon Instance": "Encara una altra instància Epicyon"
"Yet another Epicyon Instance": "Encara una altra instància Epicyon",
"Other accounts": "Altres comptes"
}

3
translations/cy.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Amleddau geiriau",
"New account": "Cyfrif newydd",
"Moved to new account address": "Wedi'i symud i gyfeiriad cyfrif newydd",
"Yet another Epicyon Instance": "Digwyddiad Epicyon arall"
"Yet another Epicyon Instance": "Digwyddiad Epicyon arall",
"Other accounts": "Cyfrifon eraill"
}

3
translations/de.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Worthäufigkeiten",
"New account": "Neues Konto",
"Moved to new account address": "An neue Kontoadresse verschoben",
"Yet another Epicyon Instance": "Noch eine Epicyon-Instanz"
"Yet another Epicyon Instance": "Noch eine Epicyon-Instanz",
"Other accounts": "Andere Konten"
}

3
translations/en.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Word frequencies",
"New account": "New account",
"Moved to new account address": "Moved to new account address",
"Yet another Epicyon Instance": "Yet another Epicyon Instance"
"Yet another Epicyon Instance": "Yet another Epicyon Instance",
"Other accounts": "Other accounts"
}

3
translations/es.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Frecuencias de palabras",
"New account": "Nueva cuenta",
"Moved to new account address": "Movido a la nueva dirección de la cuenta",
"Yet another Epicyon Instance": "Otra instancia más de Epicyon"
"Yet another Epicyon Instance": "Otra instancia más de Epicyon",
"Other accounts": "Otras cuentas"
}

3
translations/fr.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Fréquences des mots",
"New account": "Nouveau compte",
"Moved to new account address": "Déplacé vers une nouvelle adresse de compte",
"Yet another Epicyon Instance": "Encore une autre instance Epicyon"
"Yet another Epicyon Instance": "Encore une autre instance Epicyon",
"Other accounts": "Autres comptes"
}

3
translations/ga.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Minicíochtaí focal",
"New account": "Cuntas nua",
"Moved to new account address": "Ar athraíodh a ionad go seoladh cuntas nua",
"Yet another Epicyon Instance": "Institiúid Epicyon eile fós"
"Yet another Epicyon Instance": "Institiúid Epicyon eile fós",
"Other accounts": "Cuntais eile"
}

3
translations/hi.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "शब्द आवृत्तियों",
"New account": "नया खाता",
"Moved to new account address": "नए खाते के पते पर ले जाया गया",
"Yet another Epicyon Instance": "फिर भी एक और एपिकॉन उदाहरण"
"Yet another Epicyon Instance": "फिर भी एक और एपिकॉन उदाहरण",
"Other accounts": "अन्य खाते"
}

3
translations/it.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Frequenze di parole",
"New account": "Nuovo account",
"Moved to new account address": "Spostato al nuovo indirizzo dell'account",
"Yet another Epicyon Instance": "Ancora un'altra istanza di Epicyon"
"Yet another Epicyon Instance": "Ancora un'altra istanza di Epicyon",
"Other accounts": "Altri account"
}

3
translations/ja.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "単語の頻度",
"New account": "新しいアカウント",
"Moved to new account address": "新しいアカウントアドレスに移動しました",
"Yet another Epicyon Instance": "さらに別のエピキオンインスタンス"
"Yet another Epicyon Instance": "さらに別のエピキオンインスタンス",
"Other accounts": "その他のアカウント"
}

3
translations/oc.json
View File

@ -355,5 +355,6 @@
"Word frequencies": "Word frequencies",
"New account": "New account",
"Moved to new account address": "Moved to new account address",
"Yet another Epicyon Instance": "Yet another Epicyon Instance"
"Yet another Epicyon Instance": "Yet another Epicyon Instance",
"Other accounts": "Other accounts"
}

3
translations/pt.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Frequências de palavras",
"New account": "Nova conta",
"Moved to new account address": "Movido para o novo endereço da conta",
"Yet another Epicyon Instance": "Mais uma instância do Epicyon"
"Yet another Epicyon Instance": "Mais uma instância do Epicyon",
"Other accounts": "Outras contas"
}

3
translations/ru.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "Частоты слов",
"New account": "Новый аккаунт",
"Moved to new account address": "Перемещен на новый адрес учетной записи",
"Yet another Epicyon Instance": "Еще один экземпляр Эпикиона"
"Yet another Epicyon Instance": "Еще один экземпляр Эпикиона",
"Other accounts": "Другие аккаунты"
}

3
translations/zh.json
View File

@ -359,5 +359,6 @@
"Word frequencies": "词频",
"New account": "新账户",
"Moved to new account address": "移至新帐户地址",
"Yet another Epicyon Instance": "另一个Epicyon实例"
"Yet another Epicyon Instance": "另一个Epicyon实例",
"Other accounts": "其他账户"
}

21
webapp_person_options.py
View File

@ -48,7 +48,8 @@ def htmlPersonOptions(defaultTimeline: str,
dormantMonths: int,
backToPath: str,
lockedAccount: bool,
movedTo: str) -> str:
movedTo: str,
alsoKnownAs: []) -> str:
"""Show options for a person: view/follow/block/report
"""
optionsDomain, optionsPort = getDomainFromActor(optionsActor)
@ -143,6 +144,24 @@ def htmlPersonOptions(defaultTimeline: str,
' <p class="optionsText">' + \
translate['New account'] + \
': <a href="' + movedTo + '">@' + newHandle + '</a></p>\n'
elif alsoKnownAs:
optionsStr += \
' <p class="optionsText">' + \
translate['Other accounts'] + ': '
if isinstance(alsoKnownAs, list):
ctr = 0
for altActor in alsoKnownAs:
if ctr > 0:
optionsStr += ' '
ctr += 1
altDomain, altPort = getDomainFromActor(altActor)
optionsStr += \
'<a href="' + altActor + '">' + altDomain + '</a>'
elif isinstance(alsoKnownAs, str):
altDomain, altPort = getDomainFromActor(alsoKnownAs)
optionsStr += '<a href="' + alsoKnownAs + '">' + altDomain + '</a>'
optionsStr += '</p>\n'
if emailAddress:
optionsStr += \
'<p class="imText">' + translate['Email'] + \