Verified Commit bae1d33b authored by ​slice's avatar ​slice

Merge branch 'master' into v3

parents e7f031ff 8efa0847
Pipeline #54429165 passed with stage
in 2 minutes and 17 seconds
......@@ -19,15 +19,18 @@ def _owo(string: str) -> str:
@bp.get('/api/hello')
async def hello_route(request):
"""Give basic information about the instance."""
cfg = request.app.econfig
return response.json({
'name': request.app.econfig.INSTANCE_NAME,
'name': cfg.INSTANCE_NAME,
'version': VERSION,
'api': API_VERSION,
'support_email': request.app.econfig.SUPPORT_EMAIL,
'ban_period': request.app.econfig.BAN_PERIOD,
'ip_ban_period': request.app.econfig.IP_BAN_PERIOD,
'rl_threshold': request.app.econfig.RL_THRESHOLD,
'accepted_mimes': request.app.econfig.ACCEPTED_MIMES,
'invite': cfg.MAIN_INVITE,
'support_email': cfg.SUPPORT_EMAIL,
'ban_period': cfg.BAN_PERIOD,
'ip_ban_period': cfg.IP_BAN_PERIOD,
'rl_threshold': cfg.RL_THRESHOLD,
'accepted_mimes': cfg.ACCEPTED_MIMES,
})
......
Subproject commit 5236f5e040b57adc23c6018526019bc096f539ff
Subproject commit 5dc606cefb6646e8d628e1d89cd1a0b7eeea04c5
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