feat(alpha): Provide a new "sources" page to replace "feeds"

Author: marienfressinaud

locales/fr_FR/LC_MESSAGES/main.mo

@@ -226,6 +226,9 @@ public static function load(): \Minz\Router
 
         $router->addRoute('GET', '/feeds.xsl', 'Feeds#xsl', 'feeds xsl');
 
+        // Sources
+        $router->addRoute('GET', '/sources', 'Sources#index', 'sources');
+
         // Streams
         $router->addRoute('GET', '/streams/new', 'Streams#new', 'new stream');
         $router->addRoute('POST', '/streams/new', 'Streams#create', 'create stream');

locales/fr_FR/LC_MESSAGES/main.po

@@ -8,6 +8,7 @@
     padding: var(--space-medium);
 }
 
+.details__header + .filters__section,
 .filters__section + .filters__section {
     border-top: 1px solid var(--color-grey-line);
 }

public/static/icons.svg

@@ -29,6 +29,12 @@ public function index(Request $request): Response
     {
         $user = auth\CurrentUser::require();
 
+        if ($user->isAlphaEnabled()) {
+            // The page only displays a notice pointing to the Sources page to
+            // these users: there is nothing to list here.
+            return Response::ok('feeds/index.html.twig');
+        }
+
         $groups = models\Group::listBy(['user_id' => $user->id]);
         $groups = utils\Sorter::localeSort($groups, 'name');
 

src/Router.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\controllers;
+
+use App\auth;
+use App\models;
+use Minz\Request;
+use Minz\Response;
+
+/**
+ * @author  Marien Fressinaud <dev@marienfressinaud.fr>
+ * @license http://www.gnu.org/licenses/agpl-3.0.en.html AGPL
+ */
+class Sources extends BaseController
+{
+    /**
+     * List the sources followed by the current user.
+     *
+     * @response 302 /feeds
+     *     If the user has not the alpha feature enabled.
+     * @response 200
+     *     On success.
+     *
+     * @throws auth\MissingCurrentUserError
+     *     If the user is not connected.
+     */
+    public function index(Request $request): Response
+    {
+        $user = auth\CurrentUser::require();
+
+        if (!$user->isAlphaEnabled()) {
+            return Response::redirect('feeds');
+        }
+
+        $sources = $user->followedSources();
+
+        models\collections\Preloader::for($sources)
+            ->publishers()
+            ->countStreamsFor($user)
+            ->timeFiltersFor($user);
+
+        return Response::ok('sources/index.html.twig', [
+            'sources' => $sources,
+        ]);
+    }
+}

src/assets/stylesheets/components/filters.css

@@ -641,8 +641,8 @@ public function syncPublicationFrequencyPerYear(): void
      */
     public function suggestedTimeFilter(): string
     {
-        if ($this->publication_frequency_per_year >= 5 * 365) {
-            // At least five links per day.
+        if ($this->publication_frequency_per_year >= 3 * 365) {
+            // At least three links per day.
             return 'none';
         }
 

src/controllers/Feeds.php

@@ -21,6 +21,8 @@ public function elements(): array
     {
         $current_user = auth\CurrentUser::require();
 
+        $is_alpha_enabled = $current_user->isAlphaEnabled();
+
         $elements = [
             new Item(
                 label: TwigExtension::translate('News'),
@@ -44,6 +46,15 @@ public function elements(): array
             ),
         ];
 
+        if ($is_alpha_enabled) {
+            $elements[] = new Item(
+                label: TwigExtension::translate('Sources'),
+                key: 'sources',
+                url: \Minz\Url::for('sources'),
+                icon: 'feed',
+            );
+        }
+
         if ($current_user->isBetaEnabled()) {
             $elements[] = new Item(
                 label: TwigExtension::translate('Explore'),
@@ -53,7 +64,7 @@ public function elements(): array
             );
         }
 
-        if ($current_user->isAlphaEnabled()) {
+        if ($is_alpha_enabled) {
             $new_stream_action = new ItemAction(
                 label: TwigExtension::translate('New stream'),
                 url: \Minz\Url::for('new stream'),

src/controllers/Sources.php

@@ -17,7 +17,7 @@
 {% if collection.isFeed %}
     {% set feed_url = collection.feed_url %}
     {% set opengraph_description = t('A feed from %s, on %s.', [collection.feedWebsiteHost, app.brand]) %}
-    {% set current_tab = 'feeds' %}
+    {% set current_tab = is_alpha ? 'reading' : 'feeds' %}
 {% else %}
     {% set feed_url = url_full('collection feed', { id: collection.id }) %}
     {% set opengraph_description = t('A collection created by %s on %s.', [owner.username, app.brand]) %}