Fix invalid chapter page

Author: ObserverOfTime

MangAdventure/storage.py

@@ -49,9 +49,9 @@ def _photon_url(self, name: str) -> str:
         domain = settings.CONFIG['DOMAIN']
         scheme = settings.ACCOUNT_DEFAULT_HTTP_PROTOCOL
         base = f'{scheme}://i3.wp.com/'
-        qs = {'ssl': 1} if scheme == 'https' else dict()
+        qs = {'ssl': '1'} if scheme == 'https' else dict()
         if name.lower().endswith(('.jpg', '.jpeg')):
-            qs['quality'] = 100
+            qs['quality'] = '100'
         if self._fit:
             qs['fit'] = f'{self._fit["w"]},{self._fit["h"]}'
         return base + domain + self.base_url + name + '?' + urlencode(qs)

MangAdventure/templates/layout.html

@@ -59,7 +59,7 @@
     {% block stylesheets %}
       {% cache 604800 styles %}
         <link href="{% static 'COMPILED/styles/style.css' %}"
-              rel="preload stylesheet" as="style" type="text/css">
+              rel="stylesheet preload" as="style" type="text/css">
         <link href="{% static 'COMPILED/extra/style.css' %}" rel="stylesheet" type="text/css">
         <noscript>
           <link href="{% static 'styles/noscript.css' %}" rel="stylesheet" type="text/css">

MangAdventure/templates/opensearch.xml

@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>{% load cache custom_tags %}
-<OpenSearchDescription{% cache 2628000 opensearch %}
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- {% load cache custom_tags %} -->
+<!-- {% cache 2628000 opensearch %} -->
+<OpenSearchDescription
     xmlns="http://a9.com/-/spec/opensearch/1.1/"
     xmlns:moz="http://www.mozilla.org/2006/browser/search/">
   <ShortName>{{ name }}</ShortName>
@@ -10,4 +12,5 @@
   <Developer>https://github.com/mangadventure</Developer>
   <moz:SearchForm>{{ search }}</moz:SearchForm>
   <moz:UpdateUrl>{{ self }}</moz:UpdateUrl>
-</OpenSearchDescription>{% endcache %}
+</OpenSearchDescription>
+<!-- {% endcache %} -->

docs/changelog.rst

@@ -5,6 +5,7 @@ v0.8.4
 ^^^^^^
 
 * Fixed licensed chapter page
+* Fixed invalid chapter page
 
 v0.8.3
 ^^^^^^

reader/views.py

@@ -200,12 +200,15 @@ def chapter_page(request: HttpRequest, slug: str, vol: int,
     ).reverse())
     if not chapters:
         raise Http404('No chapters for this series')
-    max_ = len(chapters) - 1
+    max_, found = len(chapters) - 1, False
     for idx, current in enumerate(chapters):
         if current == (vol, num):
             next_ = chapters[idx - 1] if idx > 0 else None
             prev_ = chapters[idx + 1] if idx < max_ else None
+            found = True
             break
+    if not found:
+        raise Http404('No such chapter')
     if page == 1:
         Chapter.track_view(id=current.id)
     all_pages = list(current.pages.all())

requirements.txt

@@ -1,6 +1,6 @@
 django~=3.2.12
 djangorestframework>=3.13
-django-allauth>=0.47
+django-allauth>=0.49
 Pillow>=9.0
 libsass>=0.21
 yaenv~=1.3.2; python_version=='3.7'

users/tests/test_receivers.py

@@ -1,3 +1,4 @@
+from allauth.account.adapter import DefaultAccountAdapter
 from allauth.account.models import EmailAddress, EmailConfirmation
 from pytest import fixture
 
@@ -6,15 +7,16 @@
 
 @fixture
 def mock_allauth_adapter(monkeypatch):
-    class MockAdapter:
+    class MockAdapter(DefaultAccountAdapter):
         def confirm_email(self, *args):
             pass
 
         def send_confirmation_mail(self, *args):
             pass
 
     monkeypatch.setattr(
-        'allauth.account.models.get_adapter', lambda _: MockAdapter()
+        'allauth.account.models.get_adapter',
+        lambda *_: MockAdapter()
     )