clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12377 from MrPetovan/bug/12376-diasporacontact-subscribe 

Change DiasporaContact->subscribe type to string
This commit is contained in:
Michael Vogel 2022-12-10 15:47:49 +01:00 committed by GitHub
parent 5fd5819321 19d11c08d4
commit b29e520a25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/Diaspora/Entity/DiasporaContact.php
View File

@ -82,7 +82,7 @@ class DiasporaContact extends \Friendica\BaseEntity
protected $notify; protected $notify;
/** @var UriInterface */ /** @var UriInterface */
protected $poll; protected $poll;
/** @var UriInterface */ /** @var string URL pattern string including a placeholder "{uri}" that mustn't be URL-encoded */
protected $subscribe; protected $subscribe;
/** @var bool */ /** @var bool */
protected $searchable; protected $searchable;
@ -107,7 +107,7 @@ class DiasporaContact extends \Friendica\BaseEntity
UriInterface $url, \DateTime $created, string $guid = null, string $addr = null, UriInterface $alias = null, UriInterface $url, \DateTime $created, string $guid = null, string $addr = null, UriInterface $alias = null,
string $nick = null, string $name = null, string $givenName = null, string $familyName = null, string $nick = null, string $name = null, string $givenName = null, string $familyName = null,
UriInterface $photo = null, UriInterface $photoMedium = null, UriInterface $photoSmall = null, UriInterface $photo = null, UriInterface $photoMedium = null, UriInterface $photoSmall = null,
UriInterface $batch = null, UriInterface $notify = null, UriInterface $poll = null, UriInterface $subscribe = null, UriInterface $batch = null, UriInterface $notify = null, UriInterface $poll = null, string $subscribe = null,
bool $searchable = null, string $pubKey = null, UriInterface $baseurl = null, int $gsid = null, bool $searchable = null, string $pubKey = null, UriInterface $baseurl = null, int $gsid = null,
\DateTime $updated = null, int $interacting_count = 0, int $interacted_count = 0, int $post_count = 0, int $uriId = null \DateTime $updated = null, int $interacting_count = 0, int $interacted_count = 0, int $post_count = 0, int $uriId = null
) { ) {

4
src/Protocol/Diaspora/Factory/DiasporaContact.php
View File

@ -45,7 +45,7 @@ class DiasporaContact extends \Friendica\BaseFactory implements ICanCreateFromTa
$row['batch'] ? new Uri($row['batch']) : null, $row['batch'] ? new Uri($row['batch']) : null,
$row['notify'] ? new Uri($row['notify']) : null, $row['notify'] ? new Uri($row['notify']) : null,
$row['poll'] ? new Uri($row['poll']) : null, $row['poll'] ? new Uri($row['poll']) : null,
$row['subscribe'] ? new Uri($row['subscribe']) : null, $row['subscribe'],
$row['searchable'], $row['searchable'],
$row['pubkey'], $row['pubkey'],
$row['baseurl'] ? new Uri($row['baseurl']) : null, $row['baseurl'] ? new Uri($row['baseurl']) : null,
@ -87,7 +87,7 @@ class DiasporaContact extends \Friendica\BaseFactory implements ICanCreateFromTa
$data['batch'] ? new Uri($data['batch']) : null, $data['batch'] ? new Uri($data['batch']) : null,
$data['notify'] ? new Uri($data['notify']) : null, $data['notify'] ? new Uri($data['notify']) : null,
$data['poll'] ? new Uri($data['poll']) : null, $data['poll'] ? new Uri($data['poll']) : null,
$data['subscribe'] ? new Uri($data['subscribe']) : null, $data['subscribe'],
!$data['hide'], !$data['hide'],
$data['pubkey'], $data['pubkey'],
$data['baseurl'] ? new Uri($data['baseurl']) : null, $data['baseurl'] ? new Uri($data['baseurl']) : null,