Merge pull request #1969 from pixelfed/staging

Update Story model

app/Story.php

@@ -10,7 +10,7 @@ class Story extends Model
 {
     use HasSnowflakePrimary;
 
-    public const MAX_PER_DAY = 10;
+    public const MAX_PER_DAY = 20;
 
     /**
      * Indicates if the IDs are auto-incrementing.

app/Util/Media/Image.php

@@ -119,7 +119,41 @@ class Image
 				});
 			} else {
 				if(config('media.exif.database', false) == true) {
-                    $media->metadata = json_encode($metadata);
+					$meta = [];
+					$keys = [
+						"COMPUTED",
+						"FileName",
+						"FileSize",
+						"FileType",
+						"Make",
+						"Model",
+						"MimeType",
+						"ColorSpace",
+						"ExifVersion",
+						"Orientation",
+						"UserComment",
+						"XResolution",
+						"YResolution",
+						"FileDateTime",
+						"SectionsFound",
+						"ExifImageWidth",
+						"ResolutionUnit",
+						"ExifImageLength",
+						"FlashPixVersion",
+						"Exif_IFD_Pointer",
+						"YCbCrPositioning",
+						"ComponentsConfiguration",
+						"ExposureTime",
+						"FNumber",
+						"ISOSpeedRatings",
+						"ShutterSpeedValue"
+					];
+					foreach ($metadata as $k => $v) {
+						if(in_array($k, $keys)) {
+							$meta[$k] = $v;
+						}
+					}
+					$media->metadata = json_encode($meta);
 				} 
 
 				$img->resize($aspect['width'], $aspect['height'], function ($constraint) {

config/image-optimizer.php

@@ -43,7 +43,7 @@ return [
     /*
      * The maximum time in seconds each optimizer is allowed to run separately.
      */
-    'timeout' => 60,
+    'timeout' => 59,
 
     /*
      * If set to `true` all output of the optimizer binaries will be appended to the default log.

config/image.php

@@ -15,6 +15,6 @@ return [
     |
     */
 
-    'driver' => env('IMAGE_DRIVER', 'gd'),
+    'driver' => env('IMAGE_DRIVER', 'imagick'),
 
 ];