indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

json formats

merge-requests/3/merge
Bob Mottram 2019-11-13 14:21:21 +00:00
parent 32f4f9a77c
commit 11ee7aaf2d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon.py
View File

@ -354,7 +354,10 @@ class PubServer(BaseHTTPRequestHandler):
self.server.systemLanguage, \ self.server.systemLanguage, \
self.server.projectVersion) self.server.projectVersion)
msg=json.dumps(instanceJson).encode('utf-8') msg=json.dumps(instanceJson).encode('utf-8')
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json',len(msg),None) self._set_headers('application/ld+json',len(msg),None)
else:
self._set_headers('application/json',len(msg),None)
self._write(msg) self._write(msg)
return True return True
if self.path.startswith('/api/v1/instance/peers'): if self.path.startswith('/api/v1/instance/peers'):
@ -364,13 +367,19 @@ class PubServer(BaseHTTPRequestHandler):
# instances a full list of peers would convey a lot of information about # instances a full list of peers would convey a lot of information about
# the interests of a small number of accounts # the interests of a small number of accounts
msg=json.dumps(['mastodon.social',self.server.domainFull]).encode('utf-8') msg=json.dumps(['mastodon.social',self.server.domainFull]).encode('utf-8')
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json',len(msg),None) self._set_headers('application/ld+json',len(msg),None)
else:
self._set_headers('application/json',len(msg),None)
self._write(msg) self._write(msg)
return True return True
if self.path.startswith('/api/v1/instance/activity'): if self.path.startswith('/api/v1/instance/activity'):
# This is just a dummy result. # This is just a dummy result.
msg=json.dumps([]).encode('utf-8') msg=json.dumps([]).encode('utf-8')
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json',len(msg),None) self._set_headers('application/ld+json',len(msg),None)
else:
self._set_headers('application/json',len(msg),None)
self._write(msg) self._write(msg)
return True return True
return False return False
@ -383,7 +392,10 @@ class PubServer(BaseHTTPRequestHandler):
info=metaDataNodeInfo(self.server.baseDir,self.server.registration,self.server.projectVersion) info=metaDataNodeInfo(self.server.baseDir,self.server.registration,self.server.projectVersion)
if info: if info:
msg=json.dumps(info).encode('utf-8') msg=json.dumps(info).encode('utf-8')
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json',len(msg),None) self._set_headers('application/ld+json',len(msg),None)
else:
self._set_headers('application/json',len(msg),None)
self._write(msg) self._write(msg)
return True return True
@ -406,7 +418,10 @@ class PubServer(BaseHTTPRequestHandler):
wfResult=webfingerNodeInfo(self.server.httpPrefix,self.server.domainFull) wfResult=webfingerNodeInfo(self.server.httpPrefix,self.server.domainFull)
if wfResult: if wfResult:
msg=json.dumps(wfResult).encode('utf-8') msg=json.dumps(wfResult).encode('utf-8')
if 'application/ld+json' in self.headers['Accept']:
self._set_headers('application/ld+json',len(msg),None) self._set_headers('application/ld+json',len(msg),None)
else:
self._set_headers('application/json',len(msg),None)
self._write(msg) self._write(msg)
return True return True