UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-21 16:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging' of https://github.com/pixelfed/pixelfed into translation-coverage-extension

Browse source
This commit is contained in:
Jeff Poirier 2024-07-17 00:09:28 +00:00
commit df4303d4c7
5 changed files with 213 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@
### Updates ### Updates
- Update ApiV1Controller, add support for notification filter types ([f61159a1](https://github.com/pixelfed/pixelfed/commit/f61159a1)) - Update ApiV1Controller, add support for notification filter types ([f61159a1](https://github.com/pixelfed/pixelfed/commit/f61159a1))
- Update ApiV1Dot1Controller, fix mutual api ([a8bb97b2](https://github.com/pixelfed/pixelfed/commit/a8bb97b2)) - Update ApiV1Dot1Controller, fix mutual api ([a8bb97b2](https://github.com/pixelfed/pixelfed/commit/a8bb97b2))
- Update ApiV1Controller, fix /api/v1/favourits pagination ([72f68160](https://github.com/pixelfed/pixelfed/commit/72f68160))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3) ## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3)

11
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -1334,12 +1334,17 @@ class ApiV1Controller extends Controller
if ($res->count()) { if ($res->count()) {
$ids = $res->map(function ($status) { $ids = $res->map(function ($status) {
return $status['like_id']; return $status['like_id'];
}); })->filter();
$max = $ids->max();
$min = $ids->min(); $max = $ids->min() - 1;
$min = $ids->max();
$baseUrl = config('app.url').'/api/v1/favourites?limit='.$limit.'&'; $baseUrl = config('app.url').'/api/v1/favourites?limit='.$limit.'&';
if ($maxId) {
$link = '<'.$baseUrl.'max_id='.$max.'>; rel="next",<'.$baseUrl.'min_id='.$min.'>; rel="prev"'; $link = '<'.$baseUrl.'max_id='.$max.'>; rel="next",<'.$baseUrl.'min_id='.$min.'>; rel="prev"';
} else {
$link = '<'.$baseUrl.'max_id='.$max.'>; rel="next"';
}
return $this->json($res, 200, ['Link' => $link]); return $this->json($res, 200, ['Link' => $link]);
} else { } else {

69
app/Http/Controllers/Auth/RegisterController.php
View file

@ -3,16 +3,16 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Services\BouncerService;
use App\Services\EmailService;
use App\User; use App\User;
use Purify;
use App\Util\Lexer\RestrictedNames; use App\Util\Lexer\RestrictedNames;
use Illuminate\Auth\Events\Registered;
use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Auth\Events\Registered; use Purify;
use Illuminate\Http\Request;
use App\Services\EmailService;
use App\Services\BouncerService;
class RegisterController extends Controller class RegisterController extends Controller
{ {
@ -48,7 +48,7 @@ class RegisterController extends Controller
public function getRegisterToken() public function getRegisterToken()
{ {
return \Cache::remember('pf:register:rt', 900, function() { return \Cache::remember('pf:register:rt', 900, function () {
return str_random(40); return str_random(40);
}); });
} }
@ -56,13 +56,12 @@ class RegisterController extends Controller
/** /**
* Get a validator for an incoming registration request. * Get a validator for an incoming registration request.
* *
* @param array $data
* *
* @return \Illuminate\Contracts\Validation\Validator * @return \Illuminate\Contracts\Validation\Validator
*/ */
public function validator(array $data) public function validator(array $data)
{ {
if(config('database.default') == 'pgsql') { if (config('database.default') == 'pgsql') {
$data['username'] = strtolower($data['username']); $data['username'] = strtolower($data['username']);
$data['email'] = strtolower($data['email']); $data['email'] = strtolower($data['email']);
} }
@ -77,27 +76,31 @@ class RegisterController extends Controller
$underscore = substr_count($value, '_'); $underscore = substr_count($value, '_');
$period = substr_count($value, '.'); $period = substr_count($value, '.');
if(ends_with($value, ['.php', '.js', '.css'])) { if (ends_with($value, ['.php', '.js', '.css'])) {
return $fail('Username is invalid.'); return $fail('Username is invalid.');
} }
if(($dash + $underscore + $period) > 1) { if (($dash + $underscore + $period) > 1) {
return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).'); return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
} }
if (!ctype_alnum($value[0])) { if (! ctype_alnum($value[0])) {
return $fail('Username is invalid. Must start with a letter or number.'); return $fail('Username is invalid. Must start with a letter or number.');
} }
if (!ctype_alnum($value[strlen($value) - 1])) { if (! ctype_alnum($value[strlen($value) - 1])) {
return $fail('Username is invalid. Must end with a letter or number.'); return $fail('Username is invalid. Must end with a letter or number.');
} }
$val = str_replace(['_', '.', '-'], '', $value); $val = str_replace(['_', '.', '-'], '', $value);
if(!ctype_alnum($val)) { if (! ctype_alnum($val)) {
return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).'); return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).');
} }
if (! preg_match('/[a-zA-Z]/', $value)) {
return $fail('Username is invalid. Must contain at least one alphabetical character.');
}
$restricted = RestrictedNames::get(); $restricted = RestrictedNames::get();
if (in_array(strtolower($value), array_map('strtolower', $restricted))) { if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
return $fail('Username cannot be used.'); return $fail('Username cannot be used.');
@ -113,7 +116,7 @@ class RegisterController extends Controller
'unique:users', 'unique:users',
function ($attribute, $value, $fail) { function ($attribute, $value, $fail) {
$banned = EmailService::isBanned($value); $banned = EmailService::isBanned($value);
if($banned) { if ($banned) {
return $fail('Email is invalid.'); return $fail('Email is invalid.');
} }
}, },
@ -122,10 +125,10 @@ class RegisterController extends Controller
$rt = [ $rt = [
'required', 'required',
function ($attribute, $value, $fail) { function ($attribute, $value, $fail) {
if($value !== $this->getRegisterToken()) { if ($value !== $this->getRegisterToken()) {
return $fail('Something went wrong'); return $fail('Something went wrong');
} }
} },
]; ];
$rules = [ $rules = [
@ -137,7 +140,7 @@ class RegisterController extends Controller
'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed', 'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
]; ];
if((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) { if ((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {
$rules['h-captcha-response'] = 'required|captcha'; $rules['h-captcha-response'] = 'required|captcha';
} }
@ -147,13 +150,12 @@ class RegisterController extends Controller
/** /**
* Create a new user instance after a valid registration. * Create a new user instance after a valid registration.
* *
* @param array $data
* *
* @return \App\User * @return \App\User
*/ */
public function create(array $data) public function create(array $data)
{ {
if(config('database.default') == 'pgsql') { if (config('database.default') == 'pgsql') {
$data['username'] = strtolower($data['username']); $data['username'] = strtolower($data['username']);
$data['email'] = strtolower($data['email']); $data['email'] = strtolower($data['email']);
} }
@ -163,7 +165,7 @@ class RegisterController extends Controller
'username' => $data['username'], 'username' => $data['username'],
'email' => $data['email'], 'email' => $data['email'],
'password' => Hash::make($data['password']), 'password' => Hash::make($data['password']),
'app_register_ip' => request()->ip() 'app_register_ip' => request()->ip(),
]); ]);
} }
@ -174,24 +176,27 @@ class RegisterController extends Controller
*/ */
public function showRegistrationForm() public function showRegistrationForm()
{ {
if((bool) config_cache('pixelfed.open_registration')) { if ((bool) config_cache('pixelfed.open_registration')) {
if(config('pixelfed.bouncer.cloud_ips.ban_signups')) { if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
abort_if(BouncerService::checkIp(request()->ip()), 404); abort_if(BouncerService::checkIp(request()->ip()), 404);
} }
$hasLimit = config('pixelfed.enforce_max_users'); $hasLimit = config('pixelfed.enforce_max_users');
if($hasLimit) { if ($hasLimit) {
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
$count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count(); $count = User::where(function ($q) {
if($limit <= $count) { return $q->whereNull('status')->orWhereNotIn('status', ['deleted', 'delete']);
})->count();
if ($limit <= $count) {
return redirect(route('help.instance-max-users-limit')); return redirect(route('help.instance-max-users-limit'));
} }
abort_if($limit <= $count, 404); abort_if($limit <= $count, 404);
return view('auth.register'); return view('auth.register');
} else { } else {
return view('auth.register'); return view('auth.register');
} }
} else { } else {
if((bool) config_cache('instance.curated_registration.enabled') && config('instance.curated_registration.state.fallback_on_closed_reg')) { if ((bool) config_cache('instance.curated_registration.enabled') && config('instance.curated_registration.state.fallback_on_closed_reg')) {
return redirect('/auth/sign_up'); return redirect('/auth/sign_up');
} else { } else {
abort(404); abort(404);
@ -202,28 +207,28 @@ class RegisterController extends Controller
/** /**
* Handle a registration request for the application. * Handle a registration request for the application.
* *
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function register(Request $request) public function register(Request $request)
{ {
abort_if(config_cache('pixelfed.open_registration') == false, 400); abort_if(config_cache('pixelfed.open_registration') == false, 400);
if(config('pixelfed.bouncer.cloud_ips.ban_signups')) { if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
abort_if(BouncerService::checkIp($request->ip()), 404); abort_if(BouncerService::checkIp($request->ip()), 404);
} }
$hasLimit = config('pixelfed.enforce_max_users'); $hasLimit = config('pixelfed.enforce_max_users');
if($hasLimit) { if ($hasLimit) {
$count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count(); $count = User::where(function ($q) {
return $q->whereNull('status')->orWhereNotIn('status', ['deleted', 'delete']);
})->count();
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
if($limit && $limit <= $count) { if ($limit && $limit <= $count) {
return redirect(route('help.instance-max-users-limit')); return redirect(route('help.instance-max-users-limit'));
} }
} }
$this->validator($request->all())->validate(); $this->validator($request->all())->validate();
event(new Registered($user = $this->create($request->all()))); event(new Registered($user = $this->create($request->all())));

8
package-lock.json generated
View file

@ -20,7 +20,7 @@
"caniuse-lite": "^1.0.30001418", "caniuse-lite": "^1.0.30001418",
"chart.js": "^2.7.2", "chart.js": "^2.7.2",
"filesize": "^3.6.1", "filesize": "^3.6.1",
"hls.js": "^1.1.5", "hls.js": "^1.5.13",
"howler": "^2.2.0", "howler": "^2.2.0",
"infinite-scroll": "^3.0.6", "infinite-scroll": "^3.0.6",
"jquery-scroll-lock": "^3.1.3", "jquery-scroll-lock": "^3.1.3",
@ -5355,9 +5355,9 @@
} }
}, },
"node_modules/hls.js": { "node_modules/hls.js": {
"version": "1.5.7", "version": "1.5.13",
"resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.7.tgz", "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.13.tgz",
"integrity": "sha512-Hnyf7ojTBtXHeOW1/t6wCBJSiK1WpoKF9yg7juxldDx8u3iswrkPt2wbOA/1NiwU4j27DSIVoIEJRAhcdMef/A==" "integrity": "sha512-xRgKo84nsC7clEvSfIdgn/Tc0NOT+d7vdiL/wvkLO+0k0juc26NRBPPG1SfB8pd5bHXIjMW/F5VM8VYYkOYYdw=="
}, },
"node_modules/hmac-drbg": { "node_modules/hmac-drbg": {
"version": "1.0.1", "version": "1.0.1",

2
package.json
View file

@ -47,7 +47,7 @@
"caniuse-lite": "^1.0.30001418", "caniuse-lite": "^1.0.30001418",
"chart.js": "^2.7.2", "chart.js": "^2.7.2",
"filesize": "^3.6.1", "filesize": "^3.6.1",
"hls.js": "^1.1.5", "hls.js": "^1.5.13",
"howler": "^2.2.0", "howler": "^2.2.0",
"infinite-scroll": "^3.0.6", "infinite-scroll": "^3.0.6",
"jquery-scroll-lock": "^3.1.3", "jquery-scroll-lock": "^3.1.3",