kopia lustrzana https://github.com/nextcloud/social
rodzic
4394435990
commit
9edfc83a8f
|
@ -50,7 +50,7 @@ return [
|
||||||
['name' => 'Navigation#resizedGetPublic', 'url' => '/document/public/resized', 'verb' => 'GET'],
|
['name' => 'Navigation#resizedGetPublic', 'url' => '/document/public/resized', 'verb' => 'GET'],
|
||||||
|
|
||||||
['name' => 'ActivityPub#actor', 'url' => '/users/{username}', 'verb' => 'GET'],
|
['name' => 'ActivityPub#actor', 'url' => '/users/{username}', 'verb' => 'GET'],
|
||||||
['name' => 'ActivityPub#actorAlias', 'url' => '/@{username}/', 'verb' => 'GET'],
|
['name' => 'ActivityPub#actorAlias', 'url' => '/@{username}', 'verb' => 'GET'],
|
||||||
['name' => 'ActivityPub#inbox', 'url' => '/@{username}/inbox', 'verb' => 'POST'],
|
['name' => 'ActivityPub#inbox', 'url' => '/@{username}/inbox', 'verb' => 'POST'],
|
||||||
['name' => 'ActivityPub#getInbox', 'url' => '/@{username}/inbox', 'verb' => 'GET'],
|
['name' => 'ActivityPub#getInbox', 'url' => '/@{username}/inbox', 'verb' => 'GET'],
|
||||||
['name' => 'ActivityPub#sharedInbox', 'url' => '/inbox', 'verb' => 'POST'],
|
['name' => 'ActivityPub#sharedInbox', 'url' => '/inbox', 'verb' => 'POST'],
|
||||||
|
|
|
@ -76,8 +76,15 @@ class SocialLimitsQueryBuilder extends SocialCrossQueryBuilder {
|
||||||
* Limit the request to the Id (string)
|
* Limit the request to the Id (string)
|
||||||
*
|
*
|
||||||
* @param string $id
|
* @param string $id
|
||||||
|
* @param bool $prim
|
||||||
*/
|
*/
|
||||||
public function limitToInReplyTo(string $id) {
|
public function limitToInReplyTo(string $id, bool $prim = false) {
|
||||||
|
if ($prim) {
|
||||||
|
$this->limitToDBField('in_reply_to_prim', $this->prim($id), false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$this->limitToDBField('in_reply_to', $id, false);
|
$this->limitToDBField('in_reply_to', $id, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -274,11 +274,7 @@ class StreamRequest extends StreamRequestBuilder {
|
||||||
$qb->limitToInReplyTo($id);
|
$qb->limitToInReplyTo($id);
|
||||||
$qb->limitPaginate($since, $limit);
|
$qb->limitPaginate($since, $limit);
|
||||||
|
|
||||||
$expr = $qb->expr();
|
|
||||||
$qb->linkToCacheActors('ca', 's.attributed_to_prim');
|
$qb->linkToCacheActors('ca', 's.attributed_to_prim');
|
||||||
|
|
||||||
$qb->andWhere($expr->eq('s.attributed_to', 'ca.id_prim'));
|
|
||||||
|
|
||||||
if ($asViewer) {
|
if ($asViewer) {
|
||||||
$qb->limitToViewer('sd', 'f', true);
|
$qb->limitToViewer('sd', 'f', true);
|
||||||
$qb->leftJoinStreamAction();
|
$qb->leftJoinStreamAction();
|
||||||
|
|
Ładowanie…
Reference in New Issue