From ed184bd592a074090f3c9c5e441674f000fd983f Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 19 Oct 2021 21:30:09 +0200 Subject: [PATCH] Set intro.blocked to deprecated --- database.sql | 2 +- doc/database/db_intro.md | 2 +- src/Contact/Introduction/Depository/Introduction.php | 3 +-- src/Contact/Introduction/Entity/Introduction.php | 7 +------ src/Contact/Introduction/Factory/Introduction.php | 2 -- static/dbstructure.config.php | 2 +- update.php | 10 +++++++++- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/database.sql b/database.sql index 466a8d9b7..43986e850 100644 --- a/database.sql +++ b/database.sql @@ -719,7 +719,7 @@ CREATE TABLE IF NOT EXISTS `intro` ( `note` text COMMENT '', `hash` varchar(255) NOT NULL DEFAULT '' COMMENT '', `datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', - `blocked` boolean NOT NULL DEFAULT '1' COMMENT '', + `blocked` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated', `ignore` boolean NOT NULL DEFAULT '0' COMMENT '', PRIMARY KEY(`id`), INDEX `contact-id` (`contact-id`), diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md index da0cbe26a..0f2e36c70 100644 --- a/doc/database/db_intro.md +++ b/doc/database/db_intro.md @@ -18,7 +18,7 @@ Fields | note | | text | YES | | NULL | | | hash | | varchar(255) | NO | | | | | datetime | | datetime | NO | | 0001-01-01 00:00:00 | | -| blocked | | boolean | NO | | 1 | | +| blocked | deprecated | boolean | NO | | 0 | | | ignore | | boolean | NO | | 0 | | Indexes diff --git a/src/Contact/Introduction/Depository/Introduction.php b/src/Contact/Introduction/Depository/Introduction.php index 280ae26d6..3a4498cf3 100644 --- a/src/Contact/Introduction/Depository/Introduction.php +++ b/src/Contact/Introduction/Depository/Introduction.php @@ -75,7 +75,6 @@ class Introduction extends BaseDepository 'duplex' => $introduction->duplex ? 1 : 0, 'note' => $introduction->note, 'hash' => $introduction->hash, - 'blocked' => $introduction->blocked ? 1 : 0, 'ignore' => $introduction->ignore ? 1 : 0, 'datetime' => $introduction->datetime->format(DateTimeFormat::MYSQL), ]; @@ -143,7 +142,7 @@ class Introduction extends BaseDepository public function countActiveForUser($uid, array $params = []): int { try { - return $this->count(['blocked' => false, 'ignore' => false, 'uid' => $uid], $params); + return $this->count(['ignore' => false, 'uid' => $uid], $params); } catch (\Exception $e) { throw new IntroductionPersistenceException(sprintf('Cannot count Introductions for used %d', $uid), $e); } diff --git a/src/Contact/Introduction/Entity/Introduction.php b/src/Contact/Introduction/Entity/Introduction.php index 44eddc214..119fd1e06 100644 --- a/src/Contact/Introduction/Entity/Introduction.php +++ b/src/Contact/Introduction/Entity/Introduction.php @@ -33,7 +33,6 @@ use Friendica\BaseEntity; * @property-read string $note * @property-read string $hash * @property-read \DateTime $datetime - * @property-read bool $blocked * @property-read bool $ignore * @property-read int|null $id */ @@ -58,8 +57,6 @@ class Introduction extends BaseEntity /** @var \DateTime */ protected $datetime; /** @var bool */ - protected $blocked; - /** @var bool */ protected $ignore; /** @var int|null */ protected $id; @@ -74,11 +71,10 @@ class Introduction extends BaseEntity * @param string $note * @param string $hash * @param \DateTime $datetime - * @param bool $blocked * @param bool $ignore * @param int|null $id */ - public function __construct(int $uid, int $sid, ?int $fid, ?int $cid, bool $knowyou, bool $duplex, string $note, string $hash, \DateTime $datetime, bool $blocked, bool $ignore, ?int $id) + public function __construct(int $uid, int $sid, ?int $fid, ?int $cid, bool $knowyou, bool $duplex, string $note, string $hash, \DateTime $datetime, bool $ignore, ?int $id) { $this->uid = $uid; $this->sid = $sid; @@ -88,7 +84,6 @@ class Introduction extends BaseEntity $this->duplex = $duplex; $this->note = $note; $this->hash = $hash; - $this->blocked = $blocked; $this->ignore = $ignore; $this->id = $id; } diff --git a/src/Contact/Introduction/Factory/Introduction.php b/src/Contact/Introduction/Factory/Introduction.php index 8fec61bb9..35275de7f 100644 --- a/src/Contact/Introduction/Factory/Introduction.php +++ b/src/Contact/Introduction/Factory/Introduction.php @@ -44,7 +44,6 @@ class Introduction extends BaseFactory implements ICanCreateFromTableRow $row['note'] ?? '', $row['hash'] ?? '', new \DateTime($row['datetime'] ?? 'now', new \DateTimeZone('UTC')), - !empty($row['blocked']), !empty($row['ignore']), $row['id'] ?? null ); @@ -69,7 +68,6 @@ class Introduction extends BaseFactory implements ICanCreateFromTableRow 'note' => $note, 'hash' => Strings::getRandomHex(), 'datetime' => DateTimeFormat::utcNow(), - 'blocked' => false, 'ignore' => false, ]); } diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 4ed1e04a9..c00cb0def 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -782,7 +782,7 @@ return [ "note" => ["type" => "text", "comment" => ""], "hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "datetime" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], - "blocked" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""], + "blocked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "deprecated"], "ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], ], "indexes" => [ diff --git a/update.php b/update.php index 25e64d659..85f407d36 100644 --- a/update.php +++ b/update.php @@ -1039,7 +1039,7 @@ function update_1440() return Update::SUCCESS; } -function update__1441() +function update_1441() { $languages = DI::l10n()->getAvailableLanguages(); @@ -1053,3 +1053,11 @@ function update__1441() return Update::SUCCESS; } + +function update_1442() +{ + // transform blocked intros into ignored intros + DBA::update('intro', ['ignore' => 1, 'blocked' => 0], ['blocked' => 1]); + + return Update::SUCCESS; +}