mirror of
https://git.pleroma.social/pleroma/relay.git
synced 2024-11-21 22:17:59 +00:00
Merge branch 'fix' into 'master'
fixes See merge request pleroma/relay!34
This commit is contained in:
commit
169c7af822
|
@ -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))
|
||||||
|
|
|
@ -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}')
|
||||||
|
|
Loading…
Reference in a new issue