mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Renamed functions

Browse source
This commit is contained in:
Michael 2021-05-09 18:44:08 +00:00
parent 591619e1d3
commit a696b7f427
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ use Friendica\Database\DBA;
class ListEntity extends BaseFactory
{
public function create(int $id)
public function createFromGroupId(int $id)
{
$group = DBA::selectFirst('group', ['name'], ['id' => $id, 'deleted' => false]);
return new \Friendica\Object\Api\Mastodon\ListEntity($id, $group['name'] ?? '', 'list');

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

@ -29,7 +29,7 @@ use Friendica\Model\Notification as ModelNotification;
class Notification extends BaseFactory
{
public function create(int $id)
public function createFromNotifyId(int $id)
{
$notification = DBA::selectFirst('notify', [], ['id' => $id]);
if (!DBA::isResult($notification)) {

2
src/Module/Api/Mastodon/Accounts/Lists.php
View file

@ -56,7 +56,7 @@ class Lists extends BaseApi
if (!empty($cdata['user'])) {
$groups = DBA::select('group_member', ['gid'], ['contact-id' => $cdata['user']]);
while ($group = DBA::fetch($groups)) {
$lists[] = DI::mstdnList()->create($group['gid']);
$lists[] = DI::mstdnList()->createFromGroupId($group['gid']);
}
DBA::close($groups);
}

4
src/Module/Api/Mastodon/Lists.php
View file

@ -60,7 +60,7 @@ class Lists extends BaseApi
$groups = DBA::select('group', ['id'], ['uid' => $uid, 'deleted' => false]);
while ($group = DBA::fetch($groups)) {
$lists[] = DI::mstdnList()->create($group['id']);
$lists[] = DI::mstdnList()->createFromGroupId($group['id']);
}
DBA::close($groups);
} else {
@ -68,7 +68,7 @@ class Lists extends BaseApi
if (!DBA::exists('group',['uid' => $uid, 'deleted' => false])) {
DI::mstdnError()->RecordNotFound();
}
$lists = DI::mstdnList()->create($id);
$lists = DI::mstdnList()->createFromGroupId($id);
}
System::jsonExit($lists);

4
src/Module/Api/Mastodon/Notifications.php
View file

@ -47,7 +47,7 @@ class Notifications extends BaseApi
if (!DBA::exists('notify', ['id' => $id, 'uid' => $uid])) {
DI::mstdnError()->RecordNotFound();
}
System::jsonExit(DI::mstdnNotification()->create($id));
System::jsonExit(DI::mstdnNotification()->createFromNotifyId($id));
}
// Return results older than this ID
@ -110,7 +110,7 @@ class Notifications extends BaseApi
$notify = DBA::select('notify', ['id'], $condition, $params);
while ($notification = DBA::fetch($notify)) {
$notifications[] = DI::mstdnNotification()->create($notification['id']);
$notifications[] = DI::mstdnNotification()->createFromNotifyId($notification['id']);
}
if (!empty($min_id)) {