From 2c08961971a07abec0a7e01726f39f23d01b1be3 Mon Sep 17 00:00:00 2001 From: Kirankumar Ambati Date: Thu, 15 Aug 2019 14:55:36 +0530 Subject: [PATCH 1/5] Fix opencollective message --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index fe8f3f1df..d2e4403f7 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "name": "pixelfed", "private": true, "scripts": { "dev": "npm run development", From dfd958994f924c32da32ac66f0c3ec1250b3ab73 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 17 Aug 2019 22:59:31 -0600 Subject: [PATCH 2/5] Add new npm deps --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index d2e4403f7..0c87516db 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "vue-template-compiler": "^2.6.10" }, "dependencies": { + "@trevoreyre/autocomplete-vue": "^2.0.2", "bootstrap-vue": "^2.0.0-rc.26", "emoji-mart-vue": "^2.6.6", "filesize": "^3.6.1", @@ -45,6 +46,7 @@ "sweetalert": "^2.1.2", "twitter-text": "^2.0.5", "vue-content-loader": "^0.2.2", + "vue-cropperjs": "^4.0.0", "vue-infinite-loading": "^2.4.4", "vue-loading-overlay": "^3.2.0", "vue-timeago": "^5.1.2" From 91e58591be1ef92493ceecb9f6d4db95250126fc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 17 Aug 2019 23:00:06 -0600 Subject: [PATCH 3/5] Update ImportCities command, bump memory limit --- app/Console/Commands/ImportCities.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Commands/ImportCities.php b/app/Console/Commands/ImportCities.php index 6062ef8d5..2fd93db99 100644 --- a/app/Console/Commands/ImportCities.php +++ b/app/Console/Commands/ImportCities.php @@ -65,6 +65,7 @@ class ImportCities extends Command public function __construct() { parent::__construct(); + ini_set('memory_limit', '256M'); } /** From 0d350ea03e717baa828e743c8d64ec5aaa62e18a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 17 Aug 2019 23:39:54 -0600 Subject: [PATCH 4/5] Update PublicApiController, fix HomeTimeline cache ttl --- app/Http/Controllers/PublicApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index ba0f7d83d..29b3984c0 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -347,7 +347,7 @@ class PublicApiController extends Controller return $following->push($pid)->toArray(); }); - $private = Cache::remember('profiles:private', 1440, function() { + $private = Cache::remember('profiles:private', now()->addMinutes(1440), function() { return Profile::whereIsPrivate(true) ->orWhere('unlisted', true) ->orWhere('status', '!=', null) From 9b82f75183a883257b5e6367dc839e2caed9a24f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 17 Aug 2019 23:40:25 -0600 Subject: [PATCH 5/5] Update StatusTransformer, remove unused fields --- app/Transformer/Api/StatusTransformer.php | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php index 8a16e4dfd..83773a47c 100644 --- a/app/Transformer/Api/StatusTransformer.php +++ b/app/Transformer/Api/StatusTransformer.php @@ -10,9 +10,7 @@ class StatusTransformer extends Fractal\TransformerAbstract { protected $defaultIncludes = [ 'account', - 'mentions', 'media_attachments', - 'tags', ]; public function transform(Status $status) @@ -41,13 +39,15 @@ class StatusTransformer extends Fractal\TransformerAbstract ], 'language' => null, 'pinned' => null, - + 'mentions' => [], + 'tags' => [], 'pf_type' => $status->type ?? $status->setType(), 'reply_count' => (int) $status->reply_count, 'comments_disabled' => $status->comments_disabled ? true : false, 'thread' => false, 'replies' => [], 'parent' => [], + //'place' => $status->place ]; } @@ -58,13 +58,6 @@ class StatusTransformer extends Fractal\TransformerAbstract return $this->item($account, new AccountTransformer()); } - public function includeMentions(Status $status) - { - $mentions = $status->mentions; - - return $this->collection($mentions, new MentionTransformer()); - } - public function includeMediaAttachments(Status $status) { return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addDays(14), function() use($status) { @@ -74,11 +67,4 @@ class StatusTransformer extends Fractal\TransformerAbstract } }); } - - public function includeTags(Status $status) - { - $tags = $status->hashtags; - - return $this->collection($tags, new HashtagTransformer()); - } }