Merge branch 'make-code-run' into 'dev'
Fix runtime errors - missing import and typos See merge request pleroma/relay!45
This commit is contained in:
commit
3f2f4671be
3 changed files with 7 additions and 5 deletions
|
@ -196,7 +196,7 @@ class RelayConfig(DotDict):
|
||||||
options = {}
|
options = {}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
options['Loader'] = yaml.FullLoader
|
options['Loader'] = yaml.UnsafeLoader
|
||||||
|
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -13,7 +13,9 @@ from . import __version__
|
||||||
from .misc import (
|
from .misc import (
|
||||||
MIMETYPES,
|
MIMETYPES,
|
||||||
DotDict,
|
DotDict,
|
||||||
Message
|
Message,
|
||||||
|
WKNodeinfo,
|
||||||
|
Nodeinfo
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -186,4 +188,4 @@ class HttpClient:
|
||||||
logging.verbose(f'Failed to fetch nodeinfo url for domain: {domain}')
|
logging.verbose(f'Failed to fetch nodeinfo url for domain: {domain}')
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return await request(nodeinfo_url, loads=Nodeinfo) or False
|
return await self.get(nodeinfo_url, loads=Nodeinfo) or False
|
||||||
|
|
|
@ -4,7 +4,7 @@ import logging
|
||||||
from cachetools import LRUCache
|
from cachetools import LRUCache
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from .misc import Message
|
from .misc import Message, WKNodeinfo
|
||||||
|
|
||||||
|
|
||||||
cache = LRUCache(1024)
|
cache = LRUCache(1024)
|
||||||
|
@ -23,7 +23,7 @@ async def handle_relay(request):
|
||||||
cache[request.message.objectid] = message.id
|
cache[request.message.objectid] = message.id
|
||||||
logging.debug(f'>> relay: {message}')
|
logging.debug(f'>> relay: {message}')
|
||||||
|
|
||||||
niboxes = request.database.distill_inboxes(request.message)
|
inboxes = request.database.distill_inboxes(request.message)
|
||||||
|
|
||||||
for inbox in inboxes:
|
for inbox in inboxes:
|
||||||
request.app.push_message(inbox, message)
|
request.app.push_message(inbox, message)
|
||||||
|
|
Loading…
Reference in a new issue