pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-09 18:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix' into 'master'

Browse source 
fixes

See merge request pleroma/relay!34
This commit is contained in:
Izalia Mae 2022-05-06 08:27:31 +00:00
parent 7eac3609a6 30a3b92f26
commit 169c7af822
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
relay/processors.py
View file

@ -47,7 +47,7 @@ async def handle_forward(actor, data, request):
logging.verbose(f'Forwarding post from {actor["id"]}') logging.verbose(f'Forwarding post from {actor["id"]}')
logging.debug(f'>> Relay {data}') logging.debug(f'>> Relay {data}')
inboxes = misc.distill_inboxes(actor['id'], object_id) inboxes = misc.distill_inboxes(actor, object_id)
futures = [misc.request(inbox, data=data) for inbox in inboxes] futures = [misc.request(inbox, data=data) for inbox in inboxes]
asyncio.ensure_future(asyncio.gather(*futures)) asyncio.ensure_future(asyncio.gather(*futures))

2
relay/views.py
View file

@ -117,7 +117,7 @@ async def inbox(request):
## reject if software used by actor is banned ## reject if software used by actor is banned
if len(config.blocked_software): if len(config.blocked_software):
software = await fetch_nodeinfo(actor_domain) software = await misc.fetch_nodeinfo(actor_domain)
if config.is_banned_software(software): if config.is_banned_software(software):
logging.verbose(f'Rejected actor for using specific software: {software}') logging.verbose(f'Rejected actor for using specific software: {software}')