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

Join activity has the same meaning as Follow

main
Bob Mottram 2021-02-08 14:48:37 +00:00
parent 98a1d70565
commit ae0b1505f9
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acceptreject.py
View File

@ -77,7 +77,8 @@ def _acceptFollow(baseDir: str, domain: str, messageJson: {},
if not messageJson['object'].get('type'): if not messageJson['object'].get('type'):
return return
if not messageJson['object']['type'] == 'Follow': if not messageJson['object']['type'] == 'Follow':
return if not messageJson['object']['type'] == 'Join':
return
if debug: if debug:
print('DEBUG: receiving Follow activity') print('DEBUG: receiving Follow activity')
if not messageJson['object'].get('actor'): if not messageJson['object'].get('actor'):

6
follow.py
View File

@ -598,7 +598,8 @@ def receiveFollowRequest(session, baseDir: str, httpPrefix: str,
"""Receives a follow request within the POST section of HTTPServer """Receives a follow request within the POST section of HTTPServer
""" """
if not messageJson['type'].startswith('Follow'): if not messageJson['type'].startswith('Follow'):
return False if not messageJson['type'].startswith('Join'):
return False
print('Receiving follow request') print('Receiving follow request')
if not messageJson.get('actor'): if not messageJson.get('actor'):
if debug: if debug:
@ -1162,7 +1163,8 @@ def outboxUndoFollow(baseDir: str, messageJson: {}, debug: bool) -> None:
if not messageJson['object'].get('type'): if not messageJson['object'].get('type'):
return return
if not messageJson['object']['type'] == 'Follow': if not messageJson['object']['type'] == 'Follow':
return if not messageJson['object']['type'] == 'Join':
return
if not messageJson['object'].get('object'): if not messageJson['object'].get('object'):
return return
if not messageJson['object'].get('actor'): if not messageJson['object'].get('actor'):

7
inbox.py
View File

@ -275,7 +275,7 @@ def inboxMessageHasParams(messageJson: {}) -> bool:
# param + ' ' + str(messageJson)) # param + ' ' + str(messageJson))
return False return False
if not messageJson.get('to'): if not messageJson.get('to'):
allowedWithoutToParam = ['Like', 'Follow', 'Request', allowedWithoutToParam = ['Like', 'Follow', 'Join', 'Request',
'Accept', 'Capability', 'Undo'] 'Accept', 'Capability', 'Undo']
if messageJson['type'] not in allowedWithoutToParam: if messageJson['type'] not in allowedWithoutToParam:
return False return False
@ -297,7 +297,7 @@ def inboxPermittedMessage(domain: str, messageJson: {},
if not urlPermitted(actor, federationList): if not urlPermitted(actor, federationList):
return False return False
alwaysAllowedTypes = ('Follow', 'Like', 'Delete', 'Announce') alwaysAllowedTypes = ('Follow', 'Join', 'Like', 'Delete', 'Announce')
if messageJson['type'] not in alwaysAllowedTypes: if messageJson['type'] not in alwaysAllowedTypes:
if not messageJson.get('object'): if not messageJson.get('object'):
return True return True
@ -693,7 +693,8 @@ def _receiveUndo(session, baseDir: str, httpPrefix: str,
print('DEBUG: ' + messageJson['type'] + print('DEBUG: ' + messageJson['type'] +
' object within object is not a string') ' object within object is not a string')
return False return False
if messageJson['object']['type'] == 'Follow': if messageJson['object']['type'] == 'Follow' or \
messageJson['object']['type'] == 'Join':
return _receiveUndoFollow(session, baseDir, httpPrefix, return _receiveUndoFollow(session, baseDir, httpPrefix,
port, messageJson, port, messageJson,
federationList, debug) federationList, debug)

3
posts.py
View File

@ -2414,7 +2414,8 @@ def sendToNamedAddresses(session, baseDir: str,
print('DEBUG: ' + print('DEBUG: ' +
'no "to" field when sending to named addresses') 'no "to" field when sending to named addresses')
if postJsonObject['object'].get('type'): if postJsonObject['object'].get('type'):
if postJsonObject['object']['type'] == 'Follow': if postJsonObject['object']['type'] == 'Follow' or \
postJsonObject['object']['type'] == 'Join':
if isinstance(postJsonObject['object']['object'], str): if isinstance(postJsonObject['object']['object'], str):
if debug: if debug:
print('DEBUG: "to" field assigned to Follow') print('DEBUG: "to" field assigned to Follow')