UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-18 19:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5225 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-07-17 02:25:07 -06:00 committed by GitHub
commit 9340cd5a53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -6,6 +6,9 @@
- 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)) - Update ApiV1Controller, fix /api/v1/favourits pagination ([72f68160](https://github.com/pixelfed/pixelfed/commit/72f68160))
- Update RegisterController, update username constraints, require atleast one alpha char ([dd6e3cc2](https://github.com/pixelfed/pixelfed/commit/dd6e3cc2))
- Update AdminUser, fix entity casting ([cb5620d4](https://github.com/pixelfed/pixelfed/commit/cb5620d4))
- ([](https://github.com/pixelfed/pixelfed/commit/))
- ([](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)

17
app/Http/Resources/AdminUser.php
View file

@ -2,8 +2,8 @@
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use App\Services\AccountService; use App\Services\AccountService;
use Illuminate\Http\Resources\Json\JsonResource;
class AdminUser extends JsonResource class AdminUser extends JsonResource
{ {
@ -18,8 +18,8 @@ class AdminUser extends JsonResource
$account = AccountService::get($this->profile_id, true); $account = AccountService::get($this->profile_id, true);
$res = [ $res = [
'id' => $this->id, 'id' => (string) $this->id,
'profile_id' => $this->profile_id, 'profile_id' => (string) $this->profile_id,
'name' => $this->name, 'name' => $this->name,
'username' => $this->username, 'username' => $this->username,
'is_admin' => (bool) $this->is_admin, 'is_admin' => (bool) $this->is_admin,
@ -28,17 +28,18 @@ class AdminUser extends JsonResource
'two_factor_enabled' => (bool) $this->{'2fa_enabled'}, 'two_factor_enabled' => (bool) $this->{'2fa_enabled'},
'register_source' => $this->register_source, 'register_source' => $this->register_source,
'app_register_ip' => $this->app_register_ip, 'app_register_ip' => $this->app_register_ip,
'has_interstitial' => (bool) $this->has_interstitial,
'last_active_at' => $this->last_active_at, 'last_active_at' => $this->last_active_at,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
]; ];
if($account) { if ($account) {
$res['avatar'] = $account['avatar']; $res['avatar'] = $account['avatar'];
$res['bio'] = $account['note_text']; $res['bio'] = $account['note_text'];
$res['statuses_count'] = $account['statuses_count']; $res['statuses_count'] = (int) $account['statuses_count'];
$res['following_count'] = $account['following_count']; $res['following_count'] = (int) $account['following_count'];
$res['followers_count'] = $account['followers_count']; $res['followers_count'] = (int) $account['followers_count'];
$res['is_private'] = $account['locked']; $res['is_private'] = (bool) $account['locked'];
} }
return $res; return $res;

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",