chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2019-06-19 13:20:07 -06:00 committed by GitHub
parent 900a2577da 1f1df2d1c4
commit 74a1a6d9e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Util/RateLimit/User.php
View File

@ -4,6 +4,11 @@ namespace App\Util\RateLimit;
trait User {
public function isTrustedAccount()
{
return $this->created_at->lt(now()->subDays(20));
}
public function getMaxPostsPerHourAttribute()
{
return 20;
@ -23,4 +28,24 @@ trait User {
{
return 500;
}
public function getMaxLikesPerHourAttribute()
{
return 120;
}
public function getMaxLikesPerDayAttribute()
{
return 1000;
}
public function getMaxSharesPerHourAttribute()
{
return 60;
}
public function getMaxSharesPerDayAttribute()
{
return 500;
}
}

5
resources/views/admin/instances/home.blade.php
View File

@ -13,6 +13,11 @@
<a class="dropdown-item font-weight-light" href="{{route('admin.instances')}}?filter=autocw">Show only Auto CW</a>
<a class="dropdown-item font-weight-light" href="{{route('admin.instances')}}?filter=banned">Show only Banned</a>
<a class="dropdown-item font-weight-light" href="{{route('admin.instances')}}">Show all</a>
<div class="dropdown-divider"></div>
<form class="" method="post">
@csrf
<button type="submit" class="btn btn-primary py-1 font-weight-bold btn-sm btn-block">Run Scan</button>
</form>
</div>
</div>
</span>

6
routes/web.php
View File

@ -105,7 +105,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
});
Route::group(['prefix' => 'local'], function () {
Route::get('i/follow-suggestions', 'ApiController@followSuggestions');
Route::post('status/compose', 'InternalApiController@compose');
Route::post('status/compose', 'InternalApiController@compose')->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440');
Route::get('exp/rec', 'ApiController@userRecommendations');
});
});
@ -121,8 +121,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::post('unmute', 'AccountController@unmute');
Route::post('block', 'AccountController@block');
Route::post('unblock', 'AccountController@unblock');
Route::post('like', 'LikeController@store');
Route::post('share', 'StatusController@storeShare');
Route::post('like', 'LikeController@store')->middleware('throttle:maxLikesPerHour,60')->middleware('throttle:maxLikesPerDay,1440');
Route::post('share', 'StatusController@storeShare')->middleware('throttle:maxSharesPerHour,60')->middleware('throttle:maxSharesPerDay,1440');
Route::post('follow', 'FollowerController@store');
Route::post('bookmark', 'BookmarkController@store');
Route::get('lang/{locale}', 'SiteController@changeLocale');