Commit 65c80bca authored by Jeong Arm's avatar Jeong Arm

Merge branch 'upstream'

parents c1f1cfe0 950cd1e7
......@@ -22,8 +22,8 @@ if "actorKeys" not in DATABASE:
pubkey = privkey.publickey()
DATABASE["actorKeys"] = {
"publicKey": pubkey.exportKey('PEM').decode('UTF-8'),
"privateKey": privkey.exportKey('PEM').decode('UTF-8')
"publicKey": pubkey.exportKey('PEM').decode('utf-8'),
"privateKey": privkey.exportKey('PEM').decode('utf-8')
}
......
......@@ -7,9 +7,9 @@ host = CONFIG['ap']['host']
note = CONFIG['note']
inboxes = DATABASE.get('relay-list', [])
targets = '<br>'.join([urllib.parse.urlsplit(target).hostname for target in inboxes])
async def default(request):
targets = '<br>'.join([urllib.parse.urlsplit(target).hostname for target in inboxes])
return aiohttp.web.Response(
status=200,
content_type="text/html",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment