mirror of
https://github.com/friendica/friendica
synced 2025-04-30 15:04:23 +02:00
User defined channels can now base on circles/channels
This commit is contained in:
parent
2164787499
commit
9f23bee6e4
11 changed files with 136 additions and 73 deletions
|
@ -62,6 +62,8 @@ final class Timeline extends \Friendica\BaseEntity
|
|||
protected $path;
|
||||
/** @var int */
|
||||
protected $uid;
|
||||
/** @var int */
|
||||
protected $circle;
|
||||
/** @var string */
|
||||
protected $includeTags;
|
||||
/** @var string */
|
||||
|
@ -71,7 +73,7 @@ final class Timeline extends \Friendica\BaseEntity
|
|||
/** @var int */
|
||||
protected $mediaType;
|
||||
|
||||
public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null)
|
||||
public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null)
|
||||
{
|
||||
$this->code = $code;
|
||||
$this->label = $label;
|
||||
|
@ -83,5 +85,6 @@ final class Timeline extends \Friendica\BaseEntity
|
|||
$this->excludeTags = $excludeTags;
|
||||
$this->fullTextSearch = $fullTextSearch;
|
||||
$this->mediaType = $mediaType;
|
||||
$this->circle = $circle;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -62,6 +62,7 @@ final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTab
|
|||
$row['exclude-tags'] ?? null,
|
||||
$row['full-text-search'] ?? null,
|
||||
$row['media-type'] ?? null,
|
||||
$row['circle'] ?? null,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -91,6 +91,7 @@ class Channel extends \Friendica\BaseRepository
|
|||
'description' => $Channel->description,
|
||||
'access-key' => $Channel->accessKey,
|
||||
'uid' => $Channel->uid,
|
||||
'circle' => $Channel->circle,
|
||||
'include-tags' => $Channel->includeTags,
|
||||
'exclude-tags' => $Channel->excludeTags,
|
||||
'full-text-search' => $Channel->fullTextSearch,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue