diff --git a/public/assets/css/network/simple_stream.css b/public/assets/css/network/simple_stream.css new file mode 100644 index 0000000000..4740ec6b8d --- /dev/null +++ b/public/assets/css/network/simple_stream.css @@ -0,0 +1,4 @@ +.simple-stream .notes-wrap{ + border: none; + box-shadow: none; +} \ No newline at end of file diff --git a/src/Controller/Network.php b/src/Controller/Network.php index d5eb6e87c5..2e1efe82f0 100644 --- a/src/Controller/Network.php +++ b/src/Controller/Network.php @@ -139,4 +139,28 @@ END; 'order by f.created DESC', ['id' => $actor_id]), ]; } + + /** + * Reverse favourites stream + * + * @param Request $request + * + * @throws \App\Util\Exception\NoLoggedInUser user not logged in + * + * @return array template + */ + public function reversefavs(Request $request) + { + $actor_id = Common::ensureLoggedIn()->getId(); + + return [ + '_template' => 'network/reversefavs.html.twig', + 'notes' => DB::dql('select n from App\Entity\Note n, App\Entity\Favourite f ' . + 'where n.id = f.note_id ' . + 'and f.gsactor_id != :id ' . + 'and n.gsactor_id = :id ' . + 'order by f.created DESC' , + ['id' => $actor_id]), + ]; + } } diff --git a/src/Routes/Main.php b/src/Routes/Main.php index abd44347c8..6f37a35759 100644 --- a/src/Routes/Main.php +++ b/src/Routes/Main.php @@ -52,6 +52,7 @@ abstract class Main $r->connect('home_all', '/{nickname<' . Nickname::DISPLAY_FMT . '>}/all', [C\Network::class, 'home']); $r->connect('replies', '/{nickname<' . Nickname::DISPLAY_FMT . '>}/replies', [C\Network::class, 'replies']); $r->connect('favourites', '/{nickname<' . Nickname::DISPLAY_FMT . '>}/favourites', [C\Network::class, 'favourites']); + $r->connect('reversefavs', '/{nickname<' . Nickname::DISPLAY_FMT . '>}/reversefavs', [C\Network::class, 'reversefavs']); $r->connect('panel', '/panel', [C\AdminPanel::class, 'site']); $r->connect('panel_site', '/panel/site', [C\AdminPanel::class, 'site']); diff --git a/templates/left/left.html.twig b/templates/left/left.html.twig index 6656ac9c9e..d2b15151a0 100644 --- a/templates/left/left.html.twig +++ b/templates/left/left.html.twig @@ -45,7 +45,7 @@ Messages Replies Favourites - Reverse Favs + Reverse Favs Settings Logout diff --git a/templates/network/reversefavs.html.twig b/templates/network/reversefavs.html.twig new file mode 100644 index 0000000000..bf1fc56118 --- /dev/null +++ b/templates/network/reversefavs.html.twig @@ -0,0 +1,56 @@ +{% extends 'left/left.html.twig' %} + +{% block meta %} + {{ parent() }} +{% endblock %} + +{% block title %}Welcome!{% endblock %} + +{% block stylesheets %} + {{ parent() }} + + + + +{% endblock %} + +{% block header %} + {{ parent() }} +{% endblock %} + +{% block left %} + {{ parent() }} +{% endblock %} + +{% block body %} +
+
+ +
+
+
+ {% if notes is defined and notes is not empty %} + {% for note in notes %} + {% set id = note.getId() - 1 %} + {% include '/note/view.html.twig' with {'note': note, 'have_user': have_user} only %} + {% endfor %} + {% else %} +

This is {{ user_nickname }}'s reverse favorites stream, but nobody favored {{ user_nickname }}'s notices yet.

+ {% endif %} +
+
+
+
+
+{% endblock body %} + +{% block javascripts %}{% endblock %}