From f2ab77c3a9d5092e10abcb0a1c2f171d76f3dc0c Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Thu, 20 Aug 2020 00:43:33 +0000 Subject: [PATCH] [DB][MEDIA] Small database structure changes --- src/Entity/File.php | 52 +++++++++++++++++++-------------------- src/Entity/FileToNote.php | 28 ++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Entity/File.php b/src/Entity/File.php index daa4a03dd7..c1242e5ddf 100644 --- a/src/Entity/File.php +++ b/src/Entity/File.php @@ -43,14 +43,14 @@ class File extends Entity private int $id; private ?string $url; - private ?bool $is_url_protected; private ?string $url_hash; private ?string $file_hash; private ?int $actor_id; private ?string $mimetype; - private ?int $size; private ?string $title; private ?bool $is_local; + private ?bool $is_nsfw; + private ?bool $is_url_protected; private DateTimeInterface $modified; public function setId(int $id): self @@ -75,17 +75,6 @@ class File extends Entity return $this->url; } - public function setIsUrlProtected(?bool $is_url_protected): self - { - $this->is_url_protected = $is_url_protected; - return $this; - } - - public function getIsUrlProtected(): ?bool - { - return $this->is_url_protected; - } - public function setUrlHash(?string $url_hash): self { $this->url_hash = $url_hash; @@ -130,17 +119,6 @@ class File extends Entity return $this->mimetype; } - public function setSize(?int $size): self - { - $this->size = $size; - return $this; - } - - public function getSize(): ?int - { - return $this->size; - } - public function setTitle(?string $title): self { $this->title = $title; @@ -163,6 +141,28 @@ class File extends Entity return $this->is_local; } + public function setIsNsfw(?bool $is_nsfw): self + { + $this->is_nsfw = $is_nsfw; + return $this; + } + + public function getIsNsfw(): ?bool + { + return $this->is_nsfw; + } + + public function setIsUrlProtected(?bool $is_url_protected): self + { + $this->is_url_protected = $is_url_protected; + return $this; + } + + public function getIsUrlProtected(): ?bool + { + return $this->is_url_protected; + } + public function setModified(DateTimeInterface $modified): self { $this->modified = $modified; @@ -226,14 +226,14 @@ class File extends Entity 'fields' => [ 'id' => ['type' => 'serial', 'not null' => true], 'url' => ['type' => 'text', 'description' => 'URL after following possible redirections'], - 'is_url_protected' => ['type' => 'bool', 'default' => false, 'description' => 'true when URL is private (needs login)'], 'url_hash' => ['type' => 'varchar', 'length' => 64, 'description' => 'sha256 of destination URL (url field)'], 'file_hash' => ['type' => 'varchar', 'length' => 64, 'description' => 'sha256 of the file contents, if the file is stored locally'], 'actor_id' => ['type' => 'int', 'description' => 'If set, used so each actor can have a version of this file (for avatars, for instance)'], 'mimetype' => ['type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'], - 'size' => ['type' => 'int', 'description' => 'size of resource when available'], 'title' => ['type' => 'text', 'description' => 'title of resource when available'], 'is_local' => ['type' => 'bool', 'description' => 'whether the file is stored locally'], + 'is_nsfw' => ['type' => 'bool', 'default' => false, 'description' => 'whether the file is NSFW'], + 'is_url_protected' => ['type' => 'bool', 'default' => false, 'description' => 'true when URL is private (needs login)'], 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], ], 'primary key' => ['id'], diff --git a/src/Entity/FileToNote.php b/src/Entity/FileToNote.php index 23d3b6287d..b782500f95 100644 --- a/src/Entity/FileToNote.php +++ b/src/Entity/FileToNote.php @@ -41,7 +41,7 @@ class FileToNote extends Entity // {{{ Autocode private int $file_id; - private int $activity_id; + private int $note_id; private DateTimeInterface $modified; public function setFileId(int $file_id): self @@ -55,15 +55,15 @@ class FileToNote extends Entity return $this->file_id; } - 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 setModified(DateTimeInterface $modified): self @@ -82,20 +82,20 @@ class FileToNote extends Entity public static function schemaDef(): array { return [ - 'name' => 'file_to_activity', + 'name' => 'file_to_note', 'fields' => [ - 'file_id' => ['type' => 'int', 'not null' => true, 'description' => 'id of file'], - 'activity_id' => ['type' => 'int', 'not null' => true, 'description' => 'id of the activity it belongs to'], - 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], + 'file_id' => ['type' => 'int', 'not null' => true, 'description' => 'id of file'], + 'note_id' => ['type' => 'int', 'not null' => true, 'description' => 'id of the note it belongs to'], + 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], ], - 'primary key' => ['file_id', 'activity_id'], + 'primary key' => ['file_id', 'note_id'], 'foreign keys' => [ - 'file_to_activity_file_id_fkey' => ['file', ['file_id' => 'id']], - 'file_to_activity_activity_id_fkey' => ['notice', ['activity_id' => 'id']], + 'file_to_note_file_id_fkey' => ['file', ['file_id' => 'id']], + 'file_to_note_note_id_fkey' => ['note', ['note_id' => 'id']], ], 'indexes' => [ - 'file_id_idx' => ['file_id'], - 'activity_id_idx' => ['activity_id'], + 'file_id_idx' => ['file_id'], + 'note_id_idx' => ['note_id'], ], ]; }