Merge 2a5296f58e into eecf460e9e

app/DiscoverCategory.php

@@ -5,6 +5,14 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\{Status, StatusHashtag, Media};
 
+/**
+ * @property int $id
+ * @property string $slug
+ * @property int|null $media_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Media|null $media
+ */
 class DiscoverCategory extends Model
 {
     protected $fillable = ['slug'];

app/FollowRequest.php

@@ -5,6 +5,19 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Profile;
 
+/**
+ * @property int $id
+ * @property int $follower_id
+ * @property int $following_id
+ * @property array|null $activity
+ * @property \Illuminate\Support\Carbon|null $handled_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Profile $target
+ * @property-read \App\Profile $actor
+ * @property-read \App\Profile $follower
+ * @property-read \App\Profile $following
+ */
 class FollowRequest extends Model
 {
 	protected $fillable = ['follower_id', 'following_id', 'activity', 'handled_at'];

app/Follower.php

@@ -5,6 +5,17 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Profile;
 
+/**
+ * @property int $id
+ * @property int $profile_id
+ * @property int $following_id
+ * @property bool|null $local_profile
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Profile $actor
+ * @property-read \App\Profile $target
+ * @property-read \App\Profile $profile
+ */
 class Follower extends Model
 {
 

app/Http/Resources/Admin/AdminModeratedProfileResource.php

@@ -6,6 +6,20 @@ use App\Profile;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $id
+ * @property string $domain
+ * @property int $profile_id
+ * @property string|null $profile_url
+ * @property string|null $note
+ * @property bool $is_banned
+ * @property bool $is_nsfw
+ * @property bool $is_unlisted
+ * @property bool $is_noautolink
+ * @property bool $is_nodms
+ * @property bool $is_notrending
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class AdminModeratedProfileResource extends JsonResource
 {
     /**

app/Http/Resources/AdminHashtag.php

@@ -4,6 +4,17 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $id
+ * @property string $name
+ * @property string $slug
+ * @property bool|null $can_trend
+ * @property bool|null $can_search
+ * @property bool $is_nsfw
+ * @property bool $is_banned
+ * @property int|null $cached_count
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class AdminHashtag extends JsonResource
 {
     /**

app/Http/Resources/AdminInstance.php

@@ -4,6 +4,22 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $id
+ * @property string $domain
+ * @property string|null $software
+ * @property bool $unlisted
+ * @property bool $auto_cw
+ * @property bool $banned
+ * @property int|null $user_count
+ * @property int|null $status_count
+ * @property \Illuminate\Support\Carbon|null $last_crawled_at
+ * @property string|null $notes
+ * @property string|null $base_domain
+ * @property bool|null $ban_subdomains
+ * @property \Illuminate\Support\Carbon|null $actors_last_synced_at
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class AdminInstance extends JsonResource
 {
     /**

app/Http/Resources/AdminProfile.php

@@ -6,6 +6,14 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Services\AccountService;
 
+/**
+ * @property int $id
+ * @property string|null $domain
+ * @property string|null $status
+ * @property bool $cw
+ * @property bool $unlisted
+ * @property bool $no_autolink
+ */
 class AdminProfile extends JsonResource
 {
     /**

app/Http/Resources/AdminRemoteReport.php

@@ -8,6 +8,16 @@ use App\Instance;
 use App\Services\AccountService;
 use App\Services\StatusService;
 
+/**
+ * @property int $id
+ * @property string $uri
+ * @property int $account_id
+ * @property array|null $status_ids
+ * @property string|null $comment
+ * @property array|null $report_meta
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $action_taken_at
+ */
 class AdminRemoteReport extends JsonResource
 {
     /**

app/Http/Resources/AdminReport.php

@@ -8,6 +8,17 @@ use App\Story;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $id
+ * @property int $profile_id
+ * @property string|null $type
+ * @property int $object_id
+ * @property string $object_type
+ * @property int $reported_profile_id
+ * @property string|null $message
+ * @property \Illuminate\Support\Carbon|null $admin_seen
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class AdminReport extends JsonResource
 {
     /**

app/Http/Resources/AdminSpamReport.php

@@ -7,6 +7,14 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use App\Services\AccountService;
 use App\Services\StatusService;
 
+/**
+ * @property int $id
+ * @property string $type
+ * @property int|null $item_id
+ * @property string|null $item_type
+ * @property \Illuminate\Support\Carbon|null $read_at
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class AdminSpamReport extends JsonResource
 {
 	/**

app/Http/Resources/AdminUser.php

@@ -5,6 +5,21 @@ namespace App\Http\Resources;
 use App\Services\AccountService;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $id
+ * @property int $profile_id
+ * @property string|null $name
+ * @property string $username
+ * @property bool $is_admin
+ * @property string $email
+ * @property \Illuminate\Support\Carbon|null $email_verified_at
+ * @property bool $2fa_enabled
+ * @property string|null $register_source
+ * @property string|null $app_register_ip
+ * @property bool $has_interstitial
+ * @property \Illuminate\Support\Carbon|null $last_active_at
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class AdminUser extends JsonResource
 {
     /**

app/Http/Resources/DirectoryProfile.php

@@ -6,6 +6,11 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use Cache;
 use App\Services\AccountService;
 
+/**
+ * @property int $id
+ * @property string|null $name
+ * @property string $username
+ */
 class DirectoryProfile extends JsonResource
 {
 	/**

app/Http/Resources/ImportStatus.php

@@ -6,6 +6,9 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Services\StatusService;
 
+/**
+ * @property int $status_id
+ */
 class ImportStatus extends JsonResource
 {
     /**

app/Http/Resources/MastoApi/Admin/DomainBlockResource.php

@@ -5,6 +5,15 @@ namespace App\Http\Resources\MastoApi\Admin;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $id
+ * @property string $domain
+ * @property bool $banned
+ * @property bool $unlisted
+ * @property \Illuminate\Support\Carbon $updated_at
+ * @property array|null $notes
+ * @property string|null $limit_reason
+ */
 class DomainBlockResource extends JsonResource
 {
     /**

app/Http/Resources/MastoApi/FollowedTagResource.php

@@ -7,6 +7,9 @@ use Illuminate\Http\JsonResponse;
 use Cache;
 use App\Services\HashtagService;
 
+/**
+ * @property int $hashtag_id
+ */
 class FollowedTagResource extends JsonResource
 {
     /**

app/Http/Resources/StoryView.php

@@ -6,6 +6,10 @@ use App\Services\AccountService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $profile_id
+ * @property \Illuminate\Support\Carbon $created_at
+ */
 class StoryView extends JsonResource
 {
     /**

app/Http/Resources/UserAppSettingsResource.php

@@ -5,6 +5,11 @@ namespace App\Http\Resources;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+/**
+ * @property int $profile_id
+ * @property \Illuminate\Support\Carbon $updated_at
+ * @property array|null $common
+ */
 class UserAppSettingsResource extends JsonResource
 {
 

app/Models/Group.php

@@ -9,6 +9,19 @@ use App\Profile;
 use App\Services\GroupService;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+/**
+ * @property int $id
+ * @property int $profile_id
+ * @property string|null $name
+ * @property bool $is_private
+ * @property bool $local
+ * @property string|null $remote_url
+ * @property array|null $metadata
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read bool $is_local
+ */
 class Group extends Model
 {
     use HasSnowflakePrimary, HasFactory, SoftDeletes;

app/Models/ParentalControls.php

@@ -8,6 +8,20 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use App\User;
 use App\Services\AccountService;
 
+/**
+ * @property int $id
+ * @property int $parent_id
+ * @property int $child_id
+ * @property array|null $permissions
+ * @property string|null $verify_code
+ * @property \Illuminate\Support\Carbon|null $email_sent_at
+ * @property \Illuminate\Support\Carbon|null $email_verified_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\User $parent
+ * @property-read \App\User $child
+ */
 class ParentalControls extends Model
 {
     use HasFactory, SoftDeletes;

app/Profile.php

@@ -10,6 +10,25 @@ use App\Services\FollowerService;
 use App\Models\ProfileAlias;
 use App\Avatar;
 
+/**
+ * @property int $id
+ * @property int|null $user_id
+ * @property string $username
+ * @property string|null $name
+ * @property string|null $domain
+ * @property string|null $remote_url
+ * @property bool $is_private
+ * @property int $status_count
+ * @property int $following_count
+ * @property int $followers_count
+ * @property \Illuminate\Support\Carbon|null $last_fetched_at
+ * @property \Illuminate\Support\Carbon|null $last_status_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\User|null $user
+ * @property-read \App\Avatar $avatar
+ */
 class Profile extends Model
 {
 	use HasSnowflakePrimary, SoftDeletes;

app/Status.php

@@ -15,6 +15,32 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Str;
 use Storage;
 
+/**
+ * @property int $id
+ * @property int $profile_id
+ * @property string|null $type
+ * @property string|null $caption
+ * @property int|null $in_reply_to_id
+ * @property int|null $in_reply_to_profile_id
+ * @property int|null $reblog_of_id
+ * @property bool $is_nsfw
+ * @property string|null $scope
+ * @property string|null $visibility
+ * @property string|null $cw_summary
+ * @property bool $comments_disabled
+ * @property int $likes_count
+ * @property int $reblogs_count
+ * @property int $reply_count
+ * @property bool $local
+ * @property string|null $place
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $edited_at
+ * @property-read \App\Profile $profile
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Media> $media
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Mention> $mentions
+ */
 class Status extends Model
 {
     use HasSnowflakePrimary, SoftDeletes;

app/Story.php

@@ -7,6 +7,18 @@ use Auth;
 use Illuminate\Database\Eloquent\Model;
 use Storage;
 
+/**
+ * @property int $id
+ * @property int $profile_id
+ * @property string|null $path
+ * @property string|null $bearcap_token
+ * @property array|null $story
+ * @property int $view_count
+ * @property \Illuminate\Support\Carbon|null $expires_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Profile $profile
+ */
 class Story extends Model
 {
     use HasSnowflakePrimary;

app/StoryItem.php

@@ -6,6 +6,14 @@ use Illuminate\Database\Eloquent\Model;
 use Pixelfed\Snowflake\HasSnowflakePrimary;
 use Storage;
 
+/**
+ * @property int $id
+ * @property int $story_id
+ * @property string|null $media_path
+ * @property \Illuminate\Support\Carbon|null $expires_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ */
 class StoryItem extends Model
 {
 	use HasSnowflakePrimary;

tests/Unit/APAnnounceStrategyTest.php

@@ -8,6 +8,10 @@ use Tests\TestCase;
 
 class APAnnounceStrategyTest extends TestCase
 {
+    private array $invalid;
+    private array $mastodon;
+    private array $pleroma;
+
     public function setUp(): void
     {
         parent::setUp();