From a86a7d2769d73869bdb60cd79554859e651b7d64 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 25 May 2019 18:56:21 -0600 Subject: [PATCH 01/52] Hello Loops --- app/Http/Controllers/DiscoverController.php | 5 +++++ resources/views/discover/loops/home.blade.php | 5 +++++ routes/web.php | 1 + 3 files changed, 11 insertions(+) create mode 100644 resources/views/discover/loops/home.blade.php diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 0c87954e0..dbe08becf 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -115,4 +115,9 @@ class DiscoverController extends Controller }); return view('discover.personal', compact('posts', 'tags')); } + + public function showLoops(Request $request) + { + return view('discover.loops.home'); + } } diff --git a/resources/views/discover/loops/home.blade.php b/resources/views/discover/loops/home.blade.php new file mode 100644 index 000000000..d231d559c --- /dev/null +++ b/resources/views/discover/loops/home.blade.php @@ -0,0 +1,5 @@ +@extends('layouts.app') + +@section('content') + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 80dc86e50..10ea2fc1a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -62,6 +62,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('discover/c/{slug}', 'DiscoverController@showCategory'); Route::get('discover/personal', 'DiscoverController@showPersonal'); Route::get('discover', 'DiscoverController@home')->name('discover'); + Route::get('discover/loops', 'DiscoverController@showLoops'); Route::group(['prefix' => 'api'], function () { Route::get('search', 'SearchController@searchAPI'); From 7f437d47146304b7dded92e9a7942a89e24d7e91 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:34:54 -0600 Subject: [PATCH 02/52] Add VideoThumbnail command --- app/Console/Commands/VideoThumbnail.php | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 app/Console/Commands/VideoThumbnail.php diff --git a/app/Console/Commands/VideoThumbnail.php b/app/Console/Commands/VideoThumbnail.php new file mode 100644 index 000000000..c2d01aa63 --- /dev/null +++ b/app/Console/Commands/VideoThumbnail.php @@ -0,0 +1,52 @@ +whereNull('thumbnail_path') + ->take($limit) + ->get(); + foreach($videos as $video) { + Pipeline::dispatchNow($video); + } + } +} From a1c29b50e3589e362a73d359dc3560db98cc2fe5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:36:04 -0600 Subject: [PATCH 03/52] Update VideoPipeline --- app/Jobs/VideoPipeline/VideoThumbnail.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Jobs/VideoPipeline/VideoThumbnail.php b/app/Jobs/VideoPipeline/VideoThumbnail.php index c6000d222..882f57dd6 100644 --- a/app/Jobs/VideoPipeline/VideoThumbnail.php +++ b/app/Jobs/VideoPipeline/VideoThumbnail.php @@ -34,6 +34,9 @@ class VideoThumbnail implements ShouldQueue public function handle() { $media = $this->media; + if($media->mime != 'video/mp4') { + return; + } $base = $media->media_path; $path = explode('/', $base); $name = last($path); @@ -43,14 +46,11 @@ class VideoThumbnail implements ShouldQueue $i = count($path) - 1; $path[$i] = $t; $save = implode('/', $path); - $video = FFMpeg::open($base); - if($video->getDurationInSeconds() < 1) { - $video->getFrameFromSeconds(0); - } elseif($video->getDurationInSeconds() < 5) { - $video->getFrameFromSeconds(4); - } - $video->export() - ->save($save); + $video = FFMpeg::open($base) + ->getFrameFromSeconds(1) + ->export() + ->toDisk('local') + ->save($save); $media->thumbnail_path = $save; $media->save(); From 76f651429358c1303e68e5246078045cffd742a7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:40:09 -0600 Subject: [PATCH 04/52] Update BaseApiController --- .../Controllers/Api/BaseApiController.php | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 3110aad7d..edcc36557 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -48,7 +48,8 @@ class BaseApiController extends Controller public function notifications(Request $request) { $pid = Auth::user()->profile->id; - if(config('exp.ns') == false) { + $pg = $request->input('pg'); + if($pg == true) { $timeago = Carbon::now()->subMonths(6); $notifications = Notification::whereProfileId($pid) ->whereDate('created_at', '>', $timeago) @@ -272,6 +273,7 @@ class BaseApiController extends Controller 'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id] ); + $preview_url = $url; switch ($media->mime) { case 'image/jpeg': case 'image/png': @@ -280,6 +282,8 @@ class BaseApiController extends Controller case 'video/mp4': VideoThumbnail::dispatch($media); + $preview_url = '/storage/no-preview.png'; + $url = '/storage/no-preview.png'; break; default: @@ -288,7 +292,7 @@ class BaseApiController extends Controller $resource = new Fractal\Resource\Item($media, new MediaTransformer()); $res = $this->fractal->createData($resource)->toArray(); - $res['preview_url'] = $url; + $res['preview_url'] = $preview_url; $res['url'] = $url; return response()->json($res); } @@ -327,4 +331,34 @@ class BaseApiController extends Controller return response()->json($res); } + public function loops(Request $request) + { + abort_if(!Auth::check(), 403); + abort_if(!config('exp.loops'), 403); + + // todo proper pagination, maybe LoopService + $loops = Status::whereType('video') + ->latest() + ->take(18) + ->get(); + + $resource = new Fractal\Resource\Collection($loops, new StatusTransformer()); + return $this->fractal->createData($resource)->toArray(); + } + + + public function loopWatch(Request $request) + { + abort_if(!Auth::check(), 403); + abort_if(!config('exp.loops'), 403); + + $this->validate($request, [ + 'id' => 'integer|min:1' + ]); + $id = $request->input('id'); + + // todo log loops + + return response()->json(200); + } } From 9dbeea41ee4ee582b2ff90df2c80d1235593df38 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:40:30 -0600 Subject: [PATCH 05/52] Update config --- config/exp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/exp.php b/config/exp.php index 3c8d7f8a5..1c4bf45c6 100644 --- a/config/exp.php +++ b/config/exp.php @@ -4,6 +4,7 @@ return [ 'lc' => env('EXP_LC', false), 'rec' => env('EXP_REC', false), - 'ns' => env('EXP_NS', false) + 'ns' => env('EXP_NS', false), + 'loops' => env('EXP_LOOPS', false) ]; \ No newline at end of file From 1bfb1ae8822e2847108d78c7fb06e49b7af5a701 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:42:12 -0600 Subject: [PATCH 06/52] Update loops blade view --- resources/views/discover/loops/home.blade.php | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/resources/views/discover/loops/home.blade.php b/resources/views/discover/loops/home.blade.php index d231d559c..b1213b70b 100644 --- a/resources/views/discover/loops/home.blade.php +++ b/resources/views/discover/loops/home.blade.php @@ -1,5 +1,39 @@ @extends('layouts.app') @section('content') +
+
+
+
+
+

Loops BETA

+

Short looping videos

+
+
+
+
+
+
+ +
+
+@endsection -@endsection \ No newline at end of file +@push('styles') + +@endpush +@push('scripts') + + + +@endpush \ No newline at end of file From c84e440bbb98ae95161527ae5085b66108dd1446 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:42:42 -0600 Subject: [PATCH 07/52] Update app layout --- resources/views/layouts/app.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ef9b714a0..30a686491 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -56,19 +56,19 @@
  • - +
  • - +
  • -
    +
  • - +
  • - +
From e7d61d4ebceee85a36bab618fbbb6158316a49f3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:43:18 -0600 Subject: [PATCH 08/52] Update nav view --- resources/views/layouts/partial/nav.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 53144889c..360d267da 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -27,18 +27,18 @@
  • - +
    • -
    + {{--
    • -
    +
    --}}
  • @@ -51,7 +51,7 @@
    • --}}
  • - +
    • @@ -60,7 +60,7 @@
    • From 85c2f89ecde80f9ef4b772e1342d4bfd856a13de Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 18:56:50 -0600 Subject: [PATCH 09/52] Add LoopComponent --- .../assets/js/components/LoopComponent.vue | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 resources/assets/js/components/LoopComponent.vue diff --git a/resources/assets/js/components/LoopComponent.vue b/resources/assets/js/components/LoopComponent.vue new file mode 100644 index 000000000..c7b013916 --- /dev/null +++ b/resources/assets/js/components/LoopComponent.vue @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file From 4a46a8d772439f57016fc6ef02186524e3810f1c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 23:01:25 -0600 Subject: [PATCH 10/52] Update LoopComponent.vue --- resources/assets/js/components/LoopComponent.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/components/LoopComponent.vue b/resources/assets/js/components/LoopComponent.vue index c7b013916..c3bfe3dfb 100644 --- a/resources/assets/js/components/LoopComponent.vue +++ b/resources/assets/js/components/LoopComponent.vue @@ -2,9 +2,9 @@

    - Popular + New - Random + About

    @@ -64,7 +64,7 @@ export default { return { 'version': 1, 'loops': [], - 'tab': 'popular' + 'tab': 'new' } }, From 1f3a5e263b6f026955c0e7f35de0837cc0489044 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 23:02:01 -0600 Subject: [PATCH 11/52] Update config --- config/pixelfed.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index b9156cd56..9a831855a 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -78,13 +78,10 @@ return [ |-------------------------------------------------------------------------- | */ - 'ap_inbox' => env('ACTIVITYPUB_INBOX', false), - 'ap_shared' => env('ACTIVITYPUB_SHAREDINBOX', false), + 'activitypub_enabled' => env('ACTIVITY_PUB', false), 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0), 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10), - - 'remote_follow_enabled' => env('REMOTE_FOLLOW', false), - 'activitypub_enabled' => env('ACTIVITY_PUB', false), + 'remote_follow_enabled' => false, /* |-------------------------------------------------------------------------- From 1c900a4ba4279988aa270a9bdfdcdc147235755d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 23:03:53 -0600 Subject: [PATCH 12/52] Update StatusTransformer --- app/Transformer/Api/StatusTransformer.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php index 8f6c5c837..3e7629635 100644 --- a/app/Transformer/Api/StatusTransformer.php +++ b/app/Transformer/Api/StatusTransformer.php @@ -46,7 +46,8 @@ class StatusTransformer extends Fractal\TransformerAbstract 'reply_count' => (int) $status->reply_count, 'comments_disabled' => $status->comments_disabled ? true : false, 'thread' => false, - 'replies' => [] + 'replies' => [], + 'parent' => $status->parent() ? $this->transform($status->parent()) : [], ]; } @@ -67,8 +68,10 @@ class StatusTransformer extends Fractal\TransformerAbstract public function includeMediaAttachments(Status $status) { return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addMinutes(3), function() use($status) { - $media = $status->media()->orderBy('order')->get(); - return $this->collection($media, new MediaTransformer()); + if(in_array($status->type, ['photo', 'video'])) { + $media = $status->media()->orderBy('order')->get(); + return $this->collection($media, new MediaTransformer()); + } }); } From 95bcb5032975330fcde144be216de89a5460406d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 23:04:43 -0600 Subject: [PATCH 13/52] Update NotificationTransformer --- .../Api/NotificationTransformer.php | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/app/Transformer/Api/NotificationTransformer.php b/app/Transformer/Api/NotificationTransformer.php index 5a9e4cf40..0408eeea8 100644 --- a/app/Transformer/Api/NotificationTransformer.php +++ b/app/Transformer/Api/NotificationTransformer.php @@ -2,7 +2,10 @@ namespace App\Transformer\Api; -use App\Notification; +use App\{ + Notification, + Status +}; use League\Fractal; class NotificationTransformer extends Fractal\TransformerAbstract @@ -10,6 +13,7 @@ class NotificationTransformer extends Fractal\TransformerAbstract protected $defaultIncludes = [ 'account', 'status', + 'relationship' ]; public function transform(Notification $notification) @@ -30,9 +34,14 @@ class NotificationTransformer extends Fractal\TransformerAbstract public function includeStatus(Notification $notification) { - $item = $notification->item; - if(is_object($item) && get_class($item) === 'App\Status') { - return $this->item($item, new StatusTransformer()); + $item = $notification; + if($item->item_id && $item->item_type == 'App\Status') { + $status = Status::with('media')->find($item->item_id); + if($status) { + return $this->item($status, new StatusTransformer()); + } else { + return null; + } } else { return null; } @@ -50,4 +59,9 @@ class NotificationTransformer extends Fractal\TransformerAbstract ]; return $verbs[$verb]; } + + public function includeRelationship(Notification $notification) + { + return $this->item($notification->actor, new RelationshipTransformer()); + } } From d09b00a70f70ae3f9028d61e96862f71357455ad Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 26 May 2019 23:05:29 -0600 Subject: [PATCH 14/52] Update NotificationService --- app/Services/NotificationService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php index 4827a6c6f..15adf6c7c 100644 --- a/app/Services/NotificationService.php +++ b/app/Services/NotificationService.php @@ -73,7 +73,7 @@ class NotificationService { public static function getNotification($id) { return Cache::remember('service:notification:'.$id, now()->addDays(7), function() use($id) { - $n = Notification::findOrFail($id); + $n = Notification::with('item')->findOrFail($id); $fractal = new Fractal\Manager(); $fractal->setSerializer(new ArraySerializer()); $resource = new Fractal\Resource\Item($n, new NotificationTransformer()); From 402408e48c8561da525631b47b16c36ca2452582 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 12:58:54 -0600 Subject: [PATCH 15/52] Update Status model --- app/Status.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Status.php b/app/Status.php index 6736e49b2..b5d7e88c0 100644 --- a/app/Status.php +++ b/app/Status.php @@ -87,7 +87,7 @@ class Status extends Model return Cache::remember('status:thumb:'.$this->id, now()->addMinutes(15), function() use ($showNsfw) { $type = $this->type ?? $this->setType(); $is_nsfw = !$showNsfw ? $this->is_nsfw : false; - if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['photo', 'photo:album'])) { + if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['photo', 'photo:album', 'video'])) { return url(Storage::url('public/no-preview.png')); } @@ -99,11 +99,12 @@ class Status extends Model { if($this->uri) { return $this->uri; + } else { + $id = $this->id; + $username = $this->profile->username; + $path = url(config('app.url')."/p/{$username}/{$id}"); + return $path; } - $id = $this->id; - $username = $this->profile->username; - $path = url(config('app.url')."/p/{$username}/{$id}"); - return $path; } public function permalink($suffix = '/activity') @@ -207,6 +208,8 @@ class Status extends Model $parent = $this->in_reply_to_id ?? $this->reblog_of_id; if (!empty($parent)) { return $this->findOrFail($parent); + } else { + return false; } } From 468ae1ef60f61b0d10e4a4a1df45d280291e3cb5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 13:00:39 -0600 Subject: [PATCH 16/52] Add StatusStatelessTransformer --- .../Api/StatusStatelessTransformer.php | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 app/Transformer/Api/StatusStatelessTransformer.php diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php new file mode 100644 index 000000000..12e444322 --- /dev/null +++ b/app/Transformer/Api/StatusStatelessTransformer.php @@ -0,0 +1,84 @@ + (string) $status->id, + 'uri' => $status->url(), + 'url' => $status->url(), + 'in_reply_to_id' => $status->in_reply_to_id, + 'in_reply_to_account_id' => $status->in_reply_to_profile_id, + 'reblog' => null, + 'content' => $status->rendered ?? $status->caption, + 'created_at' => $status->created_at->format('c'), + 'emojis' => [], + 'reblogs_count' => $status->shares()->count(), + 'favourites_count' => $status->likes()->count(), + 'reblogged' => null, + 'favourited' => null, + 'muted' => null, + 'sensitive' => (bool) $status->is_nsfw, + 'spoiler_text' => $status->cw_summary, + 'visibility' => $status->visibility, + 'application' => [ + 'name' => 'web', + 'website' => null + ], + 'language' => null, + 'pinned' => null, + + 'pf_type' => $status->type ?? $status->setType(), + 'reply_count' => (int) $status->reply_count, + 'comments_disabled' => $status->comments_disabled ? true : false, + 'thread' => false, + 'replies' => [], + 'parent' => $status->parent() ? $this->transform($status->parent()) : [], + ]; + } + + public function includeAccount(Status $status) + { + $account = $status->profile; + + 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()->addMinutes(3), function() use($status) { + if(in_array($status->type, ['photo', 'video'])) { + $media = $status->media()->orderBy('order')->get(); + return $this->collection($media, new MediaTransformer()); + } + }); + } + + public function includeTags(Status $status) + { + $tags = $status->hashtags; + + return $this->collection($tags, new HashtagTransformer()); + } +} From 698d3a48c354c5c7a1e147d6ce39cdc13d745f59 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 13:54:31 -0600 Subject: [PATCH 17/52] Add Activity.vue --- resources/assets/js/components/Activity.vue | 236 ++++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 resources/assets/js/components/Activity.vue diff --git a/resources/assets/js/components/Activity.vue b/resources/assets/js/components/Activity.vue new file mode 100644 index 000000000..cc43356d3 --- /dev/null +++ b/resources/assets/js/components/Activity.vue @@ -0,0 +1,236 @@ + + + \ No newline at end of file From 08a96d47262367bf43e770997f553d932d7a8fb6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 13:54:45 -0600 Subject: [PATCH 18/52] Update activity.js --- resources/assets/js/activity.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/activity.js b/resources/assets/js/activity.js index b1b72d1b8..0023a2ab2 100644 --- a/resources/assets/js/activity.js +++ b/resources/assets/js/activity.js @@ -1,10 +1,4 @@ -$(document).ready(function() { - $('.pagination').hide(); - let elem = document.querySelector('.notification-page .list-group'); - let infScroll = new InfiniteScroll( elem, { - path: '.pagination__next', - append: '.notification-page .list-group', - status: '.page-load-status', - history: true, - }); -}); +Vue.component( + 'activity-component', + require('./components/Activity.vue').default +); \ No newline at end of file From 3a12786a76b6bc959465ea55f7686ceccfa2894a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 13:57:20 -0600 Subject: [PATCH 19/52] Update webpack config --- webpack.mix.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webpack.mix.js b/webpack.mix.js index 796506564..77f9ba28d 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -37,6 +37,12 @@ mix.js('resources/assets/js/app.js', 'public/js') // Developer Components .js('resources/assets/js/developers.js', 'public/js') +// // Direct Component +// .js('resources/assets/js/direct.js', 'public/js') + +// Loops Component +.js('resources/assets/js/loops.js', 'public/js') + .sass('resources/assets/sass/app.scss', 'public/css', { implementation: require('node-sass') }) From 14fa51fa30470cc568f2305e8d7aa79e4437503d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 14:13:02 -0600 Subject: [PATCH 20/52] Update Activity.vue --- resources/assets/js/components/Activity.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/assets/js/components/Activity.vue b/resources/assets/js/components/Activity.vue index cc43356d3..3f21f1c5d 100644 --- a/resources/assets/js/components/Activity.vue +++ b/resources/assets/js/components/Activity.vue @@ -104,9 +104,7 @@ export default { }, mounted() { - if(window.outerWidth > 767) { - this.fetchNotifications(); - } + this.fetchNotifications(); }, updated() { From a641db07643c83b3f394984fa003663a93eaae0f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 20:03:19 -0600 Subject: [PATCH 21/52] Update avatar deletion --- app/Jobs/DeletePipeline/DeleteAccountPipeline.php | 11 ----------- app/Observers/AvatarObserver.php | 8 +++++++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php index bcb02fe99..ba265379d 100644 --- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php +++ b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php @@ -74,17 +74,6 @@ class DeleteAccountPipeline implements ShouldQueue if($user->profile) { $avatar = $user->profile->avatar; - if(is_file($avatar->media_path)) { - if($avatar->media_path != 'public/avatars/default.png') { - unlink($avatar->media_path); - } - } - - if(is_file($avatar->thumb_path)) { - if($avatar->thumb_path != 'public/avatars/default.png') { - unlink($avatar->thumb_path); - } - } $avatar->forceDelete(); } diff --git a/app/Observers/AvatarObserver.php b/app/Observers/AvatarObserver.php index cdc2faa12..c8fef1a10 100644 --- a/app/Observers/AvatarObserver.php +++ b/app/Observers/AvatarObserver.php @@ -48,7 +48,13 @@ class AvatarObserver public function deleting(Avatar $avatar) { $path = storage_path('app/'.$avatar->media_path); - @unlink($path); + if(is_file($path) && $avatar->media_path != 'public/avatars/default.png') { + @unlink($path); + } + $path = storage_path('app/'.$avatar->thumb_path); + if(is_file($path) && $avatar->thumb_path != 'public/avatars/default.png') { + @unlink($path); + } } /** From 0fa282a190701c150abed9cfa6cb071024df7172 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 20:48:37 -0600 Subject: [PATCH 22/52] Update presenter components --- .../assets/js/components/presenter/MixedAlbumPresenter.vue | 4 ++-- .../assets/js/components/presenter/VideoAlbumPresenter.vue | 4 ++-- resources/assets/js/components/presenter/VideoPresenter.vue | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue index a936fd774..004f82edd 100644 --- a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue +++ b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue @@ -14,7 +14,7 @@ > -
    -
    @@ -21,6 +21,6 @@ \ No newline at end of file From 24ff1767442b2cf1f8619e1f3c69c5e8eeb058ed Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 20:56:44 -0600 Subject: [PATCH 23/52] Update Autolinker --- app/Util/Lexer/Autolink.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Util/Lexer/Autolink.php b/app/Util/Lexer/Autolink.php index 285ff65da..4ec8c2ef7 100755 --- a/app/Util/Lexer/Autolink.php +++ b/app/Util/Lexer/Autolink.php @@ -418,7 +418,7 @@ class Autolink extends Regex if(Str::startsWith($entity['screen_name'], '@')) { $text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex); } else { - $text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex + 1); + $text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex); } } else { $text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex); @@ -708,16 +708,17 @@ class Autolink extends Regex { $attributes = []; + $screen_name = $entity['screen_name']; if (!empty($entity['list_slug'])) { // Replace the list and username - $linkText = $entity['screen_name']; + $linkText = Str::startsWith($screen_name, '@') ? $screen_name : '@'.$screen_name; $class = $this->class_list; - $url = $this->url_base_list.$linkText; + $url = $this->url_base_list.$screen_name; } else { // Replace the username - $linkText = $entity['screen_name']; + $linkText = Str::startsWith($screen_name, '@') ? $screen_name : '@'.$screen_name; $class = $this->class_user; - $url = $this->url_base_user.$linkText; + $url = $this->url_base_user.$screen_name;; } if (!empty($class)) { $attributes['class'] = $class; From 52b5eab9b7a6dc4796ea646ac956f98d9bad1a5b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 20:57:08 -0600 Subject: [PATCH 24/52] Update Autolinker test --- tests/Unit/Lexer/StatusLexerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/Lexer/StatusLexerTest.php b/tests/Unit/Lexer/StatusLexerTest.php index fb25ee306..84437d9e5 100644 --- a/tests/Unit/Lexer/StatusLexerTest.php +++ b/tests/Unit/Lexer/StatusLexerTest.php @@ -59,7 +59,7 @@ class StatusLexerTest extends TestCase public function testAutolink() { - $expected = '@pixelfed hi, really like the website! #píxelfed'; + $expected = '@pixelfed hi, really like the website! #píxelfed'; $this->assertEquals($this->autolink, $expected); } From a7b3174b1c04bf93d7fa99369a67f8321a1240d1 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 23:06:20 -0600 Subject: [PATCH 25/52] Update InternalApiController --- app/Http/Controllers/InternalApiController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index d88edcb11..5ed7bbafe 100644 --- a/app/Http/Controllers/InternalApiController.php +++ b/app/Http/Controllers/InternalApiController.php @@ -106,7 +106,12 @@ class InternalApiController extends Controller }); $following = array_merge($following, $filters); - $posts = Status::select('id', 'caption', 'profile_id') + $posts = Status::select( + 'id', + 'caption', + 'profile_id', + 'type' + ) ->whereNull('uri') ->whereHas('media') ->whereHas('profile', function($q) { @@ -123,6 +128,7 @@ class InternalApiController extends Controller $res = [ 'posts' => $posts->map(function($post) { return [ + 'type' => $post->type, 'url' => $post->url(), 'thumb' => $post->thumb(), ]; From 7400c04e4a17dcf55f2905ef3d087b9f98517583 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 27 May 2019 23:07:03 -0600 Subject: [PATCH 26/52] Update LoopComponent.vue --- resources/assets/js/components/LoopComponent.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/assets/js/components/LoopComponent.vue b/resources/assets/js/components/LoopComponent.vue index c3bfe3dfb..80e3dcb12 100644 --- a/resources/assets/js/components/LoopComponent.vue +++ b/resources/assets/js/components/LoopComponent.vue @@ -10,7 +10,7 @@
    -
    +
    @@ -39,7 +39,6 @@