diff --git a/daemon.py b/daemon.py index d3076d150..d40fb1e4e 100644 --- a/daemon.py +++ b/daemon.py @@ -3351,6 +3351,18 @@ class PubServer(BaseHTTPRequestHandler): if os.path.isfile(switchFilename): os.remove(switchFilename) + # autogenerated tags + autoTagsFilename = \ + baseDir + '/accounts/' + \ + nickname + '@' + domain + \ + '/autotags.txt' + if fields.get('autoTags'): + with open(autoTagsFilename, 'w+') as autoTagsFile: + autoTagsFile.write(fields['autoTags']) + else: + if os.path.isfile(autoTagsFilename): + os.remove(autoTagsFilename) + # save blocked accounts list blockedFilename = \ baseDir + '/accounts/' + \ diff --git a/translations/ar.json b/translations/ar.json index 6faa4aa4a..2ba0ecc96 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "سياسة الوسطية أو قواعد السلوك", "Edit event": "تحرير الحدث", "Notify when posts are liked": "يخطر عندما يتم اعجاب المشاركات", - "Don't show the Like button": "لا تظهر زر أعجبني" + "Don't show the Like button": "لا تظهر زر أعجبني", + "Autogenerated Hashtags": "علامات التجزئة المُنشأة تلقائيًا" } diff --git a/translations/ca.json b/translations/ca.json index c59b79eb8..3093b203d 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Política de moderació o codi de conducta", "Edit event": "Edita l’esdeveniment", "Notify when posts are liked": "Notifiqueu-ho quan us agradin les publicacions", - "Don't show the Like button": "No mostreu el botó M'agrada" + "Don't show the Like button": "No mostreu el botó M'agrada", + "Autogenerated Hashtags": "Hashtags autogenerats" } diff --git a/translations/cy.json b/translations/cy.json index e77c7ecea..de7ac233f 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Polisi cymedroli neu god ymddygiad", "Edit event": "Golygu digwyddiad", "Notify when posts are liked": "Hysbysu pryd mae swyddi'n cael eu hoffi", - "Don't show the Like button": "Peidiwch â dangos y botwm Hoffi" + "Don't show the Like button": "Peidiwch â dangos y botwm Hoffi", + "Autogenerated Hashtags": "Hashtags awtogeneiddiedig" } diff --git a/translations/de.json b/translations/de.json index 957c54f6b..af8f4eac6 100644 --- a/translations/de.json +++ b/translations/de.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Moderationsrichtlinie oder Verhaltenskodex", "Edit event": "Ereignis bearbeiten", "Notify when posts are liked": "Benachrichtigen, wenn Beiträge gefallen", - "Don't show the Like button": "Zeigen Sie nicht die Schaltfläche \"Gefällt mir\" an" + "Don't show the Like button": "Zeigen Sie nicht die Schaltfläche \"Gefällt mir\" an", + "Autogenerated Hashtags": "Automatisch generierte Hashtags" } diff --git a/translations/en.json b/translations/en.json index aaa545bc7..656f908f6 100644 --- a/translations/en.json +++ b/translations/en.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Moderation policy or code of conduct", "Edit event": "Edit event", "Notify when posts are liked": "Notify when posts are liked", - "Don't show the Like button": "Don't show the Like button" + "Don't show the Like button": "Don't show the Like button", + "Autogenerated Hashtags": "Autogenerated Hashtags" } diff --git a/translations/es.json b/translations/es.json index 07d010a93..541d50e6f 100644 --- a/translations/es.json +++ b/translations/es.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Política de moderación o código de conducta", "Edit event": "Editar evento", "Notify when posts are liked": "Notificar cuando les gusten las publicaciones", - "Don't show the Like button": "No mostrar el botón Me gusta" + "Don't show the Like button": "No mostrar el botón Me gusta", + "Autogenerated Hashtags": "Hashtags autogenerados" } diff --git a/translations/fr.json b/translations/fr.json index 2f85eecda..056847372 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Politique de modération ou code de conduite", "Edit event": "Modifier l'événement", "Notify when posts are liked": "Notifier lorsque les messages sont aimés", - "Don't show the Like button": "Ne pas afficher le bouton J'aime" + "Don't show the Like button": "Ne pas afficher le bouton J'aime", + "Autogenerated Hashtags": "Hashtags générés automatiquement" } diff --git a/translations/ga.json b/translations/ga.json index f758411f2..1d480f4f4 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Beartas modhnóireachta nó cód iompair", "Edit event": "Cuir imeacht in eagar", "Notify when posts are liked": "Cuir in iúl cathain is maith poist", - "Don't show the Like button": "Ná taispeáin an cnaipe Cosúil" + "Don't show the Like button": "Ná taispeáin an cnaipe Cosúil", + "Autogenerated Hashtags": "Hashtags uathghinte" } diff --git a/translations/hi.json b/translations/hi.json index 6da7225e2..63bb954f9 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "मॉडरेशन पॉलिसी या आचार संहिता", "Edit event": "घटना संपादित करें", "Notify when posts are liked": "पोस्ट पसंद आने पर सूचित करें", - "Don't show the Like button": "लाइक बटन न दिखाएं" + "Don't show the Like button": "लाइक बटन न दिखाएं", + "Autogenerated Hashtags": "ऑटोजेनरेटेड हैशटैग" } diff --git a/translations/it.json b/translations/it.json index 71952e1a6..977bc54d1 100644 --- a/translations/it.json +++ b/translations/it.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Politica di moderazione o codice di condotta", "Edit event": "Modifica evento", "Notify when posts are liked": "Avvisa quando i post sono piaciuti", - "Don't show the Like button": "Non mostrare il pulsante Mi piace" + "Don't show the Like button": "Non mostrare il pulsante Mi piace", + "Autogenerated Hashtags": "Hashtag generati automaticamente" } diff --git a/translations/ja.json b/translations/ja.json index 384098456..2b4de68e8 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "モデレートポリシーまたは行動規範", "Edit event": "イベントを編集", "Notify when posts are liked": "投稿が高く評価されたときに通知する", - "Don't show the Like button": "「いいね!」ボタンを表示しない" + "Don't show the Like button": "「いいね!」ボタンを表示しない", + "Autogenerated Hashtags": "自動生成されたハッシュタグ" } diff --git a/translations/oc.json b/translations/oc.json index fae634148..4fba89d52 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -279,5 +279,6 @@ "Moderation policy or code of conduct": "Moderation policy or code of conduct", "Edit event": "Edit event", "Notify when posts are liked": "Notify when posts are liked", - "Don't show the Like button": "Don't show the Like button" + "Don't show the Like button": "Don't show the Like button", + "Autogenerated Hashtags": "Autogenerated Hashtags" } diff --git a/translations/pt.json b/translations/pt.json index 010df87da..bb91f5d9e 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Política de moderação ou código de conduta", "Edit event": "Editar evento", "Notify when posts are liked": "Notificar quando as postagens forem curtidas", - "Don't show the Like button": "Não mostrar o botão Curtir" + "Don't show the Like button": "Não mostrar o botão Curtir", + "Autogenerated Hashtags": "Hashtags autogeradas" } diff --git a/translations/ru.json b/translations/ru.json index f4742761f..a53389935 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "Политика модерации или кодекс поведения", "Edit event": "Изменить мероприятие", "Notify when posts are liked": "Уведомлять, когда публикации нравятся", - "Don't show the Like button": "Не показывать кнопку \"Нравится\"" + "Don't show the Like button": "Не показывать кнопку \"Нравится\"", + "Autogenerated Hashtags": "Автоматически сгенерированные хештеги" } diff --git a/translations/zh.json b/translations/zh.json index 7c3fffd88..38caa60ed 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -283,5 +283,6 @@ "Moderation policy or code of conduct": "审核政策或行为准则", "Edit event": "编辑活动", "Notify when posts are liked": "通知喜欢的帖子", - "Don't show the Like button": "不显示“赞”按钮" + "Don't show the Like button": "不显示“赞”按钮", + "Autogenerated Hashtags": "自动生成的标签" } diff --git a/webinterface.py b/webinterface.py index 6a23e7aac..8bca08326 100644 --- a/webinterface.py +++ b/webinterface.py @@ -1167,6 +1167,14 @@ def htmlEditProfile(translate: {}, baseDir: str, path: str, with open(switchFilename, 'r') as switchfile: switchStr = switchfile.read() + autoTags = '' + autoTagsFilename = \ + baseDir + '/accounts/' + \ + nickname + '@' + domain + '/autotags.txt' + if os.path.isfile(autoTagsFilename): + with open(autoTagsFilename, 'r') as autoTagsFile: + autoTags = autoTagsFile.read() + blockedStr = '' blockedFilename = \ baseDir + '/accounts/' + \ @@ -1507,6 +1515,14 @@ def htmlEditProfile(translate: {}, baseDir: str, path: str, ' \n' + editProfileForm += \ + '
\n' + editProfileForm += '
\n' + editProfileForm += \ + ' \n' + editProfileForm += \ '
\n'