From 7b361cce1e451dfd2da0e228c8cc1b335f02f489 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Thu, 2 Jul 2020 16:51:11 +0300
Subject: [PATCH] Fixed avatar service

---
 app/controllers/api/avatars.php | 52 +++++++++++++++------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index 2466f8a361..7ea970c56c 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -53,11 +53,11 @@ $avatarCallback = function ($type, $code, $width, $height, $quality, $response)
     if ($data) {
         //$output = (empty($output)) ? $type : $output;
 
-        $response
+        return $response
             ->setContentType('image/png')
             ->addHeader('Expires', $date)
             ->addHeader('X-Appwrite-Cache', 'hit')
-            ->send($data, 0)
+            ->send($data)
         ;
     }
 
@@ -67,19 +67,17 @@ $avatarCallback = function ($type, $code, $width, $height, $quality, $response)
 
     $output = (empty($output)) ? $type : $output;
 
+    $data = $resize->output($output, $quality);
+    
+    $cache->save($key, $data);
+    
     $response
         ->setContentType('image/png')
         ->addHeader('Expires', $date)
         ->addHeader('X-Appwrite-Cache', 'miss')
-        ->send('', null)
+        ->send($data, null);
     ;
 
-    $data = $resize->output($output, $quality);
-
-    $cache->save($key, $data);
-
-    $response->send($data, null);
-
     unset($resize);
 };
 
@@ -158,11 +156,11 @@ App::get('/v1/avatars/image')
         $data = $cache->load($key, 60 * 60 * 24 * 7 /* 1 week */);
 
         if ($data) {
-            $response
+            return $response
                 ->setContentType('image/png')
                 ->addHeader('Expires', $date)
                 ->addHeader('X-Appwrite-Cache', 'hit')
-                ->send($data, 0)
+                ->send($data)
             ;
         }
 
@@ -185,19 +183,18 @@ App::get('/v1/avatars/image')
         $resize->crop((int) $width, (int) $height);
 
         $output = (empty($output)) ? $type : $output;
+        
+        $data = $resize->output($output, $quality);
+        
+        $cache->save($key, $data);
 
         $response
             ->setContentType('image/png')
             ->addHeader('Expires', $date)
             ->addHeader('X-Appwrite-Cache', 'miss')
+            ->send($data);
         ;
 
-        $data = $resize->output($output, $quality);
-
-        $cache->save($key, $data);
-
-        $response->send($data, null);
-
         unset($resize);
     }, ['response']);
 
@@ -225,11 +222,11 @@ App::get('/v1/avatars/favicon')
         $data = $cache->load($key, 60 * 60 * 24 * 30 * 3 /* 3 months */);
 
         if ($data) {
-            $response
+            return $response
                 ->setContentType('image/png')
                 ->addHeader('Expires', $date)
                 ->addHeader('X-Appwrite-Cache', 'hit')
-                ->send($data, 0)
+                ->send($data)
             ;
         }
 
@@ -318,11 +315,11 @@ App::get('/v1/avatars/favicon')
 
             $cache->save($key, $data);
 
-            $response
+            return $response
                 ->setContentType('image/x-icon')
                 ->addHeader('Expires', $date)
                 ->addHeader('X-Appwrite-Cache', 'miss')
-                ->send($data, 0)
+                ->send($data)
             ;
         }
 
@@ -338,17 +335,16 @@ App::get('/v1/avatars/favicon')
 
         $output = (empty($output)) ? $type : $output;
 
-        $response
-            ->setContentType('image/png')
-            ->addHeader('Expires', $date)
-            ->addHeader('X-Appwrite-Cache', 'miss')
-        ;
-
         $data = $resize->output($output, $quality);
 
         $cache->save($key, $data);
 
-        $response->send($data, null);
+        $response
+            ->setContentType('image/png')
+            ->addHeader('Expires', $date)
+            ->addHeader('X-Appwrite-Cache', 'miss')
+            ->addHeader('X-Appwrite-Debug', '1')
+            ->send($data);
 
         unset($resize);
     }, ['response']);