Remove hash ending

main2
Bob Mottram 2019-09-29 11:41:21 +01:00
parent e1ba56bc3d
commit c2f8af0bf8
1 changed files with 9 additions and 5 deletions

View File

@ -1106,6 +1106,10 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
maxReplies: int,allowDeletion: bool) -> bool: maxReplies: int,allowDeletion: bool) -> bool:
""" Anything which needs to be done after capabilities checks have passed """ Anything which needs to be done after capabilities checks have passed
""" """
actor=keyId
if '#' in actor:
actor=keyId.split('#')[0]
if receiveLike(session,handle, \ if receiveLike(session,handle, \
baseDir,httpPrefix, \ baseDir,httpPrefix, \
domain,port, \ domain,port, \
@ -1116,7 +1120,7 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
federationList, \ federationList, \
debug): debug):
if debug: if debug:
print('DEBUG: Like accepted from '+keyId) print('DEBUG: Like accepted from '+actor)
return False return False
if receiveUndoLike(session,handle, \ if receiveUndoLike(session,handle, \
@ -1129,7 +1133,7 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
federationList, \ federationList, \
debug): debug):
if debug: if debug:
print('DEBUG: Undo like accepted from '+keyId) print('DEBUG: Undo like accepted from '+actor)
return False return False
if receiveAnnounce(session,handle, \ if receiveAnnounce(session,handle, \
@ -1142,7 +1146,7 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
federationList, \ federationList, \
debug): debug):
if debug: if debug:
print('DEBUG: Announce accepted from '+keyId) print('DEBUG: Announce accepted from '+actor)
if receiveUndoAnnounce(session,handle, \ if receiveUndoAnnounce(session,handle, \
baseDir,httpPrefix, \ baseDir,httpPrefix, \
@ -1154,7 +1158,7 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
federationList, \ federationList, \
debug): debug):
if debug: if debug:
print('DEBUG: Undo announce accepted from '+keyId) print('DEBUG: Undo announce accepted from '+actor)
return False return False
if receiveDelete(session,handle, \ if receiveDelete(session,handle, \
@ -1167,7 +1171,7 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
federationList, \ federationList, \
debug,allowDeletion): debug,allowDeletion):
if debug: if debug:
print('DEBUG: Delete accepted from '+keyId) print('DEBUG: Delete accepted from '+actor)
return False return False
populateReplies(baseDir,httpPrefix,domain,messageJson,maxReplies,debug) populateReplies(baseDir,httpPrefix,domain,messageJson,maxReplies,debug)