GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CONTROLLER][Network] Temporarily remove replies from streams, following planned changes to the Reply plugin

Browse Source
This commit is contained in:
Hugo Sales 2021-11-15 17:06:34 +00:00
parent e9cc760ca8
commit 587d701d11
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Controller/Network.php
View File

@ -44,14 +44,15 @@ use App\Entity\Note;
use App\Util\Common; use App\Util\Common;
use App\Util\Exception\ClientException; use App\Util\Exception\ClientException;
use App\Util\Exception\NotFoundException; use App\Util\Exception\NotFoundException;
use NotImplementedException;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
class Network extends Controller class Network extends Controller
{ {
// Can't have constants inside herestring // Can't have constants inside herestring
private $public_scope = VisibilityScope::PUBLIC; private $public_scope = VisibilityScope::PUBLIC;
private $instance_scope = VisibilityScope::PUBLIC | VisibilityScope::SITE; private $instance_scope = VisibilityScope::PUBLIC | VisibilityScope::SITE;
private $message_scope = VisibilityScope::MESSAGE; private $message_scope = VisibilityScope::MESSAGE;
private $subscriber_scope = VisibilityScope::PUBLIC | VisibilityScope::SUBSCRIBER; private $subscriber_scope = VisibilityScope::PUBLIC | VisibilityScope::SUBSCRIBER;
public function public(Request $request) public function public(Request $request)
@ -76,6 +77,7 @@ class Network extends Controller
throw new ClientException(_m('User {nickname} doesn\'t exist', ['{nickname}' => $nickname])); throw new ClientException(_m('User {nickname} doesn\'t exist', ['{nickname}' => $nickname]));
} }
// TODO Handle replies in home stream
$query = <<<END $query = <<<END
-- Select notes from: -- Select notes from:
select note.* from note left join -- left join ensures all returned notes' ids are not null select note.* from note left join -- left join ensures all returned notes' ids are not null
@ -85,8 +87,8 @@ class Network extends Controller
where f.subscriber = :target_actor_id where f.subscriber = :target_actor_id
union all union all
-- Replies to notes by target -- Replies to notes by target
select n.id from note n inner join note nr on nr.id = nr.reply_to -- select n.id from note n inner join note nr on nr.id = nr.reply_to
union all -- union all
-- Notifications to target -- Notifications to target
select a.activity_id from notification a inner join note n on a.activity_id = n.id select a.activity_id from notification a inner join note n on a.activity_id = n.id
union all union all
@ -128,6 +130,8 @@ class Network extends Controller
public function replies(Request $request) public function replies(Request $request)
{ {
// TODO replies
throw new NotImplementedException;
$actor_id = Common::ensureLoggedIn()->getId(); $actor_id = Common::ensureLoggedIn()->getId();
$notes = DB::dql('select n from App\Entity\Note n ' $notes = DB::dql('select n from App\Entity\Note n '
. 'where n.reply_to is not null and n.actor_id = :id ' . 'where n.reply_to is not null and n.actor_id = :id '