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

Optionally allow news account to be followed without request accept

main
Bob Mottram 2020-10-23 20:29:19 +01:00
parent b5d492b668
commit d6b2360860
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
follow.py
View File

@ -29,9 +29,14 @@ from session import postJson
def preApprovedFollower(baseDir: str, def preApprovedFollower(baseDir: str,
nickname: str, domain: str, nickname: str, domain: str,
approveHandle: str) -> bool: approveHandle: str,
allowNewsFollowers: bool) -> bool:
"""Is the given handle an already manually approved follower? """Is the given handle an already manually approved follower?
""" """
# optionally allow the news account to be followed
if nickname == 'news' and allowNewsFollowers:
return True
handle = nickname + '@' + domain handle = nickname + '@' + domain
accountDir = baseDir + '/accounts/' + handle accountDir = baseDir + '/accounts/' + handle
approvedFilename = accountDir + '/approved.txt' approvedFilename = accountDir + '/approved.txt'
@ -395,12 +400,13 @@ def getFollowingFeed(baseDir: str, domain: str, port: int, path: str,
def followApprovalRequired(baseDir: str, nicknameToFollow: str, def followApprovalRequired(baseDir: str, nicknameToFollow: str,
domainToFollow: str, debug: bool, domainToFollow: str, debug: bool,
followRequestHandle: str) -> bool: followRequestHandle: str,
allowNewsFollowers: bool) -> bool:
""" Returns the policy for follower approvals """ Returns the policy for follower approvals
""" """
# has this handle already been manually approved? # has this handle already been manually approved?
if preApprovedFollower(baseDir, nicknameToFollow, domainToFollow, if preApprovedFollower(baseDir, nicknameToFollow, domainToFollow,
followRequestHandle): followRequestHandle, allowNewsFollowers):
return False return False
manuallyApproveFollows = False manuallyApproveFollows = False
@ -602,7 +608,8 @@ def receiveFollowRequest(session, baseDir: str, httpPrefix: str,
# what is the followers policy? # what is the followers policy?
approveHandle = nickname + '@' + domainFull approveHandle = nickname + '@' + domainFull
if followApprovalRequired(baseDir, nicknameToFollow, if followApprovalRequired(baseDir, nicknameToFollow,
domainToFollow, debug, approveHandle): domainToFollow, debug, approveHandle,
allowNewsFollowers):
print('Follow approval is required') print('Follow approval is required')
if domain.endswith('.onion'): if domain.endswith('.onion'):
if noOfFollowRequests(baseDir, if noOfFollowRequests(baseDir,