diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php index ed5cb4bea5..5f6b58579e 100644 --- a/components/Posting/Posting.php +++ b/components/Posting/Posting.php @@ -31,7 +31,6 @@ use App\Core\Modules\Component; use App\Entity\Attachment; use App\Entity\AttachmentToNote; use App\Entity\GSActorToAttachment; -use App\Entity\GSActorToRemoteURL; use App\Entity\Note; use App\Entity\RemoteURL; use App\Entity\RemoteURLToNote; @@ -121,9 +120,7 @@ END; foreach ($attachments as $f) { // where $f is a Symfony\Component\HttpFoundation\File\UploadedFile $filesize = $f->getSize(); Event::handle('EnforceQuota', [$actor_id, $filesize]); - $processed_attachments[] = GSFile::sanitizeAndStoreFileAsAttachment( - $f - ); + $processed_attachments[] = GSFile::sanitizeAndStoreFileAsAttachment($f); } DB::persist($note); @@ -144,8 +141,7 @@ END; foreach ($matched_urls as $match) { try { $remoteurl_id = RemoteURL::getOrCreate($match[0])->getId(); - DB::persist(GSActorToRemoteURL::create(['remoteurl_id' => $remoteurl_id, 'gsactor_id' => $actor_id])); - DB::persist(RemoteURLToNote::create(['remoteurl_id' => $a->getId(), 'note_id' => $note->getId()])); + DB::persist(RemoteURLToNote::create(['remoteurl_id' => $remoteurl_id, 'note_id' => $note->getId()])); $processed_urls = true; } catch (InvalidArgumentException) { continue; diff --git a/src/Entity/GSActorToRemoteURL.php b/src/Entity/GSActorToRemoteURL.php deleted file mode 100644 index 1575fca46b..0000000000 --- a/src/Entity/GSActorToRemoteURL.php +++ /dev/null @@ -1,95 +0,0 @@ -. -// }}} - -namespace App\Entity; - -use App\Core\Entity; -use DateTimeInterface; - -/** - * Entity for relating an actor to a remote url - * - * @category DB - * @package GNUsocial - * - * @author Diogo Peralta Cordeiro - * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org - * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later - */ -class GSActorToRemoteURL extends Entity -{ - // {{{ Autocode - // @codeCoverageIgnoreStart - private int $remoteurl_id; - private int $gsactor_id; - private \DateTimeInterface $modified; - - public function setRemoteURLId(int $remoteurl_id): self - { - $this->remoteurl_id = $remoteurl_id; - return $this; - } - - public function getRemoteURLId(): int - { - return $this->remoteurl_id; - } - - public function setGSActorId(int $gsactor_id): self - { - $this->gsactor_id = $gsactor_id; - return $this; - } - - public function getGSActorId(): int - { - return $this->gsactor_id; - } - - public function setModified(DateTimeInterface $modified): self - { - $this->modified = $modified; - return $this; - } - - public function getModified(): DateTimeInterface - { - return $this->modified; - } - - // @codeCoverageIgnoreEnd - // }}} Autocode - - public static function schemaDef(): array - { - return [ - 'name' => 'gsactor_to_remoteurl', - 'fields' => [ - 'remoteurl_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'RemoteURL.id', 'multiplicity' => 'one to one', 'name' => 'attachment_to_note_attachment_id_fkey', 'not null' => true, 'description' => 'id of attachment'], - 'gsactor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'GSActor.id', 'multiplicity' => 'one to one', 'name' => 'attachment_to_note_note_id_fkey', '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' => ['remoteurl_id', 'gsactor_id'], - 'indexes' => [ - 'remoteurl_id_idx' => ['remoteurl_id'], - 'gsactor_id_idx' => ['gsactor_id'], - ], - ]; - } -}