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

Can set a url for moved account

merge-requests/8/head
Bob Mottram 2021-01-12 12:35:30 +00:00
parent 4da112e672
commit 482f179f25
17 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon.py
View File

@ -4224,6 +4224,21 @@ class PubServer(BaseHTTPRequestHandler):
setDonationUrl(actorJson, '')
actorChanged = True
# account moved to new address
movedTo = ''
if actorJson.get('movedTo'):
movedTo = actorJson['movedTo']
if fields.get('movedTo'):
if fields['movedTo'] != movedTo and \
'://' in fields['movedTo'] and \
'.' in fields['movedTo']:
actorJson['movedTo'] = movedTo
actorChanged = True
else:
if movedTo:
del actorJson['movedTo']
actorChanged = True
# change instance title
if fields.get('instanceTitle'):
currInstanceTitle = \

3
translations/ar.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "يتلقى المشاركات من الحسابات التالية",
"Sends out posts to the following accounts": "يرسل المنشورات إلى الحسابات التالية",
"Word frequencies": "ترددات الكلمات",
"New account": "حساب جديد"
"New account": "حساب جديد",
"Moved to new account address": "انتقل إلى عنوان الحساب الجديد"
}

3
translations/ca.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Rep publicacions dels comptes següents",
"Sends out posts to the following accounts": "Envia publicacions als comptes següents",
"Word frequencies": "Freqüències de paraules",
"New account": "Compte nou"
"New account": "Compte nou",
"Moved to new account address": "S'ha mogut a l'adreça del compte nova"
}

3
translations/cy.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Yn derbyn swyddi o'r cyfrifon canlynol",
"Sends out posts to the following accounts": "Yn anfon postiadau i'r cyfrifon canlynol",
"Word frequencies": "Amleddau geiriau",
"New account": "Cyfrif newydd"
"New account": "Cyfrif newydd",
"Moved to new account address": "Wedi'i symud i gyfeiriad cyfrif newydd"
}

3
translations/de.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Erhält Beiträge von folgenden Konten",
"Sends out posts to the following accounts": "Sendet Beiträge an die folgenden Konten",
"Word frequencies": "Worthäufigkeiten",
"New account": "Neues Konto"
"New account": "Neues Konto",
"Moved to new account address": "An neue Kontoadresse verschoben"
}

3
translations/en.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Receives posts from the following accounts",
"Sends out posts to the following accounts": "Sends out posts to the following accounts",
"Word frequencies": "Word frequencies",
"New account": "New account"
"New account": "New account",
"Moved to new account address": "Moved to new account address"
}

3
translations/es.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Recibe publicaciones de las siguientes cuentas",
"Sends out posts to the following accounts": "Envía publicaciones a las siguientes cuentas",
"Word frequencies": "Frecuencias de palabras",
"New account": "Nueva cuenta"
"New account": "Nueva cuenta",
"Moved to new account address": "Movido a la nueva dirección de la cuenta"
}

3
translations/fr.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Reçoit les publications des comptes suivants",
"Sends out posts to the following accounts": "Envoie des messages aux comptes suivants",
"Word frequencies": "Fréquences des mots",
"New account": "Nouveau compte"
"New account": "Nouveau compte",
"Moved to new account address": "Déplacé vers une nouvelle adresse de compte"
}

3
translations/ga.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Faigheann sé poist ó na cuntais seo a leanas",
"Sends out posts to the following accounts": "Seoltar poist chuig na cuntais seo a leanas",
"Word frequencies": "Minicíochtaí focal",
"New account": "Cuntas nua"
"New account": "Cuntas nua",
"Moved to new account address": "Ar athraíodh a ionad go seoladh cuntas nua"
}

3
translations/hi.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "निम्नलिखित खातों से पोस्ट प्राप्त करता है",
"Sends out posts to the following accounts": "निम्नलिखित खातों में पोस्ट भेजता है",
"Word frequencies": "शब्द आवृत्तियों",
"New account": "नया खाता"
"New account": "नया खाता",
"Moved to new account address": "नए खाते के पते पर ले जाया गया"
}

3
translations/it.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Riceve post dai seguenti account",
"Sends out posts to the following accounts": "Invia messaggi ai seguenti account",
"Word frequencies": "Frequenze di parole",
"New account": "Nuovo account"
"New account": "Nuovo account",
"Moved to new account address": "Spostato al nuovo indirizzo dell'account"
}

3
translations/ja.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "以下のアカウントから投稿を受け取ります",
"Sends out posts to the following accounts": "以下のアカウントに投稿を送信します",
"Word frequencies": "単語の頻度",
"New account": "新しいアカウント"
"New account": "新しいアカウント",
"Moved to new account address": "新しいアカウントアドレスに移動しました"
}

3
translations/oc.json
View File

@ -353,5 +353,6 @@
"Receives posts from the following accounts": "Receives posts from the following accounts",
"Sends out posts to the following accounts": "Sends out posts to the following accounts",
"Word frequencies": "Word frequencies",
"New account": "New account"
"New account": "New account",
"Moved to new account address": "Moved to new account address"
}

3
translations/pt.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Recebe postagens das seguintes contas",
"Sends out posts to the following accounts": "Envia postagens para as seguintes contas",
"Word frequencies": "Frequências de palavras",
"New account": "Nova conta"
"New account": "Nova conta",
"Moved to new account address": "Movido para o novo endereço da conta"
}

3
translations/ru.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "Получает сообщения от следующих аккаунтов",
"Sends out posts to the following accounts": "Отправляет сообщения на следующие аккаунты",
"Word frequencies": "Частоты слов",
"New account": "Новый аккаунт"
"New account": "Новый аккаунт",
"Moved to new account address": "Перемещен на новый адрес учетной записи"
}

3
translations/zh.json
View File

@ -357,5 +357,6 @@
"Receives posts from the following accounts": "从以下帐户接收帖子",
"Sends out posts to the following accounts": "将帖子发送到以下帐户",
"Word frequencies": "词频",
"New account": "新账户"
"New account": "新账户",
"Moved to new account address": "移至新帐户地址"
}

9
webapp_profile.py
View File

@ -903,8 +903,11 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
toxAddress = ''
briarAddress = ''
manuallyApprovesFollowers = ''
movedTo = ''
actorJson = loadJson(actorFilename)
if actorJson:
if actorJson.get('movedTo'):
movedTo = actorJson['movedTo']
donateUrl = getDonationUrl(actorJson)
xmppAddress = getXmppAddress(actorJson)
matrixAddress = getMatrixAddress(actorJson)
@ -1247,6 +1250,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
editProfileForm += \
' <textarea id="message" name="bio" style="height:200px">' + \
bioStr + '</textarea>\n'
editProfileForm += '<label class="labels">' + \
translate['Moved to new account address'] + ':</label><br>\n'
editProfileForm += \
' <input type="text" placeholder="https://..." ' + \
'name="movedTo" value="' + movedTo + '">\n'
editProfileForm += '<label class="labels">' + \
translate['Donations link'] + '</label><br>\n'
editProfileForm += \