From f5c7f9670f25a51f9ffae527579b897237126cbb Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 9 May 2021 11:54:34 +0000 Subject: [PATCH] Remove blanks --- include/enotify.php | 4 ++-- src/Factory/Api/Mastodon/Notification.php | 2 +- src/Model/Contact.php | 18 +++++++++--------- src/Module/Api/Mastodon/Accounts/Search.php | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 3aa38c1c44..1edad36ac0 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -41,7 +41,7 @@ use Friendica\Protocol\Activity; * type, event, otype, activity, verb, uid, cid, origin_cid, item, link, * source_name, source_mail, source_nick, source_link, source_photo, * show_in_notification_page - * + * * @return bool * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ @@ -273,7 +273,7 @@ function notification($params) $epreamble = $l10n->t('%1$s [url=%2$s]shared a post[/url] from %3$s.', '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $params['link'], '[url='.$params['origin_link'].']'.$params['origin_name'].'[/url]' - ); + ); } $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.'); diff --git a/src/Factory/Api/Mastodon/Notification.php b/src/Factory/Api/Mastodon/Notification.php index 78b106c04e..d9588b450d 100644 --- a/src/Factory/Api/Mastodon/Notification.php +++ b/src/Factory/Api/Mastodon/Notification.php @@ -67,7 +67,7 @@ class Notification extends BaseFactory case ModelNotification\Type::SHARE: $type = 'status'; break; - + default: return null; } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 876369f304..f75cffadac 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -264,7 +264,7 @@ class Contact $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; $contact = DBA::selectFirst('contact', $fields, $condition, $options); } - + if (!DBA::isResult($contact)) { return []; } @@ -307,7 +307,7 @@ class Contact } $contact = self::getByURL($url, $update, $fields); - if (!empty($contact['id'])) { + if (!empty($contact['id'])) { $contact['cid'] = 0; $contact['zid'] = $contact['id']; } @@ -1274,7 +1274,7 @@ class Contact * * @param string $contact_url Contact URL * @param bool $thread_mode - * @param int $update Update mode + * @param int $update Update mode * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception @@ -1289,7 +1289,7 @@ class Contact * * @param int $cid Contact ID * @param bool $thread_mode - * @param int $update Update mode + * @param int $update Update mode * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception @@ -1347,7 +1347,7 @@ class Contact $o = ''; } - if ($thread_mode) { + if ($thread_mode) { $items = Post::toArray(Post::selectForUser(local_user(), ['uri-id', 'gravity', 'parent-uri-id', 'thr-parent-id', 'author-id'], $condition, $params)); $o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user()); @@ -1607,12 +1607,12 @@ class Contact $avatar['size'] = 48; $default = self::DEFAULT_AVATAR_MICRO; break; - + case Proxy::SIZE_THUMB: $avatar['size'] = 80; $default = self::DEFAULT_AVATAR_THUMB; break; - + case Proxy::SIZE_SMALL: default: $avatar['size'] = 300; @@ -1720,7 +1720,7 @@ class Contact $contact['thumb'] ?? '', $contact['micro'] ?? '', ]; - + foreach ($data as $image_uri) { $image_rid = Photo::ridFromURI($image_uri); if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) { @@ -2027,7 +2027,7 @@ class Contact if (Contact\Relation::isDiscoverable($ret['url'])) { Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']); } - + // Update the public contact if ($uid != 0) { $contact = self::getByURL($ret['url'], false, ['id']); diff --git a/src/Module/Api/Mastodon/Accounts/Search.php b/src/Module/Api/Mastodon/Accounts/Search.php index 17adb54851..0eda36e31e 100644 --- a/src/Module/Api/Mastodon/Accounts/Search.php +++ b/src/Module/Api/Mastodon/Accounts/Search.php @@ -74,7 +74,7 @@ class Search extends BaseApi } if ($result instanceof ContactResult) { $id = Contact::getIdForURL($result->getUrl(), 0, false); - $accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid); + $accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid); } } }