friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-02 20:45:03 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity

Set intro.blocked to deprecated

Browse source
This commit is contained in:
Philipp Holzer 2021-10-19 21:30:09 +02:00
commit ed184bd592
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Contact/Introduction/Depository/Introduction.php
View file

@ -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);
}

7
src/Contact/Introduction/Entity/Introduction.php
View file

@ -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;
}

2
src/Contact/Introduction/Factory/Introduction.php
View file

@ -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,
]);
}