kopia lustrzana https://github.com/pixelfed/pixelfed
Update SiteController, add curatedOnboarding method that gracefully falls back to open registration when applicable
rodzic
853a729f76
commit
95199843e3
|
@ -2,14 +2,18 @@
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Page;
|
||||||
|
use App\Profile;
|
||||||
|
use App\Services\FollowerService;
|
||||||
|
use App\Status;
|
||||||
|
use App\User;
|
||||||
|
use App\Util\ActivityPub\Helpers;
|
||||||
|
use App\Util\Localization\Localization;
|
||||||
|
use Auth;
|
||||||
|
use Cache;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use App, Auth, Cache, View;
|
use View;
|
||||||
use App\Util\Lexer\PrettyNumber;
|
|
||||||
use App\{Follower, Page, Profile, Status, User, UserFilter};
|
|
||||||
use App\Util\Localization\Localization;
|
|
||||||
use App\Services\FollowerService;
|
|
||||||
use App\Util\ActivityPub\Helpers;
|
|
||||||
|
|
||||||
class SiteController extends Controller
|
class SiteController extends Controller
|
||||||
{
|
{
|
||||||
|
@ -58,6 +62,7 @@ class SiteController extends Controller
|
||||||
$user_count = number_format(User::count());
|
$user_count = number_format(User::count());
|
||||||
$post_count = number_format(Status::count());
|
$post_count = number_format(Status::count());
|
||||||
$rules = config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : null;
|
$rules = config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : null;
|
||||||
|
|
||||||
return view('site.about', compact('rules', 'user_count', 'post_count'))->render();
|
return view('site.about', compact('rules', 'user_count', 'post_count'))->render();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -72,6 +77,7 @@ class SiteController extends Controller
|
||||||
return Cache::remember('site:help:community-guidelines', now()->addDays(120), function () {
|
return Cache::remember('site:help:community-guidelines', now()->addDays(120), function () {
|
||||||
$slug = '/site/kb/community-guidelines';
|
$slug = '/site/kb/community-guidelines';
|
||||||
$page = Page::whereSlug($slug)->whereActive(true)->first();
|
$page = Page::whereSlug($slug)->whereActive(true)->first();
|
||||||
|
|
||||||
return View::make('site.help.community-guidelines')->with(compact('page'))->render();
|
return View::make('site.help.community-guidelines')->with(compact('page'))->render();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -80,8 +86,10 @@ class SiteController extends Controller
|
||||||
{
|
{
|
||||||
$page = Cache::remember('site:privacy', now()->addDays(120), function () {
|
$page = Cache::remember('site:privacy', now()->addDays(120), function () {
|
||||||
$slug = '/site/privacy';
|
$slug = '/site/privacy';
|
||||||
|
|
||||||
return Page::whereSlug($slug)->whereActive(true)->first();
|
return Page::whereSlug($slug)->whereActive(true)->first();
|
||||||
});
|
});
|
||||||
|
|
||||||
return View::make('site.privacy')->with(compact('page'))->render();
|
return View::make('site.privacy')->with(compact('page'))->render();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,8 +97,10 @@ class SiteController extends Controller
|
||||||
{
|
{
|
||||||
$page = Cache::remember('site:terms', now()->addDays(120), function () {
|
$page = Cache::remember('site:terms', now()->addDays(120), function () {
|
||||||
$slug = '/site/terms';
|
$slug = '/site/terms';
|
||||||
|
|
||||||
return Page::whereSlug($slug)->whereActive(true)->first();
|
return Page::whereSlug($slug)->whereActive(true)->first();
|
||||||
});
|
});
|
||||||
|
|
||||||
return View::make('site.terms')->with(compact('page'))->render();
|
return View::make('site.terms')->with(compact('page'))->render();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,10 +108,11 @@ class SiteController extends Controller
|
||||||
{
|
{
|
||||||
abort_if(! $request->user(), 404);
|
abort_if(! $request->user(), 404);
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'url' => 'required|url'
|
'url' => 'required|url',
|
||||||
]);
|
]);
|
||||||
$url = request()->input('url');
|
$url = request()->input('url');
|
||||||
abort_if(Helpers::validateUrl($url) == false, 404);
|
abort_if(Helpers::validateUrl($url) == false, 404);
|
||||||
|
|
||||||
return view('site.redirect', compact('url'));
|
return view('site.redirect', compact('url'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,6 +125,7 @@ class SiteController extends Controller
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
abort_if($user && $profile->id == $user->profile_id, 404);
|
abort_if($user && $profile->id == $user->profile_id, 404);
|
||||||
$following = $user != null ? FollowerService::follows($user->profile_id, $profile->id) : false;
|
$following = $user != null ? FollowerService::follows($user->profile_id, $profile->id) : false;
|
||||||
|
|
||||||
return view('site.intents.follow', compact('profile', 'user', 'following'));
|
return view('site.intents.follow', compact('profile', 'user', 'following'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,9 +171,33 @@ class SiteController extends Controller
|
||||||
{
|
{
|
||||||
$page = Cache::remember('site:legal-notice', now()->addDays(120), function () {
|
$page = Cache::remember('site:legal-notice', now()->addDays(120), function () {
|
||||||
$slug = '/site/legal-notice';
|
$slug = '/site/legal-notice';
|
||||||
|
|
||||||
return Page::whereSlug($slug)->whereActive(true)->first();
|
return Page::whereSlug($slug)->whereActive(true)->first();
|
||||||
});
|
});
|
||||||
abort_if(! $page, 404);
|
abort_if(! $page, 404);
|
||||||
|
|
||||||
return View::make('site.legal-notice')->with(compact('page'))->render();
|
return View::make('site.legal-notice')->with(compact('page'))->render();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function curatedOnboarding(Request $request)
|
||||||
|
{
|
||||||
|
if ($request->user()) {
|
||||||
|
return redirect('/i/web');
|
||||||
|
}
|
||||||
|
|
||||||
|
$regOpen = (bool) config_cache('pixelfed.open_registration');
|
||||||
|
$curOnboarding = (bool) config_cache('instance.curated_registration.enabled');
|
||||||
|
$curOnlyClosed = (bool) config('instance.curated_registration.state.only_enabled_on_closed_reg');
|
||||||
|
if ($regOpen) {
|
||||||
|
if ($curOnlyClosed) {
|
||||||
|
return redirect('/register');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (! $curOnboarding) {
|
||||||
|
return redirect('/');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return view('auth.curated-register.index', ['step' => 1]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue