From a5b935f9a5c6de3344ab09338b08a441af27481a Mon Sep 17 00:00:00 2001 From: bashrc Date: Thu, 26 Feb 2026 11:06:46 +0000 Subject: [PATCH] Highlight organisations and groups --- translations/ar.json | 4 +++- translations/bn.json | 4 +++- translations/ca.json | 4 +++- translations/cy.json | 4 +++- translations/de.json | 4 +++- translations/el.json | 4 +++- translations/en.json | 4 +++- translations/es.json | 4 +++- translations/fa.json | 4 +++- translations/fi.json | 4 +++- translations/fr.json | 4 +++- translations/ga.json | 4 +++- translations/he.json | 4 +++- translations/hi.json | 4 +++- translations/it.json | 4 +++- translations/ja.json | 4 +++- translations/ko.json | 4 +++- translations/ku.json | 4 +++- translations/nl.json | 4 +++- translations/oc.json | 4 +++- translations/pl.json | 4 +++- translations/pt.json | 4 +++- translations/ru.json | 4 +++- translations/sw.json | 4 +++- translations/tr.json | 4 +++- translations/uk.json | 4 +++- translations/yi.json | 4 +++- translations/zh.json | 4 +++- webapp_post.py | 24 ++++++++++++++++++------ webapp_profile.py | 33 +++++++++++++++++++++++++++------ 30 files changed, 129 insertions(+), 40 deletions(-) diff --git a/translations/ar.json b/translations/ar.json index d8c5af72e..a6720d89f 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "تحذير: رابط خطير محتمل", "Mutual": "مشترك", "Bot": "الروبوت", - "Show Map": "عرض الخريطة" + "Show Map": "عرض الخريطة", + "Organisation": "منظمة", + "Group": "مجموعة" } diff --git a/translations/bn.json b/translations/bn.json index 98946ce82..96247c758 100644 --- a/translations/bn.json +++ b/translations/bn.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "সতর্কতা: সম্ভাব্য বিপজ্জনক লিঙ্ক", "Mutual": "পারস্পরিক", "Bot": "রোবট", - "Show Map": "মানচিত্র দেখান" + "Show Map": "মানচিত্র দেখান", + "Organisation": "সংগঠন", + "Group": "গ্রুপ" } diff --git a/translations/ca.json b/translations/ca.json index a5128b722..3540f6d8a 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Avís: Possible enllaç perillós", "Mutual": "Mútua", "Bot": "Bot", - "Show Map": "Mostra el mapa" + "Show Map": "Mostra el mapa", + "Organisation": "Organització", + "Group": "Grup" } diff --git a/translations/cy.json b/translations/cy.json index e2ddc6110..f85f3a77b 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Rhybudd: Cyswllt peryglus posibl", "Mutual": "Cydfuddiannol", "Bot": "Bot", - "Show Map": "Dangos Map" + "Show Map": "Dangos Map", + "Organisation": "Sefydliad", + "Group": "Grŵp" } diff --git a/translations/de.json b/translations/de.json index a22acc8c1..6c3330a52 100644 --- a/translations/de.json +++ b/translations/de.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Warnung: Möglicher gefährlicher Link", "Mutual": "Gegenseitig", "Bot": "Roboter", - "Show Map": "Karte anzeigen" + "Show Map": "Karte anzeigen", + "Organisation": "Organisation", + "Group": "Gruppe" } diff --git a/translations/el.json b/translations/el.json index 2482e9c9a..d870eb7fe 100644 --- a/translations/el.json +++ b/translations/el.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Προειδοποίηση: Πιθανός επικίνδυνος σύνδεσμος", "Mutual": "Αμοιβαίος", "Bot": "Ρομπότ", - "Show Map": "Εμφάνιση Χάρτη" + "Show Map": "Εμφάνιση Χάρτη", + "Organisation": "Οργάνωση", + "Group": "Ομάδα" } diff --git a/translations/en.json b/translations/en.json index 12a19753e..6d537db3b 100644 --- a/translations/en.json +++ b/translations/en.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Warning: Possible dangerous link", "Mutual": "Mutual", "Bot": "Bot", - "Show Map": "Show Map" + "Show Map": "Show Map", + "Organisation": "Organisation", + "Group": "Group" } diff --git a/translations/es.json b/translations/es.json index c563efbaf..28bac21bf 100644 --- a/translations/es.json +++ b/translations/es.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Advertencia: Posible enlace peligroso", "Mutual": "Mutual", "Bot": "Bot", - "Show Map": "Mostrar mapa" + "Show Map": "Mostrar mapa", + "Organisation": "Organización", + "Group": "Grupo" } diff --git a/translations/fa.json b/translations/fa.json index 0277847e9..07ea8c3d9 100644 --- a/translations/fa.json +++ b/translations/fa.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "هشدار: احتمال لینک خطرناک", "Mutual": "متقابل", "Bot": "ربات", - "Show Map": "نمایش نقشه" + "Show Map": "نمایش نقشه", + "Organisation": "سازمان", + "Group": "گروه" } diff --git a/translations/fi.json b/translations/fi.json index 978085ae1..b13af8e9b 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Varoitus: Mahdollisesti vaarallinen linkki", "Mutual": "Keskinäinen", "Bot": "Robotti", - "Show Map": "Näytä kartta" + "Show Map": "Näytä kartta", + "Organisation": "Organisaatio", + "Group": "Ryhmä" } diff --git a/translations/fr.json b/translations/fr.json index de9d14662..deea8354a 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Avertissement : lien potentiellement dangereux", "Mutual": "Mutuelle", "Bot": "Bot", - "Show Map": "Afficher la carte" + "Show Map": "Afficher la carte", + "Organisation": "Organisation", + "Group": "Groupe" } diff --git a/translations/ga.json b/translations/ga.json index 4c4e15e79..beb59a1d2 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Rabhadh: Nasc contúirteach féideartha", "Mutual": "Frithpháirteach", "Bot": "Róbat", - "Show Map": "Taispeáin Léarscáil" + "Show Map": "Taispeáin Léarscáil", + "Organisation": "Eagraíocht", + "Group": "Grúpa" } diff --git a/translations/he.json b/translations/he.json index d338a4991..efef62604 100644 --- a/translations/he.json +++ b/translations/he.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "אזהרה: קישור מסוכן אפשרי", "Mutual": "הֲדָדִי", "Bot": "רוֹבּוֹט", - "Show Map": "הצג מפה" + "Show Map": "הצג מפה", + "Organisation": "אִרגוּן", + "Group": "קְבוּצָה" } diff --git a/translations/hi.json b/translations/hi.json index 29cae4a55..1f331abc4 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "चेतावनी: संभावित खतरनाक लिंक", "Mutual": "आपसी", "Bot": "रोबोट", - "Show Map": "नक्शा दिखाएं" + "Show Map": "नक्शा दिखाएं", + "Organisation": "संगठन", + "Group": "समूह" } diff --git a/translations/it.json b/translations/it.json index d605ef29a..55bbe1536 100644 --- a/translations/it.json +++ b/translations/it.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Attenzione: possibile collegamento pericoloso", "Mutual": "Reciproca", "Bot": "Bot", - "Show Map": "Mostra mappa" + "Show Map": "Mostra mappa", + "Organisation": "Organizzazione", + "Group": "Gruppo" } diff --git a/translations/ja.json b/translations/ja.json index 07708fe4e..a25c45c56 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "警告: 危険なリンクの可能性があります", "Mutual": "共通の", "Bot": "ロボット", - "Show Map": "地図を表示" + "Show Map": "地図を表示", + "Organisation": "組織", + "Group": "グループ" } diff --git a/translations/ko.json b/translations/ko.json index b9dfc771a..f0e8221a8 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "경고: 위험한 링크가 있을 수 있습니다", "Mutual": "상호간의", "Bot": "기계 인간", - "Show Map": "지도 표시" + "Show Map": "지도 표시", + "Organisation": "조직", + "Group": "그룹" } diff --git a/translations/ku.json b/translations/ku.json index b1c2025af..d8fac73b9 100644 --- a/translations/ku.json +++ b/translations/ku.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Hişyarî: Girêdaneke gengaz a xeternak", "Mutual": "Beramberî", "Bot": "Bot", - "Show Map": "Nexşeya Nîşan Bide" + "Show Map": "Nexşeya Nîşan Bide", + "Organisation": "Sazûman", + "Group": "Kom" } diff --git a/translations/nl.json b/translations/nl.json index cda6e9245..5ec626391 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Waarschuwing: Mogelijk gevaarlijke link", "Mutual": "Wederzijds", "Bot": "Bot", - "Show Map": "Kaart weergeven" + "Show Map": "Kaart weergeven", + "Organisation": "Organisatie", + "Group": "Groep" } diff --git a/translations/oc.json b/translations/oc.json index adf3a6e8c..79df16864 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -761,5 +761,7 @@ "Warning: Possible dangerous link": "Warning: Possible dangerous link", "Mutual": "Mutual", "Bot": "Bot", - "Show Map": "Show Map" + "Show Map": "Show Map", + "Organisation": "Organisation", + "Group": "Group" } diff --git a/translations/pl.json b/translations/pl.json index 9327af5db..e28b5046d 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Ostrzeżenie: Możliwe niebezpieczne łącze", "Mutual": "Wzajemne", "Bot": "Bot", - "Show Map": "Pokaż mapę" + "Show Map": "Pokaż mapę", + "Organisation": "Organizacja", + "Group": "Grupa" } diff --git a/translations/pt.json b/translations/pt.json index 3e8597699..05483e513 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Aviso: possível ligação perigosa", "Mutual": "Mútua", "Bot": "Robô", - "Show Map": "Mostrar mapa" + "Show Map": "Mostrar mapa", + "Organisation": "Organização", + "Group": "Grupo" } diff --git a/translations/ru.json b/translations/ru.json index 6a93b28ac..62c83ccab 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Внимание: возможная опасная ссылка", "Mutual": "Взаимный", "Bot": "Робот", - "Show Map": "Показать карту" + "Show Map": "Показать карту", + "Organisation": "Организация", + "Group": "Группа" } diff --git a/translations/sw.json b/translations/sw.json index ca8a47de7..771a25fd2 100644 --- a/translations/sw.json +++ b/translations/sw.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Onyo: Kiungo hatari kinachowezekana", "Mutual": "Kuheshimiana", "Bot": "Roboti", - "Show Map": "Onyesha Ramani" + "Show Map": "Onyesha Ramani", + "Organisation": "Shirika", + "Group": "Kundi" } diff --git a/translations/tr.json b/translations/tr.json index b641d3724..bd84fa9f1 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Uyarı: Olası tehlikeli bağlantı", "Mutual": "Karşılıklı", "Bot": "Bot", - "Show Map": "Haritayı Göster" + "Show Map": "Haritayı Göster", + "Organisation": "Organizasyon", + "Group": "Grup" } diff --git a/translations/uk.json b/translations/uk.json index 4eb99294e..5d0050279 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "Попередження: Можливе небезпечне посилання", "Mutual": "Взаємне", "Bot": "Робот", - "Show Map": "Показати карту" + "Show Map": "Показати карту", + "Organisation": "Організація", + "Group": "Група" } diff --git a/translations/yi.json b/translations/yi.json index 9f7fed53d..e1a468b60 100644 --- a/translations/yi.json +++ b/translations/yi.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "ווארענונג: מעגלעכער געפערלעכער פארבינדונג", "Mutual": "קעגנצייַטיק", "Bot": "ראָבאָט", - "Show Map": "ווייַזן מאַפּע" + "Show Map": "ווייַזן מאַפּע", + "Organisation": "אָרגאַניזאַציע", + "Group": "גרופּע" } diff --git a/translations/zh.json b/translations/zh.json index 0763efc1d..49368d878 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -765,5 +765,7 @@ "Warning: Possible dangerous link": "警告：可能存在危险链接", "Mutual": "相互的", "Bot": "机器人", - "Show Map": "显示地图" + "Show Map": "显示地图", + "Organisation": "组织", + "Group": "团体" } diff --git a/webapp_post.py b/webapp_post.py index 435c87d51..f92dbfedb 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -1580,8 +1580,12 @@ def _get_post_title_announce_html(base_dir: str, actor_type = get_actor_type(base_dir, attributed_to, person_cache) bot_prefix = '' if actor_type: - if actor_type != 'Person' or \ - announce_nickname in chatbot_nicknames(): + if actor_type in ('Organization', 'Organisation'): + bot_prefix = '[' + translate['Organisation'] + '] ' + elif actor_type == 'Group': + bot_prefix = '[' + translate['Group'] + '] ' + elif (actor_type != 'Person' or + announce_nickname in chatbot_nicknames()): bot_prefix = '[' + translate['Bot'] + '] ' _log_post_timing(enable_timing_log, post_start_time, '13.3.1') @@ -1736,8 +1740,12 @@ def _get_reply_html(translate: {}, reply_nickname = '' if '@' in reply_nickname: reply_nickname = reply_handle.split('@')[0] - if actor_type != 'Person' or \ - reply_nickname in chatbot_nicknames(): + if actor_type in ('Organization', 'Organisation'): + bot_prefix = '[' + translate['Organisation'] + '] ' + elif actor_type == 'Group': + bot_prefix = '[' + translate['Group'] + '] ' + elif (actor_type != 'Person' or + reply_nickname in chatbot_nicknames()): bot_prefix = '[' + translate['Bot'] + '] ' replying_to_str = _replying_to_with_scope(post_json_object, translate) @@ -2699,8 +2707,12 @@ def individual_post_as_html(signing_priv_key_pem: str, actor_type = get_actor_type(base_dir, post_actor, person_cache) bot_prefix = '' if actor_type: - if actor_type != 'Person' or \ - actor_nickname in chatbot_nicknames(): + if actor_type in ('Organization', 'Organisation'): + bot_prefix = '[' + translate['Organisation'] + '] ' + elif actor_type == 'Group': + bot_prefix = '[' + translate['Group'] + '] ' + elif (actor_type != 'Person' or + actor_nickname in chatbot_nicknames()): bot_prefix = '[' + translate['Bot'] + '] ' if display_name: diff --git a/webapp_profile.py b/webapp_profile.py index c0271a9c6..ea1a1da12 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -366,8 +366,15 @@ def html_profile_after_search(authorized: bool, # is this a bot account? if profile_json.get('type'): if isinstance(profile_json['type'], str): - if profile_json['type'] != 'Person' or \ - search_nickname in chatbot_nicknames(): + if profile_json['type'] in ('Organization', 'Organisation'): + display_name = \ + '[' + translate['Organisation'] + '] ' + \ + display_name + elif profile_json['type'] == 'Group': + display_name = \ + '[' + translate['Group'] + '] ' + display_name + elif (profile_json['type'] != 'Person' or + search_nickname in chatbot_nicknames()): display_name = \ '[' + translate['Bot'] + '] ' + display_name @@ -1203,8 +1210,15 @@ def html_profile(signing_priv_key_pem: str, # is this a bot account? if profile_json.get('type'): if isinstance(profile_json['type'], str): - if profile_json['type'] != 'Person' or \ - nickname in chatbot_nicknames(): + if profile_json['type'] in ('Organization', 'Organisation'): + display_name = \ + '[' + translate['Organisation'] + '] ' + \ + display_name + elif profile_json['type'] == 'Group': + display_name = \ + '[' + translate['Group'] + '] ' + display_name + elif (profile_json['type'] != 'Person' or + nickname in chatbot_nicknames()): display_name = \ '[' + translate['Bot'] + '] ' + display_name @@ -3943,8 +3957,15 @@ def _individual_follow_as_html(signing_priv_key_pem: str, actor_nickname, domain, display_name, False, translate) actor_type = get_actor_type(base_dir, follow_url, person_cache) - if actor_type != 'Person' or \ - actor_nickname in chatbot_nicknames(): + if actor_type in ('Organization', 'Organisation'): + display_name = \ + '[' + translate['Organisation'] + '] ' + \ + display_name + elif actor_type == 'Group': + display_name = \ + '[' + translate['Group'] + '] ' + display_name + elif (actor_type != 'Person' or + actor_nickname in chatbot_nicknames()): display_name = \ '[' + translate['Bot'] + '] ' + display_name title_str = display_name