From 0c59a55e6d4d1269d8aefba682e723d519d25041 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 11 Oct 2019 17:58:35 -0600 Subject: [PATCH 01/28] Update SharePipeline, federate self boosts --- app/Jobs/SharePipeline/SharePipeline.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php index b62c51268..c7328db38 100644 --- a/app/Jobs/SharePipeline/SharePipeline.php +++ b/app/Jobs/SharePipeline/SharePipeline.php @@ -61,7 +61,12 @@ class SharePipeline implements ShouldQueue ->whereItemType('App\Status') ->count(); - if ($target->id === $status->profile_id || $exists !== 0) { + if ($target->id === $status->profile_id) { + $this->remoteAnnounceDeliver(); + return true; + } + + if( $exists !== 0) { return true; } @@ -88,6 +93,9 @@ class SharePipeline implements ShouldQueue public function remoteAnnounceDeliver() { + if(config('federation.activitypub.enabled') == false) { + return true; + } $status = $this->status; $profile = $status->profile; From 5049d4d64f94011620aae8b839dd161217a234d0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 11 Oct 2019 18:01:26 -0600 Subject: [PATCH 02/28] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1f17569..0f0f6f01e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,14 @@ ### Added ### Fixed +- Fixed like and share/reblog count on profiles ([86cb7d09](https://github.com/pixelfed/pixelfed/commit/86cb7d09)) +- Fixed non federating self boosts ([0c59a55e](https://github.com/pixelfed/pixelfed/commit/0c59a55e)) ### Changed +- Update ComposeModal.vue, added a caption counter. Fixes [#1722](https://github.com/pixelfed/pixelfed/issues/1722). ([009c6ee8](https://github.com/pixelfed/pixelfed/commit/009c6ee8)) +- Updated Notifications to use the NotificationService ([f4039ce2](https://github.com/pixelfed/pixelfed/commit/f4039ce218f93a5578225dfdba66f0359c8fc72c)) + +## Deprecated ## [v0.10.6 (2019-09-30)](https://github.com/pixelfed/pixelfed/compare/v0.10.5...v0.10.6) From d8d11d7b9a7453367d165f9dcf17d19a3a89f6a4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 11 Oct 2019 22:13:32 -0600 Subject: [PATCH 03/28] Update PrivacySettings controller, clear cache after updating --- app/Http/Controllers/Settings/PrivacySettings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Settings/PrivacySettings.php b/app/Http/Controllers/Settings/PrivacySettings.php index 754258fc7..dff6636eb 100644 --- a/app/Http/Controllers/Settings/PrivacySettings.php +++ b/app/Http/Controllers/Settings/PrivacySettings.php @@ -66,6 +66,7 @@ trait PrivacySettings $settings->save(); } Cache::forget('profile:settings:' . $profile->id); + Cache::forget('user:account:id:' . $profile->user_id); return redirect(route('settings.privacy'))->with('status', 'Settings successfully updated!'); } From 73c08987030bfd9ead49f95530190350e7c4a909 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 11 Oct 2019 23:24:56 -0600 Subject: [PATCH 04/28] Update BaseApiController, add timestamp to signed media previews for client side cache invalidation --- app/Http/Controllers/Api/BaseApiController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 3d70d4b7f..cc48c08d6 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -192,7 +192,7 @@ class BaseApiController extends Controller ]); } - public function showTempMedia(Request $request, int $profileId, $mediaId) + public function showTempMedia(Request $request, int $profileId, $mediaId, $timestamp) { abort_if(!$request->user(), 403); abort_if(!$request->hasValidSignature(), 404); @@ -257,10 +257,9 @@ class BaseApiController extends Controller $media->save(); $url = URL::temporarySignedRoute( - 'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id] + 'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id, 'timestamp' => time()] ); - $preview_url = $url; switch ($media->mime) { case 'image/jpeg': case 'image/png': @@ -279,7 +278,7 @@ class BaseApiController extends Controller $resource = new Fractal\Resource\Item($media, new MediaTransformer()); $res = $this->fractal->createData($resource)->toArray(); - $res['preview_url'] = $preview_url; + $res['preview_url'] = $url; $res['url'] = $url; return response()->json($res); } From 97bd6ae2b112e45c21d6aeab848e1a3c21f213ae Mon Sep 17 00:00:00 2001 From: Hinaloe Date: Sat, 12 Oct 2019 17:33:59 +0900 Subject: [PATCH 05/28] composer prefer-dist instead of source --- contrib/docker/Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 162397168..4e089faed 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -44,7 +44,7 @@ COPY . /var/www/ WORKDIR /var/www/ RUN cp -r storage storage.skel \ && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ - && composer install --prefer-source --no-interaction \ + && composer install --prefer-dist --no-interaction \ && rm -rf html && ln -s public html VOLUME /var/www/storage /var/www/bootstrap From 5773434a131a12787ed507f2cb638708d62a0c75 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 21:31:57 -0600 Subject: [PATCH 06/28] Update AdminInstanceController, remove db transaction from instance scan --- .../Admin/AdminInstanceController.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Admin/AdminInstanceController.php b/app/Http/Controllers/Admin/AdminInstanceController.php index 5da2143f3..6dfa8d7bf 100644 --- a/app/Http/Controllers/Admin/AdminInstanceController.php +++ b/app/Http/Controllers/Admin/AdminInstanceController.php @@ -42,18 +42,18 @@ trait AdminInstanceController public function instanceScan(Request $request) { - DB::transaction(function() { - Profile::select('domain')->whereNotNull('domain') - ->groupBy('id') - ->groupBy('domain') - ->chunk(50, function($domains) { - foreach($domains as $domain) { - Instance::firstOrCreate([ - 'domain' => $domain->domain - ]); - } - }); + Profile::whereNotNull('domain') + ->latest() + ->groupBy('domain') + ->where('created_at', '>', now()->subMonths(2)) + ->chunk(100, function($domains) { + foreach($domains as $domain) { + Instance::firstOrCreate([ + 'domain' => $domain->domain + ]); + } }); + return redirect()->back(); } From bad2ecde56d90e74ce67bd9b6c89ded8540b0af0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 21:33:42 -0600 Subject: [PATCH 07/28] Update BaseApiController, add drafts method for Camera Roll --- .../Controllers/Api/BaseApiController.php | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index cc48c08d6..55f1aef94 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -20,6 +20,7 @@ use App\Transformer\Api\{ AccountTransformer, NotificationTransformer, MediaTransformer, + MediaDraftTransformer, StatusTransformer }; use League\Fractal; @@ -307,8 +308,9 @@ class BaseApiController extends Controller public function verifyCredentials(Request $request) { - abort_if(!$request->user(), 403); - $id = Auth::id(); + $user = $request->user(); + abort_if(!$user, 403); + $id = $user->id; $res = Cache::remember('user:account:id:'.$id, now()->addHours(6), function() use($id) { $profile = Profile::whereNull('status')->whereUserId($id)->firstOrFail(); @@ -319,4 +321,19 @@ class BaseApiController extends Controller return response()->json($res); } + + public function drafts(Request $request) + { + $user = $request->user(); + abort_if(!$request->user(), 403); + + $medias = Media::whereUserId($user->id) + ->whereNull('status_id') + ->latest() + ->take(13) + ->get(); + $resource = new Fractal\Resource\Collection($medias, new MediaDraftTransformer()); + $res = $this->fractal->createData($resource)->toArray(); + return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); + } } From 0e611d006fe7d1950c8500a2ffada09401957b16 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 22:24:18 -0600 Subject: [PATCH 08/28] Update Help Center view, add outdated warning --- resources/views/site/help/partial/template.blade.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/site/help/partial/template.blade.php b/resources/views/site/help/partial/template.blade.php index 72646709b..3d309998b 100644 --- a/resources/views/site/help/partial/template.blade.php +++ b/resources/views/site/help/partial/template.blade.php @@ -3,6 +3,12 @@ @section('content')
+
+
+

Some sections may contain out of date information

+

We apologize for any inconvenience, we are working on updating the Help Center.

+
+
From ebb998d296f4ce1cb9ea78f7c9de4e887cf4bf42 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 22:33:41 -0600 Subject: [PATCH 09/28] Update language view --- resources/views/site/language.blade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/views/site/language.blade.php b/resources/views/site/language.blade.php index 71c77ba31..6244a523a 100644 --- a/resources/views/site/language.blade.php +++ b/resources/views/site/language.blade.php @@ -9,7 +9,10 @@
@foreach(App\Util\Localization\Localization::languages() as $lang)
- {{locale_get_display_language($lang, $lang)}} + + {{locale_get_display_language($lang, $lang)}} + ({{locale_get_display_language($lang, 'en')}}) +
@endforeach
From f09b6573f6df8cdecbbf10dde0e96cff5fd432c4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 22:53:53 -0600 Subject: [PATCH 10/28] Update web routes --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 3db79f6ad..07dcb0e40 100644 --- a/routes/web.php +++ b/routes/web.php @@ -198,7 +198,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('auth/checkpoint', 'AccountController@twoFactorCheckpoint'); Route::post('auth/checkpoint', 'AccountController@twoFactorVerify'); - Route::get('media/preview/{profileId}/{mediaId}', 'ApiController@showTempMedia')->name('temp-media'); + Route::get('media/preview/{profileId}/{mediaId}/{timestamp}', 'ApiController@showTempMedia')->name('temp-media'); Route::get('results', 'SearchController@results'); Route::post('visibility', 'StatusController@toggleVisibility'); From dc4e5972546a481dcb3ff945ac3b64af6a10db42 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 22:54:00 -0600 Subject: [PATCH 11/28] Update changelog --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f0f6f01e..8f455a1a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,24 @@ ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.6...dev) ### Added +- Added drafts API endpoint for Camera Roll ([bad2ecde](https://github.com/pixelfed/pixelfed/commit/bad2ecde)) ### Fixed - Fixed like and share/reblog count on profiles ([86cb7d09](https://github.com/pixelfed/pixelfed/commit/86cb7d09)) - Fixed non federating self boosts ([0c59a55e](https://github.com/pixelfed/pixelfed/commit/0c59a55e)) +- Fixed CORS issues with API endpoints ([6d6f517d](https://github.com/pixelfed/pixelfed/commit/6d6f517d)) ### Changed -- Update ComposeModal.vue, added a caption counter. Fixes [#1722](https://github.com/pixelfed/pixelfed/issues/1722). ([009c6ee8](https://github.com/pixelfed/pixelfed/commit/009c6ee8)) +- Removed ```relationship``` from ```AccountTransformer``` ([4d084ac5](https://github.com/pixelfed/pixelfed/commit/4d084ac5)) +- Updated ```notification``` api endpoint to use ```NotificationService``` ([f4039ce2](https://github.com/pixelfed/pixelfed/commit/f4039ce2)) ([6ef7597](https://github.com/pixelfed/pixelfed/commit/6ef7597)) +- Update footer to use localization for the ```Places``` link ([39712714](https://github.com/pixelfed/pixelfed/commit/39712714)) +- Updated ComposeModal.vue, added a caption counter. Fixes [#1722](https://github.com/pixelfed/pixelfed/issues/1722). ([009c6ee8](https://github.com/pixelfed/pixelfed/commit/009c6ee8)) - Updated Notifications to use the NotificationService ([f4039ce2](https://github.com/pixelfed/pixelfed/commit/f4039ce218f93a5578225dfdba66f0359c8fc72c)) +- Updated PrivacySettings controller, clear cache after updating ([d8d11d7b](https://github.com/pixelfed/pixelfed/commit/d8d11d7b)) +- Updated BaseApiController, add timestamp to signed media previews for client side cache invalidation ([73c08987](https://github.com/pixelfed/pixelfed/commit/73c08987)) +- Updated AdminInstanceController, remove db transaction from instance scan ([5773434a](https://github.com/pixelfed/pixelfed/commit/5773434a)) +- Updated Help Center view, added outdated warning ([0e611d00](https://github.com/pixelfed/pixelfed/commit/0e611d00)) +- Updated language view, added English version of language names ([ebb998d2](https://github.com/pixelfed/pixelfed/commit/)) ## Deprecated From 34c13b6eb7cd48ffd7242c18a66591660c46787b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 23:42:55 -0600 Subject: [PATCH 12/28] Update app.js, add App.utils --- resources/assets/js/app.js | 63 +++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index b16d71c3b..4593326a4 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -18,4 +18,65 @@ window.App = window.App || {}; window.App.boot = function() { new Vue({ el: '#content'}); -} \ No newline at end of file +} + +window.App.util = { + time: (function() { + return new Date; + }), + version: (function() { + return 1; + }), + format: { + count: (function(count = 0) { + if(count < 1) { + return 0; + } + return new Intl.NumberFormat('en-GB', { notation: "compact" , compactDisplay: "short" }).format(count); + }) + }, + filters: [ + ['1977','filter-1977'], + ['Aden','filter-aden'], + ['Amaro','filter-amaro'], + ['Ashby','filter-ashby'], + ['Brannan','filter-brannan'], + ['Brooklyn','filter-brooklyn'], + ['Charmes','filter-charmes'], + ['Clarendon','filter-clarendon'], + ['Crema','filter-crema'], + ['Dogpatch','filter-dogpatch'], + ['Earlybird','filter-earlybird'], + ['Gingham','filter-gingham'], + ['Ginza','filter-ginza'], + ['Hefe','filter-hefe'], + ['Helena','filter-helena'], + ['Hudson','filter-hudson'], + ['Inkwell','filter-inkwell'], + ['Kelvin','filter-kelvin'], + ['Kuno','filter-juno'], + ['Lark','filter-lark'], + ['Lo-Fi','filter-lofi'], + ['Ludwig','filter-ludwig'], + ['Maven','filter-maven'], + ['Mayfair','filter-mayfair'], + ['Moon','filter-moon'], + ['Nashville','filter-nashville'], + ['Perpetua','filter-perpetua'], + ['Poprocket','filter-poprocket'], + ['Reyes','filter-reyes'], + ['Rise','filter-rise'], + ['Sierra','filter-sierra'], + ['Skyline','filter-skyline'], + ['Slumber','filter-slumber'], + ['Stinson','filter-stinson'], + ['Sutro','filter-sutro'], + ['Toaster','filter-toaster'], + ['Valencia','filter-valencia'], + ['Vesper','filter-vesper'], + ['Walden','filter-walden'], + ['Willow','filter-willow'], + ['X-Pro II','filter-xpro-ii'] + ], + emoji: ['๐Ÿ˜‚','๐Ÿ’ฏ','โค๏ธ','๐Ÿ™Œ','๐Ÿ‘','๐Ÿ‘Œ','๐Ÿ˜','๐Ÿ˜ฏ','๐Ÿ˜ข','๐Ÿ˜…','๐Ÿ˜','๐Ÿ™‚','๐Ÿ˜Ž','๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'], +}; \ No newline at end of file From 71ed965c77bf12bafd6701279c4691c568457571 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 23:45:22 -0600 Subject: [PATCH 13/28] Update CollectionCompose.vue component, fix api namespace change --- resources/assets/js/components/CollectionCompose.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/CollectionCompose.vue b/resources/assets/js/components/CollectionCompose.vue index 7ba4cb1d3..cf7b50685 100644 --- a/resources/assets/js/components/CollectionCompose.vue +++ b/resources/assets/js/components/CollectionCompose.vue @@ -201,7 +201,7 @@ export default { }, fetchRecentPosts() { - axios.get('/api/local/accounts/' + this.profileId + '/statuses', { + axios.get('/api/pixelfed/v1/accounts/' + this.profileId + '/statuses', { params: { only_media: true, min_id: 1, From 35d51215a66efd1d9a6c7fd015f5cde309bb7745 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 23:47:17 -0600 Subject: [PATCH 14/28] Update PostComponent, mark caption sensitive if post is and use util.emoji --- .../assets/js/components/PostComponent.vue | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 403c775bb..2d4b84dbe 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -117,10 +117,21 @@
-

- {{statusUsername}} - -

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

+ {{statusUsername}} + +

+
@@ -214,19 +225,6 @@
    -
  • ๐Ÿ˜‚
    • -
  • ๐Ÿ’ฏ
    • -
  • โค๏ธ
    • -
  • ๐Ÿ™Œ
    • -
  • ๐Ÿ‘
    • -
  • ๐Ÿ‘Œ
    • -
  • ๐Ÿ˜
    • -
  • ๐Ÿ˜ฏ
    • -
  • ๐Ÿ˜ข
    • -
  • ๐Ÿ˜…
    • -
  • ๐Ÿ˜
    • -
  • ๐Ÿ™‚
    • -
  • ๐Ÿ˜Ž
  • {{e}}
@@ -595,8 +593,9 @@ export default { loading: null, replyingToId: this.statusId, replyToIndex: 0, - emoji: ['๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'], + emoji: window.App.util.emoji, showReadMore: true, + showCaption: true, } }, @@ -663,6 +662,7 @@ export default { self.likesPage = 2; self.sharesPage = 2; this.showMuteBlock(); + self.showCaption = !response.data.status.sensitive; if(self.status.comments_disabled == false) { self.showComments = true; this.fetchComments(); From 30f149616ef8ad579ae60f4a4659248532d0d1ae Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 23:48:42 -0600 Subject: [PATCH 15/28] Update Profile.vue component, use formatted counts --- resources/assets/js/components/Profile.vue | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index d129156ed..fb163fae2 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -43,7 +43,7 @@
  • -

    {{profile.statuses_count}}

    +

    {{formatCount(profile.statuses_count)}}

    Posts
    @@ -51,7 +51,7 @@
  • -

    {{profile.followers_count}}

    +

    {{formatCount(profile.followers_count)}}

    Followers
    @@ -59,7 +59,7 @@
  • -

    {{profile.following_count}}

    +

    {{formatCount(profile.following_count)}}

    Following
    @@ -109,19 +109,19 @@
    - {{profile.statuses_count}} + {{formatCount(profile.statuses_count)}} Posts
    - {{profile.followers_count}} + {{formatCount(profile.followers_count)}} Followers
    - {{profile.following_count}} + {{formatCount(profile.following_count)}} Following
    @@ -304,15 +304,15 @@
    - {{profile.statuses_count}} + {{formatCount(profile.statuses_count)}} Posts - {{profile.followers_count}} + {{formatCount(profile.followers_count)}} Followers - {{profile.following_count}} + {{formatCount(profile.following_count)}} Following
    @@ -1076,6 +1076,10 @@ copyProfileLink() { navigator.clipboard.writeText(window.location.href); this.$refs.visitorContextMenu.hide(); + }, + + formatCount(count) { + return App.util.format.count(count); } } } From abfc9fe7f8079c0e98ebdcd43bcf15cd2a2df686 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 23:50:22 -0600 Subject: [PATCH 16/28] Update Timeline.vue component, use formatted counts, util.emoji and increase pagination limit to 5 --- resources/assets/js/components/Timeline.vue | 27 +++++++-------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 6de709a04..fa2cc0b01 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -203,19 +203,6 @@
      -
    • ๐Ÿ˜‚
      • -
    • ๐Ÿ’ฏ
      • -
    • โค๏ธ
      • -
    • ๐Ÿ™Œ
      • -
    • ๐Ÿ‘
      • -
    • ๐Ÿ‘Œ
      • -
    • ๐Ÿ˜
      • -
    • ๐Ÿ˜ฏ
      • -
    • ๐Ÿ˜ข
      • -
    • ๐Ÿ˜…
      • -
    • ๐Ÿ˜
      • -
    • ๐Ÿ™‚
      • -
    • ๐Ÿ˜Ž
    • {{e}}
    @@ -274,15 +261,15 @@
    -

    {{profile.statuses_count}}

    +

    {{formatCount(profile.statuses_count)}}

    Posts

     -

    {{profile.followers_count}}

    +

    {{formatCount(profile.followers_count)}}

    Followers

     -

    {{profile.following_count}}

    +

    {{formatCount(profile.following_count)}}

    Following
    @@ -502,7 +489,7 @@ showReadMore: true, replyStatus: {}, replyText: '', - emoji: ['๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'], + emoji: window.App.util.emoji, showHashtagPosts: false, hashtagPosts: [], hashtagPostsName: '', @@ -592,7 +579,7 @@ axios.get(apiUrl, { params: { max_id: this.max_id, - limit: 4 + limit: 5 } }).then(res => { let data = res.data; @@ -1311,6 +1298,10 @@ hideTips() { this.showTips = false; window.localStorage.setItem('metro-tips', false); + }, + + formatCount(count) { + return App.util.format.count(count); } } From 4110f1c4a9d89280165d7ddca0ec2fb8829530ff Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Oct 2019 23:51:19 -0600 Subject: [PATCH 17/28] Update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f455a1a1..5e7ab80ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,12 @@ - Updated BaseApiController, add timestamp to signed media previews for client side cache invalidation ([73c08987](https://github.com/pixelfed/pixelfed/commit/73c08987)) - Updated AdminInstanceController, remove db transaction from instance scan ([5773434a](https://github.com/pixelfed/pixelfed/commit/5773434a)) - Updated Help Center view, added outdated warning ([0e611d00](https://github.com/pixelfed/pixelfed/commit/0e611d00)) -- Updated language view, added English version of language names ([ebb998d2](https://github.com/pixelfed/pixelfed/commit/)) +- Updated language view, added English version of language names ([ebb998d2](https://github.com/pixelfed/pixelfed/commit/ebb998d2)) +- Updated app.js, added App.utils like ```.format.count```, ```.filters``` and ```.emoji``` ([34c13b6e](https://github.com/pixelfed/pixelfed/commit/34c13b6e)) +- Updated CollectionCompose.vue component, fix api namespace change ([71ed965c](https://github.com/pixelfed/pixelfed/commit/71ed965c)) +- Updated PostComponent, mark caption sensitive if post is and use util.emoji ([35d51215](https://github.com/pixelfed/pixelfed/commit/35d51215)) +- Updated Profile.vue component, use formatted counts ([30f14961](https://github.com/pixelfed/pixelfed/commit/30f14961)) +- Updated Timeline.vue component, use formatted counts, util.emoji and increase pagination limit to 5 ([abfc9fe7](https://github.com/pixelfed/pixelfed/commit/abfc9fe7)) ## Deprecated From c5577112eddb33e48f4ed9db17fc5e4285b554a9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 15 Oct 2019 21:22:20 -0600 Subject: [PATCH 18/28] Update npm deps --- package-lock.json | 51 +++++++++++++++++++++++++++++++++++++++++------ package.json | 1 + 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9504ca5a9..d4cc0df1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,4 +1,5 @@ { + "name": "pixelfed", "requires": true, "lockfileVersion": 1, "dependencies": { @@ -3106,6 +3107,11 @@ "entities": "^1.1.1" } }, + "dom-walk": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", + "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=" + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -4621,6 +4627,15 @@ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" }, + "global": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "requires": { + "min-document": "^2.19.0", + "process": "^0.11.10" + } + }, "global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", @@ -6085,6 +6100,14 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "requires": { + "dom-walk": "^0.1.0" + } + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -7787,14 +7810,14 @@ "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==" }, "quill": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.6.tgz", - "integrity": "sha512-K0mvhimWZN6s+9OQ249CH2IEPZ9JmkFuCQeHAOQax3EZ2nDJ3wfGh59mnlQaZV2i7u8eFarx6wAtvQKgShojug==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz", + "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", "requires": { "clone": "^2.1.1", "deep-equal": "^1.0.1", "eventemitter3": "^2.0.3", - "extend": "^3.0.1", + "extend": "^3.0.2", "parchment": "^1.1.4", "quill-delta": "^3.6.2" }, @@ -9856,8 +9879,24 @@ "vue": { "version": "2.6.10", "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", - "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==", - "dev": true + "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" + }, + "vue-carousel": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/vue-carousel/-/vue-carousel-0.18.0.tgz", + "integrity": "sha512-a2zxh7QJioDxNMguqcuJ7TPbfgK5bGDaAXIia7NWxPAWsEvNE4ZtHgsGu40L5Aha4uyjmNKXvleB14QAXFoKig==", + "requires": { + "global": "^4.3.2", + "regenerator-runtime": "^0.12.1", + "vue": "^2.5.17" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + } + } }, "vue-content-loader": { "version": "0.2.2", diff --git a/package.json b/package.json index 2bed7b899..70054c087 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "socket.io-client": "^2.2.0", "sweetalert": "^2.1.2", "twitter-text": "^2.0.5", + "vue-carousel": "^0.18.0", "vue-content-loader": "^0.2.2", "vue-cropperjs": "^4.0.0", "vue-infinite-loading": "^2.4.4", From 31b114cc0befabbb425ab06ba2f5500961320b68 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 15 Oct 2019 21:37:44 -0600 Subject: [PATCH 19/28] Update album presenters, use better carousel --- .../presenter/MixedAlbumPresenter.vue | 21 ++++++- .../presenter/PhotoAlbumPresenter.vue | 58 +++++++++++++++++-- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue index f105c1205..0014e8bfc 100644 --- a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue +++ b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue @@ -28,8 +28,8 @@
    -
    - + + + + + + +
    + +
    + +

    Error: Problem rendering preview.

    + +     +
    diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue index 173ceb3bb..75fffcd97 100644 --- a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue +++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue @@ -1,11 +1,11 @@ @@ -58,6 +68,42 @@ return { cursor: 0 } + }, + + created() { + // window.addEventListener("keydown", this.keypressNavigation); + }, + + beforeDestroy() { + // window.removeEventListener("keydown", this.keypressNavigation); + }, + + methods: { + loadSensitive() { + this.$refs.carousel.onResize(); + this.$refs.carousel.goToPage(0); + }, + + keypressNavigation(e) { + let ref = this.$refs.carousel; + if (e.keyCode == "37") { + e.preventDefault(); + + let direction = "backward"; + + ref.advancePage(direction); + ref.$emit("navigation-click", direction); + } + + if (e.keyCode == "39") { + e.preventDefault(); + + let direction = "forward"; + + ref.advancePage(direction); + ref.$emit("navigation-click", direction); + } + } } } \ No newline at end of file From 0617fada73f082c8fda5a68f0bb03ace71bf22b9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 15 Oct 2019 21:38:47 -0600 Subject: [PATCH 20/28] Update js components, add vue-carousel --- resources/assets/js/components.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components.js b/resources/assets/js/components.js index 026b496fe..fd1954aff 100644 --- a/resources/assets/js/components.js +++ b/resources/assets/js/components.js @@ -3,7 +3,9 @@ import BootstrapVue from 'bootstrap-vue' import InfiniteLoading from 'vue-infinite-loading'; import Loading from 'vue-loading-overlay'; import VueTimeago from 'vue-timeago'; +import VueCarousel from 'vue-carousel'; +Vue.use(VueCarousel); Vue.use(BootstrapVue); Vue.use(InfiniteLoading); Vue.use(Loading); @@ -37,11 +39,7 @@ try { window.filesize = require('filesize'); import swal from 'sweetalert'; -$(document).ready(function() { - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }); -}); +$('[data-toggle="tooltip"]').tooltip() const warningTitleCSS = 'color:red; font-size:60px; font-weight: bold; -webkit-text-stroke: 1px black;'; const warningDescCSS = 'font-size: 18px;'; From 96e25ad2cd4d50e35b16927f9ac5cb938e65718e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 15 Oct 2019 21:40:14 -0600 Subject: [PATCH 21/28] Update Timeline.vue component, remove tap for lightbox as it conflicts with new carousel --- resources/assets/js/components/Timeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index fa2cc0b01..4dadfc6df 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -127,7 +127,7 @@
    • -
    +
    From 3aaad81e5dc687ce337ba477e6f42b32d695e63b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 15 Oct 2019 21:44:48 -0600 Subject: [PATCH 22/28] Update ComposeModal.vue, added album support, editing and UI tweaks --- .../assets/js/components/ComposeModal.vue | 591 +++++++++++------- 1 file changed, 354 insertions(+), 237 deletions(-) diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index 911e8bca3..a9463d601 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -1,15 +1,45 @@