tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fix context order / notice fixed

Browse source
This commit is contained in:
Michael 2021-05-11 19:53:19 +00:00
parent 97a6ea0e79
commit 8eacfbc570
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Factory/Api/Mastodon/Card.php
View file

@ -40,6 +40,8 @@ class Card extends BaseFactory
$item = Post::selectFirst(['nody'], ['uri-id' => $uriId]); $item = Post::selectFirst(['nody'], ['uri-id' => $uriId]);
if (!empty($item['body'])) { if (!empty($item['body'])) {
$data = BBCode::getAttachmentData($item['body']); $data = BBCode::getAttachmentData($item['body']);
} else {
$data = [];
} }
foreach (Post\Media::getByURIId($uriId, [Post\Media::HTML]) as $attached) { foreach (Post\Media::getByURIId($uriId, [Post\Media::HTML]) as $attached) {

19
src/Module/Api/Mastodon/Statuses/Context.php
View file

@ -54,7 +54,8 @@ class Context extends BaseApi
$parents = []; $parents = [];
$children = []; $children = [];
$posts = Post::select(['uri-id', 'thr-parent-id'], ['parent-uri-id' => $parent['parent-uri-id']], [], false); $posts = Post::select(['uri-id', 'thr-parent-id'],
['parent-uri-id' => $parent['parent-uri-id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]], [], false);
while ($post = Post::fetch($posts)) { while ($post = Post::fetch($posts)) {
if ($post['uri-id'] == $post['thr-parent-id']) { if ($post['uri-id'] == $post['thr-parent-id']) {
continue; continue;
@ -67,12 +68,24 @@ class Context extends BaseApi
$statuses = ['ancestors' => [], 'descendants' => []]; $statuses = ['ancestors' => [], 'descendants' => []];
$ancestors = [];
foreach (self::getParents($id, $parents) as $ancestor) { foreach (self::getParents($id, $parents) as $ancestor) {
$statuses['ancestors'][] = DI::mstdnStatus()->createFromUriId($ancestor, $uid); $ancestors[$ancestor] = DI::mstdnStatus()->createFromUriId($ancestor, $uid);
} }
ksort($ancestors);
foreach ($ancestors as $ancestor) {
$statuses['ancestors'][] = $ancestor;
}
$descendants = [];
foreach (self::getChildren($id, $children) as $descendant) { foreach (self::getChildren($id, $children) as $descendant) {
$statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid); $descendants[] = DI::mstdnStatus()->createFromUriId($descendant, $uid);
}
ksort($descendants);
foreach ($descendants as $descendant) {
$statuses['descendants'][] = $descendant;
} }
System::jsonExit($statuses); System::jsonExit($statuses);

2
src/Module/OAuth/Token.php
View file

@ -55,7 +55,7 @@ class Token extends BaseApi
$condition = ['application-id' => $application['id'], 'code' => $code]; $condition = ['application-id' => $application['id'], 'code' => $code];
$token = DBA::selectFirst('application-token', ['access_token'], $condition); $token = DBA::selectFirst('application-token', ['access_token', 'created_at'], $condition);
if (!DBA::isResult($token)) { if (!DBA::isResult($token)) {
Logger::warning('Token not found', $condition); Logger::warning('Token not found', $condition);
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();