Преглед изворни кода

Merge pull request #3340 from pixelfed/staging

Staging
daniel пре 3 година
родитељ
комит
2a543a6e36

+ 1 - 0
CHANGELOG.md

@@ -110,6 +110,7 @@
 - Updated ApiV1Controller, fix accountStatusesById endpoint. ([db7b1af3](https://github.com/pixelfed/pixelfed/commit/db7b1af3))
 - Updated ApiV1Controller, fix accountStatusesById endpoint. ([db7b1af3](https://github.com/pixelfed/pixelfed/commit/db7b1af3))
 - Updated ApiV1Controller, update statusCreate entity. ([a84ab6ea](https://github.com/pixelfed/pixelfed/commit/a84ab6ea))
 - Updated ApiV1Controller, update statusCreate entity. ([a84ab6ea](https://github.com/pixelfed/pixelfed/commit/a84ab6ea))
 - Updated ApiV1Controller, remove pinned attribute to match MastoAPI Status entity. ([6057de30](https://github.com/pixelfed/pixelfed/commit/6057de30))
 - Updated ApiV1Controller, remove pinned attribute to match MastoAPI Status entity. ([6057de30](https://github.com/pixelfed/pixelfed/commit/6057de30))
+- Updated controller signatures, fix mysql 8 support. ([72e3d891](https://github.com/pixelfed/pixelfed/commit/72e3d891))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 
 ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)
 ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

+ 1 - 1
app/Http/Controllers/PublicApiController.php

@@ -128,7 +128,7 @@ class PublicApiController extends Controller
         return response()->json($res);
         return response()->json($res);
     }
     }
 
 
-    public function statusState(Request $request, $username, $postid)
+    public function statusState(Request $request, $username, int $postid)
     {
     {
         $profile = Profile::whereUsername($username)->whereNull('status')->firstOrFail();
         $profile = Profile::whereUsername($username)->whereNull('status')->firstOrFail();
         $status = Status::whereProfileId($profile->id)->findOrFail($postid);
         $status = Status::whereProfileId($profile->id)->findOrFail($postid);

+ 1 - 1
app/Http/Controllers/StatusController.php

@@ -29,7 +29,7 @@ use App\Services\ReblogService;
 
 
 class StatusController extends Controller
 class StatusController extends Controller
 {
 {
-	public function show(Request $request, $username, $id)
+	public function show(Request $request, $username, int $id)
 	{
 	{
 		// redirect authed users to Metro 2.0
 		// redirect authed users to Metro 2.0
 		if($request->user()) {
 		if($request->user()) {