nice version
This commit is contained in:
1 parent
360f8110a4
commit
38e54f0ab2
5 files changed
+38
-14
No files matched your search
@@ -28,7 +28,7 @@ async def s_api_v1_content_list(request):
|
||||
select(StoredContent)
|
||||
.where(
|
||||
StoredContent.type.like(store + '%'),
|
||||
StoredContent.disabled == False
|
||||
StoredContent.disabled.is_(None)
|
||||
)
|
||||
.order_by(StoredContent.created.desc())
|
||||
.offset(offset)
|
||||
|
||||
@@ -27,14 +27,29 @@ async def s_api_v1_upload_tus_hook(request):
|
||||
tusd HTTP hook endpoint. We mainly handle post-finish to: encrypt -> IPFS add+pin -> record DB.
|
||||
"""
|
||||
try:
|
||||
payload: Dict[str, Any] = request.json or {}
|
||||
payload: Dict[str, Any] = request.json
|
||||
except Exception:
|
||||
payload = {}
|
||||
event = payload.get("Type") or payload.get("type") or payload.get("Event") or payload.get("event")
|
||||
payload = None
|
||||
if payload is None:
|
||||
raw_body = request.body or b''
|
||||
try:
|
||||
payload = json.loads(raw_body) if raw_body else {}
|
||||
except Exception:
|
||||
payload = {}
|
||||
event = (payload.get("Type") or payload.get("type") or
|
||||
payload.get("Event") or payload.get("event") or
|
||||
payload.get("Hook") or payload.get("hook") or
|
||||
payload.get("HookName") or payload.get("hook_name") or
|
||||
request.headers.get("Hook-Name") or request.headers.get("hook-name"))
|
||||
upload = payload.get("Upload") or payload.get("upload") or {}
|
||||
|
||||
if not event:
|
||||
return response.json({"ok": False, "error": "NO_EVENT"}, status=400)
|
||||
hook_name = (payload.get("HookName") or payload.get("hook") or
|
||||
payload.get("hook_name") or request.headers.get("Hook-Name"))
|
||||
raw = request.body or b''
|
||||
preview = raw[:512]
|
||||
make_log("tus-hook", f"Missing event type in hook payload; ignoring (hook={hook_name}, keys={list(payload.keys())}, raw={preview!r})", level="warning")
|
||||
return response.json({"ok": True, "skipped": True})
|
||||
|
||||
if event not in ("post-finish", "postfinish"):
|
||||
# accept but ignore other events
|
||||
|
||||
Reference in new issue
Block a user