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

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Updates
 - 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 ApiV1Controller, fix /api/v1/favourits pagination ([72f68160](https://github.com/pixelfed/pixelfed/commit/72f68160))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3)

app/Http/Controllers/Api/ApiV1Controller.php

@@ -1334,12 +1334,17 @@ class ApiV1Controller extends Controller
         if ($res->count()) {
             $ids = $res->map(function ($status) {
                 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.'&';
+            if ($maxId) {
                 $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]);
         } else {

app/Http/Controllers/Auth/RegisterController.php

@@ -3,16 +3,16 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Services\BouncerService;
+use App\Services\EmailService;
 use App\User;
-use Purify;
 use App\Util\Lexer\RestrictedNames;
+use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 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
 {
@@ -56,7 +56,6 @@ class RegisterController extends Controller
     /**
      * Get a validator for an incoming registration request.
      *
-	 * @param array $data
      *
      * @return \Illuminate\Contracts\Validation\Validator
      */
@@ -98,6 +97,10 @@ class RegisterController extends Controller
                     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();
                 if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
                     return $fail('Username cannot be used.');
@@ -125,7 +128,7 @@ class RegisterController extends Controller
                 if ($value !== $this->getRegisterToken()) {
                     return $fail('Something went wrong');
                 }
-			}
+            },
         ];
 
         $rules = [
@@ -147,7 +150,6 @@ class RegisterController extends Controller
     /**
      * Create a new user instance after a valid registration.
      *
-	 * @param array $data
      *
      * @return \App\User
      */
@@ -163,7 +165,7 @@ class RegisterController extends Controller
             'username' => $data['username'],
             'email' => $data['email'],
             'password' => Hash::make($data['password']),
-			'app_register_ip' => request()->ip()
+            'app_register_ip' => request()->ip(),
         ]);
     }
 
@@ -181,11 +183,14 @@ class RegisterController extends Controller
             $hasLimit = config('pixelfed.enforce_max_users');
             if ($hasLimit) {
                 $limit = config('pixelfed.max_users');
-				$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();
                 if ($limit <= $count) {
                     return redirect(route('help.instance-max-users-limit'));
                 }
                 abort_if($limit <= $count, 404);
+
                 return view('auth.register');
             } else {
                 return view('auth.register');
@@ -202,7 +207,6 @@ class RegisterController extends Controller
     /**
      * Handle a registration request for the application.
      *
-	 * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function register(Request $request)
@@ -215,7 +219,9 @@ class RegisterController extends Controller
 
         $hasLimit = config('pixelfed.enforce_max_users');
         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');
 
             if ($limit && $limit <= $count) {
@@ -223,7 +229,6 @@ class RegisterController extends Controller
             }
         }
 
-
         $this->validator($request->all())->validate();
 
         event(new Registered($user = $this->create($request->all())));

package-lock.json

@@ -20,7 +20,7 @@
 				"caniuse-lite": "^1.0.30001418",
 				"chart.js": "^2.7.2",
 				"filesize": "^3.6.1",
-				"hls.js": "^1.1.5",
+				"hls.js": "^1.5.13",
 				"howler": "^2.2.0",
 				"infinite-scroll": "^3.0.6",
 				"jquery-scroll-lock": "^3.1.3",
@@ -5355,9 +5355,9 @@
 			}
 		},
 		"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": {
 			"version": "1.0.1",

package.json

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