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

Indicate blocked new accounts

merge-requests/30/head
Bob Mottram 2022-11-29 14:03:52 +00:00
parent 16851d9fb6
commit 6fa1ec4740
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -8385,7 +8385,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.news_instance, self.server.news_instance,
authorized, authorized,
access_keys, is_group, access_keys, is_group,
self.server.theme_name) self.server.theme_name,
self.server.blocked_cache)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)

10
webapp_person_options.py
View File

@ -163,7 +163,8 @@ def html_person_options(default_timeline: str,
authorized: bool, authorized: bool,
access_keys: {}, access_keys: {},
is_group: bool, is_group: bool,
theme: str) -> str: theme: str,
blocked_cache: []) -> str:
"""Show options for a person: view/follow/block/report """Show options for a person: view/follow/block/report
""" """
options_domain, options_port = get_domain_from_actor(options_actor) options_domain, options_port = get_domain_from_actor(options_actor)
@ -300,10 +301,15 @@ def html_person_options(default_timeline: str,
new_domain, _ = get_domain_from_actor(moved_to) new_domain, _ = get_domain_from_actor(moved_to)
if new_nickname and new_domain: if new_nickname and new_domain:
new_handle = new_nickname + '@' + new_domain new_handle = new_nickname + '@' + new_domain
blocked_icon_str = ''
if is_blocked(base_dir, nickname, domain,
new_nickname, new_domain, blocked_cache):
blocked_icon_str = '❌'
options_str += \ options_str += \
' <p class="optionsText">' + \ ' <p class="optionsText">' + \
translate['New account'] + \ translate['New account'] + \
': <a href="' + moved_to + '">@' + new_handle + '</a></p>\n' ': <a href="' + moved_to + '">@' + new_handle + '</a>' + \
blocked_icon_str + '</p>\n'
elif also_known_as: elif also_known_as:
other_accounts_html = \ other_accounts_html = \
' <p class="optionsText">' + \ ' <p class="optionsText">' + \