mirror
/
pixelfed
kopia lustrzana https://github.com/pixelfed/pixelfed
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update SiteController, add curatedOnboarding method that gracefully falls back to open registration when applicable

pull/4996/head
Daniel Supernault 2024-03-08 05:03:29 -07:00
rodzic 853a729f76
commit 95199843e3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 23740873EE6F76A1
1 zmienionych plików z 173 dodań i 137 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

310
app/Http/Controllers/SiteController.php
Wyświetl plik

@ -2,166 +2,202 @@
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
{ {
public function home(Request $request) public function home(Request $request)
{ {
if (Auth::check()) { if (Auth::check()) {
return $this->homeTimeline($request); return $this->homeTimeline($request);
} else { } else {
return $this->homeGuest(); return $this->homeGuest();
} }
} }
public function homeGuest() public function homeGuest()
{ {
return view('site.index'); return view('site.index');
} }
public function homeTimeline(Request $request) public function homeTimeline(Request $request)
{ {
if($request->has('force_old_ui')) { if ($request->has('force_old_ui')) {
return view('timeline.home', ['layout' => 'feed']); return view('timeline.home', ['layout' => 'feed']);
} }
return redirect('/i/web'); return redirect('/i/web');
} }
public function changeLocale(Request $request, $locale) public function changeLocale(Request $request, $locale)
{ {
// todo: add other locales after pushing new l10n strings // todo: add other locales after pushing new l10n strings
$locales = Localization::languages(); $locales = Localization::languages();
if(in_array($locale, $locales)) { if (in_array($locale, $locales)) {
if($request->user()) { if ($request->user()) {
$user = $request->user(); $user = $request->user();
$user->language = $locale; $user->language = $locale;
$user->save(); $user->save();
} }
session()->put('locale', $locale); session()->put('locale', $locale);
} }
return redirect(route('site.language')); return redirect(route('site.language'));
} }
public function about() public function about()
{ {
return Cache::remember('site.about_v2', now()->addMinutes(15), function() { return Cache::remember('site.about_v2', now()->addMinutes(15), function () {
$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();
});
}
public function language() return view('site.about', compact('rules', 'user_count', 'post_count'))->render();
{ });
return view('site.language'); }
}
public function communityGuidelines(Request $request) public function language()
{ {
return Cache::remember('site:help:community-guidelines', now()->addDays(120), function() { return view('site.language');
$slug = '/site/kb/community-guidelines'; }
$page = Page::whereSlug($slug)->whereActive(true)->first();
return View::make('site.help.community-guidelines')->with(compact('page'))->render();
});
}
public function privacy(Request $request) public function communityGuidelines(Request $request)
{ {
$page = Cache::remember('site:privacy', now()->addDays(120), function() { return Cache::remember('site:help:community-guidelines', now()->addDays(120), function () {
$slug = '/site/privacy'; $slug = '/site/kb/community-guidelines';
return Page::whereSlug($slug)->whereActive(true)->first(); $page = Page::whereSlug($slug)->whereActive(true)->first();
});
return View::make('site.privacy')->with(compact('page'))->render();
}
public function terms(Request $request) return View::make('site.help.community-guidelines')->with(compact('page'))->render();
{ });
$page = Cache::remember('site:terms', now()->addDays(120), function() { }
$slug = '/site/terms';
return Page::whereSlug($slug)->whereActive(true)->first();
});
return View::make('site.terms')->with(compact('page'))->render();
}
public function redirectUrl(Request $request) public function privacy(Request $request)
{ {
abort_if(!$request->user(), 404); $page = Cache::remember('site:privacy', now()->addDays(120), function () {
$this->validate($request, [ $slug = '/site/privacy';
'url' => 'required|url'
]);
$url = request()->input('url');
abort_if(Helpers::validateUrl($url) == false, 404);
return view('site.redirect', compact('url'));
}
public function followIntent(Request $request) return Page::whereSlug($slug)->whereActive(true)->first();
{ });
$this->validate($request, [
'user' => 'string|min:1|max:15|exists:users,username',
]);
$profile = Profile::whereUsername($request->input('user'))->firstOrFail();
$user = $request->user();
abort_if($user && $profile->id == $user->profile_id, 404);
$following = $user != null ? FollowerService::follows($user->profile_id, $profile->id) : false;
return view('site.intents.follow', compact('profile', 'user', 'following'));
}
public function legacyProfileRedirect(Request $request, $username) return View::make('site.privacy')->with(compact('page'))->render();
{ }
$username = Str::contains($username, '@') ? '@' . $username : $username;
if(str_contains($username, '@')) {
$profile = Profile::whereUsername($username)
->firstOrFail();
if($profile->domain == null) { public function terms(Request $request)
$url = "/$profile->username"; {
} else { $page = Cache::remember('site:terms', now()->addDays(120), function () {
$url = "/i/web/profile/_/{$profile->id}"; $slug = '/site/terms';
}
} else { return Page::whereSlug($slug)->whereActive(true)->first();
$profile = Profile::whereUsername($username) });
->whereNull('domain')
->firstOrFail();
$url = "/$profile->username";
}
return redirect($url); return View::make('site.terms')->with(compact('page'))->render();
} }
public function legacyWebfingerRedirect(Request $request, $username, $domain) public function redirectUrl(Request $request)
{ {
$un = '@'.$username.'@'.$domain; abort_if(! $request->user(), 404);
$profile = Profile::whereUsername($un) $this->validate($request, [
->firstOrFail(); 'url' => 'required|url',
]);
$url = request()->input('url');
abort_if(Helpers::validateUrl($url) == false, 404);
if($profile->domain == null) { return view('site.redirect', compact('url'));
$url = "/$profile->username"; }
} else {
$url = $request->user() ? "/i/web/profile/_/{$profile->id}" : $profile->url();
}
return redirect($url); public function followIntent(Request $request)
} {
$this->validate($request, [
'user' => 'string|min:1|max:15|exists:users,username',
]);
$profile = Profile::whereUsername($request->input('user'))->firstOrFail();
$user = $request->user();
abort_if($user && $profile->id == $user->profile_id, 404);
$following = $user != null ? FollowerService::follows($user->profile_id, $profile->id) : false;
public function legalNotice(Request $request) return view('site.intents.follow', compact('profile', 'user', 'following'));
{ }
$page = Cache::remember('site:legal-notice', now()->addDays(120), function() {
$slug = '/site/legal-notice'; public function legacyProfileRedirect(Request $request, $username)
return Page::whereSlug($slug)->whereActive(true)->first(); {
}); $username = Str::contains($username, '@') ? '@'.$username : $username;
abort_if(!$page, 404); if (str_contains($username, '@')) {
return View::make('site.legal-notice')->with(compact('page'))->render(); $profile = Profile::whereUsername($username)
} ->firstOrFail();
if ($profile->domain == null) {
$url = "/$profile->username";
} else {
$url = "/i/web/profile/_/{$profile->id}";
}
} else {
$profile = Profile::whereUsername($username)
->whereNull('domain')
->firstOrFail();
$url = "/$profile->username";
}
return redirect($url);
}
public function legacyWebfingerRedirect(Request $request, $username, $domain)
{
$un = '@'.$username.'@'.$domain;
$profile = Profile::whereUsername($un)
->firstOrFail();
if ($profile->domain == null) {
$url = "/$profile->username";
} else {
$url = $request->user() ? "/i/web/profile/_/{$profile->id}" : $profile->url();
}
return redirect($url);
}
public function legalNotice(Request $request)
{
$page = Cache::remember('site:legal-notice', now()->addDays(120), function () {
$slug = '/site/legal-notice';
return Page::whereSlug($slug)->whereActive(true)->first();
});
abort_if(! $page, 404);
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]);
}
} }