fixing opengraph user agent responses (#1559)

openstax · May 17, 2024 · 2ff7e1b · 2ff7e1b
1 parent 6865e05
commit 2ff7e1b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/openstax/middleware.py b/openstax/middleware.py
@@ -64,11 +64,33 @@ def process_response(self, request, response):
 
 class CommonMiddlewareOpenGraphRedirect(CommonMiddleware):
     OG_USER_AGENTS = [
-        'twitterbot',
+        'baiduspider',
+        'bingbot',
+        'embedly',
         'facebookbot',
         'facebookexternalhit/1.1',
+        'facebookexternalhit',
+        'facebot',
+        'google.*snippet',
+        'googlebot',
+        'linkedinbot',
+        'MetadataScraper',
+        'outbrain',
+        'pinterest',
         'pinterestbot',
+        'quora',
+        'quora link preview',
+        'rogerbot',
+        'showyoubot',
+        'slackbot',
         'slackbot-linkexpanding',
+        'twitterbot',
+        'vkShare',
+        'W3C_Validator',
+        'WhatsApp',
+        'MetadataScraper',
+        'yandex',
+        'yahoo',
     ]
 
     def __init__(self, get_response):
@@ -84,7 +106,7 @@ def __call__(self, request, *args, **kwargs):
 
                 full_url = unquote(request.build_absolute_uri())
 
-                # imdex of last / to find slug, except when there isn't a last /
+                # index of last / to find slug, except when there isn't a last /
                 if url_path == '':
                     page_slug = "openstax-homepage"
                 else:
@@ -119,8 +141,11 @@ def __call__(self, request, *args, **kwargs):
                     else:
                         page = self.page_by_slug(page_slug)
 
-                    template = self.build_template(page[0], full_url)
-                    return HttpResponse(template)
+                    if page:
+                        template = self.build_template(page[0], full_url)
+                        return HttpResponse(template)
+                    else:
+                        return self.get_response(request)
                 else:
                     return self.get_response(request)
         return self.get_response(request)
@@ -169,7 +194,7 @@ def page_by_slug(self, page_slug):
         if page_slug == 'supporters':
             return Supporters.objects.all()
         if page_slug == 'openstax-homepage':
-            return HomePage.objects.filter(locale = 1)
+            return HomePage.objects.filter(locale=1)
 
 
 
diff --git a/snippets/models.py b/snippets/models.py
@@ -247,6 +247,7 @@ def get_news_logo(self):
         index.SearchField('name', boost=10),
         index.AutocompleteField('name'),
         index.FilterField('name'),
+        index.FilterField('locale_id')
     ]
 
     def __str__(self):