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

Pass newswire as parameter

merge-requests/30/head
Bob Mottram 2020-10-06 21:22:48 +01:00
parent 576a2555e2
commit 673fd6ef19
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
daemon.py
View File

@ -4663,7 +4663,8 @@ class PubServer(BaseHTTPRequestHandler):
domain: str, domainFull: str, port: int, domain: str, domainFull: str, port: int,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
GETstartTime, GETtimings: {}, GETstartTime, GETtimings: {},
proxyType: str, debug: bool): proxyType: str, debug: bool,
newswire: {}):
"""Vote for a newswire item """Vote for a newswire item
""" """
originPathStr = path.split('/newswirevote=')[0] originPathStr = path.split('/newswirevote=')[0]
@ -4671,13 +4672,13 @@ class PubServer(BaseHTTPRequestHandler):
nickname = originPathStr.split('/users/')[1] nickname = originPathStr.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname = nickname.split('/')[0] nickname = nickname.split('/')[0]
if self.newswire.get(dateStr): if newswire.get(dateStr):
if isModerator(baseDir, nickname): if isModerator(baseDir, nickname):
if 'vote:' + nickname not in self.newswire[dateStr][2]: if 'vote:' + nickname not in newswire[dateStr][2]:
self.newswire[dateStr][2].append('vote:' + nickname) newswire[dateStr][2].append('vote:' + nickname)
filename = self.newswire[dateStr][3] filename = newswire[dateStr][3]
if filename: if filename:
saveJson(self.newswire[dateStr][2], saveJson(newswire[dateStr][2],
filename + '.votes') filename + '.votes')
originPathStrAbsolute = \ originPathStrAbsolute = \
@ -4701,7 +4702,8 @@ class PubServer(BaseHTTPRequestHandler):
domain: str, domainFull: str, port: int, domain: str, domainFull: str, port: int,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
GETstartTime, GETtimings: {}, GETstartTime, GETtimings: {},
proxyType: str, debug: bool): proxyType: str, debug: bool,
newswire: {}):
"""Remove vote for a newswire item """Remove vote for a newswire item
""" """
originPathStr = path.split('/newswirevote=')[0] originPathStr = path.split('/newswirevote=')[0]
@ -4709,13 +4711,13 @@ class PubServer(BaseHTTPRequestHandler):
nickname = originPathStr.split('/users/')[1] nickname = originPathStr.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname = nickname.split('/')[0] nickname = nickname.split('/')[0]
if self.newswire.get(dateStr): if newswire.get(dateStr):
if isModerator(baseDir, nickname): if isModerator(baseDir, nickname):
if 'vote:' + nickname in self.newswire[dateStr][2]: if 'vote:' + nickname in newswire[dateStr][2]:
self.newswire[dateStr][2].remove('vote:' + nickname) newswire[dateStr][2].remove('vote:' + nickname)
filename = self.newswire[dateStr][3] filename = newswire[dateStr][3]
if filename: if filename:
saveJson(self.newswire[dateStr][2], saveJson(newswire[dateStr][2],
filename + '.votes') filename + '.votes')
originPathStrAbsolute = \ originPathStrAbsolute = \
@ -8778,7 +8780,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.i2pDomain, self.server.i2pDomain,
GETstartTime, GETtimings, GETstartTime, GETtimings,
self.server.proxyType, self.server.proxyType,
self.server.debug) self.server.debug,
self.server.newswire)
return return
# send a newswire moderation unvote from the web interface # send a newswire moderation unvote from the web interface
@ -8795,7 +8798,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.i2pDomain, self.server.i2pDomain,
GETstartTime, GETtimings, GETstartTime, GETtimings,
self.server.proxyType, self.server.proxyType,
self.server.debug) self.server.debug,
self.server.newswire)
return return
# send a follow request approval from the web interface # send a follow request approval from the web interface