Displays correct url and can lookup fake pages

#210

shared/models.py

@@ -271,7 +271,9 @@ class ArticlesMixin(models.Model):
 
     content_panels = Page.content_panels + [FieldPanel("shared_tags")]
 
-    def append_all_shared_articles(self, previous_query: models.QuerySet | None):
+    def append_all_shared_articles(
+        self, previous_query: models.QuerySet | None = None, filter=None
+    ):
         """
         To prevent circular deps, we get class models during runtime
         """
@@ -335,35 +337,17 @@ class ArticlesMixin(models.Model):
             },
         )
 
-        districtArticleQuery: models.QuerySet = DistrictArticlePage.objects
-        uniwebArticlePageQuery: models.QuerySet = UniwebArticlePage.objects
-        mainArticlePageQuery: models.QuerySet = MainArticlePage.objects
+        district_article_query: models.QuerySet = DistrictArticlePage.objects
+        uniweb_article_query: models.QuerySet = UniwebArticlePage.objects
+        main_article_query: models.QuerySet = MainArticlePage.objects
 
-        district_by_slug = (
-            (
-                districtArticleQuery.filter(
-                    shared_tags__slug__in=self.shared_tags.values_list(
-                        "slug", flat=True
-                    )
-                )
-            )
-            .live()
-            .specific()
-        )
-        uniweb_by_slug = (
-            (
-                uniwebArticlePageQuery.filter(
-                    shared_tags__slug__in=self.shared_tags.values_list(
-                        "slug", flat=True
-                    )
-                )
-            )
-            .live()
-            .specific()
+        apply_additional_filter = (
+            lambda query: filter(query) if filter is not None else query
         )
-        main_by_slug = (
+
+        create_query_by_slug = lambda query: apply_additional_filter(
             (
-                mainArticlePageQuery.filter(
+                query.filter(
                     shared_tags__slug__in=self.shared_tags.values_list(
                         "slug", flat=True
                     )
@@ -373,6 +357,18 @@ class ArticlesMixin(models.Model):
             .specific()
         )
 
+        district_by_slug = create_query_by_slug(district_article_query)
+        if filter is not None:
+            district_by_slug = filter(district_by_slug)
+
+        uniweb_by_slug = create_query_by_slug(uniweb_article_query)
+        if filter is not None:
+            uniweb_by_slug = filter(uniweb_by_slug)
+
+        main_by_slug = create_query_by_slug(main_article_query)
+        if filter is not None:
+            main_by_slug = filter(main_by_slug)
+
         results = (
             main_by_slug.values(
                 **main_fields,
@@ -454,11 +450,13 @@ class ArticlesMixin(models.Model):
             )
 
     def get_article_page_by_slug(self, slug: str):
-        articles = self.append_all_shared_articles()
-        return articles.filter(page_ptr__path=slug).first()
+        articles = self.append_all_shared_articles(
+            filter=lambda query: query.filter(slug=slug)
+        )
+        return articles[0]
 
     def setup_article_page_context(self, request):
-        slug = request.GET.get("slug", "")
+        slug = request.GET.get("sdilene", "")
         return self.get_article_page_by_slug(slug).serve(request)
 
     def get_search_tags_params(self, site_article_ids: list):

shared/templates/shared/article_preview.html

@@ -7,10 +7,18 @@
   itemscope=""
 >
 
+  {% if article.shared %}
+    <link itemprop="mainEntityOfPage" href="{{ page.url }}sdilene?sdilene={{ article.slug|urlencode }}">
+  {% else %}
     <link itemprop="mainEntityOfPage" href="{{ article.url }}">
+  {% endif %}
 
   <div class="article-card-cover">
+    {% if article.shared %}
+      <a href="{{ page.url }}sdilene?sdilene={{ article.slug|urlencode }}" rel="noindex" itemprop="image" itemtype="http://schema.org/ImageObject" itemscope="">
+    {% else %}
       <a href="{{ article.url }}" itemprop="image" itemtype="http://schema.org/ImageObject" itemscope="">
+    {% endif %}
       {% if article.thumb_image %}
         {% image article.thumb_image fill-356x192 as img %}
         {% image article.thumb_image fill-714x384 as img_2x %}
@@ -64,7 +72,11 @@
   </div>
 
   <div class="card__body article-card__body{% if article.is_black %} text-white{% endif %}">
+    {% if article.shared %}
+      <a href="{{ page.url }}sdilene?sdilene={{ article.slug|urlencode }}" rel="noindex">
+    {% else %}
       <a href="{{ article.url }}">
+    {% endif %}
       <h1 class="card-headline mb-4">
         {{ article.title }}
       </h1>