CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-01 20:50:49 +12:00
Code Issues Projects Releases Wiki Activity

some fixes

Browse source
This commit is contained in:
shimon 2022-08-14 18:01:34 +03:00
parent 36fd693728
commit ab27e0a74d
4 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/api/avatars.php
View file

@ -49,7 +49,7 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
$response $response
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT') ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
->setContentType('image/png') ->setContentType('image/png')
->send($data) ->file($data)
; ;
unset($image); unset($image);
}; };
@ -156,7 +156,7 @@ App::get('/v1/avatars/image')
$response $response
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT') ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
->setContentType('image/png') ->setContentType('image/png')
->send($data) ->file($data)
; ;
unset($image); unset($image);
}); });
@ -287,7 +287,7 @@ App::get('/v1/avatars/favicon')
$response $response
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT') ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
->setContentType('image/png') ->setContentType('image/png')
->send($data) ->file($data)
; ;
unset($image); unset($image);
}); });
@ -329,7 +329,7 @@ App::get('/v1/avatars/qr')
$response $response
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
->setContentType('image/png') ->setContentType('image/png')
->send($image->output('png', 9)) ->file($image->output('png', 9))
; ;
}); });
@ -411,6 +411,6 @@ App::get('/v1/avatars/initials')
$response $response
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
->setContentType('image/png') ->setContentType('image/png')
->send($image->getImageBlob()) ->file($image->getImageBlob())
; ;
}); });

2
app/controllers/api/storage.php
View file

@ -960,7 +960,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
$response $response
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT') ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
->setContentType($contentType) ->setContentType($contentType)
->send($data) ->file($data)
; ;
unset($image); unset($image);
}); });

11
app/controllers/shared/api.php
View file

@ -307,7 +307,7 @@ App::shutdown()
$useCache = $route->getLabel('cache', false); $useCache = $route->getLabel('cache', false);
if ($useCache) { if ($useCache) {
$data = $response->getPayload(); $data = $response->getPayload();
if (!empty($data)) { if (!empty($data['payload'])) {
$key = md5($request->getURI() . implode('*', $request->getParams())); $key = md5($request->getURI() . implode('*', $request->getParams()));
$cacheLog = $dbForProject->getDocument('cache', $key); $cacheLog = $dbForProject->getDocument('cache', $key);
if ($cacheLog->isEmpty()) { if ($cacheLog->isEmpty()) {
@ -319,13 +319,16 @@ App::shutdown()
$cacheLog->setAttribute('accessedAt', \time()); $cacheLog->setAttribute('accessedAt', \time());
Authorization::skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog)); Authorization::skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));
} }
if (!empty($data['payload'])) {
$data['payload'] = base64_encode($data['payload']); $data = [
'content-type' => $response->getContentType(),
'payload' => base64_encode($data['payload']),
] ;
$cache = new Cache(new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())); $cache = new Cache(new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId()));
$cache->save($key, json_encode($data)); $cache->save($key, json_encode($data));
} }
} }
}
if ( if (
App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled' App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled'

8
src/Appwrite/Utopia/Response.php
View file

@ -449,7 +449,6 @@ class Response extends SwooleResponse
return $this->payload; return $this->payload;
} }
/** /**
* Output response * Output response
* *
@ -459,17 +458,15 @@ class Response extends SwooleResponse
* *
* @return void * @return void
*/ */
public function send(string $body = ''): void public function file(string $body = ''): void
{ {
$this->payload = [ $this->payload = [
'content-type' => $this->getContentType(),
'payload' => $body 'payload' => $body
]; ];
parent::send($body); $this->send($body);
} }
/** /**
* YAML * YAML
* *
@ -501,7 +498,6 @@ class Response extends SwooleResponse
return $this->payload; return $this->payload;
} }
/** /**
* Function to set a response filter * Function to set a response filter
* *