From 9fc2e4c3a59d63c9ead844751027f64654d652ae Mon Sep 17 00:00:00 2001
From: shimon <shimon@appwrite.io>
Date: Wed, 17 Aug 2022 17:29:22 +0300
Subject: [PATCH] sync with 0.16

---
 app/controllers/api/storage.php |  4 +---
 app/controllers/shared/api.php  | 12 +++++++-----
 app/workers/deletes.php         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 45f546ea67..5ed7756067 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -1353,15 +1353,13 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
-    ->inject('request')
     ->inject('dbForProject')
     ->inject('events')
     ->inject('usage')
     ->inject('mode')
     ->inject('deviceFiles')
-    ->inject('project')
     ->inject('deletes')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $events, Stats $usage, string $mode, Device $deviceFiles, Document $project, Delete $deletes) {
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $events, Stats $usage, string $mode, Device $deviceFiles, Delete $deletes) {
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
         if (
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 2d90003310..5e77424e30 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -69,7 +69,7 @@ App::init()
             throw new Exception(Exception::PROJECT_UNKNOWN);
         }
 
-        /*
+        /**
         * Abuse Check
         */
         $abuseKeyLabel = $route->getLabel('abuse-key', 'url:{url},ip:{ip}');
@@ -308,6 +308,9 @@ App::shutdown()
         $requestParams = $route->getParamsValues();
         $user = $audits->getUser();
 
+        /**
+         * Audit labels
+         */
         $pattern = $route->getLabel('audits.resource', null);
         if (!empty($pattern)) {
             $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
@@ -347,10 +350,9 @@ App::shutdown()
             $database->trigger();
         }
 
-        $route = $utopia->match($request);
-        $requestParams = $route->getParamsValues();
-        $user = $audits->getUser();
-
+        /**
+         * Cache label
+         */
         $useCache = $route->getLabel('cache', false);
         if ($useCache) {
             $resource = null;
diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 3d77cc3236..15b5b555e7 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -138,7 +138,7 @@ class DeletesV1 extends Worker
     protected function deleteCacheByTimestamp(): void
     {
         $this->deleteCacheFiles([
-            new Query('accessedAt', Query::TYPE_LESSER, [$this->args['timestamp']])
+                new Query('accessedAt', Query::TYPE_LESSER, [$this->args['timestamp']])
             ]);
     }