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

Show gemini links on person options screen

merge-requests/30/head
Bob Mottram 2022-11-05 11:30:31 +00:00
parent 1dc62429ca
commit 8c2062c84c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -8052,6 +8052,7 @@ class PubServer(BaseHTTPRequestHandler):
is_group = False is_group = False
donate_url = None donate_url = None
website_url = None website_url = None
gemini_link = None
enigma_pub_key = None enigma_pub_key = None
pgp_pub_key = None pgp_pub_key = None
pgp_fingerprint = None pgp_fingerprint = None
@ -8081,6 +8082,8 @@ class PubServer(BaseHTTPRequestHandler):
locked_account = get_locked_account(actor_json) locked_account = get_locked_account(actor_json)
donate_url = get_donation_url(actor_json) donate_url = get_donation_url(actor_json)
website_url = get_website(actor_json, self.server.translate) website_url = get_website(actor_json, self.server.translate)
gemini_link = get_gemini_link(actor_json,
self.server.translate)
xmpp_address = get_xmpp_address(actor_json) xmpp_address = get_xmpp_address(actor_json)
matrix_address = get_matrix_address(actor_json) matrix_address = get_matrix_address(actor_json)
ssb_address = get_ssb_address(actor_json) ssb_address = get_ssb_address(actor_json)
@ -8133,6 +8136,7 @@ class PubServer(BaseHTTPRequestHandler):
options_profile_url, options_profile_url,
options_link, options_link,
page_number, donate_url, website_url, page_number, donate_url, website_url,
gemini_link,
xmpp_address, matrix_address, xmpp_address, matrix_address,
ssb_address, blog_address, ssb_address, blog_address,
tox_address, briar_address, tox_address, briar_address,

8
webapp_person_options.py
View File

@ -140,6 +140,7 @@ def html_person_options(default_timeline: str,
page_number: int, page_number: int,
donate_url: str, donate_url: str,
web_address: str, web_address: str,
gemini_link: str,
xmpp_address: str, xmpp_address: str,
matrix_address: str, matrix_address: str,
ssb_address: str, ssb_address: str,
@ -340,6 +341,13 @@ def html_person_options(default_timeline: str,
options_str += \ options_str += \
'<p class="imText">🌐 <a href="' + web_str + '">' + \ '<p class="imText">🌐 <a href="' + web_str + '">' + \
web_address + '</a></p>\n' web_address + '</a></p>\n'
if gemini_link:
gemini_str = remove_html(gemini_link)
if '://' not in gemini_str:
gemini_str = 'gemini://' + gemini_str
options_str += \
'<p class="imText">🌐 <a href="' + gemini_str + '">' + \
gemini_link + '</a></p>\n'
if xmpp_address: if xmpp_address:
options_str += \ options_str += \
'<p class="imText">' + translate['XMPP'] + \ '<p class="imText">' + translate['XMPP'] + \