mirror of
https://git.pleroma.social/pleroma/relay.git
synced 2024-11-09 18:08:00 +00:00
create View class and fix Response.new_error
This commit is contained in:
parent
c1c4b24b0a
commit
3305a25da4
|
@ -10,7 +10,8 @@ from Crypto.Hash import SHA, SHA256, SHA512
|
||||||
from Crypto.PublicKey import RSA
|
from Crypto.PublicKey import RSA
|
||||||
from Crypto.Signature import PKCS1_v1_5
|
from Crypto.Signature import PKCS1_v1_5
|
||||||
from aiohttp import ClientSession
|
from aiohttp import ClientSession
|
||||||
from aiohttp.web import Response as AiohttpResponse
|
from aiohttp.hdrs import METH_ALL as METHODS
|
||||||
|
from aiohttp.web import Response as AiohttpResponse, View as AiohttpView
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from json.decoder import JSONDecodeError
|
from json.decoder import JSONDecodeError
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
@ -31,7 +32,7 @@ MIMETYPES = {
|
||||||
'activity': 'application/activity+json',
|
'activity': 'application/activity+json',
|
||||||
'html': 'text/html',
|
'html': 'text/html',
|
||||||
'json': 'application/json',
|
'json': 'application/json',
|
||||||
'plain': 'text/plain'
|
'text': 'text/plain'
|
||||||
}
|
}
|
||||||
|
|
||||||
NODEINFO_NS = {
|
NODEINFO_NS = {
|
||||||
|
@ -483,7 +484,7 @@ class Response(AiohttpResponse):
|
||||||
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def new_error(cls, status, body, ctype='plain'):
|
def new_error(cls, status, body, ctype='text'):
|
||||||
if ctype == 'json':
|
if ctype == 'json':
|
||||||
body = json.dumps({'status': status, 'error': body})
|
body = json.dumps({'status': status, 'error': body})
|
||||||
|
|
||||||
|
@ -500,6 +501,39 @@ class Response(AiohttpResponse):
|
||||||
self.headers['Location'] = value
|
self.headers['Location'] = value
|
||||||
|
|
||||||
|
|
||||||
|
class View(AiohttpView):
|
||||||
|
async def _iter(self):
|
||||||
|
if self.request.method not in METHODS:
|
||||||
|
self._raise_allowed_methods()
|
||||||
|
|
||||||
|
method = getattr(self, self.request.method.lower(), None)
|
||||||
|
|
||||||
|
if method is None:
|
||||||
|
self._raise_allowed_methods()
|
||||||
|
|
||||||
|
return await method(**self.request.match_info)
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def app(self):
|
||||||
|
return self._request.app
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def cache(self):
|
||||||
|
return self.app.cache
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def config(self):
|
||||||
|
return self.app.config
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def database(self):
|
||||||
|
return self.app.database
|
||||||
|
|
||||||
|
|
||||||
class WKNodeinfo(DotDict):
|
class WKNodeinfo(DotDict):
|
||||||
@classmethod
|
@classmethod
|
||||||
def new(cls, v20, v21):
|
def new(cls, v20, v21):
|
||||||
|
|
Loading…
Reference in a new issue