Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/1509/head
Maxence Lange 2022-11-03 11:13:41 -01:00
rodzic 7716f217f2
commit 05e41274a0
40 zmienionych plików z 87 dodań i 126 usunięć

Wyświetl plik

@ -58,8 +58,8 @@ class Fediverse extends Base {
parent::configure();
$this->setName('social:fediverse')
->addOption(
'type', 't', InputArgument::OPTIONAL,
'Change the type of access management', ''
'type', 't', InputArgument::OPTIONAL,
'Change the type of access management', ''
)
->addArgument('action', InputArgument::OPTIONAL, 'add/remove/test address', '')
->addArgument('address', InputArgument::OPTIONAL, 'address/host', '')

Wyświetl plik

@ -119,10 +119,10 @@ class MigrateAlpha3 extends Base {
$this->setName('social:migrate:alpha3')
->setDescription('Trying to migrate old data to Alpha3')
->addOption(
'remove-migrated-tables', '', InputOption::VALUE_NONE, 'Remove old table once copy is done'
'remove-migrated-tables', '', InputOption::VALUE_NONE, 'Remove old table once copy is done'
)
->addOption(
'force-remove-old-tables', '', InputOption::VALUE_NONE, 'Force remove old tables'
'force-remove-old-tables', '', InputOption::VALUE_NONE, 'Force remove old tables'
);
}

Wyświetl plik

@ -96,18 +96,18 @@ class NoteCreate extends Base {
parent::configure();
$this->setName('social:note:create')
->addOption(
'replyTo', 'r', InputOption::VALUE_OPTIONAL, 'in reply to an existing thread'
'replyTo', 'r', InputOption::VALUE_OPTIONAL, 'in reply to an existing thread'
)
->addOption(
'to', 't', InputOption::VALUE_OPTIONAL, 'mentioning people'
'to', 't', InputOption::VALUE_OPTIONAL, 'mentioning people'
)
->addOption(
'type', 'y', InputOption::VALUE_OPTIONAL,
'type: public (default), followers, unlisted, direct'
'type', 'y', InputOption::VALUE_OPTIONAL,
'type: public (default), followers, unlisted, direct'
)
->addOption(
'hashtag', 'g', InputOption::VALUE_OPTIONAL,
'hashtag, without the leading #'
'hashtag', 'g', InputOption::VALUE_OPTIONAL,
'hashtag, without the leading #'
)
->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author')
->addArgument('content', InputArgument::REQUIRED, 'content of the post')

Wyświetl plik

@ -73,7 +73,7 @@ class QueueStatus extends Base {
parent::configure();
$this->setName('social:queue:status')
->addOption(
'token', 't', InputOption::VALUE_OPTIONAL, 'token of a request'
'token', 't', InputOption::VALUE_OPTIONAL, 'token of a request'
)
->setDescription('Return status on the request queue');
}

Wyświetl plik

@ -38,8 +38,6 @@ use OCA\Social\Model\ActivityPub\Actor\Person;
use OCP\DB\QueryBuilder\IQueryBuilder;
class ActorsRequest extends ActorsRequestBuilder {
/**
* Create a new Person in the database.
* @throws SocialAppConfigException
@ -55,13 +53,13 @@ class ActorsRequest extends ActorsRequestBuilder {
->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
->setValue('avatar_version', $qb->createNamedParameter($actor->getAvatarVersion()))
->setValue(
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
)
->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey()))
->setValue(
'creation',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
'creation',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
);
$qb->executeStatement();

Wyświetl plik

@ -121,7 +121,7 @@ class ActorsRequestBuilder extends CoreRequestBuilder {
->setLocal(true)
->setAvatarVersion($this->getInt('avatar_version', $data, -1))
->setAccount(
$actor->getPreferredUsername() . '@' . $this->configService->getSocialAddress()
$actor->getPreferredUsername() . '@' . $this->configService->getSocialAddress()
);
$actor->setUrlSocial($root)
->setUrl($actor->getId());

Wyświetl plik

@ -59,7 +59,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
->setValue('featured', $qb->createNamedParameter($actor->getFeatured()))
->setValue('url', $qb->createNamedParameter($actor->getUrl()))
->setValue(
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
)
->setValue('name', $qb->createNamedParameter($actor->getName()))
->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
@ -112,7 +112,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
->set('featured', $qb->createNamedParameter($actor->getFeatured()))
->set('url', $qb->createNamedParameter($actor->getUrl()))
->set(
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
)
->set('name', $qb->createNamedParameter($actor->getName()))
->set('summary', $qb->createNamedParameter($actor->getSummary()))

Wyświetl plik

@ -56,7 +56,7 @@ class ClientRequest extends ClientRequestBuilder {
$qb->setValue('app_name', $qb->createNamedParameter($client->getAppName()))
->setValue('app_website', $qb->createNamedParameter($client->getAppWebsite()))
->setValue(
'app_redirect_uris', $qb->createNamedParameter(json_encode($client->getAppRedirectUris()))
'app_redirect_uris', $qb->createNamedParameter(json_encode($client->getAppRedirectUris()))
)
->setValue('app_client_id', $qb->createNamedParameter($client->getAppClientId()))
->setValue('app_client_secret', $qb->createNamedParameter($client->getAppClientSecret()))

Wyświetl plik

@ -1052,8 +1052,8 @@ class CoreRequestBuilder {
->selectAlias($prefix . '_f.follow_id', $prefix . '_follow_id')
->selectAlias($prefix . '_f.creation', $prefix . '_creation')
->leftJoin(
$this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f',
$andX
$this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f',
$andX
);
}

Wyświetl plik

@ -66,9 +66,9 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
->setValue('author', $qb->createNamedParameter($queue->getAuthor()))
->setValue('activity', $qb->createNamedParameter($queue->getActivity()))
->setValue(
'instance', $qb->createNamedParameter(
json_encode($queue->getInstance(), JSON_UNESCAPED_SLASHES)
)
'instance', $qb->createNamedParameter(
json_encode($queue->getInstance(), JSON_UNESCAPED_SLASHES)
)
)
->setValue('priority', $qb->createNamedParameter($queue->getPriority()))
->setValue('status', $qb->createNamedParameter($queue->getStatus()))
@ -133,8 +133,8 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
$qb = $this->getRequestQueueUpdateSql();
$qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_RUNNING))
->set(
'last',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
'last',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
);
$this->limitToId($qb, $queue->getId());
$this->limitToStatus($qb, RequestQueue::STATUS_STANDBY);

Wyświetl plik

@ -45,8 +45,6 @@ use OCP\DB\QueryBuilder\ICompositeExpression;
* @package OCA\Social\Db
*/
class SocialCrossQueryBuilder extends SocialCoreQueryBuilder {
/**
* @param string $aliasDest
* @param string $aliasFollowing
@ -187,8 +185,8 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder {
->selectAlias('cd.error', 'cachedocument_error')
->selectAlias('cd.creation', 'cachedocument_creation')
->leftJoin(
$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'cd',
$expr->eq($func->lower($pf . '.' . $fieldDocumentId), $func->lower('cd.id'))
$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'cd',
$expr->eq($func->lower($pf . '.' . $fieldDocumentId), $func->lower('cd.id'))
);
}

Wyświetl plik

@ -37,8 +37,6 @@ namespace OCA\Social\Db;
* @package OCA\Social\Db
*/
class SocialFiltersQueryBuilder extends SocialLimitsQueryBuilder {
/**
*
*/

Wyświetl plik

@ -45,8 +45,6 @@ use OCP\DB\QueryBuilder\ICompositeExpression;
* @package OCA\Social\Db
*/
class SocialLimitsQueryBuilder extends SocialCrossQueryBuilder {
/**
* Limit the request to the Type
*

Wyświetl plik

@ -40,8 +40,6 @@ use OCA\Social\Model\StreamAction;
* @package OCA\Social\Db
*/
class StreamActionsRequest extends StreamActionsRequestBuilder {
/**
* Create a new Queue in the database.
*/
@ -58,9 +56,9 @@ class StreamActionsRequest extends StreamActionsRequestBuilder {
->setValue('stream_id', $qb->createNamedParameter($action->getStreamId()))
->setValue('stream_id_prim', $qb->createNamedParameter($this->prim($action->getStreamId())))
->setValue(
'values', $qb->createNamedParameter(
json_encode($values, JSON_UNESCAPED_SLASHES)
)
'values', $qb->createNamedParameter(
json_encode($values, JSON_UNESCAPED_SLASHES)
)
)
->setValue('liked', $qb->createNamedParameter(($liked) ? 1 : 0))
->setValue('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0))

Wyświetl plik

@ -42,8 +42,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
* @package OCA\Social\Db
*/
class StreamQueueRequest extends StreamQueueRequestBuilder {
/**
* create a new Queue in the database.
*
@ -112,8 +110,8 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$qb = $this->getStreamQueueUpdateSql();
$qb->set('status', $qb->createNamedParameter(StreamQueue::STATUS_RUNNING))
->set(
'last',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
'last',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
);
$this->limitToId($qb, $queue->getId());
$this->limitToStatus($qb, StreamQueue::STATUS_STANDBY);

Wyświetl plik

@ -76,7 +76,7 @@ class StreamRequest extends StreamRequestBuilder {
/** @var Note $stream */
$qb->setValue('hashtags', $qb->createNamedParameter(json_encode($stream->getHashtags())))
->setValue('attachments', $qb->createNamedParameter(
json_encode($stream->getAttachments(), JSON_UNESCAPED_SLASHES)
json_encode($stream->getAttachments(), JSON_UNESCAPED_SLASHES)
));
}
@ -680,19 +680,19 @@ class StreamRequest extends StreamRequestBuilder {
->setValue('subtype', $qb->createNamedParameter($stream->getSubType()))
->setValue('to', $qb->createNamedParameter($stream->getTo()))
->setValue(
'to_array', $qb->createNamedParameter(
json_encode($stream->getToArray(), JSON_UNESCAPED_SLASHES)
)
'to_array', $qb->createNamedParameter(
json_encode($stream->getToArray(), JSON_UNESCAPED_SLASHES)
)
)
->setValue(
'cc', $qb->createNamedParameter(
json_encode($stream->getCcArray(), JSON_UNESCAPED_SLASHES)
)
'cc', $qb->createNamedParameter(
json_encode($stream->getCcArray(), JSON_UNESCAPED_SLASHES)
)
)
->setValue(
'bcc', $qb->createNamedParameter(
json_encode($stream->getBccArray(), JSON_UNESCAPED_SLASHES)
)
'bcc', $qb->createNamedParameter(
json_encode($stream->getBccArray(), JSON_UNESCAPED_SLASHES)
)
)
->setValue('content', $qb->createNamedParameter($stream->getContent()))
->setValue('summary', $qb->createNamedParameter($stream->getSummary()))
@ -708,13 +708,13 @@ class StreamRequest extends StreamRequestBuilder {
->setValue('details', $qb->createNamedParameter(json_encode($stream->getDetailsAll())))
->setValue('cache', $qb->createNamedParameter($cache))
->setValue(
'filter_duplicate',
$qb->createNamedParameter(($stream->isFilterDuplicate()) ? '1' : '0')
'filter_duplicate',
$qb->createNamedParameter(($stream->isFilterDuplicate()) ? '1' : '0')
)
->setValue(
'instances', $qb->createNamedParameter(
json_encode($stream->getInstancePaths(), JSON_UNESCAPED_SLASHES)
)
'instances', $qb->createNamedParameter(
json_encode($stream->getInstancePaths(), JSON_UNESCAPED_SLASHES)
)
)
->setValue('local', $qb->createNamedParameter(($stream->isLocal()) ? '1' : '0'));
@ -725,8 +725,8 @@ class StreamRequest extends StreamRequestBuilder {
'published_time', $qb->createNamedParameter($dTime, IQueryBuilder::PARAM_DATE)
)
->setValue(
'creation',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
'creation',
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
);
} catch (Exception $e) {
}

Wyświetl plik

@ -92,10 +92,10 @@ class StreamRequestBuilder extends CoreRequestBuilder {
/** @noinspection PhpMethodParametersCountMismatchInspection */
$qb->selectDistinct('s.id')
->addSelect(
's.nid', 's.type', 's.subtype', 's.to', 's.to_array', 's.cc', 's.bcc', 's.content',
's.summary', 's.attachments', 's.published', 's.published_time', 's.cache',
's.object_id', 's.attributed_to', 's.in_reply_to', 's.source', 's.local',
's.instances', 's.creation', 's.filter_duplicate', 's.details', 's.hashtags'
's.nid', 's.type', 's.subtype', 's.to', 's.to_array', 's.cc', 's.bcc', 's.content',
's.summary', 's.attachments', 's.published', 's.published_time', 's.cache',
's.object_id', 's.attributed_to', 's.in_reply_to', 's.source', 's.local',
's.instances', 's.creation', 's.filter_duplicate', 's.details', 's.hashtags'
)
->from(self::TABLE_STREAM, 's');

Wyświetl plik

@ -41,7 +41,6 @@ use OCA\Social\Model\ActivityPub\ACore;
* @package OCA\Social\Service
*/
interface IActivityPubInterface {
/**
* Freshly imported item can be processed/parsed on incoming Request.
*/

Wyświetl plik

@ -316,7 +316,6 @@ class AnnounceInterface extends AbstractActivityPubInterface implements IActivit
$notification->addDetail('accounts', $author->getAccount());
$notificationInterface->update($notification);
} catch (StreamNotFoundException $e) {
/** @var SocialAppNotification $notification */
$notification = AP::$activityPub->getItemFromType(SocialAppNotification::TYPE);
// $notification->setDetail('url', '');

Wyświetl plik

@ -200,7 +200,6 @@ class LikeInterface extends AbstractActivityPubInterface implements IActivityPub
$notification->addDetail('accounts', $author->getAccount());
$notificationInterface->update($notification);
} catch (StreamNotFoundException $e) {
/** @var SocialAppNotification $notification */
$notification = AP::$activityPub->getItemFromType(SocialAppNotification::TYPE);
// $notification->setDetail('url', '');

Wyświetl plik

@ -39,8 +39,6 @@ use OCP\Search\SearchResultEntry;
* @package OCA\Social\Search
*/
class UnifiedSearchResult extends SearchResultEntry {
/**
* UnifiedSearchResult constructor.
*

Wyświetl plik

@ -381,8 +381,8 @@ class ConfigService {
public function setSocialUrl(string $url = '') {
if ($url === '') {
$url = $this->getCloudUrl(true) . $this->urlGenerator->linkToRoute(
'social.Navigation.navigate'
);
'social.Navigation.navigate'
);
}
if (parse_url($url, PHP_URL_SCHEME) === null) {

Wyświetl plik

@ -114,7 +114,6 @@ class RequestQueueService {
$request = $requests[0];
switch ($request->getPriority()) {
case InstancePath::PRIORITY_TOP:
return $request;

Wyświetl plik

@ -202,7 +202,6 @@ class StreamQueueService {
$cache = $stream->getCache();
foreach ($cache->getItems() as $item) {
// TODO: PHP7.2 (NC16) : multiple exception per catch
try {

Wyświetl plik

@ -269,8 +269,8 @@ class StreamService {
[
'type' => 'Hashtag',
'href' => $this->configService->getSocialUrl() . 'tag/' . strtolower(
$hashtag
),
$hashtag
),
'name' => '#' . $hashtag
]
);

Wyświetl plik

@ -49,8 +49,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
* @package OCA\Social\Tools\Db
*/
class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder {
/** @var string */
private $defaultSelectAlias = '';

Wyświetl plik

@ -43,8 +43,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
* @package OCA\Social\Tools\Db
*/
class RequestBuilder {
/** @var string */
protected $defaultSelectAlias;

Wyświetl plik

@ -32,7 +32,6 @@ declare(strict_types=1);
namespace OCA\Social\Tools;
interface IDeserializable {
/**
* @param array $data
*

Wyświetl plik

@ -43,8 +43,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
* @package OCA\Social\Tools
*/
interface IExtendedQueryBuilder extends IQueryBuilder {
/**
* @param string $alias
*

Wyświetl plik

@ -42,8 +42,6 @@ use OCA\Social\Tools\Exceptions\ShellUnknownItemException;
* @package OCA\Social\Tools
*/
interface IInteractiveShellClient {
/**
* @param string $source
* @param string $field

Wyświetl plik

@ -38,7 +38,6 @@ namespace OCA\Social\Tools;
* @package OCA\Social\Tools
*/
interface IQueryRow {
/**
* import data to feed the model.
*

Wyświetl plik

@ -693,8 +693,8 @@ class Request implements JsonSerializable {
case self::QS_VAR_DUPLICATE:
default:
return '?' . preg_replace(
'/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', http_build_query($this->getParams())
);
'/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', http_build_query($this->getParams())
);
}
}

Wyświetl plik

@ -40,8 +40,6 @@ use JsonSerializable;
* @package OCA\Social\Tools\Traits
*/
trait TAsync {
/**
* Hacky way to async the rest of the process without keeping client on hold.
*

Wyświetl plik

@ -37,7 +37,6 @@ namespace OCA\Social\Tools\Traits;
* @package OCA\Social\Tools\Traits
*/
trait TFileTools {
/**
* @param $stream
*

Wyświetl plik

@ -71,12 +71,12 @@ trait TNCLogger {
$this->logger()
->log(
$level,
$message,
[
'app' => $this->setup('app'),
'exception' => $t
]
$level,
$message,
[
'app' => $this->setup('app'),
'exception' => $t
]
);
}
@ -111,12 +111,12 @@ trait TNCLogger {
$this->logger()
->log(
$level,
$message,
[
'app' => $this->setup('app'),
'exception' => $e
]
$level,
$message,
[
'app' => $this->setup('app'),
'exception' => $e
]
);
}

Wyświetl plik

@ -44,8 +44,6 @@ use OCA\Social\Tools\Model\Request;
* @package OCA\Social\Tools\Traits
*/
trait TNCRequest {
/** @var int */
private $maxDownloadSize = 100;
@ -150,14 +148,14 @@ trait TNCRequest {
curl_setopt($curl, CURLOPT_BUFFERSIZE, 128);
curl_setopt($curl, CURLOPT_NOPROGRESS, false);
curl_setopt(
/**
* @param $downloadSize
* @param int $downloaded
* @param $uploadSize
* @param int $uploaded
*
* @return int
*/
/**
* @param $downloadSize
* @param int $downloaded
* @param $uploadSize
* @param int $uploaded
*
* @return int
*/
$curl, CURLOPT_PROGRESSFUNCTION,
function ($downloadSize, int $downloaded, $uploadSize, int $uploaded) {
if ($downloaded > ($this->maxDownloadSize * (1024 * 1024))) {

Wyświetl plik

@ -38,7 +38,6 @@ namespace OCA\Social\Tools\Traits;
* @package OCA\Social\Tools\Traits
*/
trait TPathTools {
/**
* @param string $path
*

Wyświetl plik

@ -144,14 +144,14 @@ trait TRequest {
curl_setopt($curl, CURLOPT_BUFFERSIZE, 128);
curl_setopt($curl, CURLOPT_NOPROGRESS, false);
curl_setopt(
/**
* @param $downloadSize
* @param int $downloaded
* @param $uploadSize
* @param int $uploaded
*
* @return int
*/
/**
* @param $downloadSize
* @param int $downloaded
* @param $uploadSize
* @param int $uploaded
*
* @return int
*/
$curl, CURLOPT_PROGRESSFUNCTION,
function ($downloadSize, int $downloaded, $uploadSize, int $uploaded) {
if ($downloaded > ($this->maxDownloadSize * (1024 * 1024))) {

Wyświetl plik

@ -39,8 +39,6 @@ use Exception;
* @package OCA\Social\Tools\Traits
*/
trait TStringTools {
/**
* @param int $length
*

Wyświetl plik

@ -39,8 +39,6 @@ use OCA\Social\Model\ActivityPub\Item;
* @package OCA\Social\Traits
*/
trait TDetails {
/** @var array */
private $details = [];