From ebbe8424165caf984f38608debbadbd9f3536a15 Mon Sep 17 00:00:00 2001 From: Carly Ho Date: Sat, 29 Dec 2018 16:55:47 -0600 Subject: [PATCH 1/3] Add confirmation check to post deletion function --- .../assets/js/components/PostComponent.vue | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index c3b9f6258..cf6665a95 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -56,11 +56,11 @@
-
+
- +
@@ -164,10 +164,10 @@
-
@@ -195,10 +195,10 @@
-
@@ -281,7 +281,7 @@ export default { $('head title').text(title); } }, - + methods: { authCheck() { let authed = $('body').hasClass('loggedIn'); @@ -495,19 +495,22 @@ export default { }, deletePost() { - if($('body').hasClass('loggedIn') == false) { - return; - } + var result = confirm('Are you sure you want to delete this post?'); + if (result) { + if($('body').hasClass('loggedIn') == false) { + return; + } - axios.post('/i/delete', { - type: 'status', - item: this.status.id - }).then(res => { - swal('Success', 'You have successfully deleted this post', 'success'); - }).catch(err => { - swal('Error', 'Something went wrong. Please try again later.', 'error'); - }); + axios.post('/i/delete', { + type: 'status', + item: this.status.id + }).then(res => { + swal('Success', 'You have successfully deleted this post', 'success'); + }).catch(err => { + swal('Error', 'Something went wrong. Please try again later.', 'error'); + }); + } } } } - \ No newline at end of file + From d60da26f19621cbf1b216993ff7e49b7976ed801 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 6 Jan 2019 20:29:46 -0700 Subject: [PATCH 2/3] Update routes --- routes/web.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/routes/web.php b/routes/web.php index f74f894e6..be801fddb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -20,7 +20,7 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () { Route::get('/', 'SiteController@home')->name('timeline.personal'); - Route::post('/', 'StatusController@store')->middleware('throttle:500,1440'); + Route::post('/', 'StatusController@store'); Auth::routes(); @@ -41,7 +41,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('accounts/verify_credentials', 'ApiController@verifyCredentials'); Route::post('avatar/update', 'ApiController@avatarUpdate'); Route::get('likes', 'ApiController@hydrateLikes'); - Route::post('media', 'ApiController@uploadMedia')->middleware('throttle:500,1440'); + Route::post('media', 'ApiController@uploadMedia'); Route::get('notifications', 'ApiController@notifications'); Route::get('timelines/public', 'PublicApiController@publicTimelineApi'); Route::get('timelines/home', 'PublicApiController@homeTimelineApi'); @@ -58,7 +58,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::group(['prefix' => 'local'], function () { Route::get('i/follow-suggestions', 'ApiController@followSuggestions'); Route::post('i/more-comments', 'ApiController@loadMoreComments'); - Route::post('status/compose', 'InternalApiController@compose')->middleware('throttle:500,1440'); + Route::post('status/compose', 'InternalApiController@compose'); }); }); @@ -67,20 +67,20 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::group(['prefix' => 'i'], function () { Route::redirect('/', '/'); Route::get('compose', 'StatusController@compose')->name('compose'); - Route::post('comment', 'CommentController@store')->middleware('throttle:1000,1440'); - Route::post('delete', 'StatusController@delete')->middleware('throttle:1000,1440'); + Route::post('comment', 'CommentController@store'); + Route::post('delete', 'StatusController@delete'); Route::post('mute', 'AccountController@mute'); Route::post('block', 'AccountController@block'); - Route::post('like', 'LikeController@store')->middleware('throttle:1000,1440'); - Route::post('share', 'StatusController@storeShare')->middleware('throttle:1000,1440'); - Route::post('follow', 'FollowerController@store')->middleware('throttle:250,1440'); - Route::post('bookmark', 'BookmarkController@store')->middleware('throttle:250,1440'); + Route::post('like', 'LikeController@store'); + Route::post('share', 'StatusController@storeShare'); + Route::post('follow', 'FollowerController@store'); + Route::post('bookmark', 'BookmarkController@store'); Route::get('lang/{locale}', 'SiteController@changeLocale'); Route::get('restored', 'AccountController@accountRestored'); Route::get('verify-email', 'AccountController@verifyEmail'); - Route::post('verify-email', 'AccountController@sendVerifyEmail')->middleware('throttle:10,1440'); - Route::get('confirm-email/{userToken}/{randomToken}', 'AccountController@confirmVerifyEmail')->middleware('throttle:10,1440'); + Route::post('verify-email', 'AccountController@sendVerifyEmail'); + Route::get('confirm-email/{userToken}/{randomToken}', 'AccountController@confirmVerifyEmail'); Route::get('auth/sudo', 'AccountController@sudoMode'); Route::post('auth/sudo', 'AccountController@sudoModeVerify'); @@ -92,7 +92,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::group(['prefix' => 'report'], function () { Route::get('/', 'ReportController@showForm')->name('report.form'); - Route::post('/', 'ReportController@formStore')->middleware('throttle:10,5'); + Route::post('/', 'ReportController@formStore'); Route::get('not-interested', 'ReportController@notInterestedForm')->name('report.not-interested'); Route::get('spam', 'ReportController@spamForm')->name('report.spam'); Route::get('spam/comment', 'ReportController@spamCommentForm')->name('report.spam.comment'); @@ -118,19 +118,19 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::redirect('/', '/settings/home'); Route::get('home', 'SettingsController@home') ->name('settings'); - Route::post('home', 'SettingsController@homeUpdate')->middleware('throttle:250,1440'); + Route::post('home', 'SettingsController@homeUpdate'); Route::get('avatar', 'SettingsController@avatar')->name('settings.avatar'); Route::post('avatar', 'AvatarController@store'); Route::get('password', 'SettingsController@password')->name('settings.password')->middleware('dangerzone'); - Route::post('password', 'SettingsController@passwordUpdate')->middleware(['throttle:2,1440','dangerzone']); + Route::post('password', 'SettingsController@passwordUpdate')->middleware('dangerzone'); Route::get('email', 'SettingsController@email')->name('settings.email'); Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications'); Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy'); - Route::post('privacy', 'SettingsController@privacyStore')->middleware('throttle:250,1440'); + Route::post('privacy', 'SettingsController@privacyStore'); Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users'); - Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate')->middleware('throttle:100,1440'); + Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate'); Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users'); - Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate')->middleware('throttle:100,1440'); + Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate'); Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances'); // Todo: Release in 0.7.2 From c99ec6f6481f5107c82581d4be891a2d92973468 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 6 Jan 2019 20:30:13 -0700 Subject: [PATCH 3/3] Bump version to 0.7.8 --- config/pixelfed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 0bd5b94f7..509160897 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.7.7', + 'version' => '0.7.8', /* |--------------------------------------------------------------------------