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

Merge pull request #12963 from annando/warnings 

Fix some warnings
This commit is contained in:
Hypolite Petovan 2023-03-31 14:15:02 -04:00 committed by GitHub
parent d200503381 9df68da80e
commit 5dd4bfb852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Module/Api/Mastodon/Statuses.php
View File

@ -71,7 +71,7 @@ class Statuses extends BaseApi
'origin' => true,
];
$post = Post::selectFirst(['uri-id', 'id', 'gravity', 'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'network'], $condition);
$post = Post::selectFirst(['uri-id', 'id', 'gravity', 'verb', 'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'network'], $condition);
if (empty($post['id'])) {
throw new HTTPException\NotFoundException('Item with URI ID ' . $this->parameters['id'] . ' not found for user ' . $uid . '.');
}
@ -87,6 +87,8 @@ class Statuses extends BaseApi
$item['uid'] = $post['uid'];
$item['body'] = $body;
$item['network'] = $post['network'];
$item['gravity'] = $post['gravity'];
$item['verb'] = $post['verb'];
$item['app'] = $this->getApp();
if (!empty($request['language'])) {
@ -108,7 +110,7 @@ class Statuses extends BaseApi
}
}
$item = DI::contentItem()->expandTags($item, $request['visibility'] == 'direct');
$item = DI::contentItem()->expandTags($item);
/*
The provided ids in the request value consists of these two sources:

6
src/Protocol/ActivityPub/ClientToServer.php
View File

@ -264,7 +264,7 @@ class ClientToServer
$item['contact-id'] = $owner['id'];
$item['author-id'] = $item['owner-id'] = Contact::getPublicIdByUserId($uid);
$item['title'] = $object_data['name'];
$item['body'] = Markdown::toBBCode($object_data['content']);
$item['body'] = Markdown::toBBCode($object_data['content'] ?? '');
$item['app'] = $application['name'] ?? 'API';
if (!empty($object_data['target'][Receiver::TARGET_GLOBAL])) {
@ -354,6 +354,10 @@ class ClientToServer
$apcontact = APContact::getByURL($owner['url']);
if (empty($apcontact)) {
throw new \Friendica\Network\HTTPException\NotFoundException();
}
return self::getCollection($condition, DI::baseUrl() . '/outbox/' . $owner['nickname'], $page, $max_id, $uid, $apcontact['statuses_count']);
}