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

Missing parameter

merge-requests/8/head
Bob Mottram 2020-10-23 20:55:03 +01:00
parent fa419cf995
commit 87604e6d77
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -2056,7 +2056,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
debug, debug,
self.server.projectVersion) self.server.projectVersion,
self.server.allowNewsFollowers)
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:
originPathStr = 'http://' + onionDomain + usersPath originPathStr = 'http://' + onionDomain + usersPath
elif (callingDomain.endswith('.i2p') and i2pDomain): elif (callingDomain.endswith('.i2p') and i2pDomain):

5
follow.py
View File

@ -808,7 +808,7 @@ def sendFollowRequest(session, baseDir: str,
clientToServer: bool, federationList: [], clientToServer: bool, federationList: [],
sendThreads: [], postLog: [], cachedWebfingers: {}, sendThreads: [], postLog: [], cachedWebfingers: {},
personCache: {}, debug: bool, personCache: {}, debug: bool,
projectVersion: str) -> {}: projectVersion: str, allowNewsFollowers: bool) -> {}:
"""Gets the json object for sending a follow request """Gets the json object for sending a follow request
""" """
if not domainPermitted(followDomain, federationList): if not domainPermitted(followDomain, federationList):
@ -850,7 +850,8 @@ def sendFollowRequest(session, baseDir: str,
'object': followedId 'object': followedId
} }
if followApprovalRequired(baseDir, nickname, domain, debug, followHandle): if followApprovalRequired(baseDir, nickname, domain, debug,
followHandle, allowNewsFollowers):
# Remove any follow requests rejected for the account being followed. # Remove any follow requests rejected for the account being followed.
# It's assumed that if you are following someone then you are # It's assumed that if you are following someone then you are
# ok with them following back. If this isn't the case then a rejected # ok with them following back. If this isn't the case then a rejected

2
tests.py
View File

@ -758,7 +758,7 @@ def testFollowBetweenServers():
clientToServer, federationList, clientToServer, federationList,
aliceSendThreads, alicePostLog, aliceSendThreads, alicePostLog,
aliceCachedWebfingers, alicePersonCache, aliceCachedWebfingers, alicePersonCache,
True, __version__) True, __version__, False)
print('sendResult: ' + str(sendResult)) print('sendResult: ' + str(sendResult))
for t in range(10): for t in range(10):