api(application): v2 backport

This commit is contained in:
Matthew Penner 2022-12-14 17:05:46 -07:00
parent 4cd0bee231
commit 67bf3e342e
No known key found for this signature in database
172 changed files with 2922 additions and 1579 deletions

View file

@ -4,10 +4,13 @@ namespace Pterodactyl\Transformers\Api\Client;
use Illuminate\Support\Str;
use Pterodactyl\Models\User;
use League\Fractal\Resource\Item;
use Pterodactyl\Models\ActivityLog;
use Illuminate\Database\Eloquent\Model;
use League\Fractal\Resource\NullResource;
use Pterodactyl\Transformers\Api\Transformer;
class ActivityLogTransformer extends BaseClientTransformer
class ActivityLogTransformer extends Transformer
{
protected array $availableIncludes = ['actor'];
@ -34,13 +37,13 @@ class ActivityLogTransformer extends BaseClientTransformer
];
}
public function includeActor(ActivityLog $model)
public function includeActor(ActivityLog $model): Item|NullResource
{
if (!$model->actor instanceof User) {
return $this->null();
}
return $this->item($model->actor, $this->makeTransformer(UserTransformer::class), User::RESOURCE_NAME);
return $this->item($model->actor, new UserTransformer());
}
/**