[AUTOGENERATED] Update autogenerated code

src/Entity/Avatar.php

@@ -45,20 +45,20 @@ class Avatar extends Entity
 {
     // {{{ Autocode
 
-    private int $profile_id;
+    private int $gsactor_id;
     private int $file_id;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setFileId(int $file_id): self

src/Entity/ConfirmAddress.php

@@ -44,9 +44,9 @@ class ConfirmAddress
     private string $address;
     private ?string $address_extra;
     private string $address_type;
-    private ?\DateTimeInterface $claimed;
-    private \DateTimeInterface $sent;
-    private \DateTimeInterface $modified;
+    private ?DateTimeInterface $claimed;
+    private DateTimeInterface $sent;
+    private DateTimeInterface $modified;
 
     public function setCode(string $code): self
     {

src/Entity/Conversation.php

@@ -38,10 +38,9 @@ class Conversation
     // {{{ Autocode
 
     private int $id;
-    private string $uri;
-    private ?string $url;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private int $note_id;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {
@@ -54,26 +53,15 @@ class Conversation
         return $this->id;
     }
 
-    public function setUri(string $uri): self
+    public function setNoteId(int $note_id): self
     {
-        $this->uri = $uri;
+        $this->note_id = $note_id;
         return $this;
     }
 
-    public function getUri(): string
+    public function getNoteId(): int
     {
-        return $this->uri;
-    }
-
-    public function setUrl(?string $url): self
-    {
-        $this->url = $url;
-        return $this;
-    }
-
-    public function getUrl(): ?string
-    {
-        return $this->url;
+        return $this->note_id;
     }
 
     public function setCreated(DateTimeInterface $created): self

src/Entity/File.php

@@ -51,7 +51,7 @@ class File extends Entity
     private ?string $title;
     private ?int $timestamp;
     private ?bool $is_local;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {

src/Entity/FileThumbnail.php

@@ -42,7 +42,7 @@ class FileThumbnail
     private int $file_id;
     private int $width;
     private int $height;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setFileId(int $file_id): self
     {

src/Entity/FileToActivity.php

@@ -41,7 +41,7 @@ class FileToActivity
 
     private int $file_id;
     private int $activity_id;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setFileId(int $file_id): self
     {

src/Entity/Follow.php

@@ -43,8 +43,8 @@ class Follow
     private int $follower;
     private int $followed;
     private ?string $uri;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setFollower(int $follower): self
     {

src/Entity/FollowQueue.php

@@ -41,7 +41,7 @@ class FollowQueue
 
     private int $follower;
     private int $followed;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
 
     public function setFollower(int $follower): self
     {

src/Entity/GSActor.php

@@ -54,8 +54,8 @@ class GSActor extends Entity
     private ?float $lon;
     private ?int $location_id;
     private ?int $location_service;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {

src/Entity/GSActorBlock.php

@@ -41,7 +41,7 @@ class GSActorBlock
 
     private int $blocker;
     private int $blocked;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setBlocker(int $blocker): self
     {

src/Entity/GSActorCircle.php

@@ -45,12 +45,8 @@ class GSActorCircle
     private string $tag;
     private ?string $description;
     private ?bool $private;
-    private ?string $uri;
-    private ?string $mainpage;
-    private ?int $tagged_count;
-    private ?int $follower_count;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {
@@ -107,50 +103,6 @@ class GSActorCircle
         return $this->private;
     }
 
-    public function setUri(?string $uri): self
-    {
-        $this->uri = $uri;
-        return $this;
-    }
-
-    public function getUri(): ?string
-    {
-        return $this->uri;
-    }
-
-    public function setMainpage(?string $mainpage): self
-    {
-        $this->mainpage = $mainpage;
-        return $this;
-    }
-
-    public function getMainpage(): ?string
-    {
-        return $this->mainpage;
-    }
-
-    public function setTaggedCount(?int $tagged_count): self
-    {
-        $this->tagged_count = $tagged_count;
-        return $this;
-    }
-
-    public function getTaggedCount(): ?int
-    {
-        return $this->tagged_count;
-    }
-
-    public function setFollowerCount(?int $follower_count): self
-    {
-        $this->follower_count = $follower_count;
-        return $this;
-    }
-
-    public function getFollowerCount(): ?int
-    {
-        return $this->follower_count;
-    }
-
     public function setCreated(DateTimeInterface $created): self
     {
         $this->created = $created;
@@ -197,11 +149,9 @@ class GSActorCircle
                 'gsactor_list_tagger_fkey' => ['gsactor', ['tagger' => 'id']],
             ],
             'indexes' => [
-                'gsactor_list_modified_idx'       => ['modified'],
-                'gsactor_list_tag_idx'            => ['tag'],
-                'gsactor_list_tagger_tag_idx'     => ['tagger', 'tag'],
-                'gsactor_list_tagged_count_idx'   => ['tagged_count'],
-                'gsactor_list_follower_count_idx' => ['follower_count'],
+                'gsactor_list_modified_idx'   => ['modified'],
+                'gsactor_list_tag_idx'        => ['tag'],
+                'gsactor_list_tagger_tag_idx' => ['tagger', 'tag'],
             ],
         ];
     }

src/Entity/GSActorTag.php

@@ -42,7 +42,7 @@ class GSActorTag
     private int $tagger;
     private int $tagged;
     private string $tag;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setTagger(int $tagger): self
     {

src/Entity/GSActorTagFollow.php

@@ -39,31 +39,31 @@ class GSActorTagFollow
 {
     // {{{ Autocode
 
-    private int $profile_tag_id;
-    private int $profile_id;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private int $gsactor_tag_id;
+    private int $gsactor_id;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
-    public function setProfileTagId(int $profile_tag_id): self
+    public function setGsactorTagId(int $gsactor_tag_id): self
     {
-        $this->profile_tag_id = $profile_tag_id;
+        $this->gsactor_tag_id = $gsactor_tag_id;
         return $this;
     }
 
-    public function getProfileTagId(): int
+    public function getGsactorTagId(): int
     {
-        return $this->profile_tag_id;
+        return $this->gsactor_tag_id;
     }
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setCreated(DateTimeInterface $created): self

src/Entity/Group.php

@@ -40,7 +40,7 @@ class Group
     // {{{ Autocode
 
     private int $id;
-    private int $profile_id;
+    private int $gsactor_id;
     private ?string $nickname;
     private ?string $fullname;
     private ?string $homepage;
@@ -55,8 +55,8 @@ class Group
     private ?string $mainpage;
     private ?int $join_policy;
     private ?int $force_scope;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {
@@ -69,15 +69,15 @@ class Group
         return $this->id;
     }
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setNickname(?string $nickname): self

src/Entity/GroupAlias.php

@@ -41,7 +41,7 @@ class GroupAlias
 
     private string $alias;
     private int $group_id;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setAlias(string $alias): self
     {

src/Entity/GroupBlock.php

@@ -40,9 +40,9 @@ class GroupBlock
     // {{{ Autocode
 
     private int $group_id;
-    private int $blocked_profile;
+    private int $blocked_gsactor;
     private int $blocker_user;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setGroupId(int $group_id): self
     {
@@ -55,15 +55,15 @@ class GroupBlock
         return $this->group_id;
     }
 
-    public function setBlockedProfile(int $blocked_profile): self
+    public function setBlockedGsactor(int $blocked_gsactor): self
     {
-        $this->blocked_profile = $blocked_profile;
+        $this->blocked_gsactor = $blocked_gsactor;
         return $this;
     }
 
-    public function getBlockedProfile(): int
+    public function getBlockedGsactor(): int
     {
-        return $this->blocked_profile;
+        return $this->blocked_gsactor;
     }
 
     public function setBlockerUser(int $blocker_user): self

src/Entity/GroupInbox.php

@@ -41,7 +41,7 @@ class GroupInbox
 
     private int $group_id;
     private int $activity_id;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
 
     public function setGroupId(int $group_id): self
     {

src/Entity/GroupJoinQueue.php

@@ -39,19 +39,19 @@ class GroupJoinQueue
 {
     // {{{ Autocode
 
-    private int $profile_id;
+    private int $gsactor_id;
     private int $group_id;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setGroupId(int $group_id): self

src/Entity/GroupMember.php

@@ -40,11 +40,11 @@ class GroupMember
     // {{{ Autocode
 
     private int $group_id;
-    private int $profile_id;
+    private int $gsactor_id;
     private ?bool $is_admin;
     private ?string $uri;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setGroupId(int $group_id): self
     {
@@ -57,15 +57,15 @@ class GroupMember
         return $this->group_id;
     }
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setIsAdmin(?bool $is_admin): self

src/Entity/Invitation.php

@@ -44,7 +44,7 @@ class Invitation
     private string $address;
     private string $address_type;
     private ?int $registered_user_id;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
 
     public function setCode(string $code): self
     {

src/Entity/LocalGroup.php

@@ -41,8 +41,8 @@ class LocalGroup
 
     private int $group_id;
     private ?string $nickname;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setGroupId(int $group_id): self
     {

src/Entity/LocalUser.php

@@ -60,8 +60,8 @@ class LocalUser extends Entity implements UserInterface
     private ?bool $auto_follow_back;
     private ?int $follow_policy;
     private ?bool $is_stream_private;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setNickname(?string $nickname): self
     {

src/Entity/LocationService.php

@@ -41,8 +41,8 @@ class LocationService
 
     private int $id;
     private ?string $description;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {

src/Entity/Note.php

@@ -38,20 +38,16 @@ class Note
     // {{{ Autocode
 
     private int $id;
-    private int $profile_id;
-    private ?string $uri;
+    private int $gsactor_id;
     private ?string $content;
-    private ?string $rendered;
     private ?int $reply_to;
     private ?bool $is_local;
     private ?string $source;
     private ?int $conversation;
     private ?int $repeat_of;
-    private ?string $object_type;
-    private ?string $verb;
     private ?int $scope;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {
@@ -64,26 +60,15 @@ class Note
         return $this->id;
     }
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
-    }
-
-    public function setUri(?string $uri): self
-    {
-        $this->uri = $uri;
-        return $this;
-    }
-
-    public function getUri(): ?string
-    {
-        return $this->uri;
+        return $this->gsactor_id;
     }
 
     public function setContent(?string $content): self
@@ -97,17 +82,6 @@ class Note
         return $this->content;
     }
 
-    public function setRendered(?string $rendered): self
-    {
-        $this->rendered = $rendered;
-        return $this;
-    }
-
-    public function getRendered(): ?string
-    {
-        return $this->rendered;
-    }
-
     public function setReplyTo(?int $reply_to): self
     {
         $this->reply_to = $reply_to;
@@ -163,28 +137,6 @@ class Note
         return $this->repeat_of;
     }
 
-    public function setObjectType(?string $object_type): self
-    {
-        $this->object_type = $object_type;
-        return $this;
-    }
-
-    public function getObjectType(): ?string
-    {
-        return $this->object_type;
-    }
-
-    public function setVerb(?string $verb): self
-    {
-        $this->verb = $verb;
-        return $this;
-    }
-
-    public function getVerb(): ?string
-    {
-        return $this->verb;
-    }
-
     public function setScope(?int $scope): self
     {
         $this->scope = $scope;

src/Entity/NoteHashtag.php

@@ -1,6 +1,6 @@
 <?php
 
-// {{{ License
+// {{{ License/
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
 // GNU social is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@ class NoteHashtag
     // {{{ Autocode
 
     private string $tag;
-    private int $activity_id;
+    private int $note_id;
     private DateTimeInterface $created;
 
     public function setTag(string $tag): self
@@ -55,15 +55,15 @@ class NoteHashtag
         return $this->tag;
     }
 
-    public function setActivityId(int $activity_id): self
+    public function setNoteId(int $note_id): self
     {
-        $this->activity_id = $activity_id;
+        $this->note_id = $note_id;
         return $this;
     }
 
-    public function getActivityId(): int
+    public function getNoteId(): int
     {
-        return $this->activity_id;
+        return $this->note_id;
     }
 
     public function setCreated(DateTimeInterface $created): self
@@ -85,9 +85,9 @@ class NoteHashtag
             'name'        => 'note_hashtag',
             'description' => 'Hash tags on notes',
             'fields'      => [
-                'tag'      => ['type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this note'],
-                'note_id'  => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to tagged note'],
-                'modified' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+                'tag'     => ['type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this note'],
+                'note_id' => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to tagged note'],
+                'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
             ],
             'primary key'  => ['tag', 'note_id'],
             'foreign keys' => [

src/Entity/NoteLocation.php

@@ -39,22 +39,22 @@ class NoteLocation
 {
     // {{{ Autocode
 
-    private int $activity_id;
+    private int $note_id;
     private ?float $lat;
     private ?float $lon;
     private ?int $location_id;
     private ?int $location_service;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
-    public function setActivityId(int $activity_id): self
+    public function setNoteId(int $note_id): self
     {
-        $this->activity_id = $activity_id;
+        $this->note_id = $note_id;
         return $this;
     }
 
-    public function getActivityId(): int
+    public function getNoteId(): int
     {
-        return $this->activity_id;
+        return $this->note_id;
     }
 
     public function setLat(?float $lat): self

src/Entity/NoteSource.php

@@ -42,8 +42,7 @@ class NoteSource
     private string $code;
     private string $name;
     private string $url;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setCode(string $code): self
     {
@@ -78,17 +77,6 @@ class NoteSource
         return $this->url;
     }
 
-    public function setCreated(DateTimeInterface $created): self
-    {
-        $this->created = $created;
-        return $this;
-    }
-
-    public function getCreated(): DateTimeInterface
-    {
-        return $this->created;
-    }
-
     public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;

src/Entity/Notification.php

@@ -40,10 +40,10 @@ class Notification
     // {{{ Autocode
 
     private int $notice_id;
-    private int $profile_id;
+    private int $gsactor_id;
     private ?string $reason;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setNoticeId(int $notice_id): self
     {
@@ -56,15 +56,15 @@ class Notification
         return $this->notice_id;
     }
 
-    public function setProfileId(int $profile_id): self
+    public function setGsactorId(int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): int
+    public function getGsactorId(): int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setReason(?string $reason): self

src/Entity/RelatedGroup.php

@@ -41,7 +41,7 @@ class RelatedGroup
 
     private int $group_id;
     private int $related_group_id;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
 
     public function setGroupId(int $group_id): self
     {

src/Entity/RememberMeToken.php

@@ -39,7 +39,7 @@ class RememberMeToken
 
     private string $series;
     private string $value;
-    private \DateTimeInterface $lastUsed;
+    private DateTimeInterface $lastUsed;
     private string $class;
     private string $username;
 

src/Entity/ReservedNickname.php

@@ -40,7 +40,7 @@ class ReservedNickname
     // {{{ Autocode
 
     private string $nickname;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
 
     public function setNickname(string $nickname): self
     {

src/Entity/SmsCarrier.php

@@ -42,8 +42,8 @@ class SmsCarrier
     private int $id;
     private ?string $name;
     private string $email_pattern;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {

src/Entity/UserLocationPrefs.php

@@ -39,8 +39,8 @@ class UserLocationPrefs
 
     private int $user_id;
     private ?bool $share_location;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setUserId(int $user_id): self
     {

src/Entity/UserNotificationPrefs.php

@@ -37,7 +37,7 @@ class UserNotificationPrefs
 
     private int $user_id;
     private string $transport;
-    private ?int $target_profile_id;
+    private ?int $target_gsactor_id;
     private bool $activity_by_followed  = true;
     private bool $mention               = true;
     private bool $reply                 = true;
@@ -47,8 +47,8 @@ class UserNotificationPrefs
     private bool $dm                    = true;
     private bool $post_on_status_change = false;
     private ?bool $enable_posting;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setUserId(int $user_id): self
     {
@@ -72,15 +72,15 @@ class UserNotificationPrefs
         return $this->transport;
     }
 
-    public function setTargetProfileId(?int $target_profile_id): self
+    public function setTargetGsactorId(?int $target_gsactor_id): self
     {
-        $this->target_profile_id = $target_profile_id;
+        $this->target_gsactor_id = $target_gsactor_id;
         return $this;
     }
 
-    public function getTargetProfileId(): ?int
+    public function getTargetGsactorId(): ?int
     {
-        return $this->target_profile_id;
+        return $this->target_gsactor_id;
     }
 
     public function setActivityByFollowed(bool $activity_by_followed): self

src/Entity/UserUrlShortenerPrefs.php

@@ -43,8 +43,8 @@ class UserUrlShortenerPrefs
     private ?string $url_shortening_service;
     private int $max_url_length;
     private int $max_notice_length;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setUserId(int $user_id): self
     {