UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-11 06:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3034 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-12-04 15:31:40 -07:00 committed by GitHub
commit cd1a263f6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -32,6 +32,7 @@
- Updated PublicApiController, fix private account statuses api. Closes #2995. ([aa2dd26c](https://github.com/pixelfed/pixelfed/commit/aa2dd26c)) - Updated PublicApiController, fix private account statuses api. Closes #2995. ([aa2dd26c](https://github.com/pixelfed/pixelfed/commit/aa2dd26c))
- Updated Status model, use AccountService to generate urls instead of loading profile relation. ([2ae527c0](https://github.com/pixelfed/pixelfed/commit/2ae527c0)) - Updated Status model, use AccountService to generate urls instead of loading profile relation. ([2ae527c0](https://github.com/pixelfed/pixelfed/commit/2ae527c0))
- Updated Autospam service, add mark all as read and mark all as not spam options and filter active, spam and not spam reports. ([ae8c7517](https://github.com/pixelfed/pixelfed/commit/ae8c7517)) - Updated Autospam service, add mark all as read and mark all as not spam options and filter active, spam and not spam reports. ([ae8c7517](https://github.com/pixelfed/pixelfed/commit/ae8c7517))
- Updated UserInviteController, fixes #3017. ([b8e9056e](https://github.com/pixelfed/pixelfed/commit/b8e9056e))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

8
app/Http/Controllers/UserInviteController.php
View file

@ -9,19 +9,16 @@ use Illuminate\Support\Str;
class UserInviteController extends Controller class UserInviteController extends Controller
{ {
public function __construct()
{
abort_if(!config('pixelfed.user_invites.enabled'), 404);
}
public function create(Request $request) public function create(Request $request)
{ {
abort_if(!config('pixelfed.user_invites.enabled'), 404);
abort_unless(Auth::check(), 403); abort_unless(Auth::check(), 403);
return view('settings.invites.create'); return view('settings.invites.create');
} }
public function show(Request $request) public function show(Request $request)
{ {
abort_if(!config('pixelfed.user_invites.enabled'), 404);
abort_unless(Auth::check(), 403); abort_unless(Auth::check(), 403);
$invites = UserInvite::whereUserId(Auth::id())->paginate(10); $invites = UserInvite::whereUserId(Auth::id())->paginate(10);
$limit = config('pixelfed.user_invites.limit.total'); $limit = config('pixelfed.user_invites.limit.total');
@ -31,6 +28,7 @@ class UserInviteController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
abort_if(!config('pixelfed.user_invites.enabled'), 404);
abort_unless(Auth::check(), 403); abort_unless(Auth::check(), 403);
$this->validate($request, [ $this->validate($request, [
'email' => 'required|email|unique:users|unique:user_invites', 'email' => 'required|email|unique:users|unique:user_invites',