From a696b7f427a3109b47b598624cfd3e015f7add0f Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 9 May 2021 18:44:08 +0000 Subject: [PATCH] Renamed functions --- src/Factory/Api/Mastodon/ListEntity.php | 2 +- src/Factory/Api/Mastodon/Notification.php | 2 +- src/Module/Api/Mastodon/Accounts/Lists.php | 2 +- src/Module/Api/Mastodon/Lists.php | 4 ++-- src/Module/Api/Mastodon/Notifications.php | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Factory/Api/Mastodon/ListEntity.php b/src/Factory/Api/Mastodon/ListEntity.php index 57547e438a..a149b25af2 100644 --- a/src/Factory/Api/Mastodon/ListEntity.php +++ b/src/Factory/Api/Mastodon/ListEntity.php @@ -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'); diff --git a/src/Factory/Api/Mastodon/Notification.php b/src/Factory/Api/Mastodon/Notification.php index d9588b450d..db5e7d4898 100644 --- a/src/Factory/Api/Mastodon/Notification.php +++ b/src/Factory/Api/Mastodon/Notification.php @@ -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)) { diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php index 95677dad6d..b15124a45c 100644 --- a/src/Module/Api/Mastodon/Accounts/Lists.php +++ b/src/Module/Api/Mastodon/Accounts/Lists.php @@ -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); } diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php index f65ef51395..d9f9c6e5a8 100644 --- a/src/Module/Api/Mastodon/Lists.php +++ b/src/Module/Api/Mastodon/Lists.php @@ -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); diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php index 8f1b1d2d97..a10ebf5d50 100644 --- a/src/Module/Api/Mastodon/Notifications.php +++ b/src/Module/Api/Mastodon/Notifications.php @@ -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)) {