From 5ef7936b48950377bad907f2d05ab2b53df1c931 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:18:23 -0600 Subject: [PATCH 01/59] Update BaseApiController --- app/Http/Controllers/Api/BaseApiController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index a18efa5d2..6fa1073f2 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -59,14 +59,11 @@ class BaseApiController extends Controller $res = $this->fractal->createData($resource)->toArray(); } else { $this->validate($request, [ - 'page' => 'nullable|integer|min:1', + 'page' => 'nullable|integer|min:1|max:10', 'limit' => 'nullable|integer|min:1|max:10' ]); $limit = $request->input('limit') ?? 10; $page = $request->input('page') ?? 1; - if($page > 3) { - return response()->json([]); - } $end = (int) $page * $limit; $start = (int) $end - $limit; $res = NotificationService::get($pid, $start, $end); From 9d7943a9ded7e1368472c9da43145d62cdbba8bb Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:22:35 -0600 Subject: [PATCH 02/59] Add StatusHashtagTransformer --- .../Api/StatusHashtagTransformer.php | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 app/Transformer/Api/StatusHashtagTransformer.php diff --git a/app/Transformer/Api/StatusHashtagTransformer.php b/app/Transformer/Api/StatusHashtagTransformer.php new file mode 100644 index 000000000..a0874af7a --- /dev/null +++ b/app/Transformer/Api/StatusHashtagTransformer.php @@ -0,0 +1,35 @@ +hashtag; + $status = $statusHashtag->status; + $profile = $statusHashtag->profile; + + return [ + 'status' => [ + 'type' => $status->type, + 'url' => $status->url(), + 'thumb' => $status->thumb(), + 'sensitive' => (bool) $status->is_nsfw, + 'like_count' => $status->likes_count, + 'share_count' => $status->reblogs_count, + 'user' => [ + 'username' => $profile->username, + 'url' => $profile->url(), + ] + ], + 'hashtag' => [ + 'name' => $hashtag->name, + 'url' => $hashtag->url(), + ] + ]; + } +} From 468a4203ca223fba771688cafac247d41d6b210b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:27:27 -0600 Subject: [PATCH 03/59] Add StatusHashtagService --- app/Services/StatusHashtagService.php | 73 +++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 app/Services/StatusHashtagService.php diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php new file mode 100644 index 000000000..0c5120726 --- /dev/null +++ b/app/Services/StatusHashtagService.php @@ -0,0 +1,73 @@ + 2000 ? 2000 : $stop; + $ids = Redis::zrangebyscore($key, $start, $stop); + if(empty($ids)) { + $ids = self::coldGet($id, $start, $stop); + } + foreach($ids as $statusId) { + $res->push(self::getStatus($statusId, $id)); + } + return $res; + } + + public static function coldGet($id, $start = 0, $stop = 2000) + { + $stop = $stop > 2000 ? 2000 : $stop; + $ids = StatusHashtag::whereHashtagId($id) + ->latest() + ->skip($start) + ->take($stop) + ->pluck('status_id'); + foreach($ids as $key) { + self::set($id, $key); + } + return $ids; + } + + public static function set($key, $val) + { + return Redis::zadd(self::CACHE_KEY . $key, $val, $val); + } + + public static function del($key) + { + return Redis::zrem(self::CACHE_KEY . $key, $val); + } + + public static function count($id) + { + return Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf'); + } + + public static function getStatus($statusId, $hashtagId) + { + return Cache::remember('pf:services:status-hashtag:post:'.$statusId.':hashtag:'.$hashtagId, now()->addMonths(3), function() use($statusId, $hashtagId) { + $statusHashtag = StatusHashtag::with('profile', 'status', 'hashtag') + ->whereStatusId($statusId) + ->whereHashtagId($hashtagId) + ->first(); + $fractal = new Fractal\Manager(); + $fractal->setSerializer(new ArraySerializer()); + $resource = new Fractal\Resource\Item($statusHashtag, new StatusHashtagTransformer()); + return $fractal->createData($resource)->toArray(); + }); + } +} \ No newline at end of file From 9d55d65b58392b6b780a871355a014247596221e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:38:26 -0600 Subject: [PATCH 04/59] Add StatusHashtagObserver --- app/Observers/StatusHashtagObserver.php | 64 +++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 app/Observers/StatusHashtagObserver.php diff --git a/app/Observers/StatusHashtagObserver.php b/app/Observers/StatusHashtagObserver.php new file mode 100644 index 000000000..51832bcb8 --- /dev/null +++ b/app/Observers/StatusHashtagObserver.php @@ -0,0 +1,64 @@ +hashtag_id, $hashtag->status_id); + } + + /** + * Handle the notification "updated" event. + * + * @param \App\Notification $notification + * @return void + */ + public function updated(StatusHashtag $hashtag) + { + StatusHashtagService::set($hashtag->hashtag_id, $hashtag->status_id); + } + + /** + * Handle the notification "deleted" event. + * + * @param \App\Notification $notification + * @return void + */ + public function deleted(StatusHashtag $hashtag) + { + StatusHashtagService::del($hashtag->hashtag_id, $hashtag->status_id); + } + + /** + * Handle the notification "restored" event. + * + * @param \App\Notification $notification + * @return void + */ + public function restored(StatusHashtag $hashtag) + { + StatusHashtagService::set($hashtag->hashtag_id, $hashtag->status_id); + } + + /** + * Handle the notification "force deleted" event. + * + * @param \App\Notification $notification + * @return void + */ + public function forceDeleted(StatusHashtag $hashtag) + { + StatusHashtagService::del($hashtag->hashtag_id, $hashtag->status_id); + } +} From dea1e916cf6c39b7638d8977a09f612a3cb2fc52 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:39:00 -0600 Subject: [PATCH 05/59] Add StatusHashtag Observer to AppServiceProvider --- app/Providers/AppServiceProvider.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index cf52e7fd4..6bfe29459 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -5,11 +5,13 @@ namespace App\Providers; use App\Observers\{ AvatarObserver, NotificationObserver, + StatusHashtagObserver, UserObserver }; use App\{ Avatar, Notification, + StatusHashtag, User }; use Auth, Horizon, URL; @@ -31,6 +33,7 @@ class AppServiceProvider extends ServiceProvider Avatar::observe(AvatarObserver::class); Notification::observe(NotificationObserver::class); + StatusHashtag::observe(StatusHashtagObserver::class); User::observe(UserObserver::class); Horizon::auth(function ($request) { From 1980ec025d8c06d48350ded4000f9e3793bfb873 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:41:55 -0600 Subject: [PATCH 06/59] Remove deprecated timeline views --- .../views/timeline/partial/new-form.blade.php | 82 ----------- resources/views/timeline/personal.blade.php | 68 --------- resources/views/timeline/public.blade.php | 59 -------- resources/views/timeline/template.blade.php | 132 ------------------ 4 files changed, 341 deletions(-) delete mode 100644 resources/views/timeline/partial/new-form.blade.php delete mode 100644 resources/views/timeline/personal.blade.php delete mode 100644 resources/views/timeline/public.blade.php delete mode 100644 resources/views/timeline/template.blade.php diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php deleted file mode 100644 index 3dfd37e79..000000000 --- a/resources/views/timeline/partial/new-form.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -
-
-
{{__('Create New Post')}}
-
-
- -
- @csrf - - -
-
- - -
- - Max Size: @maxFileSize(). Supported formats: jpeg, png, gif, bmp. Limited to {{config('pixelfed.max_album_length')}} photos per post. - -
-
- -

- 0 - / - {{config('pixelfed.max_caption_length')}} -

-
-
- -
-
- -
- -
- - Set the visibility of this post. - -
-
- -
- - -
- - Please mark all NSFW and controversial content, as per our content policy. - -
-
- -
- -
- - No filter selected. - -
-
- - -
-
-
- -
-
-
\ No newline at end of file diff --git a/resources/views/timeline/personal.blade.php b/resources/views/timeline/personal.blade.php deleted file mode 100644 index 016727e58..000000000 --- a/resources/views/timeline/personal.blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@extends('layouts.app') - -@push('scripts') - -@endpush - -@section('content') - -
-
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - - @include('timeline.partial.new-form') - -
- @foreach($timeline as $item) - - @include('status.template') - - @endforeach - @if($timeline->count() == 0) -
-
-
-

{{ __('timeline.emptyPersonalTimeline') }}

-
-
-
- @endif -
- - - -
- {{$timeline->links()}} -
- -
-
- - -@endsection diff --git a/resources/views/timeline/public.blade.php b/resources/views/timeline/public.blade.php deleted file mode 100644 index a84e54bd5..000000000 --- a/resources/views/timeline/public.blade.php +++ /dev/null @@ -1,59 +0,0 @@ -@extends('layouts.app') - -@push('scripts') - -@endpush - -@section('content') - -
-
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - - @include('timeline.partial.new-form') - -
- @foreach($timeline as $item) - - @include('status.template') - - @endforeach -
- - - -
- {{$timeline->links()}} -
- -
-
- - -@endsection diff --git a/resources/views/timeline/template.blade.php b/resources/views/timeline/template.blade.php deleted file mode 100644 index 83737a4dd..000000000 --- a/resources/views/timeline/template.blade.php +++ /dev/null @@ -1,132 +0,0 @@ -@extends('layouts.app') - -@section('content') - - - -
-
-
- @if (session('status')) -
- {!! session('status') !!} -
- @endif - @if (session('error')) -
- {!! session('error') !!} -
- @endif - - -
- - @foreach($timeline as $item) - @if(is_null($item->in_reply_to_id)) - @include('status.template') - @endif - @endforeach - - @if($timeline->count() == 0) -
-
-
-

{{ __('timeline.emptyPersonalTimeline') }}

-
-
-
- @endif -
- - - -
- {{$timeline->links()}} -
- -
-
-
- - {{Auth::user()->username}}'s avatar - -
-

@{{Auth::user()->username}}

-

{{Auth::user()->name}}

-
-
- -
- -
- - {{-- --}} - - -
-
-
- -@endsection - -@push('scripts') - -@endpush \ No newline at end of file From 09361db173744c57d6b32c3420dce5bfaa56aeaa Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jun 2019 22:49:44 -0600 Subject: [PATCH 07/59] Remove deprecated status views --- resources/views/status/show/album.blade.php | 104 ---------------- resources/views/status/show/photo.blade.php | 85 ------------- resources/views/status/show/sidebar.blade.php | 117 ------------------ resources/views/status/show/video.blade.php | 50 -------- resources/views/status/template.blade.php | 2 +- .../views/status/timeline/album.blade.php | 29 ----- .../views/status/timeline/photo.blade.php | 15 --- .../status/timeline/video-album.blade.php | 57 --------- .../views/status/timeline/video.blade.php | 19 --- 9 files changed, 1 insertion(+), 477 deletions(-) delete mode 100644 resources/views/status/show/album.blade.php delete mode 100644 resources/views/status/show/photo.blade.php delete mode 100644 resources/views/status/show/sidebar.blade.php delete mode 100644 resources/views/status/show/video.blade.php delete mode 100644 resources/views/status/timeline/album.blade.php delete mode 100644 resources/views/status/timeline/photo.blade.php delete mode 100644 resources/views/status/timeline/video-album.blade.php delete mode 100644 resources/views/status/timeline/video.blade.php diff --git a/resources/views/status/show/album.blade.php b/resources/views/status/show/album.blade.php deleted file mode 100644 index da71a6dcc..000000000 --- a/resources/views/status/show/album.blade.php +++ /dev/null @@ -1,104 +0,0 @@ -@extends('layouts.app',['title' => $user->username . " posted a photo: " . $status->likes_count . " likes, " . $status->comments_count . " comments" ]) - -@section('content') - -
-
-
-
- -
- -
-
- {{$user->username}} -
- -
-
- -
- Report - {{-- Embed --}} - @if(Auth::check()) - @if(Auth::user()->profile->id !== $status->profile->id) -
-
- @csrf - - - -
-
- @csrf - - - -
- @endif - @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) -
- {{-- Edit --}} -
- @csrf - - - -
- @endif - @endif - -
-
-
-
-
- @if($status->is_nsfw) -
- -

CW / NSFW / Hidden Media

-

(click to show)

- - @endif - - @if($status->is_nsfw) -
- @endif -
- @include('status.show.sidebar') -
-
-
- -@endsection - -@push('meta') - - - -@endpush diff --git a/resources/views/status/show/photo.blade.php b/resources/views/status/show/photo.blade.php deleted file mode 100644 index 7c3f34564..000000000 --- a/resources/views/status/show/photo.blade.php +++ /dev/null @@ -1,85 +0,0 @@ -@extends('layouts.app',['title' => $user->username . " posted a photo: " . $status->likes_count . " likes, " . $status->comments_count . " comments" ]) - -@section('content') - -
-
-
-
- -
- -
-
- {{$user->username}} -
- -
-
- -
- Report - {{-- Embed --}} - @if(Auth::check()) - @if(Auth::user()->profile->id !== $status->profile->id) -
-
- @csrf - - - -
-
- @csrf - - - -
- @endif - @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) -
- {{-- Edit --}} -
- @csrf - - - -
- @endif - @endif - -
-
-
-
-
- @if($status->is_nsfw && $status->media_count == 1) -
- -

CW / NSFW / Hidden Media

-

(click to show)

- - - - -
- @elseif(!$status->is_nsfw && $status->media_count == 1) -
- -
- @endif -
- @include('status.show.sidebar') -
-
-
- -@endsection - -@push('meta') - - - -@endpush diff --git a/resources/views/status/show/sidebar.blade.php b/resources/views/status/show/sidebar.blade.php deleted file mode 100644 index e524cb98d..000000000 --- a/resources/views/status/show/sidebar.blade.php +++ /dev/null @@ -1,117 +0,0 @@ -
-
- -
- -
-
- {{$user->username}} -
- -
-
- -
- Report - {{-- Embed --}} - @if(Auth::check()) - @if(Auth::user()->profile->id !== $status->profile->id) -
-
- @csrf - - - -
-
- @csrf - - - -
- @endif - @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) -
- {{-- Edit --}} -
- @csrf - - - -
- @endif - @endif - -
-
-
-
-
-
-
-

- {{$status->profile->username}} - {!! $status->rendered ?? e($status->caption) !!} -

-

View all comments

-
- @foreach($replies as $item) -

- {{ str_limit($item->profile->username, 15)}} - {!! $item->rendered ?? e($item->caption) !!} {{$item->created_at->diffForHumans(null, true, true ,true)}} -

- @endforeach -
-
-
-
-
- @if(Auth::check()) -
- @csrf - - -
-

- - - @endif - -
- @csrf - - -
- -
- -
- - {{$status->created_at->format('F j, Y')}} - -
-
-
-
-
- @csrf - - - -
-
-
diff --git a/resources/views/status/show/video.blade.php b/resources/views/status/show/video.blade.php deleted file mode 100644 index 5babc6f68..000000000 --- a/resources/views/status/show/video.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends('layouts.app',['title' => $user->username . " posted a photo: " . $status->likes_count . " likes, " . $status->comments_count . " comments" ]) - -@section('content') - -
-
-
-
- -
- -
-
- {{$user->username}} -
- -
-
- @if($status->is_nsfw && $status->media_count == 1) -
- -

CW / NSFW / Hidden Media

-

(click to show)

- -
- -
-
- @elseif(!$status->is_nsfw && $status->media_count == 1) -
- -
- @endif -
- @include('status.show.sidebar') -
-
-
- -@endsection - -@push('meta') - - - -@endpush diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index f9f66f23f..ebdc292fb 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -91,7 +91,7 @@ likes
-

+

{{$item->profile->username}} diff --git a/resources/views/status/timeline/album.blade.php b/resources/views/status/timeline/album.blade.php deleted file mode 100644 index f606d41c1..000000000 --- a/resources/views/status/timeline/album.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@if($status->is_nsfw) - -@else -

-@endif \ No newline at end of file diff --git a/resources/views/status/timeline/photo.blade.php b/resources/views/status/timeline/photo.blade.php deleted file mode 100644 index 9009b5d7f..000000000 --- a/resources/views/status/timeline/photo.blade.php +++ /dev/null @@ -1,15 +0,0 @@ -@if($status->is_nsfw) -
- -

CW / NSFW / Hidden Media

-

(click to show)

- - - - -
-@else -
- -
-@endif \ No newline at end of file diff --git a/resources/views/status/timeline/video-album.blade.php b/resources/views/status/timeline/video-album.blade.php deleted file mode 100644 index 684bd2d34..000000000 --- a/resources/views/status/timeline/video-album.blade.php +++ /dev/null @@ -1,57 +0,0 @@ -@if($status->is_nsfw) - -@else - -@endif \ No newline at end of file diff --git a/resources/views/status/timeline/video.blade.php b/resources/views/status/timeline/video.blade.php deleted file mode 100644 index e0f4245ef..000000000 --- a/resources/views/status/timeline/video.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@if($status->is_nsfw) -
- -

CW / NSFW / Hidden Media

-

(click to show)

- -
- -
-
-@else -
- -
-@endif \ No newline at end of file From 7591eadbd19cea17d5fa47f87d33da1dc73452c2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 1 Jul 2019 21:52:29 -0600 Subject: [PATCH 08/59] Update Hashtag limit --- app/Jobs/StatusPipeline/StatusEntityLexer.php | 3 +++ app/Util/Lexer/Extractor.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php index ecad11e1e..beda89bd5 100644 --- a/app/Jobs/StatusPipeline/StatusEntityLexer.php +++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php @@ -89,6 +89,9 @@ class StatusEntityLexer implements ShouldQueue $status = $this->status; foreach ($tags as $tag) { + if(mb_strlen($tag) > 124) { + continue; + } DB::transaction(function () use ($status, $tag) { $slug = str_slug($tag, '-', false); $hashtag = Hashtag::firstOrCreate( diff --git a/app/Util/Lexer/Extractor.php b/app/Util/Lexer/Extractor.php index 9e194b068..bcdbba919 100755 --- a/app/Util/Lexer/Extractor.php +++ b/app/Util/Lexer/Extractor.php @@ -264,7 +264,9 @@ class Extractor extends Regex if (preg_match(self::$patterns['end_hashtag_match'], $outer[0])) { continue; } - + if(mb_strlen($hashtag[0]) > 124) { + continue; + } $tags[] = [ 'hashtag' => $hashtag[0], 'indices' => [$start_position, $end_position], From 7ffb4c4a450be192f3563bae898edb191c37cb4f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 1 Jul 2019 23:06:37 -0600 Subject: [PATCH 09/59] Update StatusHashtag model, add media relation --- app/StatusHashtag.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/StatusHashtag.php b/app/StatusHashtag.php index 15e282025..de67ebd6a 100644 --- a/app/StatusHashtag.php +++ b/app/StatusHashtag.php @@ -26,4 +26,16 @@ class StatusHashtag extends Model { return $this->belongsTo(Profile::class); } + + public function media() + { + return $this->hasManyThrough( + Media::class, + Status::class, + 'id', + 'status_id', + 'status_id', + 'id' + ); + } } From 914b0e49657d25ae0c8ea792f3967b92d7ce9a2c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 1 Jul 2019 23:13:43 -0600 Subject: [PATCH 10/59] Update StatusHashtagService --- app/Services/StatusHashtagService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index 0c5120726..4f876a68f 100644 --- a/app/Services/StatusHashtagService.php +++ b/app/Services/StatusHashtagService.php @@ -32,6 +32,7 @@ class StatusHashtagService { { $stop = $stop > 2000 ? 2000 : $stop; $ids = StatusHashtag::whereHashtagId($id) + ->whereHas('media') ->latest() ->skip($start) ->take($stop) From 4f9a88a77f6aafa58f8a731eb184472f70d2b2af Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 1 Jul 2019 23:14:01 -0600 Subject: [PATCH 11/59] Update StatusHashtagTransformer --- app/Transformer/Api/StatusHashtagTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Transformer/Api/StatusHashtagTransformer.php b/app/Transformer/Api/StatusHashtagTransformer.php index a0874af7a..62ccd2c75 100644 --- a/app/Transformer/Api/StatusHashtagTransformer.php +++ b/app/Transformer/Api/StatusHashtagTransformer.php @@ -12,12 +12,13 @@ class StatusHashtagTransformer extends Fractal\TransformerAbstract $hashtag = $statusHashtag->hashtag; $status = $statusHashtag->status; $profile = $statusHashtag->profile; - + return [ 'status' => [ 'type' => $status->type, 'url' => $status->url(), 'thumb' => $status->thumb(), + 'filter' => $status->firstMedia()->filter_class, 'sensitive' => (bool) $status->is_nsfw, 'like_count' => $status->likes_count, 'share_count' => $status->reblogs_count, From 58a19bbf0507cd988565f65ca54e6df71728e351 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 2 Jul 2019 00:33:58 -0600 Subject: [PATCH 12/59] Update StatusHashtagTransformer --- .../Api/StatusHashtagTransformer.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Transformer/Api/StatusHashtagTransformer.php b/app/Transformer/Api/StatusHashtagTransformer.php index 62ccd2c75..afe1712f8 100644 --- a/app/Transformer/Api/StatusHashtagTransformer.php +++ b/app/Transformer/Api/StatusHashtagTransformer.php @@ -15,21 +15,22 @@ class StatusHashtagTransformer extends Fractal\TransformerAbstract return [ 'status' => [ - 'type' => $status->type, - 'url' => $status->url(), - 'thumb' => $status->thumb(), - 'filter' => $status->firstMedia()->filter_class, - 'sensitive' => (bool) $status->is_nsfw, - 'like_count' => $status->likes_count, - 'share_count' => $status->reblogs_count, + 'id' => (int) $status->id, + 'type' => $status->type, + 'url' => $status->url(), + 'thumb' => $status->thumb(), + 'filter' => $status->firstMedia()->filter_class, + 'sensitive' => (bool) $status->is_nsfw, + 'like_count' => $status->likes_count, + 'share_count' => $status->reblogs_count, 'user' => [ 'username' => $profile->username, 'url' => $profile->url(), ] ], 'hashtag' => [ - 'name' => $hashtag->name, - 'url' => $hashtag->url(), + 'name' => $hashtag->name, + 'url' => $hashtag->url(), ] ]; } From 8a47b03a1b21a164e34ad76b15228009b349ec15 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 2 Jul 2019 00:34:28 -0600 Subject: [PATCH 13/59] Update StatusHashtagService --- app/Services/StatusHashtagService.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index 4f876a68f..76d0f47e3 100644 --- a/app/Services/StatusHashtagService.php +++ b/app/Services/StatusHashtagService.php @@ -18,9 +18,14 @@ class StatusHashtagService { $res = collect([]); $key = self::CACHE_KEY . $id; $stop = $stop > 2000 ? 2000 : $stop; - $ids = Redis::zrangebyscore($key, $start, $stop); + $ids = Redis::zrevrangebyscore($key, $start, $stop); if(empty($ids)) { - $ids = self::coldGet($id, $start, $stop); + if(self::count($id) == 0) { + $ids = self::coldGet($id, 0, 2000); + $ids = $ids->splice($start, $stop); + } else { + $ids = self::coldGet($id, $start, $stop); + } } foreach($ids as $statusId) { $res->push(self::getStatus($statusId, $id)); From eab5fceb9fb4946f262fe209e61e8e99e8b9f8d2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 4 Jul 2019 20:05:28 -0600 Subject: [PATCH 14/59] Update StatusHashtagService --- app/Services/StatusHashtagService.php | 34 +++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index 76d0f47e3..1cfcf4290 100644 --- a/app/Services/StatusHashtagService.php +++ b/app/Services/StatusHashtagService.php @@ -13,24 +13,18 @@ class StatusHashtagService { const CACHE_KEY = 'pf:services:status-hashtag:collection:'; - public static function get($id, $start = 0, $stop = 100) + public static function get($id, $page = 1, $stop = 9) { - $res = collect([]); - $key = self::CACHE_KEY . $id; - $stop = $stop > 2000 ? 2000 : $stop; - $ids = Redis::zrevrangebyscore($key, $start, $stop); - if(empty($ids)) { - if(self::count($id) == 0) { - $ids = self::coldGet($id, 0, 2000); - $ids = $ids->splice($start, $stop); - } else { - $ids = self::coldGet($id, $start, $stop); - } - } - foreach($ids as $statusId) { - $res->push(self::getStatus($statusId, $id)); - } - return $res; + return StatusHashtag::whereHashtagId($id) + ->whereHas('media') + ->skip($stop) + ->latest() + ->take(9) + ->pluck('status_id') + ->map(function ($i, $k) use ($id) { + return self::getStatus($i, $id); + }) + ->all(); } public static function coldGet($id, $start = 0, $stop = 2000) @@ -60,7 +54,11 @@ class StatusHashtagService { public static function count($id) { - return Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf'); + $count = Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf'); + if(empty($count)) { + $count = StatusHashtag::whereHashtagId($id)->count(); + } + return $count; } public static function getStatus($statusId, $hashtagId) From 6f783cac66b4d3e8ef116dc643ff06f792aea75f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 4 Jul 2019 20:21:20 -0600 Subject: [PATCH 15/59] Update DiscoverController --- app/Http/Controllers/DiscoverController.php | 72 ++++++--------------- 1 file changed, 21 insertions(+), 51 deletions(-) diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index bbc8d765c..0a4d67af9 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -17,6 +17,7 @@ use App\Transformer\Api\StatusStatelessTransformer; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; use League\Fractal\Pagination\IlluminatePaginatorAdapter; +use App\Services\StatusHashtagService; class DiscoverController extends Controller { @@ -37,56 +38,9 @@ class DiscoverController extends Controller public function showTags(Request $request, $hashtag) { abort_if(!Auth::check(), 403); - - $tag = Hashtag::whereSlug($hashtag) - ->firstOrFail(); - - $page = 1; - $key = 'discover:tag-'.$tag->id.':page-'.$page; - $keyMinutes = 15; - - $posts = Cache::remember($key, now()->addMinutes($keyMinutes), function() use ($tag, $request) { - $tags = StatusHashtag::select('status_id') - ->whereHashtagId($tag->id) - ->orderByDesc('id') - ->take(48) - ->pluck('status_id'); - - return Status::select( - 'id', - 'uri', - 'caption', - 'rendered', - 'profile_id', - 'type', - 'in_reply_to_id', - 'reblog_of_id', - 'is_nsfw', - 'scope', - 'local', - 'created_at', - 'updated_at' - )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) - ->with('media') - ->whereLocal(true) - ->whereNull('uri') - ->whereIn('id', $tags) - ->whereNull('in_reply_to_id') - ->whereNull('reblog_of_id') - ->whereNull('url') - ->whereNull('uri') - ->withCount(['likes', 'comments']) - ->whereIsNsfw(false) - ->whereVisibility('public') - ->orderBy('id', 'desc') - ->get(); - }); - - if($posts->count() == 0) { - abort(404); - } - - return view('discover.tags.show', compact('tag', 'posts')); + $tag = Hashtag::whereSlug($hashtag)->firstOrFail(); + $tagCount = StatusHashtagService::count($tag->id); + return view('discover.tags.show', compact('tag', 'tagCount')); } public function showCategory(Request $request, $slug) @@ -156,7 +110,6 @@ class DiscoverController extends Controller return $res; } - public function loopWatch(Request $request) { abort_if(!Auth::check(), 403); @@ -171,4 +124,21 @@ class DiscoverController extends Controller return response()->json(200); } + + public function getHashtags(Request $request) + { + abort_if(!Auth::check(), 403); + $this->validate($request, [ + 'hashtag' => 'required|alphanum|min:2|max:124', + 'page' => 'nullable|integer|min:1|max:19' + ]); + + $page = $request->input('page') ?? '1'; + $end = $page > 1 ? $page * 9 : 0; + $tag = $request->input('hashtag'); + + $hashtag = Hashtag::whereName($tag)->firstOrFail(); + $res = StatusHashtagService::get($hashtag->id, $page, $end); + return $res; + } } From 9ccada5b0b72f7599cac7cee8d232efc9db305f0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 4 Jul 2019 21:19:29 -0600 Subject: [PATCH 16/59] Update CW for comments --- resources/assets/js/components/PostComponent.vue | 11 +++++++---- resources/assets/js/components/PostMenu.vue | 14 ++++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 8ea58b59c..a0f786fa4 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -124,10 +124,13 @@
-
-

This comment may contain sensitive material

-

Show

-
+ + {{truncate(reply.account.username,15)}} + + This comment may contain sensitive material + Show + +

diff --git a/resources/assets/js/components/PostMenu.vue b/resources/assets/js/components/PostMenu.vue index dc5ab0933..b219978ad 100644 --- a/resources/assets/js/components/PostMenu.vue +++ b/resources/assets/js/components/PostMenu.vue @@ -6,8 +6,8 @@

Go to post - Share - Embed + Report @@ -54,8 +54,9 @@
Go to post - Share - Embed + + Hide Report Mute Profile @@ -157,6 +158,11 @@ $('#mt_pid_'+this.status.id).modal('hide'); }, + hidePost(status) { + status.sensitive = true; + $('#mt_pid_'+status.id).modal('hide'); + }, + moderatePost(status, action, $event) { let username = status.account.username; switch(action) { From 8bdab9bb6789a48eb21d08bddece14d7e6593ee8 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 4 Jul 2019 21:45:25 -0600 Subject: [PATCH 17/59] Add Hashtag.vue component --- resources/assets/js/components/Hashtag.vue | 113 +++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 resources/assets/js/components/Hashtag.vue diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue new file mode 100644 index 000000000..d7a839835 --- /dev/null +++ b/resources/assets/js/components/Hashtag.vue @@ -0,0 +1,113 @@ + + + \ No newline at end of file From d07c3deb86306e1c712d9dcafeeec6755b1eece7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 6 Jul 2019 20:51:23 -0600 Subject: [PATCH 18/59] Add HashtagFollow model, migration and controller --- app/HashtagFollow.php | 10 ++++++ .../Controllers/HashtagFollowController.php | 10 ++++++ ...05_034644_create_hashtag_follows_table.php | 35 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 app/HashtagFollow.php create mode 100644 app/Http/Controllers/HashtagFollowController.php create mode 100644 database/migrations/2019_07_05_034644_create_hashtag_follows_table.php diff --git a/app/HashtagFollow.php b/app/HashtagFollow.php new file mode 100644 index 000000000..5258520d6 --- /dev/null +++ b/app/HashtagFollow.php @@ -0,0 +1,10 @@ +bigIncrements('id'); + $table->bigInteger('user_id')->unsigned()->index(); + $table->bigInteger('profile_id')->unsigned()->index(); + $table->bigInteger('hashtag_id')->unsigned()->index(); + $table->unique(['user_id', 'profile_id', 'hashtag_id']); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('hashtag_follows'); + } +} From 2658385007d2259470ffcfc9fd46591126e3a624 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 6 Jul 2019 20:53:07 -0600 Subject: [PATCH 19/59] Update web routes --- routes/web.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/web.php b/routes/web.php index a7a591c21..5658952ed 100644 --- a/routes/web.php +++ b/routes/web.php @@ -106,6 +106,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('status/compose', 'InternalApiController@composePost')->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440'); Route::get('loops', 'DiscoverController@loopsApi'); Route::post('loops/watch', 'DiscoverController@loopWatch'); + Route::get('discover/tag', 'DiscoverController@getHashtags'); }); Route::group(['prefix' => 'local'], function () { Route::get('i/follow-suggestions', 'ApiController@followSuggestions'); From c480a5a0238e99fc6b09e5310b538f2e92d3ca17 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 6 Jul 2019 23:31:27 -0600 Subject: [PATCH 20/59] Update PostComponent, increase caption read more limit --- resources/assets/js/components/PostComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index a0f786fa4..431f48ea9 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -107,7 +107,7 @@
-

+

{{statusUsername}}

From f86fc83cbdec89399545561a7bb7857ef3db775c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 20:24:10 -0600 Subject: [PATCH 21/59] Update PublicApiController, fix bug that does not show private posts in home timeline --- app/Http/Controllers/PublicApiController.php | 6 ++++++ config/instance.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index dce50d009..bd22505e3 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -211,6 +211,10 @@ class PublicApiController extends Controller 'limit' => 'nullable|integer|max:20' ]); + if(config('instance.timeline.local.is_public') == false && !Auth::check()) { + abort(403, 'Authentication required.'); + } + $page = $request->input('page'); $min = $request->input('min_id'); $max = $request->input('max_id'); @@ -331,6 +335,8 @@ class PublicApiController extends Controller ->orWhere('status', '!=', null) ->pluck('id'); }); + + $private = $private->diff($following)->flatten(); $filters = UserFilter::whereUserId($pid) ->whereFilterableType('App\Profile') diff --git a/config/instance.php b/config/instance.php index 6fc04c902..9f4f249f6 100644 --- a/config/instance.php +++ b/config/instance.php @@ -11,5 +11,11 @@ return [ 'announcement' => [ 'enabled' => env('INSTANCE_ANNOUNCEMENT_ENABLED', true), 'message' => env('INSTANCE_ANNOUNCEMENT_MESSAGE', 'Example announcement message.
Something else here') + ], + + 'timeline' => [ + 'local' => [ + 'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false) + ] ] ]; \ No newline at end of file From f6663c7ded4f642ab89324bcc2b1df105046745e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 21:17:47 -0600 Subject: [PATCH 22/59] Update search results, fix status grid --- app/Http/Controllers/SearchController.php | 1 + resources/assets/js/components/SearchResults.vue | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 6c9d4b83c..fc336c301 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -143,6 +143,7 @@ class SearchController extends Controller 'tokens' => [$item->caption], 'name' => $item->caption, 'thumb' => $item->thumb(), + 'filter' => $item->firstMedia()->filter_class ]; }); $tokens['posts'] = $posts; diff --git a/resources/assets/js/components/SearchResults.vue b/resources/assets/js/components/SearchResults.vue index 321fdfbee..e93354190 100644 --- a/resources/assets/js/components/SearchResults.vue +++ b/resources/assets/js/components/SearchResults.vue @@ -67,15 +67,13 @@

Statuses

- -
- -
-

-

+
+ +
+
-
- + +
From 7282e428912e369dc853491aca01fabb2e9cd424 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 22:16:32 -0600 Subject: [PATCH 23/59] Update error pages --- resources/views/errors/404.blade.php | 10 +++------- resources/views/errors/500.blade.php | 11 +++-------- resources/views/errors/503.blade.php | 11 +++-------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 01a24eb2c..68094ba2e 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -2,13 +2,9 @@ @section('content')
-
-
-
-

Page Not Found

- -
-
+
+

Sorry, this page isn't available.

+

The link you followed may be broken, or the page may have been removed. Go back to Pixelfed.

@endsection diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index b163d53c9..ee7436b7d 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -2,14 +2,9 @@ @section('content')
-
-
-
-

Whoops! Something went wrong.

-

If you keep seeing this message, please contact an admin.

- -
-
+
+

Something went wrong

+

We cannot process your request at this time, please try again later. Go back to Pixelfed.

@endsection diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index c141503df..5f2c20583 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -2,14 +2,9 @@ @section('content')
-
-
-
-

Service Unavailable

-

Our services are in maintenance mode, please try again later.

- -
-
+
+

Service Unavailable

+

Our service is in maintenance mode, please try again later. Go back to Pixelfed.

@endsection From 9fbfab62b0ef93d52d17f3158b0b30c17f290549 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 22:25:24 -0600 Subject: [PATCH 24/59] Update Hashtag.vue component, add follow button --- resources/assets/js/components/Hashtag.vue | 96 +++++++++++++++++++--- 1 file changed, 84 insertions(+), 12 deletions(-) diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue index d7a839835..8ca2725cd 100644 --- a/resources/assets/js/components/Hashtag.vue +++ b/resources/assets/js/components/Hashtag.vue @@ -1,6 +1,6 @@ + + \ No newline at end of file From 1284a4050be566dd0f125ef6d7d33c6dca8ce85d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 22:26:25 -0600 Subject: [PATCH 25/59] Add hashtag.js resource --- resources/assets/js/hashtag.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 resources/assets/js/hashtag.js diff --git a/resources/assets/js/hashtag.js b/resources/assets/js/hashtag.js new file mode 100644 index 000000000..e4536789f --- /dev/null +++ b/resources/assets/js/hashtag.js @@ -0,0 +1,4 @@ +Vue.component( + 'hashtag-component', + require('./components/Hashtag.vue').default +); \ No newline at end of file From 45e4cbe65c2d439da0400f904a15b9ccdf48b1ed Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 22:26:44 -0600 Subject: [PATCH 26/59] Update webpack, add hashtag.js asset --- webpack.mix.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.mix.js b/webpack.mix.js index 5aaf91dd8..290529160 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -30,6 +30,7 @@ mix.js('resources/assets/js/app.js', 'public/js') .js('resources/assets/js/lib/ace/theme-monokai.js', 'public/js') // .js('resources/assets/js/embed.js', 'public') // .js('resources/assets/js/direct.js', 'public/js') +.js('resources/assets/js/hashtag.js', 'public/js') .extract([ 'lodash', 'popper.js', From db49f5e0529dc760b7fa00841765a84ebb9a2f36 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 22:27:55 -0600 Subject: [PATCH 27/59] Update HashtagFollowController, add store method --- .../Controllers/HashtagFollowController.php | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/HashtagFollowController.php b/app/Http/Controllers/HashtagFollowController.php index d597937b5..be47a9289 100644 --- a/app/Http/Controllers/HashtagFollowController.php +++ b/app/Http/Controllers/HashtagFollowController.php @@ -3,8 +3,48 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Auth; +use App\{ + Hashtag, + HashtagFollow, + Status +}; class HashtagFollowController extends Controller { - // + public function __construct() + { + $this->middleware('auth'); + } + + public function store(Request $request) + { + $this->validate($request, [ + 'name' => 'required|alpha_num|min:1|max:124|exists:hashtags,name' + ]); + + $user = Auth::user(); + $profile = $user->profile; + $tag = $request->input('name'); + + $hashtag = Hashtag::whereName($tag)->firstOrFail(); + + $hashtagFollow = HashtagFollow::firstOrCreate([ + 'user_id' => $user->id, + 'profile_id' => $user->profile_id ?? $user->profile->id, + 'hashtag_id' => $hashtag->id + ]); + + if($hashtagFollow->wasRecentlyCreated) { + $state = 'created'; + // todo: send to HashtagFollowService + } else { + $state = 'deleted'; + $hashtagFollow->delete(); + } + + return [ + 'state' => $state + ]; + } } From f90cf7f6f768834feba4bab4144a3a4c128e67af Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:23:01 -0600 Subject: [PATCH 28/59] Update instance config, add optional public hashtags --- config/instance.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/config/instance.php b/config/instance.php index 9f4f249f6..15d1a400e 100644 --- a/config/instance.php +++ b/config/instance.php @@ -1,21 +1,33 @@ env('INSTANCE_CONTACT_EMAIL'), - - 'contact' => [ - 'enabled' => env('INSTANCE_CONTACT_FORM', false), - 'max_per_day' => env('INSTANCE_CONTACT_MAX_PER_DAY', 1), - ], 'announcement' => [ 'enabled' => env('INSTANCE_ANNOUNCEMENT_ENABLED', true), 'message' => env('INSTANCE_ANNOUNCEMENT_MESSAGE', 'Example announcement message.
Something else here') ], + 'contact' => [ + 'enabled' => env('INSTANCE_CONTACT_FORM', false), + 'max_per_day' => env('INSTANCE_CONTACT_MAX_PER_DAY', 1), + ], + + 'discover' => [ + 'loops' => [ + 'enabled' => false + ], + 'tags' => [ + 'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false) + ], + ], + + 'email' => env('INSTANCE_CONTACT_EMAIL'), + 'timeline' => [ 'local' => [ 'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false) ] - ] + ], + + ]; \ No newline at end of file From c7eb639a8e83f62b93c2587a66e446d96d46c102 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:25:59 -0600 Subject: [PATCH 29/59] Add new migration, add status visibility to StatusHashtag model --- ...us_visibility_to_status_hashtags_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2019_07_08_045824_add_status_visibility_to_status_hashtags_table.php diff --git a/database/migrations/2019_07_08_045824_add_status_visibility_to_status_hashtags_table.php b/database/migrations/2019_07_08_045824_add_status_visibility_to_status_hashtags_table.php new file mode 100644 index 000000000..fab19c210 --- /dev/null +++ b/database/migrations/2019_07_08_045824_add_status_visibility_to_status_hashtags_table.php @@ -0,0 +1,32 @@ +string('status_visibility')->nullable()->index()->after('profile_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('status_hashtags', function (Blueprint $table) { + $table->dropColumn('status_visibility'); + }); + } +} From 78d19ed847257b1d3e521abf04e0970a22696085 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:29:25 -0600 Subject: [PATCH 30/59] Update Hashtag.vue component, limit pagination for guests --- resources/assets/js/components/Hashtag.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue index 8ca2725cd..454c32a32 100644 --- a/resources/assets/js/components/Hashtag.vue +++ b/resources/assets/js/components/Hashtag.vue @@ -133,7 +133,7 @@ }, infiniteLoader($state) { - if(this.page > 19) { + if(this.page > (this.authenticated ? 19 : 3)) { $state.complete(); return; } From a0eb1f19068f08ec37e87e91f2b716a18f610d5c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:30:21 -0600 Subject: [PATCH 31/59] Update StatusHashtagTransformer, add scope to status --- app/Transformer/Api/StatusHashtagTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Transformer/Api/StatusHashtagTransformer.php b/app/Transformer/Api/StatusHashtagTransformer.php index afe1712f8..1dfdba3b9 100644 --- a/app/Transformer/Api/StatusHashtagTransformer.php +++ b/app/Transformer/Api/StatusHashtagTransformer.php @@ -26,7 +26,8 @@ class StatusHashtagTransformer extends Fractal\TransformerAbstract 'user' => [ 'username' => $profile->username, 'url' => $profile->url(), - ] + ], + 'visibility' => $status->visibility ?? $status->scope ], 'hashtag' => [ 'name' => $hashtag->name, From 39e58f60a2956616596ea2d94a58e58598ff0cfb Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:31:19 -0600 Subject: [PATCH 32/59] Update StatusHashtag model, add status_visibility to $fillable --- app/StatusHashtag.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/StatusHashtag.php b/app/StatusHashtag.php index de67ebd6a..cee8e39b9 100644 --- a/app/StatusHashtag.php +++ b/app/StatusHashtag.php @@ -9,7 +9,8 @@ class StatusHashtag extends Model public $fillable = [ 'status_id', 'hashtag_id', - 'profile_id' + 'profile_id', + 'status_visibility' ]; public function status() From 8ac2c9167c8f1bae97fe91d1237bb88706a6d02d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:32:05 -0600 Subject: [PATCH 33/59] Update StatusPipeline, add status_visibility to hashtag lexer --- app/Jobs/StatusPipeline/StatusEntityLexer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php index beda89bd5..197477672 100644 --- a/app/Jobs/StatusPipeline/StatusEntityLexer.php +++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php @@ -101,7 +101,8 @@ class StatusEntityLexer implements ShouldQueue [ 'status_id' => $status->id, 'hashtag_id' => $hashtag->id, - 'profile_id' => $status->profile_id + 'profile_id' => $status->profile_id, + 'status_visibility' => $status->visibility, ] ); }); From 76c480bf85cc0b3629fb5ff478f6b29f875b1c5d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:32:53 -0600 Subject: [PATCH 34/59] Update DeleteAccountPipeline to delete StatusHashtags --- app/Jobs/DeletePipeline/DeleteAccountPipeline.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php index ba265379d..06e8191a6 100644 --- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php +++ b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php @@ -80,8 +80,10 @@ class DeleteAccountPipeline implements ShouldQueue Bookmark::whereProfileId($user->profile->id)->forceDelete(); EmailVerification::whereUserId($user->id)->forceDelete(); - $id = $user->profile->id; + + StatusHashtag::whereProfileId($id)->delete(); + FollowRequest::whereFollowingId($id)->orWhere('follower_id', $id)->forceDelete(); Follower::whereProfileId($id)->orWhere('following_id', $id)->forceDelete(); From 521b5b5b073bd60579d60563e19aaab237e3b569 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:45:21 -0600 Subject: [PATCH 35/59] Add FixHashtags command --- app/Console/Commands/FixHashtags.php | 109 +++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 app/Console/Commands/FixHashtags.php diff --git a/app/Console/Commands/FixHashtags.php b/app/Console/Commands/FixHashtags.php new file mode 100644 index 000000000..3b51bb407 --- /dev/null +++ b/app/Console/Commands/FixHashtags.php @@ -0,0 +1,109 @@ +info(' ____ _ ______ __ '); + $this->info(' / __ \(_) _____ / / __/__ ____/ / '); + $this->info(' / /_/ / / |/_/ _ \/ / /_/ _ \/ __ / '); + $this->info(' / ____/ /> info(' /_/ /_/_/|_|\___/_/_/ \___/\__,_/ '); + $this->info(' '); + $this->info(' '); + $this->info('Pixelfed version: ' . config('pixelfed.version')); + $this->info(' '); + $this->info('Running Fix Hashtags command'); + $this->info(' '); + + $missingCount = StatusHashtag::doesntHave('status')->count(); + if($missingCount > 0) { + $this->info("Found {$missingCount} orphaned StatusHashtag records to delete ..."); + $this->info(' '); + $bar = $this->output->createProgressBar($missingCount); + $bar->start(); + foreach(StatusHashtag::doesntHave('status')->get() as $tag) { + $tag->delete(); + $bar->advance(); + } + $bar->finish(); + $this->info(' '); + } else { + $this->info(' '); + $this->info('Found no orphaned hashtags to delete!'); + } + + + $this->info(' '); + + $count = StatusHashtag::whereNull('status_visibility')->count(); + if($count > 0) { + $this->info("Found {$count} hashtags to fix ..."); + $this->info(' '); + } else { + $this->info('Found no hashtags to fix!'); + $this->info(' '); + return; + } + + $bar = $this->output->createProgressBar($count); + $bar->start(); + + StatusHashtag::with('status') + ->whereNull('status_visibility') + ->chunk(50, function($tags) use($bar) { + foreach($tags as $tag) { + if(!$tag->status || !$tag->status->scope) { + continue; + } + $tag->status_visibility = $tag->status->scope; + $tag->save(); + $bar->advance(); + } + }); + + $bar->finish(); + $this->info(' '); + $this->info(' '); + } +} From 46d4d256c592fe9a9d88b05c64bc359c4a3c9d4b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:45:49 -0600 Subject: [PATCH 36/59] Update StatusHashtagService, fix delete bug --- app/Services/StatusHashtagService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index 1cfcf4290..d9249b9f0 100644 --- a/app/Services/StatusHashtagService.php +++ b/app/Services/StatusHashtagService.php @@ -49,7 +49,7 @@ class StatusHashtagService { public static function del($key) { - return Redis::zrem(self::CACHE_KEY . $key, $val); + return Redis::zrem(self::CACHE_KEY . $key, $key); } public static function count($id) From 84cd4f1b57deceb535a755a11623cf329022146a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:49:55 -0600 Subject: [PATCH 37/59] Update discover tag blade view to use Hashtag.vue component --- resources/views/discover/tags/show.blade.php | 48 ++------------------ 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/resources/views/discover/tags/show.blade.php b/resources/views/discover/tags/show.blade.php index 00983bcc5..06a3ce6c3 100644 --- a/resources/views/discover/tags/show.blade.php +++ b/resources/views/discover/tags/show.blade.php @@ -1,53 +1,11 @@ @extends('layouts.app') @section('content') - -
- -
-
-
- -
-
-
-
-
- {{$tag->name}} -
-
-
-
-
-
- @foreach($posts as $status) -
- -
-
-
-
- - {{$status->likes_count}} - - - {{$status->comments_count}} - -
-
-
- -
- @endforeach -
-
-
- + @endsection @push('scripts') + - + @endpush \ No newline at end of file From 61c6d330a56fbdc775d9aa79f349ef22121564dc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:50:20 -0600 Subject: [PATCH 38/59] Update web routes, add hashtag subscribe route --- routes/web.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/web.php b/routes/web.php index 5658952ed..48e26387a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -112,6 +112,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('i/follow-suggestions', 'ApiController@followSuggestions'); Route::post('status/compose', 'InternalApiController@compose')->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440'); Route::get('exp/rec', 'ApiController@userRecommendations'); + Route::post('discover/tag/subscribe', 'HashtagFollowController@store'); }); }); From 9b07b423196479e5cb93c031087af9cd83060363 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:53:32 -0600 Subject: [PATCH 39/59] Update PostComponent --- resources/assets/js/components/PostComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 431f48ea9..27973c4d5 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -108,7 +108,7 @@

- {{statusUsername}} + {{statusUsername}}

From ec39939245de46b9c865326b7be6c422638b9241 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:54:28 -0600 Subject: [PATCH 40/59] Update Timeline.vue component --- resources/assets/js/components/Timeline.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index cb3be6da7..eecef5783 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -439,7 +439,9 @@ showReadMore: true, replyStatus: {}, replyText: '', - emoji: ['๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'] + emoji: ['๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'], + showHashtagPosts: true, + hashtagPosts: [] } }, From e8b2eb639499648237be2227a4fc01ea80499eee Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Jul 2019 23:59:02 -0600 Subject: [PATCH 41/59] Update compiled assets --- public/js/direct.js | 1557 ------------------------------------ public/js/hashtag.js | 1 + public/js/loops.js | 2 +- public/js/mode-dot.js | 2 +- public/js/profile.js | 2 +- public/js/quill.js | 2 +- public/js/search.js | 2 +- public/js/status.js | 2 +- public/js/theme-monokai.js | 2 +- public/js/timeline.js | 2 +- public/js/vendor.js | 2 +- public/mix-manifest.json | 19 +- 12 files changed, 20 insertions(+), 1575 deletions(-) delete mode 100644 public/js/direct.js create mode 100644 public/js/hashtag.js diff --git a/public/js/direct.js b/public/js/direct.js deleted file mode 100644 index 3c9c23974..000000000 --- a/public/js/direct.js +++ /dev/null @@ -1,1557 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) { -/******/ return installedModules[moduleId].exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); -/******/ } -/******/ }; -/******/ -/******/ // define __esModule on exports -/******/ __webpack_require__.r = function(exports) { -/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { -/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); -/******/ } -/******/ Object.defineProperty(exports, '__esModule', { value: true }); -/******/ }; -/******/ -/******/ // create a fake namespace object -/******/ // mode & 1: value is a module id, require it -/******/ // mode & 2: merge all properties of value into the ns -/******/ // mode & 4: return value when already ns object -/******/ // mode & 8|1: behave like require -/******/ __webpack_require__.t = function(value, mode) { -/******/ if(mode & 1) value = __webpack_require__(value); -/******/ if(mode & 8) return value; -/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; -/******/ var ns = Object.create(null); -/******/ __webpack_require__.r(ns); -/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); -/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); -/******/ return ns; -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = "/"; -/******/ -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 10); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/assets/js/components/Direct.vue?vue&type=script&lang=js&": -/*!************************************************************************************************************************************************************************!*\ - !*** ./node_modules/babel-loader/lib??ref--4-0!./node_modules/vue-loader/lib??vue-loader-options!./resources/assets/js/components/Direct.vue?vue&type=script&lang=js& ***! - \************************************************************************************************************************************************************************/ -/*! exports provided: default */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -/* harmony default export */ __webpack_exports__["default"] = ({ - data: function data() { - return { - threads: [], - thread: false - }; - }, - mounted: function mounted() {}, - methods: {} -}); - -/***/ }), - -/***/ "./node_modules/css-loader/index.js?!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/assets/js/components/Direct.vue?vue&type=style&index=0&id=96e9d740&scoped=true&lang=css&": -/*!*******************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/css-loader??ref--8-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--8-2!./node_modules/vue-loader/lib??vue-loader-options!./resources/assets/js/components/Direct.vue?vue&type=style&index=0&id=96e9d740&scoped=true&lang=css& ***! - \*******************************************************************************************************************************************************************************************************************************************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); -// imports - - -// module -exports.push([module.i, "\n.chat.card[data-v-96e9d740] {\n\theight: 500px;\n\tbackground-color: rgba(0,0,0,0.4) !important;\n}\n.im-card[data-v-96e9d740] {\n\toverflow-y: auto;\n}\n.chat.card.card-header[data-v-96e9d740] {\n\tborder-bottom: 0 !important;\n}\n.chat.card.card-footer[data-v-96e9d740] {\n\tborder-top: 0 !important;\n}\n.im-input[data-v-96e9d740] {\n\tbackground-color: rgba(0,0,0,0.3) !important;\n\tborder: 0 !important;\n\tcolor: #fff !important;\n\theight: 60px !important;\n\toverflow-y: auto;\n}\n.im-input[data-v-96e9d740]:focus {\n\tbox-shadow: none !important;\n\toutline: 0px !important;\n}\n.im-picker[data-v-96e9d740] {\n\tborder-radius: 15px 0 0 15px !important;\n\tbackground-color: rgba(0,0,0,0.3) !important;\n\tborder: 0 !important;\n\tcolor: white !important;\n\tcursor: pointer;\n}\n.im-send[data-v-96e9d740] {\n\tborder-radius: 0 15px 15px 0 !important;\n\tbackground-color: rgba(0,0,0,0.3) !important;\n\tborder: 0 !important;\n\tcolor: white !important;\n\tcursor: pointer;\n}\n.im-msg-avatar[data-v-96e9d740],\n.im-avatar[data-v-96e9d740] {\n\theight: 40px;\n\twidth: 40px;\n}\n.im-bubble-to[data-v-96e9d740] {\n\tmargin-top: auto;\n\tmargin-bottom: auto;\n\tmargin-left: 10px;\n\tborder-radius: 5px;\n\tbackground-color: #E5E4E9;\n\tcolor: #363636;\n\tpadding: 10px;\n\tposition: relative;\n}\n.im-bubble-from[data-v-96e9d740] {\n\tmargin-top: auto;\n\tmargin-bottom: auto;\n\tmargin-right: 10px;\n\tborder-radius: 5px;\n\tbackground-color: #2095FE;\n\tcolor: #fff;\n\tpadding: 10px;\n\tposition: relative;\n}\n.im-ts[data-v-96e9d740] {\n\tposition: absolute;\n\tleft: 0;\n\tbottom: -15px;\n\tcolor: #cdcdcd;\n\tfont-size: 10px;\n}\n.im-ts-to[data-v-96e9d740] {\n\tposition: absolute;\n\tright: 0;\n\tbottom: -15px;\n\tcolor: #cdcdcd;\n\tfont-size: 10px;\n}\n", ""]); - -// exports - - -/***/ }), - -/***/ "./node_modules/css-loader/lib/css-base.js": -/*!*************************************************!*\ - !*** ./node_modules/css-loader/lib/css-base.js ***! - \*************************************************/ -/*! no static exports found */ -/***/ (function(module, exports) { - -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -// css base code, injected by the css-loader -module.exports = function(useSourceMap) { - var list = []; - - // return the list of modules as css string - list.toString = function toString() { - return this.map(function (item) { - var content = cssWithMappingToString(item, useSourceMap); - if(item[2]) { - return "@media " + item[2] + "{" + content + "}"; - } else { - return content; - } - }).join(""); - }; - - // import a list of modules into the list - list.i = function(modules, mediaQuery) { - if(typeof modules === "string") - modules = [[null, modules, ""]]; - var alreadyImportedModules = {}; - for(var i = 0; i < this.length; i++) { - var id = this[i][0]; - if(typeof id === "number") - alreadyImportedModules[id] = true; - } - for(i = 0; i < modules.length; i++) { - var item = modules[i]; - // skip already imported module - // this implementation is not 100% perfect for weird media query combinations - // when a module is imported multiple times with different media queries. - // I hope this will never occur (Hey this way we have smaller bundles) - if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) { - if(mediaQuery && !item[2]) { - item[2] = mediaQuery; - } else if(mediaQuery) { - item[2] = "(" + item[2] + ") and (" + mediaQuery + ")"; - } - list.push(item); - } - } - }; - return list; -}; - -function cssWithMappingToString(item, useSourceMap) { - var content = item[1] || ''; - var cssMapping = item[3]; - if (!cssMapping) { - return content; - } - - if (useSourceMap && typeof btoa === 'function') { - var sourceMapping = toComment(cssMapping); - var sourceURLs = cssMapping.sources.map(function (source) { - return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */' - }); - - return [content].concat(sourceURLs).concat([sourceMapping]).join('\n'); - } - - return [content].join('\n'); -} - -// Adapted from convert-source-map (MIT) -function toComment(sourceMap) { - // eslint-disable-next-line no-undef - var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))); - var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64; - - return '/*# ' + data + ' */'; -} - - -/***/ }), - -/***/ "./node_modules/style-loader/index.js!./node_modules/css-loader/index.js?!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/assets/js/components/Direct.vue?vue&type=style&index=0&id=96e9d740&scoped=true&lang=css&": -/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/style-loader!./node_modules/css-loader??ref--8-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--8-2!./node_modules/vue-loader/lib??vue-loader-options!./resources/assets/js/components/Direct.vue?vue&type=style&index=0&id=96e9d740&scoped=true&lang=css& ***! - \***********************************************************************************************************************************************************************************************************************************************************************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - - -var content = __webpack_require__(/*! !../../../../node_modules/css-loader??ref--8-1!../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../node_modules/postcss-loader/src??ref--8-2!../../../../node_modules/vue-loader/lib??vue-loader-options!./Direct.vue?vue&type=style&index=0&id=96e9d740&scoped=true&lang=css& */ "./node_modules/css-loader/index.js?!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/assets/js/components/Direct.vue?vue&type=style&index=0&id=96e9d740&scoped=true&lang=css&"); - -if(typeof content === 'string') content = [[module.i, content, '']]; - -var transform; -var insertInto; - - - -var options = {"hmr":true} - -options.transform = transform -options.insertInto = undefined; - -var update = __webpack_require__(/*! ../../../../node_modules/style-loader/lib/addStyles.js */ "./node_modules/style-loader/lib/addStyles.js")(content, options); - -if(content.locals) module.exports = content.locals; - -if(false) {} - -/***/ }), - -/***/ "./node_modules/style-loader/lib/addStyles.js": -/*!****************************************************!*\ - !*** ./node_modules/style-loader/lib/addStyles.js ***! - \****************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ - -var stylesInDom = {}; - -var memoize = function (fn) { - var memo; - - return function () { - if (typeof memo === "undefined") memo = fn.apply(this, arguments); - return memo; - }; -}; - -var isOldIE = memoize(function () { - // Test for IE <= 9 as proposed by Browserhacks - // @see http://browserhacks.com/#hack-e71d8692f65334173fee715c222cb805 - // Tests for existence of standard globals is to allow style-loader - // to operate correctly into non-standard environments - // @see https://github.com/webpack-contrib/style-loader/issues/177 - return window && document && document.all && !window.atob; -}); - -var getTarget = function (target, parent) { - if (parent){ - return parent.querySelector(target); - } - return document.querySelector(target); -}; - -var getElement = (function (fn) { - var memo = {}; - - return function(target, parent) { - // If passing function in options, then use it for resolve "head" element. - // Useful for Shadow Root style i.e - // { - // insertInto: function () { return document.querySelector("#foo").shadowRoot } - // } - if (typeof target === 'function') { - return target(); - } - if (typeof memo[target] === "undefined") { - var styleTarget = getTarget.call(this, target, parent); - // Special case to return head of iframe instead of iframe itself - if (window.HTMLIFrameElement && styleTarget instanceof window.HTMLIFrameElement) { - try { - // This will throw an exception if access to iframe is blocked - // due to cross-origin restrictions - styleTarget = styleTarget.contentDocument.head; - } catch(e) { - styleTarget = null; - } - } - memo[target] = styleTarget; - } - return memo[target] - }; -})(); - -var singleton = null; -var singletonCounter = 0; -var stylesInsertedAtTop = []; - -var fixUrls = __webpack_require__(/*! ./urls */ "./node_modules/style-loader/lib/urls.js"); - -module.exports = function(list, options) { - if (typeof DEBUG !== "undefined" && DEBUG) { - if (typeof document !== "object") throw new Error("The style-loader cannot be used in a non-browser environment"); - } - - options = options || {}; - - options.attrs = typeof options.attrs === "object" ? options.attrs : {}; - - // Force single-tag solution on IE6-9, which has a hard limit on the # of