kopia lustrzana https://github.com/nextcloud/social
rodzic
7da94393dc
commit
1adf04fcc1
|
@ -58,8 +58,8 @@ class Fediverse extends Base {
|
||||||
parent::configure();
|
parent::configure();
|
||||||
$this->setName('social:fediverse')
|
$this->setName('social:fediverse')
|
||||||
->addOption(
|
->addOption(
|
||||||
'type', 't', InputArgument::OPTIONAL,
|
'type', 't', InputArgument::OPTIONAL,
|
||||||
'Change the type of access management', ''
|
'Change the type of access management', ''
|
||||||
)
|
)
|
||||||
->addArgument('action', InputArgument::OPTIONAL, 'add/remove/test address', '')
|
->addArgument('action', InputArgument::OPTIONAL, 'add/remove/test address', '')
|
||||||
->addArgument('address', InputArgument::OPTIONAL, 'address/host', '')
|
->addArgument('address', InputArgument::OPTIONAL, 'address/host', '')
|
||||||
|
|
|
@ -119,10 +119,10 @@ class MigrateAlpha3 extends Base {
|
||||||
$this->setName('social:migrate:alpha3')
|
$this->setName('social:migrate:alpha3')
|
||||||
->setDescription('Trying to migrate old data to Alpha3')
|
->setDescription('Trying to migrate old data to Alpha3')
|
||||||
->addOption(
|
->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(
|
->addOption(
|
||||||
'force-remove-old-tables', '', InputOption::VALUE_NONE, 'Force remove old tables'
|
'force-remove-old-tables', '', InputOption::VALUE_NONE, 'Force remove old tables'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -96,18 +96,18 @@ class NoteCreate extends Base {
|
||||||
parent::configure();
|
parent::configure();
|
||||||
$this->setName('social:note:create')
|
$this->setName('social:note:create')
|
||||||
->addOption(
|
->addOption(
|
||||||
'replyTo', 'r', InputOption::VALUE_OPTIONAL, 'in reply to an existing thread'
|
'replyTo', 'r', InputOption::VALUE_OPTIONAL, 'in reply to an existing thread'
|
||||||
)
|
)
|
||||||
->addOption(
|
->addOption(
|
||||||
'to', 't', InputOption::VALUE_OPTIONAL, 'mentioning people'
|
'to', 't', InputOption::VALUE_OPTIONAL, 'mentioning people'
|
||||||
)
|
)
|
||||||
->addOption(
|
->addOption(
|
||||||
'type', 'y', InputOption::VALUE_OPTIONAL,
|
'type', 'y', InputOption::VALUE_OPTIONAL,
|
||||||
'type: public (default), followers, unlisted, direct'
|
'type: public (default), followers, unlisted, direct'
|
||||||
)
|
)
|
||||||
->addOption(
|
->addOption(
|
||||||
'hashtag', 'g', InputOption::VALUE_OPTIONAL,
|
'hashtag', 'g', InputOption::VALUE_OPTIONAL,
|
||||||
'hashtag, without the leading #'
|
'hashtag, without the leading #'
|
||||||
)
|
)
|
||||||
->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author')
|
->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author')
|
||||||
->addArgument('content', InputArgument::REQUIRED, 'content of the post')
|
->addArgument('content', InputArgument::REQUIRED, 'content of the post')
|
||||||
|
|
|
@ -73,7 +73,7 @@ class QueueStatus extends Base {
|
||||||
parent::configure();
|
parent::configure();
|
||||||
$this->setName('social:queue:status')
|
$this->setName('social:queue:status')
|
||||||
->addOption(
|
->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');
|
->setDescription('Return status on the request queue');
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,13 +53,13 @@ class ActorsRequest extends ActorsRequestBuilder {
|
||||||
->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
|
->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
|
||||||
->setValue('avatar_version', $qb->createNamedParameter($actor->getAvatarVersion()))
|
->setValue('avatar_version', $qb->createNamedParameter($actor->getAvatarVersion()))
|
||||||
->setValue(
|
->setValue(
|
||||||
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
|
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
|
||||||
)
|
)
|
||||||
->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
|
->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
|
||||||
->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey()))
|
->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey()))
|
||||||
->setValue(
|
->setValue(
|
||||||
'creation',
|
'creation',
|
||||||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||||
);
|
);
|
||||||
|
|
||||||
$qb->executeStatement();
|
$qb->executeStatement();
|
||||||
|
|
|
@ -121,7 +121,7 @@ class ActorsRequestBuilder extends CoreRequestBuilder {
|
||||||
->setLocal(true)
|
->setLocal(true)
|
||||||
->setAvatarVersion($this->getInt('avatar_version', $data, -1))
|
->setAvatarVersion($this->getInt('avatar_version', $data, -1))
|
||||||
->setAccount(
|
->setAccount(
|
||||||
$actor->getPreferredUsername() . '@' . $this->configService->getSocialAddress()
|
$actor->getPreferredUsername() . '@' . $this->configService->getSocialAddress()
|
||||||
);
|
);
|
||||||
$actor->setUrlSocial($root)
|
$actor->setUrlSocial($root)
|
||||||
->setUrl($actor->getId());
|
->setUrl($actor->getId());
|
||||||
|
|
|
@ -59,7 +59,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
|
||||||
->setValue('featured', $qb->createNamedParameter($actor->getFeatured()))
|
->setValue('featured', $qb->createNamedParameter($actor->getFeatured()))
|
||||||
->setValue('url', $qb->createNamedParameter($actor->getUrl()))
|
->setValue('url', $qb->createNamedParameter($actor->getUrl()))
|
||||||
->setValue(
|
->setValue(
|
||||||
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
|
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
|
||||||
)
|
)
|
||||||
->setValue('name', $qb->createNamedParameter($actor->getName()))
|
->setValue('name', $qb->createNamedParameter($actor->getName()))
|
||||||
->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
|
->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
|
||||||
|
@ -112,7 +112,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
|
||||||
->set('featured', $qb->createNamedParameter($actor->getFeatured()))
|
->set('featured', $qb->createNamedParameter($actor->getFeatured()))
|
||||||
->set('url', $qb->createNamedParameter($actor->getUrl()))
|
->set('url', $qb->createNamedParameter($actor->getUrl()))
|
||||||
->set(
|
->set(
|
||||||
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
|
'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
|
||||||
)
|
)
|
||||||
->set('name', $qb->createNamedParameter($actor->getName()))
|
->set('name', $qb->createNamedParameter($actor->getName()))
|
||||||
->set('summary', $qb->createNamedParameter($actor->getSummary()))
|
->set('summary', $qb->createNamedParameter($actor->getSummary()))
|
||||||
|
|
|
@ -56,7 +56,7 @@ class ClientRequest extends ClientRequestBuilder {
|
||||||
$qb->setValue('app_name', $qb->createNamedParameter($client->getAppName()))
|
$qb->setValue('app_name', $qb->createNamedParameter($client->getAppName()))
|
||||||
->setValue('app_website', $qb->createNamedParameter($client->getAppWebsite()))
|
->setValue('app_website', $qb->createNamedParameter($client->getAppWebsite()))
|
||||||
->setValue(
|
->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_id', $qb->createNamedParameter($client->getAppClientId()))
|
||||||
->setValue('app_client_secret', $qb->createNamedParameter($client->getAppClientSecret()))
|
->setValue('app_client_secret', $qb->createNamedParameter($client->getAppClientSecret()))
|
||||||
|
|
|
@ -1054,8 +1054,8 @@ class CoreRequestBuilder {
|
||||||
->selectAlias($prefix . '_f.follow_id', $prefix . '_follow_id')
|
->selectAlias($prefix . '_f.follow_id', $prefix . '_follow_id')
|
||||||
->selectAlias($prefix . '_f.creation', $prefix . '_creation')
|
->selectAlias($prefix . '_f.creation', $prefix . '_creation')
|
||||||
->leftJoin(
|
->leftJoin(
|
||||||
$this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f',
|
$this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f',
|
||||||
$andX
|
$andX
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,9 +66,9 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
|
||||||
->setValue('author', $qb->createNamedParameter($queue->getAuthor()))
|
->setValue('author', $qb->createNamedParameter($queue->getAuthor()))
|
||||||
->setValue('activity', $qb->createNamedParameter($queue->getActivity()))
|
->setValue('activity', $qb->createNamedParameter($queue->getActivity()))
|
||||||
->setValue(
|
->setValue(
|
||||||
'instance', $qb->createNamedParameter(
|
'instance', $qb->createNamedParameter(
|
||||||
json_encode($queue->getInstance(), JSON_UNESCAPED_SLASHES)
|
json_encode($queue->getInstance(), JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->setValue('priority', $qb->createNamedParameter($queue->getPriority()))
|
->setValue('priority', $qb->createNamedParameter($queue->getPriority()))
|
||||||
->setValue('status', $qb->createNamedParameter($queue->getStatus()))
|
->setValue('status', $qb->createNamedParameter($queue->getStatus()))
|
||||||
|
@ -133,8 +133,8 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
|
||||||
$qb = $this->getRequestQueueUpdateSql();
|
$qb = $this->getRequestQueueUpdateSql();
|
||||||
$qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_RUNNING))
|
$qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_RUNNING))
|
||||||
->set(
|
->set(
|
||||||
'last',
|
'last',
|
||||||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||||
);
|
);
|
||||||
$this->limitToId($qb, $queue->getId());
|
$this->limitToId($qb, $queue->getId());
|
||||||
$this->limitToStatus($qb, RequestQueue::STATUS_STANDBY);
|
$this->limitToStatus($qb, RequestQueue::STATUS_STANDBY);
|
||||||
|
|
|
@ -183,8 +183,8 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder {
|
||||||
->selectAlias('cd.error', 'cachedocument_error')
|
->selectAlias('cd.error', 'cachedocument_error')
|
||||||
->selectAlias('cd.creation', 'cachedocument_creation')
|
->selectAlias('cd.creation', 'cachedocument_creation')
|
||||||
->leftJoin(
|
->leftJoin(
|
||||||
$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'cd',
|
$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'cd',
|
||||||
$expr->eq($func->lower($pf . '.' . $fieldDocumentId), $func->lower('cd.id'))
|
$expr->eq($func->lower($pf . '.' . $fieldDocumentId), $func->lower('cd.id'))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,9 +56,9 @@ class StreamActionsRequest extends StreamActionsRequestBuilder {
|
||||||
->setValue('stream_id', $qb->createNamedParameter($action->getStreamId()))
|
->setValue('stream_id', $qb->createNamedParameter($action->getStreamId()))
|
||||||
->setValue('stream_id_prim', $qb->createNamedParameter($this->prim($action->getStreamId())))
|
->setValue('stream_id_prim', $qb->createNamedParameter($this->prim($action->getStreamId())))
|
||||||
->setValue(
|
->setValue(
|
||||||
'values', $qb->createNamedParameter(
|
'values', $qb->createNamedParameter(
|
||||||
json_encode($values, JSON_UNESCAPED_SLASHES)
|
json_encode($values, JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->setValue('liked', $qb->createNamedParameter(($liked) ? 1 : 0))
|
->setValue('liked', $qb->createNamedParameter(($liked) ? 1 : 0))
|
||||||
->setValue('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0))
|
->setValue('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0))
|
||||||
|
|
|
@ -110,8 +110,8 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
|
||||||
$qb = $this->getStreamQueueUpdateSql();
|
$qb = $this->getStreamQueueUpdateSql();
|
||||||
$qb->set('status', $qb->createNamedParameter(StreamQueue::STATUS_RUNNING))
|
$qb->set('status', $qb->createNamedParameter(StreamQueue::STATUS_RUNNING))
|
||||||
->set(
|
->set(
|
||||||
'last',
|
'last',
|
||||||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||||
);
|
);
|
||||||
$this->limitToId($qb, $queue->getId());
|
$this->limitToId($qb, $queue->getId());
|
||||||
$this->limitToStatus($qb, StreamQueue::STATUS_STANDBY);
|
$this->limitToStatus($qb, StreamQueue::STATUS_STANDBY);
|
||||||
|
|
|
@ -77,9 +77,9 @@ class StreamRequest extends StreamRequestBuilder {
|
||||||
/** @var Note $stream */
|
/** @var Note $stream */
|
||||||
$qb->setValue('hashtags', $qb->createNamedParameter(json_encode($stream->getHashtags())))
|
$qb->setValue('hashtags', $qb->createNamedParameter(json_encode($stream->getHashtags())))
|
||||||
->setValue(
|
->setValue(
|
||||||
'attachments', $qb->createNamedParameter(
|
'attachments', $qb->createNamedParameter(
|
||||||
json_encode($stream->getAttachments(), JSON_UNESCAPED_SLASHES)
|
json_encode($stream->getAttachments(), JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -707,19 +707,19 @@ class StreamRequest extends StreamRequestBuilder {
|
||||||
->setValue('subtype', $qb->createNamedParameter($stream->getSubType()))
|
->setValue('subtype', $qb->createNamedParameter($stream->getSubType()))
|
||||||
->setValue('to', $qb->createNamedParameter($stream->getTo()))
|
->setValue('to', $qb->createNamedParameter($stream->getTo()))
|
||||||
->setValue(
|
->setValue(
|
||||||
'to_array', $qb->createNamedParameter(
|
'to_array', $qb->createNamedParameter(
|
||||||
json_encode($stream->getToArray(), JSON_UNESCAPED_SLASHES)
|
json_encode($stream->getToArray(), JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->setValue(
|
->setValue(
|
||||||
'cc', $qb->createNamedParameter(
|
'cc', $qb->createNamedParameter(
|
||||||
json_encode($stream->getCcArray(), JSON_UNESCAPED_SLASHES)
|
json_encode($stream->getCcArray(), JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->setValue(
|
->setValue(
|
||||||
'bcc', $qb->createNamedParameter(
|
'bcc', $qb->createNamedParameter(
|
||||||
json_encode($stream->getBccArray(), JSON_UNESCAPED_SLASHES)
|
json_encode($stream->getBccArray(), JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->setValue('content', $qb->createNamedParameter($stream->getContent()))
|
->setValue('content', $qb->createNamedParameter($stream->getContent()))
|
||||||
->setValue('summary', $qb->createNamedParameter($stream->getSummary()))
|
->setValue('summary', $qb->createNamedParameter($stream->getSummary()))
|
||||||
|
@ -735,13 +735,13 @@ class StreamRequest extends StreamRequestBuilder {
|
||||||
->setValue('details', $qb->createNamedParameter(json_encode($stream->getDetailsAll())))
|
->setValue('details', $qb->createNamedParameter(json_encode($stream->getDetailsAll())))
|
||||||
->setValue('cache', $qb->createNamedParameter($cache))
|
->setValue('cache', $qb->createNamedParameter($cache))
|
||||||
->setValue(
|
->setValue(
|
||||||
'filter_duplicate',
|
'filter_duplicate',
|
||||||
$qb->createNamedParameter(($stream->isFilterDuplicate()) ? '1' : '0')
|
$qb->createNamedParameter(($stream->isFilterDuplicate()) ? '1' : '0')
|
||||||
)
|
)
|
||||||
->setValue(
|
->setValue(
|
||||||
'instances', $qb->createNamedParameter(
|
'instances', $qb->createNamedParameter(
|
||||||
json_encode($stream->getInstancePaths(), JSON_UNESCAPED_SLASHES)
|
json_encode($stream->getInstancePaths(), JSON_UNESCAPED_SLASHES)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->setValue('local', $qb->createNamedParameter(($stream->isLocal()) ? '1' : '0'));
|
->setValue('local', $qb->createNamedParameter(($stream->isLocal()) ? '1' : '0'));
|
||||||
|
|
||||||
|
@ -752,8 +752,8 @@ class StreamRequest extends StreamRequestBuilder {
|
||||||
'published_time', $qb->createNamedParameter($dTime, IQueryBuilder::PARAM_DATE)
|
'published_time', $qb->createNamedParameter($dTime, IQueryBuilder::PARAM_DATE)
|
||||||
)
|
)
|
||||||
->setValue(
|
->setValue(
|
||||||
'creation',
|
'creation',
|
||||||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||||
);
|
);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,10 +92,10 @@ class StreamRequestBuilder extends CoreRequestBuilder {
|
||||||
/** @noinspection PhpMethodParametersCountMismatchInspection */
|
/** @noinspection PhpMethodParametersCountMismatchInspection */
|
||||||
$qb->selectDistinct('s.id')
|
$qb->selectDistinct('s.id')
|
||||||
->addSelect(
|
->addSelect(
|
||||||
's.nid', 's.type', 's.subtype', 's.to', 's.to_array', 's.cc', 's.bcc', 's.content',
|
'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.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.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.instances', 's.creation', 's.filter_duplicate', 's.details', 's.hashtags'
|
||||||
)
|
)
|
||||||
->from(self::TABLE_STREAM, 's');
|
->from(self::TABLE_STREAM, 's');
|
||||||
|
|
||||||
|
|
|
@ -521,10 +521,10 @@ class Version1000Date20221118000001 extends SimpleMigrationStep {
|
||||||
[
|
[
|
||||||
'length' => 20,
|
'length' => 20,
|
||||||
'unsigned' => true
|
'unsigned' => true
|
||||||
// 'autoincrement' => true,
|
// 'autoincrement' => true,
|
||||||
// 'customSchemaOptions' => [
|
// 'customSchemaOptions' => [
|
||||||
// 'unique' => true
|
// 'unique' => true
|
||||||
// ]
|
// ]
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
$table->addColumn(
|
$table->addColumn(
|
||||||
|
|
|
@ -71,12 +71,12 @@ trait TNCLogger {
|
||||||
|
|
||||||
$this->logger()
|
$this->logger()
|
||||||
->log(
|
->log(
|
||||||
$level,
|
$level,
|
||||||
$message,
|
$message,
|
||||||
[
|
[
|
||||||
'app' => $this->setup('app'),
|
'app' => $this->setup('app'),
|
||||||
'exception' => $t
|
'exception' => $t
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -111,12 +111,12 @@ trait TNCLogger {
|
||||||
|
|
||||||
$this->logger()
|
$this->logger()
|
||||||
->log(
|
->log(
|
||||||
$level,
|
$level,
|
||||||
$message,
|
$message,
|
||||||
[
|
[
|
||||||
'app' => $this->setup('app'),
|
'app' => $this->setup('app'),
|
||||||
'exception' => $e
|
'exception' => $e
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue