mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link publish icon option up to timeline

main
Bob Mottram 2020-10-24 17:26:40 +01:00
parent 98e1805930
commit 6dec65f544
2 changed files with 61 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
daemon.py
View File

@ -6445,7 +6445,8 @@ class PubServer(BaseHTTPRequestHandler):
YTReplacementDomain, YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
if GETstartTime: if GETstartTime:
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'show status done', 'show status done',
@ -6559,7 +6560,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -6666,7 +6668,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -6773,7 +6776,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -6880,7 +6884,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -6996,7 +7001,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
moderator, editor, moderator, editor,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -7073,7 +7079,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -7164,7 +7171,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -7274,7 +7282,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -7376,7 +7385,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
@ -7468,7 +7478,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.showPublishedDateOnly, self.server.showPublishedDateOnly,
self.server.newswire, self.server.newswire,
self.server.positiveVoting) self.server.positiveVoting,
self.server.showPublishAsIcon)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)

63
webinterface.py
View File

@ -5931,7 +5931,8 @@ def htmlTimeline(defaultTimeline: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, moderator: bool, newswire: {}, moderator: bool,
editor: bool, editor: bool,
positiveVoting: bool) -> str: positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the timeline as html """Show the timeline as html
""" """
timelineStartTime = time.time() timelineStartTime = time.time()
@ -6574,7 +6575,8 @@ def htmlTimeline(defaultTimeline: str,
httpPrefix, translate, iconsDir, httpPrefix, translate, iconsDir,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
False, None, True, True) False, None, True,
showPublishAsIcon)
tlStr += ' <td valign="top" class="col-right">' + \ tlStr += ' <td valign="top" class="col-right">' + \
rightColumnStr + ' </td>\n' rightColumnStr + ' </td>\n'
tlStr += ' </tr>\n' tlStr += ' </tr>\n'
@ -6617,7 +6619,8 @@ def htmlShares(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
YTReplacementDomain: str, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the shares timeline as html """Show the shares timeline as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -6632,7 +6635,7 @@ def htmlShares(defaultTimeline: str,
False, YTReplacementDomain, False, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlInbox(defaultTimeline: str, def htmlInbox(defaultTimeline: str,
@ -6644,7 +6647,8 @@ def htmlInbox(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the inbox as html """Show the inbox as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -6659,7 +6663,7 @@ def htmlInbox(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlBookmarks(defaultTimeline: str, def htmlBookmarks(defaultTimeline: str,
@ -6671,7 +6675,8 @@ def htmlBookmarks(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the bookmarks as html """Show the bookmarks as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -6686,7 +6691,7 @@ def htmlBookmarks(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlEvents(defaultTimeline: str, def htmlEvents(defaultTimeline: str,
@ -6698,7 +6703,8 @@ def htmlEvents(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the events as html """Show the events as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -6713,7 +6719,7 @@ def htmlEvents(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlInboxDMs(defaultTimeline: str, def htmlInboxDMs(defaultTimeline: str,
@ -6725,7 +6731,8 @@ def htmlInboxDMs(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the DM timeline as html """Show the DM timeline as html
""" """
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts, return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
@ -6734,7 +6741,8 @@ def htmlInboxDMs(defaultTimeline: str,
nickname, domain, port, inboxJson, 'dm', allowDeletion, nickname, domain, port, inboxJson, 'dm', allowDeletion,
httpPrefix, projectVersion, False, minimal, httpPrefix, projectVersion, False, minimal,
YTReplacementDomain, showPublishedDateOnly, YTReplacementDomain, showPublishedDateOnly,
newswire, False, False, positiveVoting) newswire, False, False, positiveVoting,
showPublishAsIcon)
def htmlInboxReplies(defaultTimeline: str, def htmlInboxReplies(defaultTimeline: str,
@ -6746,7 +6754,8 @@ def htmlInboxReplies(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the replies timeline as html """Show the replies timeline as html
""" """
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts, return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
@ -6757,7 +6766,7 @@ def htmlInboxReplies(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlInboxMedia(defaultTimeline: str, def htmlInboxMedia(defaultTimeline: str,
@ -6769,7 +6778,8 @@ def htmlInboxMedia(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the media timeline as html """Show the media timeline as html
""" """
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts, return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
@ -6780,7 +6790,7 @@ def htmlInboxMedia(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlInboxBlogs(defaultTimeline: str, def htmlInboxBlogs(defaultTimeline: str,
@ -6792,7 +6802,8 @@ def htmlInboxBlogs(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the blogs timeline as html """Show the blogs timeline as html
""" """
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts, return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
@ -6803,7 +6814,7 @@ def htmlInboxBlogs(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, False, False, newswire, False, False,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlInboxNews(defaultTimeline: str, def htmlInboxNews(defaultTimeline: str,
@ -6816,7 +6827,7 @@ def htmlInboxNews(defaultTimeline: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, moderator: bool, editor: bool, newswire: {}, moderator: bool, editor: bool,
positiveVoting: bool) -> str: positiveVoting: bool, showPublishAsIcon: bool) -> str:
"""Show the news timeline as html """Show the news timeline as html
""" """
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts, return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
@ -6827,7 +6838,7 @@ def htmlInboxNews(defaultTimeline: str,
minimal, YTReplacementDomain, minimal, YTReplacementDomain,
showPublishedDateOnly, showPublishedDateOnly,
newswire, moderator, editor, newswire, moderator, editor,
positiveVoting) positiveVoting, showPublishAsIcon)
def htmlModeration(defaultTimeline: str, def htmlModeration(defaultTimeline: str,
@ -6839,7 +6850,8 @@ def htmlModeration(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
YTReplacementDomain: str, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the moderation feed as html """Show the moderation feed as html
""" """
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts, return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
@ -6848,7 +6860,8 @@ def htmlModeration(defaultTimeline: str,
nickname, domain, port, inboxJson, 'moderation', nickname, domain, port, inboxJson, 'moderation',
allowDeletion, httpPrefix, projectVersion, True, False, allowDeletion, httpPrefix, projectVersion, True, False,
YTReplacementDomain, showPublishedDateOnly, YTReplacementDomain, showPublishedDateOnly,
newswire, False, False, positiveVoting) newswire, False, False, positiveVoting,
showPublishAsIcon)
def htmlOutbox(defaultTimeline: str, def htmlOutbox(defaultTimeline: str,
@ -6860,7 +6873,8 @@ def htmlOutbox(defaultTimeline: str,
httpPrefix: str, projectVersion: str, httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str, minimal: bool, YTReplacementDomain: str,
showPublishedDateOnly: bool, showPublishedDateOnly: bool,
newswire: {}, positiveVoting: bool) -> str: newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool) -> str:
"""Show the Outbox as html """Show the Outbox as html
""" """
manuallyApproveFollowers = \ manuallyApproveFollowers = \
@ -6872,7 +6886,8 @@ def htmlOutbox(defaultTimeline: str,
allowDeletion, httpPrefix, projectVersion, allowDeletion, httpPrefix, projectVersion,
manuallyApproveFollowers, minimal, manuallyApproveFollowers, minimal,
YTReplacementDomain, showPublishedDateOnly, YTReplacementDomain, showPublishedDateOnly,
newswire, False, False, positiveVoting) newswire, False, False, positiveVoting,
showPublishAsIcon)
def htmlIndividualPost(recentPostsCache: {}, maxRecentPosts: int, def htmlIndividualPost(recentPostsCache: {}, maxRecentPosts: int,