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

Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2022-02-22 12:17:45 +00:00
parent 5d796b587f 4f201ae658
commit 22a5a30160
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon.py
View File

@ -1524,10 +1524,14 @@ class PubServer(BaseHTTPRequestHandler):
self.server.outbox_thread_index[account_outbox_thread_name] = index self.server.outbox_thread_index[account_outbox_thread_name] = index
# remove any existing thread from the current index in the buffer # remove any existing thread from the current index in the buffer
if self.server.outboxThread.get(account_outbox_thread_name): acct = account_outbox_thread_name
acct = account_outbox_thread_name if self.server.outboxThread.get(acct):
if self.server.outboxThread[acct][index].is_alive(): if len(self.server.outboxThread[acct]) > index:
self.server.outboxThread[acct][index].kill() try:
if self.server.outboxThread[acct][index].is_alive():
self.server.outboxThread[acct][index].kill()
except BaseException:
pass
return index return index
def _post_to_outbox_thread(self, message_json: {}) -> bool: def _post_to_outbox_thread(self, message_json: {}) -> bool:

7
webapp_media.py
View File

@ -176,8 +176,13 @@ def _add_embedded_video_from_sites(translate: {}, content: str,
if '/c/' in url: if '/c/' in url:
# don't try to embed peertube channel page # don't try to embed peertube channel page
continue continue
url = url.replace('/w/', '/embed/') if '/w/' in url:
if '/videos/' not in url:
url = url.replace('/w/', '/videos/embed/')
else:
url = url.replace('/w/', '/embed/')
url = url.replace('/watch/', '/embed/') url = url.replace('/watch/', '/embed/')
content += \ content += \
"<center>\n<iframe loading=\"lazy\" " + \ "<center>\n<iframe loading=\"lazy\" " + \
"sandbox=\"allow-same-origin " + \ "sandbox=\"allow-same-origin " + \