1
0
Fork 0

Compare commits

...

5 Commits

Author SHA1 Message Date
hnrd 8caee23865 allow 30 char usernames 2023-07-27 12:49:01 +02:00
hnrd 1621a5eba0 disable beagle service 2023-07-17 10:47:39 +02:00
hnrd d2e6e4179f Merge remote-tracking branch 'origin/dev' into pixelfed.de 2023-07-17 10:44:40 +02:00
chris 79c8dba872 Default to rich discovery page 2022-09-11 14:08:12 +02:00
chris a0737cc1d3 hardwired legal notice 2022-09-09 13:03:51 +02:00
9 changed files with 46 additions and 5 deletions

View File

@ -70,7 +70,7 @@ class RegisterController extends Controller
$usernameRules = [
'required',
'min:2',
'max:15',
'max:30',
'unique:users',
function ($attribute, $value, $fail) {
$dash = substr_count($value, '-');

View File

@ -279,16 +279,16 @@ class DiscoverController extends Controller
}
return [
'hashtags' => [
'enabled' => false,
'enabled' => true,
],
'memories' => [
'enabled' => false,
'enabled' => true,
],
'insights' => [
'enabled' => false,
'enabled' => true,
],
'friends' => [
'enabled' => false,
'enabled' => true,
],
'server' => [
'enabled' => false,

View File

@ -94,6 +94,15 @@ class SiteController extends Controller
return View::make('site.terms')->with(compact('page'))->render();
}
public function legal(Request $request)
{
$page = Cache::remember('site:terms', now()->addDays(120), function() {
$slug = '/site/legal';
return Page::whereSlug($slug)->whereActive(true)->first();
});
return View::make('site.legal')->with(compact('page'))->render();
}
public function redirectUrl(Request $request)
{
abort_if(!$request->user(), 404);

View File

@ -112,6 +112,7 @@ class RemoteAuthService
}
return Cache::remember(self::CACHE_KEY . 'domain-compatible:' . $domain, 14400, function() use($domain) {
return true;
try {
$res = Http::timeout(20)->retry(3, 750)->get('https://beagle.pixelfed.net/api/v1/raa/domain?domain=' . $domain);
if(!$res->ok()) {
@ -136,6 +137,7 @@ class RemoteAuthService
public static function lookupWebfingerUses($wf)
{
return 0;
try {
$res = Http::timeout(20)->retry(3, 750)->get('https://beagle.pixelfed.net/api/v1/raa/lookup?webfinger=' . $wf);
if(!$res->ok()) {
@ -158,6 +160,7 @@ class RemoteAuthService
public static function submitToBeagle($ow, $ou, $dw, $du)
{
return;
try {
$url = 'https://beagle.pixelfed.net/api/v1/raa/submit';
$res = Http::throw()->timeout(10)->get($url, [

View File

@ -16,4 +16,5 @@ return [
'contact-us' => 'Kontaktiere uns',
'places' => 'Orte',
'profiles' => 'Profile',
'legal' => 'Impressum',
];

View File

@ -16,5 +16,6 @@ return [
'contact-us' => 'Contact Us',
'places' => 'Places',
'profiles' => 'Profiles',
'legal' => 'Legal Notice',
];

View File

@ -7,6 +7,7 @@
<a href="{{route('site.terms')}}" class="text-dark p-2">{{__('site.terms')}}</a>
<a href="{{route('site.privacy')}}" class="text-dark p-2">{{__('site.privacy')}}</a>
<a href="{{route('site.language')}}" class="text-dark p-2">{{__('site.language')}}</a>
<a href="{{route('site.legal')}}" class="text-dark p-2">{{__('site.legal')}}</a>
@if(config_cache('instance.has_legal_notice'))
<a href="/site/legal-notice" class="text-dark p-2">Legal Notice</a>
@endif

View File

@ -0,0 +1,25 @@
@extends('layouts.app')
@section('content')
<div class="container mt-5">
<div class="col-12">
<p class="font-weight-bold text-lighter text-uppercase">Legal Notice</p>
<div class="card border shadow-none">
<div class="card-body p-md-5 text-justify mx-md-3">
@if($page && $page->content)
{!! $page->content !!}
@else
<div class="terms">
<h5 class="font-weight-bold">Legal</h5>
<p class="">Hey</p>
</div>
@endif
</div>
</div>
</div>
</div>
@endsection
@push('meta')
<meta property="og:description" content="Terms of Use">
@endpush

View File

@ -575,6 +575,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::view('open-source', 'site.opensource')->name('site.opensource');
Route::view('banned-instances', 'site.bannedinstances')->name('site.bannedinstances');
Route::get('terms', 'SiteController@terms')->name('site.terms');
Route::get('legal', 'SiteController@legal')->name('site.legal');
Route::get('privacy', 'SiteController@privacy')->name('site.privacy');
Route::view('platform', 'site.platform')->name('site.platform');
Route::view('language', 'site.language')->name('site.language');