diff --git a/src/Entity/Activity.php b/src/Entity/Activity.php index c112ae116d..0153b28af1 100644 --- a/src/Entity/Activity.php +++ b/src/Entity/Activity.php @@ -46,24 +46,22 @@ class Activity private ?string $uri; private ?string $content; private ?string $rendered; - private ?string $url; - private DateTimeInterface $created; - private DateTimeInterface $modified; private ?int $reply_to; - private ?int $is_local; + 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; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -74,7 +72,6 @@ class Activity $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -85,7 +82,6 @@ class Activity $this->uri = $uri; return $this; } - public function getUri(): ?string { return $this->uri; @@ -96,7 +92,6 @@ class Activity $this->content = $content; return $this; } - public function getContent(): ?string { return $this->content; @@ -107,63 +102,27 @@ class Activity $this->rendered = $rendered; return $this; } - public function getRendered(): ?string { return $this->rendered; } - public function setUrl(?string $url): self - { - $this->url = $url; - return $this; - } - - public function getUrl(): ?string - { - 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; - return $this; - } - - public function getModified(): DateTimeInterface - { - return $this->modified; - } - public function setReplyTo(?int $reply_to): self { $this->reply_to = $reply_to; return $this; } - public function getReplyTo(): ?int { return $this->reply_to; } - public function setIsLocal(?int $is_local): self + public function setIsLocal(?bool $is_local): self { $this->is_local = $is_local; return $this; } - - public function getIsLocal(): ?int + public function getIsLocal(): ?bool { return $this->is_local; } @@ -173,7 +132,6 @@ class Activity $this->source = $source; return $this; } - public function getSource(): ?string { return $this->source; @@ -184,7 +142,6 @@ class Activity $this->conversation = $conversation; return $this; } - public function getConversation(): ?int { return $this->conversation; @@ -195,7 +152,6 @@ class Activity $this->repeat_of = $repeat_of; return $this; } - public function getRepeatOf(): ?int { return $this->repeat_of; @@ -206,7 +162,6 @@ class Activity $this->object_type = $object_type; return $this; } - public function getObjectType(): ?string { return $this->object_type; @@ -217,7 +172,6 @@ class Activity $this->verb = $verb; return $this; } - public function getVerb(): ?string { return $this->verb; @@ -228,12 +182,31 @@ class Activity $this->scope = $scope; return $this; } - public function getScope(): ?int { return $this->scope; } + 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; + return $this; + } + public function getModified(): DateTimeInterface + { + return $this->modified; + } + // }}} Autocode public static function schemaDef(): array @@ -281,7 +254,7 @@ class Activity ], ]; - if (common_config('search', 'type') == 'fulltext') { + if (isset($_ENV['SOCIAL_DB_USE_FULLTEXT_SEARCH'])) { $def['fulltext indexes'] = ['content' => ['content']]; } diff --git a/src/Entity/ActivityLocation.php b/src/Entity/ActivityLocation.php index ef71454e8d..84c2cc47f8 100644 --- a/src/Entity/ActivityLocation.php +++ b/src/Entity/ActivityLocation.php @@ -39,22 +39,21 @@ class ActivityLocation { // {{{ Autocode - private int $notice_id; + private int $activity_id; private ?float $lat; private ?float $lon; private ?int $location_id; - private ?int $location_ns; - private DateTimeInterface $modified; + private ?int $location_service; + private \DateTimeInterface $modified; - public function setNoticeId(int $notice_id): self + public function setActivityId(int $activity_id): self { - $this->notice_id = $notice_id; + $this->activity_id = $activity_id; return $this; } - - public function getNoticeId(): int + public function getActivityId(): int { - return $this->notice_id; + return $this->activity_id; } public function setLat(?float $lat): self @@ -62,7 +61,6 @@ class ActivityLocation $this->lat = $lat; return $this; } - public function getLat(): ?float { return $this->lat; @@ -73,7 +71,6 @@ class ActivityLocation $this->lon = $lon; return $this; } - public function getLon(): ?float { return $this->lon; @@ -84,21 +81,19 @@ class ActivityLocation $this->location_id = $location_id; return $this; } - public function getLocationId(): ?int { return $this->location_id; } - public function setLocationNs(?int $location_ns): self + public function setLocationService(?int $location_service): self { - $this->location_ns = $location_ns; + $this->location_service = $location_service; return $this; } - - public function getLocationNs(): ?int + public function getLocationService(): ?int { - return $this->location_ns; + return $this->location_service; } public function setModified(DateTimeInterface $modified): self @@ -106,7 +101,6 @@ class ActivityLocation $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/ActivitySource.php b/src/Entity/ActivitySource.php index a47122e3e3..29ede79db4 100644 --- a/src/Entity/ActivitySource.php +++ b/src/Entity/ActivitySource.php @@ -42,16 +42,14 @@ class ActivitySource private string $code; private string $name; private string $url; - private int $notice_id; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setCode(string $code): self { $this->code = $code; return $this; } - public function getCode(): string { return $this->code; @@ -62,7 +60,6 @@ class ActivitySource $this->name = $name; return $this; } - public function getName(): string { return $this->name; @@ -73,29 +70,16 @@ class ActivitySource $this->url = $url; return $this; } - public function getUrl(): string { return $this->url; } - public function setNoticeId(int $notice_id): self - { - $this->notice_id = $notice_id; - return $this; - } - - public function getNoticeId(): int - { - return $this->notice_id; - } - public function setCreated(DateTimeInterface $created): self { $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -106,7 +90,6 @@ class ActivitySource $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/ActivityTag.php b/src/Entity/ActivityTag.php index 75312421a1..58cce60299 100644 --- a/src/Entity/ActivityTag.php +++ b/src/Entity/ActivityTag.php @@ -40,29 +40,27 @@ class ActivityTag // {{{ Autocode private string $tag; - private int $notice_id; - private DateTimeInterface $created; + private int $activity_id; + private \DateTimeInterface $created; public function setTag(string $tag): self { $this->tag = $tag; return $this; } - public function getTag(): string { return $this->tag; } - public function setNoticeId(int $notice_id): self + public function setActivityId(int $activity_id): self { - $this->notice_id = $notice_id; + $this->activity_id = $activity_id; return $this; } - - public function getNoticeId(): int + public function getActivityId(): int { - return $this->notice_id; + return $this->activity_id; } public function setCreated(DateTimeInterface $created): self @@ -70,7 +68,6 @@ class ActivityTag $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/Avatar.php b/src/Entity/Avatar.php index c26db67d1d..52ad83099b 100644 --- a/src/Entity/Avatar.php +++ b/src/Entity/Avatar.php @@ -40,34 +40,31 @@ class Avatar // {{{ Autocode private int $profile_id; - private ?bool $original; + private ?bool $is_original; private int $width; private int $height; private string $mediatype; - private ?string $filename; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setProfileId(int $profile_id): self { $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; } - public function setOriginal(?bool $original): self + public function setIsOriginal(?bool $is_original): self { - $this->original = $original; + $this->is_original = $is_original; return $this; } - - public function getOriginal(): ?bool + public function getIsOriginal(): ?bool { - return $this->original; + return $this->is_original; } public function setWidth(int $width): self @@ -75,7 +72,6 @@ class Avatar $this->width = $width; return $this; } - public function getWidth(): int { return $this->width; @@ -86,7 +82,6 @@ class Avatar $this->height = $height; return $this; } - public function getHeight(): int { return $this->height; @@ -97,29 +92,16 @@ class Avatar $this->mediatype = $mediatype; return $this; } - public function getMediatype(): string { return $this->mediatype; } - public function setFilename(?string $filename): self - { - $this->filename = $filename; - return $this; - } - - public function getFilename(): ?string - { - return $this->filename; - } - public function setCreated(DateTimeInterface $created): self { $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -130,7 +112,6 @@ class Avatar $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/Config.php b/src/Entity/Config.php index 4530b37f69..ad0d58bd52 100644 --- a/src/Entity/Config.php +++ b/src/Entity/Config.php @@ -46,7 +46,6 @@ class Config $this->section = $section; return $this; } - public function getSection(): string { return $this->section; @@ -57,7 +56,6 @@ class Config $this->setting = $setting; return $this; } - public function getSetting(): string { return $this->setting; @@ -68,7 +66,6 @@ class Config $this->value = $value; return $this; } - public function getValue(): ?string { return $this->value; @@ -76,13 +73,6 @@ class Config // }}} Autocode - public function __construct($sec, $set, $val) - { - $this->section = $sec; - $this->setting = $set; - $this->value = $val; - } - public static function schemaDef(): array { return [ diff --git a/src/Entity/ConfirmAddress.php b/src/Entity/ConfirmAddress.php index 7aa42b3c5a..fab179e107 100644 --- a/src/Entity/ConfirmAddress.php +++ b/src/Entity/ConfirmAddress.php @@ -44,16 +44,15 @@ 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 { $this->code = $code; return $this; } - public function getCode(): string { return $this->code; @@ -64,7 +63,6 @@ class ConfirmAddress $this->user_id = $user_id; return $this; } - public function getUserId(): ?int { return $this->user_id; @@ -75,7 +73,6 @@ class ConfirmAddress $this->address = $address; return $this; } - public function getAddress(): string { return $this->address; @@ -86,7 +83,6 @@ class ConfirmAddress $this->address_extra = $address_extra; return $this; } - public function getAddressExtra(): ?string { return $this->address_extra; @@ -97,7 +93,6 @@ class ConfirmAddress $this->address_type = $address_type; return $this; } - public function getAddressType(): string { return $this->address_type; @@ -108,7 +103,6 @@ class ConfirmAddress $this->claimed = $claimed; return $this; } - public function getClaimed(): ?DateTimeInterface { return $this->claimed; @@ -119,7 +113,6 @@ class ConfirmAddress $this->sent = $sent; return $this; } - public function getSent(): ?DateTimeInterface { return $this->sent; @@ -130,7 +123,6 @@ class ConfirmAddress $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/Conversation.php b/src/Entity/Conversation.php index 2bc2c5d781..52ea4b25d4 100644 --- a/src/Entity/Conversation.php +++ b/src/Entity/Conversation.php @@ -40,15 +40,14 @@ class Conversation private int $id; private string $uri; private ?string $url; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -59,7 +58,6 @@ class Conversation $this->uri = $uri; return $this; } - public function getUri(): string { return $this->uri; @@ -70,7 +68,6 @@ class Conversation $this->url = $url; return $this; } - public function getUrl(): ?string { return $this->url; @@ -81,7 +78,6 @@ class Conversation $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -92,7 +88,6 @@ class Conversation $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/File.php b/src/Entity/File.php index 32a86a7344..6f2af51355 100644 --- a/src/Entity/File.php +++ b/src/Entity/File.php @@ -40,61 +40,67 @@ class File // {{{ Autocode private int $id; - private string $urlhash; private ?string $url; - private ?string $filehash; + private ?bool $is_url_protected; + private string $url_hash; + private ?string $file_hash; private ?string $mimetype; private ?int $size; private ?string $title; - private ?int $date; - private ?int $protected; - private ?string $filename; + private ?int $timestamp; + private ?bool $is_local; private ?int $width; private ?int $height; - private DateTimeInterface $modified; + private \DateTimeInterface $modified; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; } - public function setUrlhash(string $urlhash): self - { - $this->urlhash = $urlhash; - return $this; - } - - public function getUrlhash(): string - { - return $this->urlhash; - } - public function setUrl(?string $url): self { $this->url = $url; return $this; } - public function getUrl(): ?string { return $this->url; } - public function setFilehash(?string $filehash): self + public function setIsUrlProtected(?bool $is_url_protected): self { - $this->filehash = $filehash; + $this->is_url_protected = $is_url_protected; return $this; } - - public function getFilehash(): ?string + public function getIsUrlProtected(): ?bool { - return $this->filehash; + return $this->is_url_protected; + } + + public function setUrlHash(string $url_hash): self + { + $this->url_hash = $url_hash; + return $this; + } + public function getUrlHash(): string + { + return $this->url_hash; + } + + public function setFileHash(?string $file_hash): self + { + $this->file_hash = $file_hash; + return $this; + } + public function getFileHash(): ?string + { + return $this->file_hash; } public function setMimetype(?string $mimetype): self @@ -102,7 +108,6 @@ class File $this->mimetype = $mimetype; return $this; } - public function getMimetype(): ?string { return $this->mimetype; @@ -113,7 +118,6 @@ class File $this->size = $size; return $this; } - public function getSize(): ?int { return $this->size; @@ -124,43 +128,29 @@ class File $this->title = $title; return $this; } - public function getTitle(): ?string { return $this->title; } - public function setDate(?int $date): self + public function setTimestamp(?int $timestamp): self { - $this->date = $date; + $this->timestamp = $timestamp; return $this; } - - public function getDate(): ?int + public function getTimestamp(): ?int { - return $this->date; + return $this->timestamp; } - public function setProtected(?int $protected): self + public function setIsLocal(?bool $is_local): self { - $this->protected = $protected; + $this->is_local = $is_local; return $this; } - - public function getProtected(): ?int + public function getIsLocal(): ?bool { - return $this->protected; - } - - public function setFilename(?string $filename): self - { - $this->filename = $filename; - return $this; - } - - public function getFilename(): ?string - { - return $this->filename; + return $this->is_local; } public function setWidth(?int $width): self @@ -168,7 +158,6 @@ class File $this->width = $width; return $this; } - public function getWidth(): ?int { return $this->width; @@ -179,7 +168,6 @@ class File $this->height = $height; return $this; } - public function getHeight(): ?int { return $this->height; @@ -190,7 +178,6 @@ class File $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/FileThumbnail.php b/src/Entity/FileThumbnail.php index 3dec606c2a..0d389a5a44 100644 --- a/src/Entity/FileThumbnail.php +++ b/src/Entity/FileThumbnail.php @@ -40,63 +40,25 @@ class FileThumbnail // {{{ Autocode private int $file_id; - private ?string $urlhash; - private ?string $url; - private ?string $filename; private int $width; private int $height; - private DateTimeInterface $modified; + private \DateTimeInterface $modified; public function setFileId(int $file_id): self { $this->file_id = $file_id; return $this; } - public function getFileId(): int { return $this->file_id; } - public function setUrlhash(?string $urlhash): self - { - $this->urlhash = $urlhash; - return $this; - } - - public function getUrlhash(): ?string - { - return $this->urlhash; - } - - public function setUrl(?string $url): self - { - $this->url = $url; - return $this; - } - - public function getUrl(): ?string - { - return $this->url; - } - - public function setFilename(?string $filename): self - { - $this->filename = $filename; - return $this; - } - - public function getFilename(): ?string - { - return $this->filename; - } - public function setWidth(int $width): self { $this->width = $width; return $this; } - public function getWidth(): int { return $this->width; @@ -107,7 +69,6 @@ class FileThumbnail $this->height = $height; return $this; } - public function getHeight(): int { return $this->height; @@ -118,7 +79,6 @@ class FileThumbnail $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/FileToActivity.php b/src/Entity/FileToActivity.php index cf1ec5166c..733a5d4298 100644 --- a/src/Entity/FileToActivity.php +++ b/src/Entity/FileToActivity.php @@ -40,29 +40,27 @@ class FileToActivity // {{{ Autocode private int $file_id; - private int $post_id; - private DateTimeInterface $modified; + private int $activity_id; + private \DateTimeInterface $modified; public function setFileId(int $file_id): self { $this->file_id = $file_id; return $this; } - public function getFileId(): int { return $this->file_id; } - public function setPostId(int $post_id): self + public function setActivityId(int $activity_id): self { - $this->post_id = $post_id; + $this->activity_id = $activity_id; return $this; } - - public function getPostId(): int + public function getActivityId(): int { - return $this->post_id; + return $this->activity_id; } public function setModified(DateTimeInterface $modified): self @@ -70,7 +68,6 @@ class FileToActivity $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/Follow.php b/src/Entity/Follow.php index 980eec2e5e..cfcebf04f2 100644 --- a/src/Entity/Follow.php +++ b/src/Entity/Follow.php @@ -40,80 +40,30 @@ class Follow // {{{ Autocode >>>>>>> e63aa4d971 ([TOOLS] Change autocode tag to allow editor folding) - private int $subscriber; - private int $subscribed; - private ?bool $jabber; - private ?bool $sms; - private ?string $token; - private ?string $secret; + private int $follower; + private int $followed; private ?string $uri; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; - public function setSubscriber(int $subscriber): self + public function setFollower(int $follower): self { - $this->subscriber = $subscriber; + $this->follower = $follower; return $this; } - - public function getSubscriber(): int + public function getFollower(): int { - return $this->subscriber; + return $this->follower; } - public function setSubscribed(int $subscribed): self + public function setFollowed(int $followed): self { - $this->subscribed = $subscribed; + $this->followed = $followed; return $this; } - - public function getSubscribed(): int + public function getFollowed(): int { - return $this->subscribed; - } - - public function setJabber(?bool $jabber): self - { - $this->jabber = $jabber; - return $this; - } - - public function getJabber(): ?bool - { - return $this->jabber; - } - - public function setSms(?bool $sms): self - { - $this->sms = $sms; - return $this; - } - - public function getSms(): ?bool - { - return $this->sms; - } - - public function setToken(?string $token): self - { - $this->token = $token; - return $this; - } - - public function getToken(): ?string - { - return $this->token; - } - - public function setSecret(?string $secret): self - { - $this->secret = $secret; - return $this; - } - - public function getSecret(): ?string - { - return $this->secret; + return $this->followed; } public function setUri(?string $uri): self @@ -121,7 +71,6 @@ class Follow $this->uri = $uri; return $this; } - public function getUri(): ?string { return $this->uri; @@ -132,7 +81,6 @@ class Follow $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -143,7 +91,6 @@ class Follow $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/FollowQueue.php b/src/Entity/FollowQueue.php index 647f63d24d..8147dfb9bd 100644 --- a/src/Entity/FollowQueue.php +++ b/src/Entity/FollowQueue.php @@ -39,30 +39,28 @@ class FollowQueue { // {{{ Autocode - private int $subscriber; - private int $subscribed; - private DateTimeInterface $created; + private int $follower; + private int $followed; + private \DateTimeInterface $created; - public function setSubscriber(int $subscriber): self + public function setFollower(int $follower): self { - $this->subscriber = $subscriber; + $this->follower = $follower; return $this; } - - public function getSubscriber(): int + public function getFollower(): int { - return $this->subscriber; + return $this->follower; } - public function setSubscribed(int $subscribed): self + public function setFollowed(int $followed): self { - $this->subscribed = $subscribed; + $this->followed = $followed; return $this; } - - public function getSubscribed(): int + public function getFollowed(): int { - return $this->subscribed; + return $this->followed; } public function setCreated(DateTimeInterface $created): self @@ -70,7 +68,6 @@ class FollowQueue $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/Group.php b/src/Entity/Group.php index a7edb48f70..37fc5a4ac7 100644 --- a/src/Entity/Group.php +++ b/src/Entity/Group.php @@ -45,13 +45,14 @@ class Group private ?string $fullname; private ?string $homepage; private ?string $description; + private ?bool $is_local; private ?string $location; private ?string $original_logo; private ?string $homepage_logo; private ?string $stream_logo; private ?string $mini_logo; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; private ?string $uri; private ?string $mainpage; private ?int $join_policy; @@ -62,7 +63,6 @@ class Group $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -73,7 +73,6 @@ class Group $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -84,7 +83,6 @@ class Group $this->nickname = $nickname; return $this; } - public function getNickname(): ?string { return $this->nickname; @@ -95,7 +93,6 @@ class Group $this->fullname = $fullname; return $this; } - public function getFullname(): ?string { return $this->fullname; @@ -106,7 +103,6 @@ class Group $this->homepage = $homepage; return $this; } - public function getHomepage(): ?string { return $this->homepage; @@ -117,18 +113,26 @@ class Group $this->description = $description; return $this; } - public function getDescription(): ?string { return $this->description; } + public function setIsLocal(?bool $is_local): self + { + $this->is_local = $is_local; + return $this; + } + public function getIsLocal(): ?bool + { + return $this->is_local; + } + public function setLocation(?string $location): self { $this->location = $location; return $this; } - public function getLocation(): ?string { return $this->location; @@ -139,7 +143,6 @@ class Group $this->original_logo = $original_logo; return $this; } - public function getOriginalLogo(): ?string { return $this->original_logo; @@ -150,7 +153,6 @@ class Group $this->homepage_logo = $homepage_logo; return $this; } - public function getHomepageLogo(): ?string { return $this->homepage_logo; @@ -161,7 +163,6 @@ class Group $this->stream_logo = $stream_logo; return $this; } - public function getStreamLogo(): ?string { return $this->stream_logo; @@ -172,7 +173,6 @@ class Group $this->mini_logo = $mini_logo; return $this; } - public function getMiniLogo(): ?string { return $this->mini_logo; @@ -183,7 +183,6 @@ class Group $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -194,7 +193,6 @@ class Group $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; @@ -205,7 +203,6 @@ class Group $this->uri = $uri; return $this; } - public function getUri(): ?string { return $this->uri; @@ -216,7 +213,6 @@ class Group $this->mainpage = $mainpage; return $this; } - public function getMainpage(): ?string { return $this->mainpage; @@ -227,7 +223,6 @@ class Group $this->join_policy = $join_policy; return $this; } - public function getJoinPolicy(): ?int { return $this->join_policy; @@ -238,7 +233,6 @@ class Group $this->force_scope = $force_scope; return $this; } - public function getForceScope(): ?int { return $this->force_scope; diff --git a/src/Entity/GroupAlias.php b/src/Entity/GroupAlias.php index 7569982ab6..ceb03451d6 100644 --- a/src/Entity/GroupAlias.php +++ b/src/Entity/GroupAlias.php @@ -41,14 +41,13 @@ class GroupAlias private string $alias; private int $group_id; - private DateTimeInterface $modified; + private \DateTimeInterface $modified; public function setAlias(string $alias): self { $this->alias = $alias; return $this; } - public function getAlias(): string { return $this->alias; @@ -59,7 +58,6 @@ class GroupAlias $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; @@ -70,7 +68,6 @@ class GroupAlias $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/GroupBlock.php b/src/Entity/GroupBlock.php index cdc2eb4d1c..8c69047f58 100644 --- a/src/Entity/GroupBlock.php +++ b/src/Entity/GroupBlock.php @@ -40,41 +40,38 @@ class GroupBlock // {{{ Autocode private int $group_id; - private int $blocked; - private int $blocker; - private DateTimeInterface $modified; + private int $blocked_profile; + private int $blocker_user; + private \DateTimeInterface $modified; public function setGroupId(int $group_id): self { $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; } - public function setBlocked(int $blocked): self + public function setBlockedProfile(int $blocked_profile): self { - $this->blocked = $blocked; + $this->blocked_profile = $blocked_profile; return $this; } - - public function getBlocked(): int + public function getBlockedProfile(): int { - return $this->blocked; + return $this->blocked_profile; } - public function setBlocker(int $blocker): self + public function setBlockerUser(int $blocker_user): self { - $this->blocker = $blocker; + $this->blocker_user = $blocker_user; return $this; } - - public function getBlocker(): int + public function getBlockerUser(): int { - return $this->blocker; + return $this->blocker_user; } public function setModified(DateTimeInterface $modified): self @@ -82,7 +79,6 @@ class GroupBlock $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/GroupInbox.php b/src/Entity/GroupInbox.php index 39f00f0e7b..db7834d9c6 100644 --- a/src/Entity/GroupInbox.php +++ b/src/Entity/GroupInbox.php @@ -40,29 +40,27 @@ class GroupInbox // {{{ Autocode private int $group_id; - private int $notice_id; - private DateTimeInterface $created; + private int $activity_id; + private \DateTimeInterface $created; public function setGroupId(int $group_id): self { $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; } - public function setNoticeId(int $notice_id): self + public function setActivityId(int $activity_id): self { - $this->notice_id = $notice_id; + $this->activity_id = $activity_id; return $this; } - - public function getNoticeId(): int + public function getActivityId(): int { - return $this->notice_id; + return $this->activity_id; } public function setCreated(DateTimeInterface $created): self @@ -70,7 +68,6 @@ class GroupInbox $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/GroupJoinQueue.php b/src/Entity/GroupJoinQueue.php index 0dcec8a5a2..5c34a81da0 100644 --- a/src/Entity/GroupJoinQueue.php +++ b/src/Entity/GroupJoinQueue.php @@ -41,14 +41,13 @@ class GroupJoinQueue private int $profile_id; private int $group_id; - private DateTimeInterface $created; + private \DateTimeInterface $created; public function setProfileId(int $profile_id): self { $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -59,7 +58,6 @@ class GroupJoinQueue $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; @@ -70,7 +68,6 @@ class GroupJoinQueue $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/GroupMember.php b/src/Entity/GroupMember.php index acdf63271f..42c2a01506 100644 --- a/src/Entity/GroupMember.php +++ b/src/Entity/GroupMember.php @@ -43,15 +43,14 @@ class GroupMember private int $profile_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 { $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; @@ -62,7 +61,6 @@ class GroupMember $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -73,7 +71,6 @@ class GroupMember $this->is_admin = $is_admin; return $this; } - public function getIsAdmin(): ?bool { return $this->is_admin; @@ -84,7 +81,6 @@ class GroupMember $this->uri = $uri; return $this; } - public function getUri(): ?string { return $this->uri; @@ -95,7 +91,6 @@ class GroupMember $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -106,7 +101,6 @@ class GroupMember $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/Invitation.php b/src/Entity/Invitation.php index a50986c63d..584ae5f965 100644 --- a/src/Entity/Invitation.php +++ b/src/Entity/Invitation.php @@ -43,7 +43,7 @@ class Invitation private int $user_id; private string $address; private string $address_type; - private DateTimeInterface $created; + private \DateTimeInterface $created; private ?int $registered_user_id; public function setCode(string $code): self @@ -51,7 +51,6 @@ class Invitation $this->code = $code; return $this; } - public function getCode(): string { return $this->code; @@ -62,7 +61,6 @@ class Invitation $this->user_id = $user_id; return $this; } - public function getUserId(): int { return $this->user_id; @@ -73,7 +71,6 @@ class Invitation $this->address = $address; return $this; } - public function getAddress(): string { return $this->address; @@ -84,7 +81,6 @@ class Invitation $this->address_type = $address_type; return $this; } - public function getAddressType(): string { return $this->address_type; @@ -95,7 +91,6 @@ class Invitation $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -106,7 +101,6 @@ class Invitation $this->registered_user_id = $registered_user_id; return $this; } - public function getRegisteredUserId(): ?int { return $this->registered_user_id; diff --git a/src/Entity/LocationService.php b/src/Entity/LocationService.php index 4cabe5601d..0345b1e68b 100644 --- a/src/Entity/LocationService.php +++ b/src/Entity/LocationService.php @@ -41,15 +41,14 @@ 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 { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -60,7 +59,6 @@ class LocationService $this->description = $description; return $this; } - public function getDescription(): ?string { return $this->description; @@ -71,7 +69,6 @@ class LocationService $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -82,7 +79,6 @@ class LocationService $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/Notification.php b/src/Entity/Notification.php index 2957b03567..31e36017f7 100644 --- a/src/Entity/Notification.php +++ b/src/Entity/Notification.php @@ -42,15 +42,14 @@ class Notification private int $notice_id; private int $profile_id; private ?string $reason; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setNoticeId(int $notice_id): self { $this->notice_id = $notice_id; return $this; } - public function getNoticeId(): int { return $this->notice_id; @@ -61,7 +60,6 @@ class Notification $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -72,7 +70,6 @@ class Notification $this->reason = $reason; return $this; } - public function getReason(): ?string { return $this->reason; @@ -83,7 +80,6 @@ class Notification $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -94,7 +90,6 @@ class Notification $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/Profile.php b/src/Entity/Profile.php index 86cf2256ee..b2fa7df3d7 100644 --- a/src/Entity/Profile.php +++ b/src/Entity/Profile.php @@ -42,23 +42,21 @@ class Profile private int $id; private string $nickname; private ?string $fullname; - private ?string $profileurl; private ?string $homepage; private ?string $bio; private ?string $location; private ?float $lat; private ?float $lon; private ?int $location_id; - private ?int $location_ns; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private ?int $location_service; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -69,7 +67,6 @@ class Profile $this->nickname = $nickname; return $this; } - public function getNickname(): string { return $this->nickname; @@ -80,29 +77,16 @@ class Profile $this->fullname = $fullname; return $this; } - public function getFullname(): ?string { return $this->fullname; } - public function setProfileurl(?string $profileurl): self - { - $this->profileurl = $profileurl; - return $this; - } - - public function getProfileurl(): ?string - { - return $this->profileurl; - } - public function setHomepage(?string $homepage): self { $this->homepage = $homepage; return $this; } - public function getHomepage(): ?string { return $this->homepage; @@ -113,7 +97,6 @@ class Profile $this->bio = $bio; return $this; } - public function getBio(): ?string { return $this->bio; @@ -124,7 +107,6 @@ class Profile $this->location = $location; return $this; } - public function getLocation(): ?string { return $this->location; @@ -135,7 +117,6 @@ class Profile $this->lat = $lat; return $this; } - public function getLat(): ?float { return $this->lat; @@ -146,7 +127,6 @@ class Profile $this->lon = $lon; return $this; } - public function getLon(): ?float { return $this->lon; @@ -157,21 +137,19 @@ class Profile $this->location_id = $location_id; return $this; } - public function getLocationId(): ?int { return $this->location_id; } - public function setLocationNs(?int $location_ns): self + public function setLocationService(?int $location_service): self { - $this->location_ns = $location_ns; + $this->location_service = $location_service; return $this; } - - public function getLocationNs(): ?int + public function getLocationService(): ?int { - return $this->location_ns; + return $this->location_service; } public function setCreated(DateTimeInterface $created): self @@ -179,7 +157,6 @@ class Profile $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -190,7 +167,6 @@ class Profile $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; @@ -223,7 +199,7 @@ class Profile ], ]; - if (common_config('search', 'type') == 'fulltext') { + if (isset($_ENV['SOCIAL_DB_USE_FULLTEXT_SEARCH'])) { $def['fulltext indexes'] = ['nickname' => ['nickname', 'fullname', 'location', 'bio', 'homepage']]; } diff --git a/src/Entity/ProfileBlock.php b/src/Entity/ProfileBlock.php index 8564232872..d2dc74510a 100644 --- a/src/Entity/ProfileBlock.php +++ b/src/Entity/ProfileBlock.php @@ -41,14 +41,13 @@ class ProfileBlock private int $blocker; private int $blocked; - private DateTimeInterface $modified; + private \DateTimeInterface $modified; public function setBlocker(int $blocker): self { $this->blocker = $blocker; return $this; } - public function getBlocker(): int { return $this->blocker; @@ -59,7 +58,6 @@ class ProfileBlock $this->blocked = $blocked; return $this; } - public function getBlocked(): int { return $this->blocked; @@ -70,7 +68,6 @@ class ProfileBlock $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/ProfileList.php b/src/Entity/ProfileList.php index 08f6662c41..d0ba679bc5 100644 --- a/src/Entity/ProfileList.php +++ b/src/Entity/ProfileList.php @@ -44,19 +44,18 @@ class ProfileList private string $tag; private ?string $description; private ?bool $private; - private DateTimeInterface $created; - private DateTimeInterface $modified; private ?string $uri; private ?string $mainpage; private ?int $tagged_count; - private ?int $subscriber_count; + private ?int $follower_count; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -67,7 +66,6 @@ class ProfileList $this->tagger = $tagger; return $this; } - public function getTagger(): int { return $this->tagger; @@ -78,7 +76,6 @@ class ProfileList $this->tag = $tag; return $this; } - public function getTag(): string { return $this->tag; @@ -89,7 +86,6 @@ class ProfileList $this->description = $description; return $this; } - public function getDescription(): ?string { return $this->description; @@ -100,40 +96,16 @@ class ProfileList $this->private = $private; return $this; } - public function getPrivate(): ?bool { return $this->private; } - 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; - return $this; - } - - public function getModified(): DateTimeInterface - { - return $this->modified; - } - public function setUri(?string $uri): self { $this->uri = $uri; return $this; } - public function getUri(): ?string { return $this->uri; @@ -144,7 +116,6 @@ class ProfileList $this->mainpage = $mainpage; return $this; } - public function getMainpage(): ?string { return $this->mainpage; @@ -155,21 +126,39 @@ class ProfileList $this->tagged_count = $tagged_count; return $this; } - public function getTaggedCount(): ?int { return $this->tagged_count; } - public function setSubscriberCount(?int $subscriber_count): self + public function setFollowerCount(?int $follower_count): self { - $this->subscriber_count = $subscriber_count; + $this->follower_count = $follower_count; return $this; } - - public function getSubscriberCount(): ?int + public function getFollowerCount(): ?int { - return $this->subscriber_count; + return $this->follower_count; + } + + 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; + return $this; + } + public function getModified(): DateTimeInterface + { + return $this->modified; } // }}} Autocode diff --git a/src/Entity/ProfilePrefs.php b/src/Entity/ProfilePrefs.php index 427bdeacaf..650f84c1f9 100644 --- a/src/Entity/ProfilePrefs.php +++ b/src/Entity/ProfilePrefs.php @@ -43,15 +43,14 @@ class ProfilePrefs private string $namespace; private string $topic; private $data; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setProfileId(int $profile_id): self { $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -62,7 +61,6 @@ class ProfilePrefs $this->namespace = $namespace; return $this; } - public function getNamespace(): string { return $this->namespace; @@ -73,7 +71,6 @@ class ProfilePrefs $this->topic = $topic; return $this; } - public function getTopic(): string { return $this->topic; @@ -84,7 +81,6 @@ class ProfilePrefs $this->data = $data; return $this; } - public function getData() { return $this->data; @@ -95,7 +91,6 @@ class ProfilePrefs $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -106,7 +101,6 @@ class ProfilePrefs $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/ProfileRole.php b/src/Entity/ProfileRole.php index b5f9e42005..cce69fa4a2 100644 --- a/src/Entity/ProfileRole.php +++ b/src/Entity/ProfileRole.php @@ -41,14 +41,13 @@ class ProfileRole private int $profile_id; private string $role; - private DateTimeInterface $created; + private \DateTimeInterface $created; public function setProfileId(int $profile_id): self { $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -59,7 +58,6 @@ class ProfileRole $this->role = $role; return $this; } - public function getRole(): string { return $this->role; @@ -70,7 +68,6 @@ class ProfileRole $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/ProfileTag.php b/src/Entity/ProfileTag.php index bf37f2b6e1..8292a48e30 100644 --- a/src/Entity/ProfileTag.php +++ b/src/Entity/ProfileTag.php @@ -42,14 +42,13 @@ class ProfileTag private int $tagger; private int $tagged; private string $tag; - private DateTimeInterface $modified; + private \DateTimeInterface $modified; public function setTagger(int $tagger): self { $this->tagger = $tagger; return $this; } - public function getTagger(): int { return $this->tagger; @@ -60,7 +59,6 @@ class ProfileTag $this->tagged = $tagged; return $this; } - public function getTagged(): int { return $this->tagged; @@ -71,7 +69,6 @@ class ProfileTag $this->tag = $tag; return $this; } - public function getTag(): string { return $this->tag; @@ -82,7 +79,6 @@ class ProfileTag $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/ProfileTagFollow.php b/src/Entity/ProfileTagFollow.php index 3ad4e57473..3a3a3680c5 100644 --- a/src/Entity/ProfileTagFollow.php +++ b/src/Entity/ProfileTagFollow.php @@ -41,15 +41,14 @@ class ProfileTagFollow private int $profile_tag_id; private int $profile_id; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setProfileTagId(int $profile_tag_id): self { $this->profile_tag_id = $profile_tag_id; return $this; } - public function getProfileTagId(): int { return $this->profile_tag_id; @@ -60,7 +59,6 @@ class ProfileTagFollow $this->profile_id = $profile_id; return $this; } - public function getProfileId(): int { return $this->profile_id; @@ -71,7 +69,6 @@ class ProfileTagFollow $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -82,7 +79,6 @@ class ProfileTagFollow $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/QueueItem.php b/src/Entity/QueueItem.php index 97638a5798..8b938915dc 100644 --- a/src/Entity/QueueItem.php +++ b/src/Entity/QueueItem.php @@ -42,15 +42,14 @@ class QueueItem private int $id; private $frame; private string $transport; - private DateTimeInterface $created; - private ?DateTimeInterface $claimed; + private \DateTimeInterface $created; + private ?\DateTimeInterface $claimed; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -61,7 +60,6 @@ class QueueItem $this->frame = $frame; return $this; } - public function getFrame() { return $this->frame; @@ -72,7 +70,6 @@ class QueueItem $this->transport = $transport; return $this; } - public function getTransport(): string { return $this->transport; @@ -83,7 +80,6 @@ class QueueItem $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -94,7 +90,6 @@ class QueueItem $this->claimed = $claimed; return $this; } - public function getClaimed(): ?DateTimeInterface { return $this->claimed; diff --git a/src/Entity/RelatedGroup.php b/src/Entity/RelatedGroup.php index 35bf764309..d5fb729d53 100644 --- a/src/Entity/RelatedGroup.php +++ b/src/Entity/RelatedGroup.php @@ -41,14 +41,13 @@ class RelatedGroup private int $group_id; private int $related_group_id; - private DateTimeInterface $created; + private \DateTimeInterface $created; public function setGroupId(int $group_id): self { $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; @@ -59,7 +58,6 @@ class RelatedGroup $this->related_group_id = $related_group_id; return $this; } - public function getRelatedGroupId(): int { return $this->related_group_id; @@ -70,7 +68,6 @@ class RelatedGroup $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/ReservedNickname.php b/src/Entity/ReservedNickname.php index fd7ca30d25..e705254a09 100644 --- a/src/Entity/ReservedNickname.php +++ b/src/Entity/ReservedNickname.php @@ -40,14 +40,13 @@ class ReservedNickname // {{{ Autocode private string $nickname; - private DateTimeInterface $created; + private \DateTimeInterface $created; public function setNickname(string $nickname): self { $this->nickname = $nickname; return $this; } - public function getNickname(): string { return $this->nickname; @@ -58,7 +57,6 @@ class ReservedNickname $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; diff --git a/src/Entity/SmsCarrier.php b/src/Entity/SmsCarrier.php index 942251dccc..19f998434c 100644 --- a/src/Entity/SmsCarrier.php +++ b/src/Entity/SmsCarrier.php @@ -42,15 +42,14 @@ 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 { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -61,7 +60,6 @@ class SmsCarrier $this->name = $name; return $this; } - public function getName(): ?string { return $this->name; @@ -72,7 +70,6 @@ class SmsCarrier $this->email_pattern = $email_pattern; return $this; } - public function getEmailPattern(): string { return $this->email_pattern; @@ -83,7 +80,6 @@ class SmsCarrier $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -94,7 +90,6 @@ class SmsCarrier $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/User.php b/src/Entity/User.php index cc81803254..b6c7466e9f 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -42,35 +42,25 @@ class User private int $id; private ?string $nickname; private ?string $password; - private ?string $email; - private ?string $incomingemail; - private ?bool $emailnotifysub; - private ?int $emailnotifyfav; - private ?bool $emailnotifynudge; - private ?bool $emailnotifymsg; - private ?bool $emailnotifyattn; + private ?string $outgoing_email; + private ?string $incoming_email; private ?string $language; private ?string $timezone; - private ?bool $emailpost; - private ?string $sms; - private ?int $carrier; - private ?bool $smsnotify; - private ?bool $smsreplies; - private ?string $smsemail; + private ?string $sms_phone_number; + private ?int $sms_carrier; + private ?string $sms_email; private ?string $uri; - private ?bool $autosubscribe; - private ?int $subscribe_policy; - private ?string $urlshorteningservice; - private ?bool $private_stream; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private ?bool $auto_follow_back; + private ?int $follow_policy; + private ?bool $is_stream_private; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setId(int $id): self { $this->id = $id; return $this; } - public function getId(): int { return $this->id; @@ -81,7 +71,6 @@ class User $this->nickname = $nickname; return $this; } - public function getNickname(): ?string { return $this->nickname; @@ -92,87 +81,29 @@ class User $this->password = $password; return $this; } - public function getPassword(): ?string { return $this->password; } - public function setEmail(?string $email): self + public function setOutgoingEmail(?string $outgoing_email): self { - $this->email = $email; + $this->outgoing_email = $outgoing_email; return $this; } - - public function getEmail(): ?string + public function getOutgoingEmail(): ?string { - return $this->email; + return $this->outgoing_email; } - public function setIncomingemail(?string $incomingemail): self + public function setIncomingEmail(?string $incoming_email): self { - $this->incomingemail = $incomingemail; + $this->incoming_email = $incoming_email; return $this; } - - public function getIncomingemail(): ?string + public function getIncomingEmail(): ?string { - return $this->incomingemail; - } - - public function setEmailnotifysub(?bool $emailnotifysub): self - { - $this->emailnotifysub = $emailnotifysub; - return $this; - } - - public function getEmailnotifysub(): ?bool - { - return $this->emailnotifysub; - } - - public function setEmailnotifyfav(?int $emailnotifyfav): self - { - $this->emailnotifyfav = $emailnotifyfav; - return $this; - } - - public function getEmailnotifyfav(): ?int - { - return $this->emailnotifyfav; - } - - public function setEmailnotifynudge(?bool $emailnotifynudge): self - { - $this->emailnotifynudge = $emailnotifynudge; - return $this; - } - - public function getEmailnotifynudge(): ?bool - { - return $this->emailnotifynudge; - } - - public function setEmailnotifymsg(?bool $emailnotifymsg): self - { - $this->emailnotifymsg = $emailnotifymsg; - return $this; - } - - public function getEmailnotifymsg(): ?bool - { - return $this->emailnotifymsg; - } - - public function setEmailnotifyattn(?bool $emailnotifyattn): self - { - $this->emailnotifyattn = $emailnotifyattn; - return $this; - } - - public function getEmailnotifyattn(): ?bool - { - return $this->emailnotifyattn; + return $this->incoming_email; } public function setLanguage(?string $language): self @@ -180,7 +111,6 @@ class User $this->language = $language; return $this; } - public function getLanguage(): ?string { return $this->language; @@ -191,76 +121,39 @@ class User $this->timezone = $timezone; return $this; } - public function getTimezone(): ?string { return $this->timezone; } - public function setEmailpost(?bool $emailpost): self + public function setSmsPhoneNumber(?string $sms_phone_number): self { - $this->emailpost = $emailpost; + $this->sms_phone_number = $sms_phone_number; return $this; } - - public function getEmailpost(): ?bool + public function getSmsPhoneNumber(): ?string { - return $this->emailpost; + return $this->sms_phone_number; } - public function setSms(?string $sms): self + public function setSmsCarrier(?int $sms_carrier): self { - $this->sms = $sms; + $this->sms_carrier = $sms_carrier; return $this; } - - public function getSms(): ?string + public function getSmsCarrier(): ?int { - return $this->sms; + return $this->sms_carrier; } - public function setCarrier(?int $carrier): self + public function setSmsEmail(?string $sms_email): self { - $this->carrier = $carrier; + $this->sms_email = $sms_email; return $this; } - - public function getCarrier(): ?int + public function getSmsEmail(): ?string { - return $this->carrier; - } - - public function setSmsnotify(?bool $smsnotify): self - { - $this->smsnotify = $smsnotify; - return $this; - } - - public function getSmsnotify(): ?bool - { - return $this->smsnotify; - } - - public function setSmsreplies(?bool $smsreplies): self - { - $this->smsreplies = $smsreplies; - return $this; - } - - public function getSmsreplies(): ?bool - { - return $this->smsreplies; - } - - public function setSmsemail(?string $smsemail): self - { - $this->smsemail = $smsemail; - return $this; - } - - public function getSmsemail(): ?string - { - return $this->smsemail; + return $this->sms_email; } public function setUri(?string $uri): self @@ -268,54 +161,39 @@ class User $this->uri = $uri; return $this; } - public function getUri(): ?string { return $this->uri; } - public function setAutosubscribe(?bool $autosubscribe): self + public function setAutoFollowBack(?bool $auto_follow_back): self { - $this->autosubscribe = $autosubscribe; + $this->auto_follow_back = $auto_follow_back; return $this; } - - public function getAutosubscribe(): ?bool + public function getAutoFollowBack(): ?bool { - return $this->autosubscribe; + return $this->auto_follow_back; } - public function setSubscribePolicy(?int $subscribe_policy): self + public function setFollowPolicy(?int $follow_policy): self { - $this->subscribe_policy = $subscribe_policy; + $this->follow_policy = $follow_policy; return $this; } - - public function getSubscribePolicy(): ?int + public function getFollowPolicy(): ?int { - return $this->subscribe_policy; + return $this->follow_policy; } - public function setUrlshorteningservice(?string $urlshorteningservice): self + public function setIsStreamPrivate(?bool $is_stream_private): self { - $this->urlshorteningservice = $urlshorteningservice; + $this->is_stream_private = $is_stream_private; return $this; } - - public function getUrlshorteningservice(): ?string + public function getIsStreamPrivate(): ?bool { - return $this->urlshorteningservice; - } - - public function setPrivateStream(?bool $private_stream): self - { - $this->private_stream = $private_stream; - return $this; - } - - public function getPrivateStream(): ?bool - { - return $this->private_stream; + return $this->is_stream_private; } public function setCreated(DateTimeInterface $created): self @@ -323,7 +201,6 @@ class User $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -334,7 +211,6 @@ class User $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/UserLocationPrefs.php b/src/Entity/UserLocationPrefs.php index 2076c4e629..0b56f2bca7 100644 --- a/src/Entity/UserLocationPrefs.php +++ b/src/Entity/UserLocationPrefs.php @@ -39,15 +39,14 @@ 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 { $this->user_id = $user_id; return $this; } - public function getUserId(): int { return $this->user_id; @@ -58,7 +57,6 @@ class UserLocationPrefs $this->share_location = $share_location; return $this; } - public function getShareLocation(): ?bool { return $this->share_location; @@ -69,7 +67,6 @@ class UserLocationPrefs $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -80,7 +77,6 @@ class UserLocationPrefs $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/UserNotificationPrefs.php b/src/Entity/UserNotificationPrefs.php index 2ed3fbaba0..60fe95af7f 100644 --- a/src/Entity/UserNotificationPrefs.php +++ b/src/Entity/UserNotificationPrefs.php @@ -38,34 +38,38 @@ class UserNotificationPrefs // {{{ Autocode private int $user_id; - private string $screenname; + private string $service_name; private string $transport; - private bool $notify; - private bool $replies; - private bool $updatefrompresence; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private ?int $profile_id; + private bool $posts_by_followed; + private bool $mention; + private bool $follow; + private bool $favorite; + private bool $nudge; + private bool $dm; + private bool $post_on_status_change; + private ?bool $enable_posting; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setUserId(int $user_id): self { $this->user_id = $user_id; return $this; } - public function getUserId(): int { return $this->user_id; } - public function setScreenname(string $screenname): self + public function setServiceName(string $service_name): self { - $this->screenname = $screenname; + $this->service_name = $service_name; return $this; } - - public function getScreenname(): string + public function getServiceName(): string { - return $this->screenname; + return $this->service_name; } public function setTransport(string $transport): self @@ -73,43 +77,99 @@ class UserNotificationPrefs $this->transport = $transport; return $this; } - public function getTransport(): string { return $this->transport; } - public function setNotify(bool $notify): self + public function setProfileId(?int $profile_id): self { - $this->notify = $notify; + $this->profile_id = $profile_id; return $this; } - - public function getNotify(): bool + public function getProfileId(): ?int { - return $this->notify; + return $this->profile_id; } - public function setReplies(bool $replies): self + public function setPostsByFollowed(bool $posts_by_followed): self { - $this->replies = $replies; + $this->posts_by_followed = $posts_by_followed; return $this; } - - public function getReplies(): bool + public function getPostsByFollowed(): bool { - return $this->replies; + return $this->posts_by_followed; } - public function setUpdatefrompresence(bool $updatefrompresence): self + public function setMention(bool $mention): self { - $this->updatefrompresence = $updatefrompresence; + $this->mention = $mention; return $this; } - - public function getUpdatefrompresence(): bool + public function getMention(): bool { - return $this->updatefrompresence; + return $this->mention; + } + + public function setFollow(bool $follow): self + { + $this->follow = $follow; + return $this; + } + public function getFollow(): bool + { + return $this->follow; + } + + public function setFavorite(bool $favorite): self + { + $this->favorite = $favorite; + return $this; + } + public function getFavorite(): bool + { + return $this->favorite; + } + + public function setNudge(bool $nudge): self + { + $this->nudge = $nudge; + return $this; + } + public function getNudge(): bool + { + return $this->nudge; + } + + public function setDm(bool $dm): self + { + $this->dm = $dm; + return $this; + } + public function getDm(): bool + { + return $this->dm; + } + + public function setPostOnStatusChange(bool $post_on_status_change): self + { + $this->post_on_status_change = $post_on_status_change; + return $this; + } + public function getPostOnStatusChange(): bool + { + return $this->post_on_status_change; + } + + public function setEnablePosting(?bool $enable_posting): self + { + $this->enable_posting = $enable_posting; + return $this; + } + public function getEnablePosting(): ?bool + { + return $this->enable_posting; } public function setCreated(DateTimeInterface $created): self @@ -117,7 +177,6 @@ class UserNotificationPrefs $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -128,7 +187,6 @@ class UserNotificationPrefs $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; diff --git a/src/Entity/UserUrlShortenerPrefs.php b/src/Entity/UserUrlShortenerPrefs.php index 557851a357..b7ce777a44 100644 --- a/src/Entity/UserUrlShortenerPrefs.php +++ b/src/Entity/UserUrlShortenerPrefs.php @@ -40,54 +40,50 @@ class UserUrlShortenerPrefs // {{{ Autocode private int $user_id; - private ?string $urlshorteningservice; - private int $maxurllength; - private int $maxnoticelength; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private ?string $url_shortening_service; + private int $max_url_length; + private int $max_notice_length; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setUserId(int $user_id): self { $this->user_id = $user_id; return $this; } - public function getUserId(): int { return $this->user_id; } - public function setUrlshorteningservice(?string $urlshorteningservice): self + public function setUrlShorteningService(?string $url_shortening_service): self { - $this->urlshorteningservice = $urlshorteningservice; + $this->url_shortening_service = $url_shortening_service; return $this; } - - public function getUrlshorteningservice(): ?string + public function getUrlShorteningService(): ?string { - return $this->urlshorteningservice; + return $this->url_shortening_service; } - public function setMaxurllength(int $maxurllength): self + public function setMaxUrlLength(int $max_url_length): self { - $this->maxurllength = $maxurllength; + $this->max_url_length = $max_url_length; return $this; } - - public function getMaxurllength(): int + public function getMaxUrlLength(): int { - return $this->maxurllength; + return $this->max_url_length; } - public function setMaxnoticelength(int $maxnoticelength): self + public function setMaxNoticeLength(int $max_notice_length): self { - $this->maxnoticelength = $maxnoticelength; + $this->max_notice_length = $max_notice_length; return $this; } - - public function getMaxnoticelength(): int + public function getMaxNoticeLength(): int { - return $this->maxnoticelength; + return $this->max_notice_length; } public function setCreated(DateTimeInterface $created): self @@ -95,7 +91,6 @@ class UserUrlShortenerPrefs $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -106,7 +101,6 @@ class UserUrlShortenerPrefs $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified;