Merge pull request #1434 from pixelfed/frontend-ui-refactor

Retire Classic Compose UI

app/Http/Controllers/StatusController.php

@@ -101,6 +101,8 @@ class StatusController extends Controller
 
     public function store(Request $request)
     {
+        return;
+        
         $this->authCheck();
         $user = Auth::user();
 

app/User.php

@@ -6,10 +6,11 @@ use Laravel\Passport\HasApiTokens;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use App\Util\RateLimit\User as UserRateLimit;
 
 class User extends Authenticatable
 {
-    use Notifiable, SoftDeletes, HasApiTokens;
+    use Notifiable, SoftDeletes, HasApiTokens, UserRateLimit;
 
     /**
      * The attributes that should be mutated to dates.
@@ -76,4 +77,5 @@ class User extends Authenticatable
     {
         return $this->hasMany(UserDevice::class);
     }
+
 }

app/Util/RateLimit/User.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Util\RateLimit;
+
+trait User {
+	
+	public function getMaxPostsPerHourAttribute()
+	{
+		return 20;
+	}
+
+	public function getMaxPostsPerDayAttribute()
+	{
+		return 100;
+	}
+
+	public function getMaxCommentsPerHourAttribute()
+	{
+		return 50;
+	}
+
+	public function getMaxCommentsPerDayAttribute()
+	{
+		return 500;
+	}
+}

public/mix-manifest.json

@@ -7,7 +7,7 @@
     "/css/appdark.css": "/css/appdark.css?id=34cd81dd9c8bc68cfd51",
     "/css/landing.css": "/css/landing.css?id=1ea686af4c64df5018fc",
     "/js/components.js": "/js/components.js?id=97c7f6876bb4e5c9ffd8",
-    "/js/compose.js": "/js/compose.js?id=cc128424ca6d42cdf5ff",
+    "/js/compose.js": "/js/compose.js?id=4c9e7ca132bc83a42e29",
     "/js/developers.js": "/js/developers.js?id=4dba6abdc3ae8ec8c222",
     "/js/discover.js": "/js/discover.js?id=b9b5d3d054cadf63aed2",
     "/js/loops.js": "/js/loops.js?id=d5c7e9d0d6a44553dd0d",

resources/assets/js/components/ComposeModal.vue

@@ -202,10 +202,6 @@
 						</div>
 					</div>
 				</div>
-
-				<div class="card-footer py-1">
-					<p class="text-center mb-0 font-weight-bold text-muted small">Having issues? You can also use the <a href="/i/compose">Classic Compose UI</a>.</p>
-				</div>
 			</div>
 		</div>
 	</div>

resources/views/status/compose.blade.php

@@ -5,7 +5,10 @@
 <div class="container mt-5">
 	<div class="row">
 		<div class="col-12 col-md-6 offset-md-3">
-			@include('timeline.partial.new-form')
+      <p class="lead text-center font-weight-bold">The Classic Compose UI has been retired.</p>
+      <p class="lead text-center">
+        <a href="javascript:void(0)" class="btn btn-primary font-weight-bold" data-toggle="modal" data-target="#composeModal">New Post</a>
+      </p>
 		</div>
 	</div>
 </div>
@@ -19,25 +22,6 @@ $(document).ready(function() {
   new Vue({ 
     el: '#content'
   });
-
-  $('.metro-classic-compose textarea[name="caption"]').on('click', function(e) {
-  	  let el = $(this);
-  	  el.attr('rows', 4);
-  });
-  $('.metro-classic-compose textarea[name="caption"]').on('change keyup paste', function(e) {
-  	  let el = $(this);
-      let len = el.val().length;
-      let limit = el.attr('data-limit');
-
-      let res = len;
-
-      if(len > limit) {
-      	res = '<span class="text-danger">' + (limit - len) + '</span>';
-      } else {
-      	res = '<span>' + len + '</span>';
-      }
-      $('.metro-classic-compose .caption-counter').html(res);
-  })
 });
 </script>
 @endpush

routes/web.php

@@ -99,7 +99,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
             Route::get('status/{id}/replies', 'InternalApiController@statusReplies');
             Route::post('moderator/action', 'InternalApiController@modAction');
             Route::get('discover/categories', 'InternalApiController@discoverCategories');
-            Route::post('status/compose', 'InternalApiController@composePost');
+            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');
         });
@@ -115,7 +115,7 @@ 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');
+        Route::post('comment', 'CommentController@store')->middleware('throttle:maxCommentsPerHour,60')->middleware('throttle:maxCommentsPerDay,1440');
         Route::post('delete', 'StatusController@delete');
         Route::post('mute', 'AccountController@mute');
         Route::post('unmute', 'AccountController@unmute');
@@ -294,7 +294,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
     Route::group(['prefix' => 'timeline'], function () {
         Route::redirect('/', '/');
         Route::get('public', 'TimelineController@local')->name('timeline.public');
-        Route::post('public', 'StatusController@store');
         // Route::get('network', 'TimelineController@network')->name('timeline.network');
     });