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 | Bin 53888 -> 0 bytes public/js/hashtag.js | Bin 0 -> 12597 bytes public/js/loops.js | Bin 10158 -> 10159 bytes public/js/mode-dot.js | Bin 8315 -> 8315 bytes public/js/profile.js | Bin 61116 -> 60864 bytes public/js/quill.js | Bin 236018 -> 236018 bytes public/js/search.js | Bin 7747 -> 7663 bytes public/js/status.js | Bin 60562 -> 60503 bytes public/js/theme-monokai.js | Bin 3174 -> 3174 bytes public/js/timeline.js | Bin 62417 -> 62231 bytes public/js/vendor.js | Bin 353880 -> 353880 bytes public/mix-manifest.json | Bin 1355 -> 1419 bytes 12 files changed, 0 insertions(+), 0 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 3c9c239744854c452bc64b2be115de8b8bedd42c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53888 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 diff --git a/public/js/hashtag.js b/public/js/hashtag.js new file mode 100644 index 0000000000000000000000000000000000000000..1b4b1e56fa9c8d52769e098157d029c0700e83b8 GIT binary patch literal 12597 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 Lb%GXLBnbWq_39@% literal 0 HcmV?d00001 diff --git a/public/js/loops.js b/public/js/loops.js index 277aaf8d7140892b7e253993e9964f57d770e119..60a1c1ddb91809fa4129f10687d11a89c0749cfa 100644 GIT binary patch delta 13 UcmZ4Izutd>DU+eWMzaca03?e9ssI20 delta 12 TcmZ4Qzs`SxDWl~^^9pqUAkGAW diff --git a/public/js/mode-dot.js b/public/js/mode-dot.js index 95c1dd94b128127293aa7181238a4bbdc6560baa..9517e65d9cddb3b4cbf7ebf486dcfbbf4d26dc68 100644 GIT binary patch delta 12 TcmezE@Y`X68KdDwa~A~wC8Pwq delta 12 TcmezE@Y`X68Kc2Qa~A~wC7%Sk diff --git a/public/js/profile.js b/public/js/profile.js index 0ddcd0afec5e40d7a0b4a9255948c9abfb48c960..84b7d23c5b9e7d33a04d27db84f68fb02eeabb59 100644 GIT binary patch delta 270 zcmdmUm-)bL<_Tt;MzK28O8ORo!4vJJS(35~yeGzWZM5Fc#GF)VxcMJb(R3C!v+VrI z6Hd$VmL(P`WZD*MfR%5aKg*nXbK|^^vS3}4Kc4jEFfcMPO)*L`o9uSV0>NoJCBM07 zPc<(~Ub=Gt$e_)~Pc3FP%E(Mf4ahGpu}Uk=OD@UG&(kQ;tS-?jPR%RMEXgcOwN*6G zQPEIR&Mk>A$V`b>(k|H?cCL{T;+z9};wH=5a%^_IpwF~9=JI8($pPL+kdObHd!IG+B{Vdh&*MJOIcQmiZM4~YwmCDHHPJzeCD$yy)bOrF2Wa`J{fA{-_LX(`E; zi6)cJ?6E*_c=pP(s}v?y+K!v%Au$rCaxC)eLs;H}k( zF42oG(@+Y|NGzHxcqMZ32X6sBxTtGxQfkWN^LITqf4DS@YjVdWF&3yomC5y!1SbD` iWDF8y1*_Y9{_a73gj4EP$?yOTiZ;eZav<3ipXlZ!> diff --git a/public/js/quill.js b/public/js/quill.js index 4a8e134f1e3585e59cf7f768e33bed7ce2f1ad04..3c07d0bfa513d6914be5dd08a04d607ffa9bac56 100644 GIT binary patch delta 34 qcmeygneWqPz6oaR#<4ophK5$t-+MF5G)A^YGPXuCZH;7}ITHZwxD3+( delta 34 qcmeygneWqPz6oaRMzK28hK5$t-+MF5G)A^YGPXuCZH;7}ITHZwpA6Cf diff --git a/public/js/search.js b/public/js/search.js index e4c95d9cb343b041390c55d576103ace43eb1cf5..c7ff1bd3be2a0770bea0abe0e5dfbdad758fbddc 100644 GIT binary patch delta 306 zcmYj~O-sWt9LCx34aB1_AY&n?jy0uf-5?6{?!}9zvO}6CZ82?T^6y}j;a3p)Jp|d& zqX$2Z2hV~TQ}FQczz=@U^M3t#^*riCujB8dZSd`&X>YgsM3D&1Na$iqa_*{3$py-p z&4FcPrY#WrSTiH=(vRDlH3I z{*W16S1Bn$$fWkbaokuP_otj>07rW+mBxVKu+Rm;1)Rp JPqtsZyC3-HXvF{k delta 235 zcmaEFeb{D#8Kdz=^S@$~J%oEE^NL7KRuE*-(9O(E*Dc8}Pyo?sIi;B?N;-)pB}K(n z)x|~0R>gWH8Kt>NwY8J^d6Y#Hi&Aux@>41mN>VFIbdyu_N>YmyCI|3KNaQBz8YmR! zCg$Wo738^{Lb(9{r%2Kd=jsJ z6i?E!3MVy2l-V3z@MTXv?)C*+6Vi$Jw>fklQ(|Iw)B<@o3*e7LgSPQs7*3yUFvFFY z4sA=9jJb_$dlO-x!X#mL(-!oSUQml@;7&AvdP@oQxO~4m;P>c*BSwp!^IqbN9@mHu z;_DjFZ|1_oqj|6pC7!mO$KXzlDkm5<9wx>?xuu3+y9CD1^umMAPS}ZPGpQsw4CnGQ z1F&;S1wT9Lz}%(EhIKkLc+hXOz|QIcxb7f9@|=td{TkbLz+R@cZAW=@l*1E;S0* zZYZ;Csp{K+*E703Vk71*lu;5ny`d98ylL$+KhP+wVH*9pc;P z*KDt=qJu(s2qU2YD-?ugtXO~$W=3CUj51BcNZ@(PdDO=pJG%l2|$N$KEndY^PxhpDsgt@B0QFef10xZcH#yC^h%Z3?_x#+DeG*iVSQ8di;1sP8t zafn0In`@%%GovSOZ)5Oy!w!>mdU(~E3#QEy^!k1CUeJ9m7H3jJTZ0xqmMMXzHx?DL WT`vUa6Z!ISs;8%dGCQ44L-k+XiYXNU delta 920 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 Rcbxu*dnILAh<*M~_CM3VH68!} diff --git a/public/js/vendor.js b/public/js/vendor.js index 0cbfa2406f1b840c6e29f3d46d8fd02b408af39b..6a508774ad25fd2f90e57c30a608a9be946d74aa 100644 GIT binary patch delta 29 kcmca{M)bxR(Fsb%7 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index cbe51aa435e97632208065a0e60a7c55f8c1a9bd..0e9397f3b01259458d22eaebd8fba15670b6093d 100644 GIT binary patch delta 287 zcmYL^F-`+95Jd&MX_gWflxV96p^ZJZ$77_3f|HELHX)QthfoecgXEJ?Qc}}!B;3)y zSN!*XruU1FXGMjrMyIVLFO`V|(&y>-+#Ps5yzt|4T<5#%d3RiQ|K$ED?|m?_h=eHG zaAiZ9OnVr%N?5A5kl7TSy)NCmb{ZBHGC0aej%}#6B%)l}_i(EyA=d~YJ8(UNK-<#J z#;syvP2P7FGcwe`rL_Hcqab*VNt09(qF8JVwY_$M=xg%MKoE9)$zX)`HO9*%9-TNu dQ!389d42WNSUP?8&GRdEcf+wI41Pgor9qduTZfm**e=E zl2Z-xoQF(wQT6V!9=E$RU@~|FaRwSxkxAESyHCi9+BElxhF!}fqV@S7z+)nop&Cfk o6$i%p-Q+5|5m|2BURTf{(ONkw%P3Zx-0r9S54RmbM*si- From 5b713a1e0f31ab673336273fbb1403312cda535e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 00:04:02 -0600 Subject: [PATCH 42/59] Update DiscoverController --- app/Http/Controllers/DiscoverController.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 0a4d67af9..83322ecae 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -6,6 +6,7 @@ use App\{ DiscoverCategory, Follower, Hashtag, + HashtagFollow, Profile, Status, StatusHashtag, @@ -37,7 +38,8 @@ class DiscoverController extends Controller public function showTags(Request $request, $hashtag) { - abort_if(!Auth::check(), 403); + abort_if(!config('instance.discover.tags.is_public') && !Auth::check(), 403); + $tag = Hashtag::whereSlug($hashtag)->firstOrFail(); $tagCount = StatusHashtagService::count($tag->id); return view('discover.tags.show', compact('tag', 'tagCount')); @@ -127,10 +129,12 @@ class DiscoverController extends Controller public function getHashtags(Request $request) { - abort_if(!Auth::check(), 403); + $auth = Auth::check(); + abort_if(!config('instance.discover.tags.is_public') && $auth, 403); + $this->validate($request, [ 'hashtag' => 'required|alphanum|min:2|max:124', - 'page' => 'nullable|integer|min:1|max:19' + 'page' => 'nullable|integer|min:1|max:' . ($auth ? 19 : 3) ]); $page = $request->input('page') ?? '1'; @@ -138,7 +142,10 @@ class DiscoverController extends Controller $tag = $request->input('hashtag'); $hashtag = Hashtag::whereName($tag)->firstOrFail(); - $res = StatusHashtagService::get($hashtag->id, $page, $end); + $res['tags'] = StatusHashtagService::get($hashtag->id, $page, $end); + if($page == 1) { + $res['follows'] = HashtagFollow::whereUserId(Auth::id())->whereHashtagId($hashtag->id)->exists(); + } return $res; } } From d371c5a7decdf1159fbc045b9acd787443f15295 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 00:09:50 -0600 Subject: [PATCH 43/59] Update DiscoverController --- app/Http/Controllers/DiscoverController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 83322ecae..fb226c741 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -130,7 +130,7 @@ class DiscoverController extends Controller public function getHashtags(Request $request) { $auth = Auth::check(); - abort_if(!config('instance.discover.tags.is_public') && $auth, 403); + abort_if(!config('instance.discover.tags.is_public') && !$auth, 403); $this->validate($request, [ 'hashtag' => 'required|alphanum|min:2|max:124', From 3b457c7afec607748314972bd7923c1dccc08c1c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 00:13:46 -0600 Subject: [PATCH 44/59] Update HashtagFollow model --- app/HashtagFollow.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/HashtagFollow.php b/app/HashtagFollow.php index 5258520d6..74ff73074 100644 --- a/app/HashtagFollow.php +++ b/app/HashtagFollow.php @@ -6,5 +6,9 @@ use Illuminate\Database\Eloquent\Model; class HashtagFollow extends Model { - // + protected $fillable = [ + 'user_id', + 'profile_id', + 'hashtag_id' + ]; } From 9d0720e295b258df8774372fa56e8d5623fbfaa2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 00:14:20 -0600 Subject: [PATCH 45/59] Update error views --- resources/views/errors/400.blade.php | 10 ++++++++++ resources/views/errors/403.blade.php | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 resources/views/errors/400.blade.php create mode 100644 resources/views/errors/403.blade.php diff --git a/resources/views/errors/400.blade.php b/resources/views/errors/400.blade.php new file mode 100644 index 000000000..68094ba2e --- /dev/null +++ b/resources/views/errors/400.blade.php @@ -0,0 +1,10 @@ +@extends('layouts.app') + +@section('content') +
+
+

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/403.blade.php b/resources/views/errors/403.blade.php new file mode 100644 index 000000000..68094ba2e --- /dev/null +++ b/resources/views/errors/403.blade.php @@ -0,0 +1,10 @@ +@extends('layouts.app') + +@section('content') +
+
+

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 From cec1c118d545f73e8f6d23e50011cde538915fb3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 00:20:32 -0600 Subject: [PATCH 46/59] Update FixHashtags command --- app/Console/Commands/FixHashtags.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/FixHashtags.php b/app/Console/Commands/FixHashtags.php index 3b51bb407..dd292e6f5 100644 --- a/app/Console/Commands/FixHashtags.php +++ b/app/Console/Commands/FixHashtags.php @@ -56,13 +56,13 @@ class FixHashtags extends Command $this->info('Running Fix Hashtags command'); $this->info(' '); - $missingCount = StatusHashtag::doesntHave('status')->count(); + $missingCount = StatusHashtag::doesntHave('profile')->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) { + foreach(StatusHashtag::doesntHave('profile')->doesntHave('status')->get() as $tag) { $tag->delete(); $bar->advance(); } From 882f4aeba9b6825d7827dcda379174534c14556a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 20:09:49 -0600 Subject: [PATCH 47/59] Update Hashtag.vue component --- 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 454c32a32..7ba4d3715 100644 --- a/resources/assets/js/components/Hashtag.vue +++ b/resources/assets/js/components/Hashtag.vue @@ -100,7 +100,7 @@ data() { return { loaded: false, - page: 2, + page: 1, authenticated: false, following: false, tags: [], From 38d6b892562b64ca7584bf588216d4dde2a7fcb9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 20:10:18 -0600 Subject: [PATCH 48/59] Update compiled assets --- public/js/hashtag.js | Bin 12597 -> 12599 bytes public/mix-manifest.json | Bin 1419 -> 1419 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/hashtag.js b/public/js/hashtag.js index 1b4b1e56fa9c8d52769e098157d029c0700e83b8..e5b2ee8381fa28f440e964109e3c1fb3348c4ff8 100644 GIT binary patch delta 191 zcmdm*v^{CV873ANpHj!k%k_QOO)OHqof53_7@mK-0ac)VUxW?qU$UTIE_PM%J_j-sKaPNHr6 i=6-cvcEeZav<3jpEIir( delta 171 zcmdmVXp&@UXl}H*nVEwL0Gdq*jsO4v delta 33 ocmeC??&jW*&n#kUZfKdBoNR8HY+#s}mS|{UU}3nqnVEwL0HNav1poj5 From 16b93eb31502e6337cbe19e166ef44d89481276b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 20:16:09 -0600 Subject: [PATCH 49/59] Update Hashtag.vue component --- resources/assets/js/components/Hashtag.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue index 7ba4d3715..9d9c5fcd8 100644 --- a/resources/assets/js/components/Hashtag.vue +++ b/resources/assets/js/components/Hashtag.vue @@ -115,7 +115,8 @@ getResults() { axios.get('/api/v2/discover/tag', { params: { - hashtag: this.hashtag + hashtag: this.hashtag, + page: this.page } }).then(res => { let data = res.data; @@ -129,6 +130,7 @@ //this.top = tags.slice(6, 9); this.loaded = true; this.following = data.follows; + this.page++; }); }, From 1b9b29992711a1f22eff70bd8e04817f938ed828 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 20:16:24 -0600 Subject: [PATCH 50/59] Update DiscoverController --- app/Http/Controllers/DiscoverController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index fb226c741..1a0e6d23e 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -138,7 +138,7 @@ class DiscoverController extends Controller ]); $page = $request->input('page') ?? '1'; - $end = $page > 1 ? $page * 9 : 0; + $end = $page > 1 ? $page * 9 : 1; $tag = $request->input('hashtag'); $hashtag = Hashtag::whereName($tag)->firstOrFail(); From 3a2f72ddf4e3182db24d8d430211b9adb07ba80e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 20:16:44 -0600 Subject: [PATCH 51/59] Update compiled assets --- public/js/hashtag.js | Bin 12599 -> 12621 bytes public/mix-manifest.json | Bin 1419 -> 1419 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/hashtag.js b/public/js/hashtag.js index e5b2ee8381fa28f440e964109e3c1fb3348c4ff8..197c938428bc034e111b997ebb799238ac4709c6 100644 GIT binary patch delta 287 zcmdmbqr!-V>PV-8L~GclG<4&*QrD%B{_N!6^aP0cAztu9L}Qb?OTl|!C4%|1F-FF8LiIk7||ZSp}5 zR~98-ZG*|bSQX?zii&OXG?YN*Drs8h>E&q@Yw9J|>I9UfB~SjtDz{mKb3W7LYuwG7 zlX#Xhu>dt{Z|3FC1I{6N6d_A cn>n=D*(Q4%c=6WiL`NH%>KMev#%fvv0BZGL_5c6? diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b225f2df5823c85b55dd121bf1c985913875fe47..cd0f52292ff763316fe783ae01f6fd53a93048c2 100644 GIT binary patch delta 33 ocmeC??&jW*&n#kWlx&=6mSmV{U}9-vnPO~dkeIZ&nVEwL0G}QR`2YX_ delta 33 ocmeC??&jW*&n#kSXpn4fm}rz_m||>VXp&@UXl}H*nVEwL0Gdq*jsO4v From 9805cd841f77637ca7fb80568a8ea4e945e6986f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 21:46:00 -0600 Subject: [PATCH 52/59] Update HashtagFollow model, add hashtag relation --- app/HashtagFollow.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/HashtagFollow.php b/app/HashtagFollow.php index 74ff73074..0503330b0 100644 --- a/app/HashtagFollow.php +++ b/app/HashtagFollow.php @@ -11,4 +11,9 @@ class HashtagFollow extends Model 'profile_id', 'hashtag_id' ]; + + public function hashtag() + { + return $this->belongsTo(Hashtag::class); + } } From 869360a7445492c813b823c05a6a87742de6917c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 21:46:32 -0600 Subject: [PATCH 53/59] Update HashtagFollowerController, add getTags api method --- app/Http/Controllers/HashtagFollowController.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Http/Controllers/HashtagFollowController.php b/app/Http/Controllers/HashtagFollowController.php index be47a9289..585248abb 100644 --- a/app/Http/Controllers/HashtagFollowController.php +++ b/app/Http/Controllers/HashtagFollowController.php @@ -47,4 +47,15 @@ class HashtagFollowController extends Controller 'state' => $state ]; } + + public function getTags(Request $request) + { + return HashtagFollow::with('hashtag')->whereUserId(Auth::id()) + ->inRandomOrder() + ->take(3) + ->get() + ->map(function($follow, $k) { + return $follow->hashtag->name; + }); + } } From 8367e0cf489988b25509f6babddd204a79ba550c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 21:48:04 -0600 Subject: [PATCH 54/59] Update User RateLimits --- app/Util/RateLimit/User.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/Util/RateLimit/User.php b/app/Util/RateLimit/User.php index c93aa6c4f..f54c94d33 100644 --- a/app/Util/RateLimit/User.php +++ b/app/Util/RateLimit/User.php @@ -49,8 +49,23 @@ trait User { return 500; } + public function getMaxUserBansPerDayAttribute() + { + return 100; + } + public function getMaxInstanceBansPerDayAttribute() { return 100; } + + public function getMaxHashtagFollowsPerHourAttribute() + { + return 20; + } + + public function getMaxHashtagFollowsPerDayAttribute() + { + return 100; + } } \ No newline at end of file From c11a12edfa56266414070a674786a51d8bde60b4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 22:03:56 -0600 Subject: [PATCH 55/59] Update Timeline.vue component --- resources/assets/js/components/Timeline.vue | 57 ++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index eecef5783..1779d1dff 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -39,6 +39,33 @@
+ +
+
+ +
#{{hashtagPostsName}}
+ +
+
+
+ +
+
+
+
+ + {{tag.status.like_count}} + + + {{tag.status.share_count}} + +
+
+
+ +
+
+
@@ -440,8 +467,9 @@ replyStatus: {}, replyText: '', emoji: ['๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'], - showHashtagPosts: true, - hashtagPosts: [] + showHashtagPosts: false, + hashtagPosts: [], + hashtagPostsName: '', } }, @@ -544,6 +572,7 @@ this.max_id = Math.min(...ids); $('.timeline .pagination').removeClass('d-none'); this.loading = false; + this.fetchHashtagPosts(); }).catch(err => { }); }, @@ -1106,6 +1135,30 @@ } }, 10000); }); + }, + + fetchHashtagPosts() { + + axios.get('/api/local/discover/tag/list') + .then(res => { + let tags = res.data; + if(tags.length == 0) { + return; + } + let hashtag = tags[0]; + this.hashtagPostsName = hashtag; + axios.get('/api/v2/discover/tag', { + params: { + hashtag: hashtag + } + }).then(res => { + if(res.data.tags.length) { + this.showHashtagPosts = true; + this.hashtagPosts = res.data.tags.splice(0,3); + } + }) + }) + } } } From 9516eb33bc8d7cb8cc688659f0a8806932c60a7a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 22:04:17 -0600 Subject: [PATCH 56/59] Update web routes --- routes/web.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 48e26387a..f94072f89 100644 --- a/routes/web.php +++ b/routes/web.php @@ -112,7 +112,8 @@ 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'); + Route::post('discover/tag/subscribe', 'HashtagFollowController@store')->middleware('throttle:maxHashtagFollowsPerHour,60')->middleware('throttle:maxHashtagFollowsPerDay,1440');; + Route::get('discover/tag/list', 'HashtagFollowController@getTags'); }); }); From 1ff089e9a525daf7f5ca95544792fa7fcb0771a3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 22:04:33 -0600 Subject: [PATCH 57/59] Update compiled assets --- public/js/timeline.js | Bin 62231 -> 63994 bytes public/mix-manifest.json | Bin 1419 -> 1419 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/timeline.js b/public/js/timeline.js index b7bd32902e55e57f0f67ce6880d8eb89c662bce5..62a3690bcbeec2636f36ba9b5e138938b20d3667 100644 GIT binary patch delta 3834 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 T*+<_wufEB5x~#X3Hnry7ZRm%kcoQVky delta 32 ncmeC??&jW5%qn4QW^QC?X=IU@Vw#v_YGh_?WN4zqRm%kcjhqMS From 7262ca5f0d28a2afe116754cd887f042e32dfa3e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 22:34:42 -0600 Subject: [PATCH 58/59] Update hashtag help center page --- resources/views/site/help/hashtags.blade.php | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/resources/views/site/help/hashtags.blade.php b/resources/views/site/help/hashtags.blade.php index 85e68826c..13733e4ac 100644 --- a/resources/views/site/help/hashtags.blade.php +++ b/resources/views/site/help/hashtags.blade.php @@ -16,6 +16,43 @@
  • You can add up to 30 hashtags to your post or comment.
    • +
    +

    + +

    +
    +
      +
    • You can add hashtags to post captions, if the post is public the hashtag will be discoverable.
      • +
    • You can follow hashtags on Pixelfed to stay connected with interests you care about.
      • +
    +
    +
    +

    +

    + +

    +
    +

    You can follow hashtags on Pixelfed to stay connected with interests you care about.

    +

    To follow a hashtag:

    +
      +
    1. Tap any hashtag (example: #art) you see on Pixelfed.
      2. +
    2. Tap Follow. Once you follow a hashtag, you'll see its photos and videos appear in feed.
      3. +
    +

    To unfollow a hashtag, tap the hashtag and then tap Unfollow to confirm.

    +

    + You can follow up to 20 hashtags per hour or 100 per day. +

    +
    +
    +

    +
    +
    Hashtag Tips
    From 623e0c9adb1d988aab44173b604e8cdcbf4f60e1 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 Jul 2019 22:40:54 -0600 Subject: [PATCH 59/59] Update StatusHashtagService --- app/Services/StatusHashtagService.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php index d9249b9f0..7c5ed87bb 100644 --- a/app/Services/StatusHashtagService.php +++ b/app/Services/StatusHashtagService.php @@ -16,6 +16,7 @@ class StatusHashtagService { public static function get($id, $page = 1, $stop = 9) { return StatusHashtag::whereHashtagId($id) + ->whereStatusVisibility('public') ->whereHas('media') ->skip($stop) ->latest() @@ -31,6 +32,7 @@ class StatusHashtagService { { $stop = $stop > 2000 ? 2000 : $stop; $ids = StatusHashtag::whereHashtagId($id) + ->whereStatusVisibility('public') ->whereHas('media') ->latest() ->skip($start) @@ -65,6 +67,7 @@ class StatusHashtagService { { return Cache::remember('pf:services:status-hashtag:post:'.$statusId.':hashtag:'.$hashtagId, now()->addMonths(3), function() use($statusId, $hashtagId) { $statusHashtag = StatusHashtag::with('profile', 'status', 'hashtag') + ->whereStatusVisibility('public') ->whereStatusId($statusId) ->whereHashtagId($hashtagId) ->first();