From 4373a66f74affd5e9f7bf6266c8706fdb2e67ee1 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 23 Nov 2021 14:55:52 +0000 Subject: [PATCH] Coding standards --- src/Factory/Api/Friendica/Activities.php | 11 ++++++----- src/Factory/Api/Twitter/Mention.php | 5 ++--- src/Factory/Api/Twitter/Status.php | 4 +--- src/Object/Api/Twitter/Hashtag.php | 2 +- src/Object/Api/Twitter/Media.php | 3 +-- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/Factory/Api/Friendica/Activities.php b/src/Factory/Api/Friendica/Activities.php index 1979add350..c55649e9b4 100644 --- a/src/Factory/Api/Friendica/Activities.php +++ b/src/Factory/Api/Friendica/Activities.php @@ -50,7 +50,7 @@ class Activities extends BaseFactory * @return Array * @throws HTTPException\InternalServerErrorException */ - public function createFromUriId(int $uriId, int $uid): Array + public function createFromUriId(int $uriId, int $uid): array { $activities = [ 'like' => [], @@ -60,10 +60,11 @@ class Activities extends BaseFactory 'attendmaybe' => [], 'announce' => [], ]; - + $condition = ['uid' => $uid, 'thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY]; + $ret = Post::selectForUser($uid, ['author-id', 'verb'], $condition); - + while ($parent_item = Post::fetch($ret)) { // get user data and add it to the array of the activity $user = $this->twitterUser->createFromContactId($parent_item['author-id'], $uid)->toArray(); @@ -90,9 +91,9 @@ class Activities extends BaseFactory break; } } - + DBA::close($ret); - + return $activities; } } diff --git a/src/Factory/Api/Twitter/Mention.php b/src/Factory/Api/Twitter/Mention.php index a9d37d0c56..db0cc3bd71 100644 --- a/src/Factory/Api/Twitter/Mention.php +++ b/src/Factory/Api/Twitter/Mention.php @@ -23,7 +23,6 @@ namespace Friendica\Factory\Api\Twitter; use Friendica\App\BaseURL; use Friendica\BaseFactory; -use Friendica\Collection\Api\Mastodon\Mentions; use Friendica\Model\Contact; use Friendica\Model\Tag; use Friendica\Network\HTTPException; @@ -46,12 +45,12 @@ class Mention extends BaseFactory * @return Array * @throws HTTPException\InternalServerErrorException */ - public function createFromUriId(int $uriId): Array + public function createFromUriId(int $uriId): array { $mentions = []; $tags = Tag::getByURIId($uriId, [Tag::MENTION, Tag::EXCLUSIVE_MENTION, Tag::IMPLICIT_MENTION]); foreach ($tags as $tag) { - $indices = []; + $indices = []; $contact = Contact::getByURL($tag['url'], false); $object = new \Friendica\Object\Api\Twitter\Mention($tag, $contact, $indices); $mentions[] = $object->toArray(); diff --git a/src/Factory/Api/Twitter/Status.php b/src/Factory/Api/Twitter/Status.php index 35a75f7721..f06c23eb31 100644 --- a/src/Factory/Api/Twitter/Status.php +++ b/src/Factory/Api/Twitter/Status.php @@ -27,8 +27,6 @@ use Friendica\Content\Text\HTML; use Friendica\Database\Database; use Friendica\Factory\Api\Friendica\Activities; use Friendica\Factory\Api\Twitter\User as TwitterUser; -use Friendica\Factory\Api\Twitter\Hashtag; -use Friendica\Factory\Api\Twitter\Mention; use Friendica\Factory\Api\Twitter\Url; use Friendica\Model\Post; use Friendica\Model\Verb; @@ -96,7 +94,7 @@ class Status extends BaseFactory $coords = explode(' ', $item["coord"]); if (count($coords) == 2) { $geo = [ - 'type' => 'Point', + 'type' => 'Point', 'coordinates' => [(float) $coords[0], (float) $coords[1]] ]; } diff --git a/src/Object/Api/Twitter/Hashtag.php b/src/Object/Api/Twitter/Hashtag.php index f6b7a491aa..3ddfb61084 100644 --- a/src/Object/Api/Twitter/Hashtag.php +++ b/src/Object/Api/Twitter/Hashtag.php @@ -44,7 +44,7 @@ class Hashtag extends BaseDataTransferObject public function __construct(string $name, array $indices) { $this->indices = $indices; - $this->text = $name; + $this->text = $name; } /** diff --git a/src/Object/Api/Twitter/Media.php b/src/Object/Api/Twitter/Media.php index 6256d427c2..1c09c865da 100644 --- a/src/Object/Api/Twitter/Media.php +++ b/src/Object/Api/Twitter/Media.php @@ -79,7 +79,7 @@ class Media extends BaseDataTransferObject $size = 'large'; } - $this->sizes = [ + $this->sizes = [ $size => [ 'h' => $media['height'], 'resize' => 'fit', @@ -87,7 +87,6 @@ class Media extends BaseDataTransferObject ] ]; } - } /**