tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Content is now filled

Browse source
This commit is contained in:
Michael 2020-09-03 19:13:03 +00:00
parent cd3d4ae4e6
commit 305fe62659
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Module/Api/Mastodon/Timelines/PublicTimeline.php
View file

@ -56,7 +56,6 @@ class PublicTimeline extends BaseApi
$condition = ['gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => Item::PUBLIC]; $condition = ['gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => Item::PUBLIC];
if ($local) { if ($local) {
$condition['wall'] = true;
$condition['origin'] = true; $condition['origin'] = true;
} else { } else {
$condition['uid'] = 0; $condition['uid'] = 0;

5
src/Object/Api/Mastodon/Status.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Object\Api\Mastodon; namespace Friendica\Object\Api\Mastodon;
use Friendica\BaseEntity; use Friendica\BaseEntity;
use Friendica\Content\Text\BBCode;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
/** /**
@ -105,7 +106,7 @@ class Status extends BaseEntity
} }
$this->sensitive = false; $this->sensitive = false;
$this->spoiler_text = ""; $this->spoiler_text = $item['title'];
$visibility = ['public', 'private', 'unlisted']; $visibility = ['public', 'private', 'unlisted'];
$this->visibility = $visibility[$item['private']]; $this->visibility = $visibility[$item['private']];
@ -121,7 +122,7 @@ class Status extends BaseEntity
$this->muted = false; $this->muted = false;
$this->bookmarked = false; $this->bookmarked = false;
$this->pinned = false; $this->pinned = false;
$this->content; $this->content = BBCode::convert($item['body'], false);
$this->reblog = null; $this->reblog = null;
$this->application = null; $this->application = null;
$this->account = $account->toArray(); $this->account = $account->toArray();