mirror of
https://github.com/friendica/friendica
synced 2025-04-27 08:30:10 +00:00
Reformatted code
This commit is contained in:
Roland Häder
parent
5699b03e8d
commit
fd8f4269ff
14 changed files with 138 additions and 155 deletions
|
|
@ -261,7 +261,7 @@ class Relation
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns an array of sugguested contacts for given user id
|
||||
* Returns an array of suggested contacts for given user id
|
||||
*
|
||||
* @param int $uid User id
|
||||
* @param int $start optional, default 0
|
||||
|
|
@ -288,13 +288,8 @@ class Relation
|
|||
AND NOT `hidden` AND `network` IN (?, ?, ?, ?)",
|
||||
$cid,
|
||||
0,
|
||||
$uid,
|
||||
Contact::FRIEND,
|
||||
Contact::SHARING,
|
||||
Protocol::ACTIVITYPUB,
|
||||
Protocol::DFRN,
|
||||
$diaspora,
|
||||
$ostatus,
|
||||
$uid, Contact::FRIEND, Contact::SHARING,
|
||||
Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus,
|
||||
], [
|
||||
'order' => ['last-item' => true],
|
||||
'limit' => $totallimit,
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ class User
|
|||
/**
|
||||
* Apply changes from contact update data to user-contact table
|
||||
*
|
||||
* @param array $fields Fields
|
||||
* @param array $condition Conditions
|
||||
* @param array $fields
|
||||
* @param array $condition
|
||||
* @return void
|
||||
* @throws PDOException
|
||||
* @throws Exception
|
||||
|
|
@ -106,7 +106,7 @@ class User
|
|||
DBA::close($contacts);
|
||||
}
|
||||
|
||||
DBA::commit();
|
||||
DBA::commit();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -683,7 +683,6 @@ class GServer
|
|||
* Fetch server data from '/statistics.json' on the given server
|
||||
*
|
||||
* @param string $url URL of the given server
|
||||
*
|
||||
* @return array server data
|
||||
*/
|
||||
private static function fetchStatistics(string $url): array
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class Link
|
|||
/**
|
||||
* Check if the link is stored
|
||||
*
|
||||
* @param int $uriId URI id
|
||||
* @param int $uriId
|
||||
* @param string $url URL
|
||||
* @return bool Whether record has been found
|
||||
*/
|
||||
|
|
@ -52,9 +52,9 @@ class Link
|
|||
/**
|
||||
* Returns URL by URI id and other URL
|
||||
*
|
||||
* @param int $uriId URI id
|
||||
* @param string $url URL
|
||||
* @param string size Size
|
||||
* @param int $uriId
|
||||
* @param string $url
|
||||
* @param string $size
|
||||
* @return string Found link URL + id on success, $url on failture
|
||||
*/
|
||||
public static function getByLink(int $uriId, string $url, string $size = ''): string
|
||||
|
|
@ -113,7 +113,7 @@ class Link
|
|||
* Fetches MIME type by URL and Accept: header
|
||||
*
|
||||
* @param string $url URL to fetch
|
||||
* @param string $accept Accept: line
|
||||
* @param string $accept Comma-separated list of expected response MIME type(s)
|
||||
* @return string Discovered MIME type or empty string on failure
|
||||
*/
|
||||
private static function fetchMimeType(string $url, string $accept = HttpClientAccept::DEFAULT): string
|
||||
|
|
@ -132,8 +132,8 @@ class Link
|
|||
/**
|
||||
* Add external links and replace them in the body
|
||||
*
|
||||
* @param integer $uriId URI id
|
||||
* @param string $body HTML body
|
||||
* @param integer $uriId
|
||||
* @param string $body Item body formatted with BBCodes
|
||||
* @return string Body with replaced links
|
||||
*/
|
||||
public static function insertFromBody(int $uriId, string $body): string
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Factory\Api\Mastodon\Notification as NotificationFactory;
|
||||
use Friendica\Navigation\Notifications\Entity;
|
||||
use Friendica\Object\Api\Mastodon\Notification;
|
||||
use Minishlink\WebPush\VAPID;
|
||||
|
|
@ -133,12 +134,12 @@ class Subscription
|
|||
/**
|
||||
* Prepare push notification
|
||||
*
|
||||
* @param Notification $Notification Notification instance
|
||||
* @param Notification $Notification
|
||||
* @return void
|
||||
*/
|
||||
public static function pushByNotification(Entity\Notification $notification)
|
||||
{
|
||||
$type = \Friendica\Factory\Api\Mastodon\Notification::getType($notification);
|
||||
$type = NotificationFactory::getType($notification);
|
||||
|
||||
if (DI::notify()->NotifyOnDesktop($notification, $type)) {
|
||||
DI::notify()->createFromNotification($notification);
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class Tag
|
|||
/**
|
||||
* Store tag/mention elements
|
||||
*
|
||||
* @param integer $uriId URI id
|
||||
* @param integer $uriId
|
||||
* @param integer $type Tag type
|
||||
* @param string $name Tag name
|
||||
* @param string $url Contact URL (optional)
|
||||
|
|
@ -217,7 +217,7 @@ class Tag
|
|||
* Get a tag id for a given tag name and URL
|
||||
*
|
||||
* @param string $name Name of tag
|
||||
* @param string $url URL
|
||||
* @param string $url
|
||||
* @param int $type Type of tag
|
||||
* @return int Tag id
|
||||
*/
|
||||
|
|
@ -254,10 +254,10 @@ class Tag
|
|||
/**
|
||||
* Store tag/mention elements
|
||||
*
|
||||
* @param integer $uriId URI id
|
||||
* @param string $hash Hash
|
||||
* @param string $name Name
|
||||
* @param string $url URL
|
||||
* @param integer $uriId
|
||||
* @param string $hash
|
||||
* @param string $name
|
||||
* @param string $url
|
||||
* @param boolean $probing Whether probing is active
|
||||
* @return void
|
||||
*/
|
||||
|
|
@ -372,7 +372,7 @@ class Tag
|
|||
/**
|
||||
* Remove tag/mention
|
||||
*
|
||||
* @param integer $uriId URI id
|
||||
* @param integer $uriId
|
||||
* @param integer $type Type
|
||||
* @param string $name Name
|
||||
* @param string $url URL
|
||||
|
|
@ -397,10 +397,10 @@ class Tag
|
|||
/**
|
||||
* Remove tag/mention
|
||||
*
|
||||
* @param integer $uriId URI id
|
||||
* @param string $hash Hash
|
||||
* @param string $name Name
|
||||
* @param string $url URL
|
||||
* @param integer $uriId
|
||||
* @param string $hash
|
||||
* @param string $name
|
||||
* @param string $url
|
||||
* @return void
|
||||
*/
|
||||
public static function removeByHash(int $uriId, string $hash, string $name, string $url = '')
|
||||
|
|
@ -416,7 +416,7 @@ class Tag
|
|||
/**
|
||||
* Get the type for the given hash
|
||||
*
|
||||
* @param string $hash Hash
|
||||
* @param string $hash
|
||||
* @return integer Tag type
|
||||
*/
|
||||
private static function getTypeForHash(string $hash): int
|
||||
|
|
@ -437,8 +437,8 @@ class Tag
|
|||
/**
|
||||
* Create implicit mentions for a given post
|
||||
*
|
||||
* @param integer $uriId URI Id
|
||||
* @param integer $parentUriId Parent URI id
|
||||
* @param integer $uriId
|
||||
* @param integer $parentUriId
|
||||
* @return void
|
||||
*/
|
||||
public static function createImplicitMentions(int $uriId, int $parentUriId)
|
||||
|
|
@ -461,7 +461,7 @@ class Tag
|
|||
/**
|
||||
* Retrieves the terms from the provided type(s) associated with the provided item ID.
|
||||
*
|
||||
* @param int $uriId URI id
|
||||
* @param int $uriId
|
||||
* @param array $type Tag type(s)
|
||||
* @return array|bool Array on success, false on error
|
||||
* @throws \Exception
|
||||
|
|
@ -475,7 +475,7 @@ class Tag
|
|||
/**
|
||||
* Return a string with all tags and mentions
|
||||
*
|
||||
* @param integer $uriId URI id
|
||||
* @param integer $uriId
|
||||
* @param array $type Tag type(s)
|
||||
* @return string tags and mentions
|
||||
* @throws \Exception
|
||||
|
|
@ -565,15 +565,8 @@ class Tag
|
|||
{
|
||||
$condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
|
||||
AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
|
||||
$search,
|
||||
0,
|
||||
$uid,
|
||||
Protocol::ACTIVITYPUB,
|
||||
Protocol::DFRN,
|
||||
Protocol::DIASPORA,
|
||||
Protocol::OSTATUS,
|
||||
$uid,
|
||||
0,
|
||||
$search, 0, $uid,
|
||||
Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0,
|
||||
];
|
||||
|
||||
return DBA::count('tag-search-view', $condition);
|
||||
|
|
@ -593,15 +586,8 @@ class Tag
|
|||
{
|
||||
$condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
|
||||
AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
|
||||
$search,
|
||||
0,
|
||||
$uid,
|
||||
Protocol::ACTIVITYPUB,
|
||||
Protocol::DFRN,
|
||||
Protocol::DIASPORA,
|
||||
Protocol::OSTATUS,
|
||||
$uid,
|
||||
0,
|
||||
$search, 0, $uid,
|
||||
Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0,
|
||||
];
|
||||
|
||||
if (!empty($last_uriid)) {
|
||||
|
|
@ -686,9 +672,7 @@ class Tag
|
|||
FROM `tag-search-view`
|
||||
WHERE `private` = ? AND `uid` = ? AND `uri-id` > ? $block_sql
|
||||
GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
|
||||
Item::PUBLIC,
|
||||
0,
|
||||
$post['uri-id'],
|
||||
Item::PUBLIC, 0, $post['uri-id'],
|
||||
$limit
|
||||
);
|
||||
|
||||
|
|
@ -743,8 +727,7 @@ class Tag
|
|||
FROM `tag-search-view`
|
||||
WHERE `private` = ? AND `wall` AND `origin` AND `uri-id` > ? $block_sql
|
||||
GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
|
||||
Item::PUBLIC,
|
||||
$post['uri-id'],
|
||||
Item::PUBLIC, $post['uri-id'],
|
||||
$limit
|
||||
);
|
||||
|
||||
|
|
@ -797,7 +780,7 @@ class Tag
|
|||
/**
|
||||
* Fetch user who subscribed to the tags of the given item
|
||||
*
|
||||
* @param integer $uriId URI Id
|
||||
* @param integer $uriId
|
||||
* @return array User list
|
||||
*/
|
||||
public static function getUIDListByURIId(int $uriId): array
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue