From 25d632c76100c40284500d8ed5284ffc5d91fe66 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 17 Jun 2019 22:15:36 -0600
Subject: [PATCH] Add new config

---
 app/Util/Media/Image.php | 22 +++++++++++++---------
 config/media.php         | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 config/media.php

diff --git a/app/Util/Media/Image.php b/app/Util/Media/Image.php
index 06e8be9f5..e519b4714 100644
--- a/app/Util/Media/Image.php
+++ b/app/Util/Media/Image.php
@@ -57,21 +57,21 @@ class Image
         }
         if ($thumbnail) {
             return [
-            'dimensions'  => $this->thumbnail,
-            'orientation' => 'thumbnail',
-          ];
+                'dimensions'  => $this->thumbnail,
+                'orientation' => 'thumbnail',
+            ];
         }
 
         list($width, $height) = getimagesize($mediaPath);
         $aspect = $width / $height;
         $orientation = $aspect === 1 ? 'square' :
-      ($aspect > 1 ? 'landscape' : 'portrait');
+        ($aspect > 1 ? 'landscape' : 'portrait');
         $this->orientation = $orientation;
 
         return [
-      'dimensions'  => $this->orientations()[$orientation],
-      'orientation' => $orientation,
-    ];
+          'dimensions'  => $this->orientations()[$orientation],
+          'orientation' => $orientation,
+      ];
     }
 
     public function resizeImage(Media $media)
@@ -116,11 +116,14 @@ class Image
                     $constraint->aspectRatio();
                 });
             } else {
-                $metadata = $img->exif();
+                if(config('media.exif.database', false) == true) {
+                    $metadata = $img->exif();
+                    $media->metadata = json_encode($metadata);
+                }
+
                 $img->resize($aspect['width'], $aspect['height'], function ($constraint) {
                     $constraint->aspectRatio();
                 });
-                $media->metadata = json_encode($metadata);
             }
             $converted = $this->setBaseName($path, $thumbnail, $img->extension);
             $newPath = storage_path('app/'.$converted['path']);
@@ -141,6 +144,7 @@ class Image
             }
 
             $media->save();
+            Cache::forget('status:transformer:media:attachments:'.$media->status_id);
             Cache::forget('status:thumb:'.$media->status_id);
         } catch (Exception $e) {
         }
diff --git a/config/media.php b/config/media.php
new file mode 100644
index 000000000..21ce50a56
--- /dev/null
+++ b/config/media.php
@@ -0,0 +1,15 @@
+<?php
+
+return [
+	'exif' => [
+		'database' => env('MEDIA_EXIF_DATABASE', false),
+		'strip' => true
+	],
+	'types' => env('MEDIA_TYPES', 'image/jpeg,image/png,image/gif'),
+	'photo' => [
+		'optimize' => env('PF_OPTIMIZE_IMAGES', true),
+		'quality' => (int) env('IMAGE_QUALITY', 80),
+		'max_size' => env('MAX_PHOTO_SIZE', 15000),
+		'max_album_length' => env('MAX_ALBUM_LENGTH', 4),
+	],
+];
\ No newline at end of file