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

Show limited buttons for public share view

merge-requests/30/head
Bob Mottram 2023-08-23 14:17:32 +01:00
parent 333cc78056
commit 025f07f017
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.py
View File

@ -17393,7 +17393,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
self.server.default_timeline, self.server.default_timeline,
self.server.theme_name, shares_file_type, self.server.theme_name, shares_file_type,
share_category) share_category, not authorized)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -18461,7 +18461,8 @@ class PubServer(BaseHTTPRequestHandler):
item_id, self.server.translate, item_id, self.server.translate,
self.server.shared_items_federated_domains, self.server.shared_items_federated_domains,
self.server.default_timeline, self.server.default_timeline,
self.server.theme_name, 'shares', category) self.server.theme_name, 'shares', category,
False)
if not msg: if not msg:
if calling_domain.endswith('.onion') and \ if calling_domain.endswith('.onion') and \
self.server.onion_domain: self.server.onion_domain:

2
webapp_search.py
View File

@ -224,7 +224,7 @@ def _html_shares_result(base_dir: str, shares_json: {}, page_number: int,
http_prefix, domain_full, http_prefix, domain_full,
contact_nickname, contact_nickname,
name, actor, shares_file_type, name, actor, shares_file_type,
shared_item['category']) shared_item['category'], False)
if not results_exist and curr_page > 1: if not results_exist and curr_page > 1:
# show the previous page button # show the previous page button
shared_items_form += \ shared_items_form += \

34
webapp_utils.py
View File

@ -1913,7 +1913,8 @@ def html_search_result_share(base_dir: str, shared_item: {}, translate: {},
http_prefix: str, domain_full: str, http_prefix: str, domain_full: str,
contact_nickname: str, item_id: str, contact_nickname: str, item_id: str,
actor: str, shares_file_type: str, actor: str, shares_file_type: str,
category: str) -> str: category: str,
publicly_visible: bool) -> str:
"""Returns the html for an individual shared item """Returns the html for an individual shared item
""" """
shared_items_form = '<div class="container">\n' shared_items_form = '<div class="container">\n'
@ -1959,15 +1960,20 @@ def html_search_result_share(base_dir: str, shared_item: {}, translate: {},
contact_title_str = translate['Request to stay'] contact_title_str = translate['Request to stay']
button_style_str = 'contactbutton' button_style_str = 'contactbutton'
shared_items_form += \ if not publicly_visible:
'<p>' + \ shared_items_form += \
'<a href="' + actor + '?replydm=sharedesc:' + \ '<p>' + \
shared_item['displayName'] + '?mention=' + contact_actor + \ '<a href="' + actor + '?replydm=sharedesc:' + \
'?category=' + category + \ shared_item['displayName'] + '?mention=' + contact_actor + \
'"><button class="' + button_style_str + '">' + contact_title_str + \ '?category=' + category + '">' + \
'</button></a>\n' + \ '<button class="' + button_style_str + '">' + contact_title_str + \
'<a href="' + contact_actor + '"><button class="button">' + \ '</button></a>\n' + \
translate['Profile'] + '</button></a>\n' '<a href="' + contact_actor + '"><button class="button">' + \
translate['Profile'] + '</button></a>\n'
else:
shared_items_form += \
'<a href="' + contact_actor + '"><button class="button">' + \
translate['Contact'] + '</button></a>\n'
# should the remove button be shown? # should the remove button be shown?
show_remove_button = False show_remove_button = False
@ -1984,7 +1990,7 @@ def html_search_result_share(base_dir: str, shared_item: {}, translate: {},
if actor.endswith('/users/' + admin_nickname): if actor.endswith('/users/' + admin_nickname):
show_remove_button = True show_remove_button = True
if show_remove_button: if show_remove_button and not publicly_visible:
if shares_file_type == 'shares': if shares_file_type == 'shares':
shared_items_form += \ shared_items_form += \
' <a href="' + actor + '?rmshare=' + \ ' <a href="' + actor + '?rmshare=' + \
@ -2004,7 +2010,8 @@ def html_show_share(base_dir: str, domain: str, nickname: str,
item_id: str, translate: {}, item_id: str, translate: {},
shared_items_federated_domains: [], shared_items_federated_domains: [],
default_timeline: str, theme: str, default_timeline: str, theme: str,
shares_file_type: str, category: str) -> str: shares_file_type: str, category: str,
publicly_visible: bool) -> str:
"""Shows an individual shared item after selecting it from the left column """Shows an individual shared item after selecting it from the left column
""" """
shares_json = None shares_json = None
@ -2069,7 +2076,8 @@ def html_show_share(base_dir: str, domain: str, nickname: str,
share_str += \ share_str += \
html_search_result_share(base_dir, shared_item, translate, http_prefix, html_search_result_share(base_dir, shared_item, translate, http_prefix,
domain_full, contact_nickname, item_id, domain_full, contact_nickname, item_id,
actor, shares_file_type, category) actor, shares_file_type, category,
publicly_visible)
css_filename = base_dir + '/epicyon-profile.css' css_filename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'): if os.path.isfile(base_dir + '/epicyon.css'):