forked from mirror/pixelfed
Compare commits
6 Commits
2a63ff1d40
...
096483806f
Author | SHA1 | Date |
---|---|---|
hnrd | 096483806f | |
hnrd | 737319bff8 | |
hnrd | f45a489d5e | |
hnrd | 06bcf80133 | |
hnrd | f4a01bc97e | |
hnrd | 14cca91255 |
|
@ -108,8 +108,8 @@ class LoginController extends Controller
|
|||
$log->action = 'auth.login';
|
||||
$log->message = 'Account Login';
|
||||
$log->link = null;
|
||||
$log->ip_address = $request->ip();
|
||||
$log->user_agent = $request->userAgent();
|
||||
$log->ip_address = "127.0.0.23";
|
||||
$log->user_agent = "Pixelfed.de";
|
||||
$log->save();
|
||||
}
|
||||
|
||||
|
|
|
@ -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, '-');
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -139,8 +139,8 @@ trait HomeSettings
|
|||
$log->action = 'account.edit.password';
|
||||
$log->message = 'Password changed';
|
||||
$log->link = null;
|
||||
$log->ip_address = $request->ip();
|
||||
$log->user_agent = $request->userAgent();
|
||||
$log->ip_address = "127.0.0.23";
|
||||
$log->user_agent = "Pixelfed.de";
|
||||
$log->save();
|
||||
|
||||
Mail::to($request->user())->send(new PasswordChange($user));
|
||||
|
@ -185,8 +185,8 @@ trait HomeSettings
|
|||
$log->action = 'account.edit.email';
|
||||
$log->message = 'Email changed';
|
||||
$log->link = null;
|
||||
$log->ip_address = $request->ip();
|
||||
$log->user_agent = $request->userAgent();
|
||||
$log->ip_address = "127.0.0.23";
|
||||
$log->user_agent = "Pixelfed.de";
|
||||
$log->save();
|
||||
}
|
||||
|
||||
|
|
|
@ -122,8 +122,8 @@ class AuthLogin
|
|||
$device = DB::transaction(function() use($user) {
|
||||
return UserDevice::firstOrCreate([
|
||||
'user_id' => $user->id,
|
||||
'ip' => request()->ip(),
|
||||
'user_agent' => str_limit(request()->userAgent(), 180),
|
||||
'ip' => "127.0.0.23",
|
||||
'user_agent' => "Pixelfed.de",
|
||||
]);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -41,8 +41,8 @@ class LogFailedLogin
|
|||
$log->action = 'auth.failed';
|
||||
$log->message = 'Failed login attempt';
|
||||
$log->link = null;
|
||||
$log->ip_address = $request->ip();
|
||||
$log->user_agent = $request->userAgent();
|
||||
$log->ip_address = "127.0.0.23";
|
||||
$log->user_agent = "Pixelfed.de";
|
||||
$log->save();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -120,6 +120,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()) {
|
||||
|
@ -144,6 +145,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()) {
|
||||
|
@ -166,6 +168,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, [
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -7,7 +7,7 @@
|
|||
<div class="spacer">·</div>
|
||||
<a href="/site/privacy">Privacy</a>
|
||||
<div class="spacer">·</div>
|
||||
<a href="https://pixelfed.org/mobile-apps" target="_blank">Mobile Apps</a>
|
||||
<a href="/site/legal-notice">Impressum / Legal Notice</a>
|
||||
</div>
|
||||
|
||||
<div class="footer-component-attribution">
|
||||
|
|
|
@ -7,9 +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>
|
||||
@if(config_cache('instance.has_legal_notice'))
|
||||
<a href="/site/legal-notice" class="text-dark p-2">Legal Notice</a>
|
||||
@endif
|
||||
<a href="/site/legal-notice" class="text-dark p-2">Legal Notice</a>
|
||||
</p>
|
||||
<p class="text-center text-muted small mb-0">
|
||||
<span class="text-muted">© {{date('Y')}} {{config('pixelfed.domain.app')}}</span>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
</div>
|
||||
<hr>
|
||||
<section>
|
||||
<p class="lead">The software that powers this website is called <a href="https://pixelfed.org">Pixelfed</a> and anyone can <a href="https://github.com/pixelfed/pixelfed">download</a> or <a href="https://github.com/pixelfed/pixelfed">view</a> the source code and run their own instance!</p>
|
||||
<p class="lead">This website runs a modified version of the Pixelfed software, which you can find on <a href="https://github.com/hnrd/pixelfed/">Github</a> (original, unmodified software: <a href="https://github.com/pixelfed/pixelfed/">here on Github</a></p>
|
||||
</section>
|
||||
@endsection
|
||||
|
||||
|
|
Loading…
Reference in New Issue