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

Only create linker link if likes exist for a post

merge-requests/30/head
Bob Mottram 2022-03-01 14:01:08 +00:00
parent fd80babfb8
commit d97395bb9a
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -10469,6 +10469,9 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
'inbox', self.server.default_timeline) 'inbox', self.server.default_timeline)
if not msg:
self._404()
return True
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._set_headers('text/html', msglen, self._set_headers('text/html', msglen,

10
webapp_likers.py
View File

@ -52,7 +52,9 @@ def html_likers_of_post(base_dir: str, nickname: str,
post_json_object = \ post_json_object = \
locate_post(base_dir, nickname, domain, post_url) locate_post(base_dir, nickname, domain, post_url)
if not post_json_object: if not post_json_object:
return html_str + html_footer() return None
if not post_json_object.get('actor') or not post_json_object.get('object'):
return None
# show the top banner # show the top banner
banner_file, _ = \ banner_file, _ = \
@ -101,11 +103,11 @@ def html_likers_of_post(base_dir: str, nickname: str,
if has_object_dict(post_json_object): if has_object_dict(post_json_object):
obj = post_json_object['object'] obj = post_json_object['object']
if not obj.get('likes'): if not obj.get('likes'):
return html_str + html_footer() return None
if not isinstance(obj['likes'], dict): if not isinstance(obj['likes'], dict):
return html_str + html_footer() return None
if not obj['likes'].get('items'): if not obj['likes'].get('items'):
return html_str + html_footer() return None
html_str += '<center><h2>' + translate['Liked by'] + '</h2></center>\n' html_str += '<center><h2>' + translate['Liked by'] + '</h2></center>\n'

15
webapp_post.py
View File

@ -659,18 +659,23 @@ def _get_like_icon_html(nickname: str, domain_full: str,
like_str += '</label>\n' like_str += '</label>\n'
like_post_id = remove_hash_from_post_id(post_json_object['id']) like_post_id = remove_hash_from_post_id(post_json_object['id'])
like_post_id = remove_id_ending(like_post_id) like_post_id = remove_id_ending(like_post_id)
# create the link to likers of the post
likers_post_id = like_post_id.replace('/', '--') likers_post_id = like_post_id.replace('/', '--')
likers_screen_link = \ likers_screen_link = like_title + like_count_str
'/users/' + nickname + '?likers=' + likers_post_id if like_count > 0:
likers_screen_link = \
'/users/' + nickname + '?likers=' + likers_post_id
likers_screen_link = \
'<a href=' + "'" + likers_screen_link + "'>" + \
like_title + like_count_str + '</a>'
like_str += \ like_str += \
' <a class="imageAnchor" href="/users/' + nickname + '?' + \ ' <a class="imageAnchor" href="/users/' + nickname + '?' + \
like_link + '=' + like_post_id + \ like_link + '=' + like_post_id + \
page_number_param + \ page_number_param + \
'?actor=' + post_json_object['actor'] + \ '?actor=' + post_json_object['actor'] + \
'?bm=' + timeline_post_bookmark + \ '?bm=' + timeline_post_bookmark + \
'?tl=' + box_name + '" title="' + \ '?tl=' + box_name + '" title="' + likers_screen_link + '">\n'
'<a href=' + "'" + likers_screen_link + "'>" + \
like_title + like_count_str + '</a>">\n'
like_str += \ like_str += \
' ' + \ ' ' + \
'<img loading="lazy" title="' + like_title + like_count_str + \ '<img loading="lazy" title="' + like_title + like_count_str + \