Tweaked routes a little to combat duplicated content due to pagination.

misago/apps/admin/sections/overview.py

@@ -45,7 +45,7 @@ ADMIN_ACTIONS = (
                route='admin_online',
                urlpatterns=patterns('misago.apps.admin.online.views',
                         url(r'^$', 'List', name='admin_online'),
-                        url(r'^(?P<page>\d+)/$', 'List', name='admin_online'),
+                        url(r'^(?P<page>[^0]\d+)/$', 'List', name='admin_online'),
                     ),
                ),
     AdminAction(

misago/apps/admin/sections/users.py

@@ -28,7 +28,7 @@ ADMIN_ACTIONS = (
                route='admin_users',
                urlpatterns=patterns('misago.apps.admin.users.views',
                         url(r'^$', 'List', name='admin_users'),
-                        url(r'^(?P<page>\d+)/$', 'List', name='admin_users'),
+                        url(r'^(?P<page>[^0]\d+)/$', 'List', name='admin_users'),
                         url(r'^inactive/$', 'inactive', name='admin_users_inactive'),
                         url(r'^new/$', 'New', name='admin_users_new'),
                         url(r'^edit/(?P<slug>[a-z0-9]+)-(?P<target>\d+)/$', 'Edit', name='admin_users_edit'),
@@ -88,7 +88,7 @@ ADMIN_ACTIONS = (
                route='admin_bans',
                urlpatterns=patterns('misago.apps.admin.bans.views',
                         url(r'^$', 'List', name='admin_bans'),
-                        url(r'^(?P<page>\d+)/$', 'List', name='admin_bans'),
+                        url(r'^(?P<page>[^0]\d+)/$', 'List', name='admin_bans'),
                         url(r'^new/$', 'New', name='admin_bans_new'),
                         url(r'^edit/(?P<target>\d+)/$', 'Edit', name='admin_bans_edit'),
                         url(r'^delete/(?P<target>\d+)/$', 'Delete', name='admin_bans_delete'),
@@ -148,7 +148,7 @@ ADMIN_ACTIONS = (
                route='admin_newsletters',
                urlpatterns=patterns('misago.apps.admin.newsletters.views',
                         url(r'^$', 'List', name='admin_newsletters'),
-                        url(r'^(?P<page>\d+)/$', 'List', name='admin_newsletters'),
+                        url(r'^(?P<page>[^0]\d+)/$', 'List', name='admin_newsletters'),
                         url(r'^new/$', 'New', name='admin_newsletters_new'),
                         url(r'^send/(?P<target>\d+)/(?P<token>[a-zA-Z0-9]+)/$', 'send', name='admin_newsletters_send'),
                         url(r'^edit/(?P<target>\d+)/$', 'Edit', name='admin_newsletters_edit'),

misago/apps/privatethreads/urls.py

@@ -2,7 +2,7 @@ from django.conf.urls import patterns, url
 
 urlpatterns = patterns('misago.apps.privatethreads',
     url(r'^$', 'list.ThreadsListView', name="private_threads"),
-    url(r'^(?P<page>\d+)/$', 'list.ThreadsListView', name="private_threads"),
+    url(r'^(?P<page>[^0]\d+)/$', 'list.ThreadsListView', name="private_threads"),
     url(r'^start/$', 'posting.NewThreadView', name="private_thread_start"),
     url(r'^start/(?P<username>\w+)-(?P<user>\d+)/$', 'posting.NewThreadView', name="private_thread_start_with"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/edit/$', 'posting.EditThreadView', name="private_thread_edit"),
@@ -10,7 +10,7 @@ urlpatterns = patterns('misago.apps.privatethreads',
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<quote>\d+)/reply/$', 'posting.NewReplyView', name="private_thread_reply"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<post>\d+)/edit/$', 'posting.EditReplyView', name="private_post_edit"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/$', 'thread.ThreadView', name="private_thread"),
-    url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<page>\d+)/$', 'thread.ThreadView', name="private_thread"),
+    url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<page>[^0]\d+)/$', 'thread.ThreadView', name="private_thread"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/last/$', 'jumps.LastReplyView', name="private_thread_last"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/find-(?P<post>\d+)/$', 'jumps.FindReplyView', name="private_thread_find"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/new/$', 'jumps.NewReplyView', name="private_thread_new"),

misago/apps/profiles/followers/urls.py

@@ -6,11 +6,11 @@ def register_profile_urls(first=False):
         urlpatterns += patterns('misago.apps.profiles.followers.views',
             url(r'^$', 'followers', name="user"),
             url(r'^$', 'followers', name="user_followers"),
-            url(r'^(?P<page>\d+)/$', 'followers', name="user_followers"),
+            url(r'^(?P<page>[^0]\d+)/$', 'followers', name="user_followers"),
         )
     else:
         urlpatterns += patterns('misago.apps.profiles.followers.views',
             url(r'^followers/$', 'followers', name="user_followers"),
-            url(r'^followers/(?P<page>\d+)/$', 'followers', name="user_followers"),
+            url(r'^followers/(?P<page>[^0]\d+)/$', 'followers', name="user_followers"),
         )
     return urlpatterns

misago/apps/profiles/follows/urls.py

@@ -6,11 +6,11 @@ def register_profile_urls(first=False):
         urlpatterns += patterns('misago.apps.profiles.follows.views',
             url(r'^$', 'follows', name="user"),
             url(r'^$', 'follows', name="user_follows"),
-            url(r'^(?P<page>\d+)/$', 'follows', name="user_follows"),
+            url(r'^(?P<page>[^0]\d+)/$', 'follows', name="user_follows"),
         )
     else:
         urlpatterns += patterns('misago.apps.profiles.follows.views',
             url(r'^follows/$', 'follows', name="user_follows"),
-            url(r'^follows/(?P<page>\d+)/$', 'follows', name="user_follows"),
+            url(r'^follows/(?P<page>[^0]\d+)/$', 'follows', name="user_follows"),
         )
     return urlpatterns

misago/apps/profiles/posts/urls.py

@@ -6,11 +6,11 @@ def register_profile_urls(first=False):
         urlpatterns += patterns('misago.apps.profiles.posts.views',
             url(r'^$', 'posts', name="user"),
             url(r'^$', 'posts', name="user_posts"),
-            url(r'^(?P<page>\d+)/$', 'posts', name="user_posts"),
+            url(r'^(?P<page>[^0]\d+)/$', 'posts', name="user_posts"),
         )
     else:
         urlpatterns += patterns('misago.apps.profiles.posts.views',
             url(r'^posts/$', 'posts', name="user_posts"),
-            url(r'^posts/(?P<page>\d+)/$', 'posts', name="user_posts"),
+            url(r'^posts/(?P<page>[^0]\d+)/$', 'posts', name="user_posts"),
         )
     return urlpatterns

misago/apps/profiles/threads/urls.py

@@ -6,11 +6,11 @@ def register_profile_urls(first=False):
         urlpatterns += patterns('misago.apps.profiles.threads.views',
             url(r'^$', 'threads', name="user"),
             url(r'^$', 'threads', name="user_threads"),
-            url(r'^(?P<page>\d+)/$', 'threads', name="user_threads"),
+            url(r'^(?P<page>[^0]\d+)/$', 'threads', name="user_threads"),
         )
     else:
         urlpatterns += patterns('misago.apps.profiles.threads.views',
             url(r'^threads/$', 'threads', name="user_threads"),
-            url(r'^threads/(?P<page>\d+)/$', 'threads', name="user_threads"),
+            url(r'^threads/(?P<page>[^0]\d+)/$', 'threads', name="user_threads"),
         )
     return urlpatterns

misago/apps/profiles/urls.py

@@ -4,7 +4,7 @@ from django.utils.importlib import import_module
 
 urlpatterns = patterns('misago.apps.profiles.views',
     url(r'^$', 'list', name="users"),
-    url(r'^(?P<page>[0-9]+)/$', 'list', name="users"),
+    url(r'^(?P<page>[^0][0-9]+)/$', 'list', name="users"),
 )
 
 # Build extensions URLs
@@ -21,5 +21,5 @@ for extension in settings.PROFILE_EXTENSIONS:
 
 urlpatterns += patterns('misago.apps.profiles.views',
     url(r'^(?P<slug>(\w|-)+)/$', 'list', name="users"),
-    url(r'^(?P<slug>(\w|-)+)/(?P<page>[0-9]+)/$', 'list', name="users"),
+    url(r'^(?P<slug>(\w|-)+)/(?P<page>[^0][0-9]+)/$', 'list', name="users"),
 )

misago/apps/reports/urls.py

@@ -2,5 +2,5 @@ from django.conf.urls import patterns, url
 
 urlpatterns = patterns('misago.apps.reports.views',
     url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/$', 'ThreadsListView', name="reports"),
-    url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/(?P<page>\d+)/$', 'ThreadsView', name="reports"),
+    url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/(?P<page>[^0]\d+)/$', 'ThreadsView', name="reports"),
 )

misago/apps/threads/urls.py

@@ -2,14 +2,14 @@ from django.conf.urls import patterns, url
 
 urlpatterns = patterns('misago.apps.threads',
     url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/$', 'list.ThreadsListView', name="forum"),
-    url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/(?P<page>\d+)/$', 'list.ThreadsListView', name="forum"),
+    url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/(?P<page>[^0]\d+)/$', 'list.ThreadsListView', name="forum"),
     url(r'^forum/(?P<slug>(\w|-)+)-(?P<forum>\d+)/start/$', 'posting.NewThreadView', name="thread_start"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/edit/$', 'posting.EditThreadView', name="thread_edit"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/reply/$', 'posting.NewReplyView', name="thread_reply"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<quote>\d+)/reply/$', 'posting.NewReplyView', name="thread_reply"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<post>\d+)/edit/$', 'posting.EditReplyView', name="post_edit"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/$', 'thread.ThreadView', name="thread"),
-    url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<page>\d+)/$', 'thread.ThreadView', name="thread"),
+    url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/(?P<page>[^0]\d+)/$', 'thread.ThreadView', name="thread"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/last/$', 'jumps.LastReplyView', name="thread_last"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/find-(?P<post>\d+)/$', 'jumps.FindReplyView', name="thread_find"),
     url(r'^thread/(?P<slug>(\w|-)+)-(?P<thread>\d+)/new/$', 'jumps.NewReplyView', name="thread_new"),

misago/apps/watchedthreads/urls.py

@@ -2,7 +2,7 @@ from django.conf.urls import patterns, url
 
 urlpatterns = patterns('misago.apps.watchedthreads.views',
     url(r'^$', 'watched_threads', name="watched_threads"),
-    url(r'^(?P<page>\d+)/$', 'watched_threads', name="watched_threads"),
+    url(r'^(?P<page>[^0]\d+)/$', 'watched_threads', name="watched_threads"),
     url(r'^new/$', 'watched_threads', name="watched_threads_new", kwargs={'new': True}),
-    url(r'^new/(?P<page>\d+)/$', 'watched_threads', name="watched_threads_new", kwargs={'new': True}),
+    url(r'^new/(?P<page>[^0]\d+)/$', 'watched_threads', name="watched_threads_new", kwargs={'new': True}),
 )

misago/urls.py

@@ -15,9 +15,9 @@ urlpatterns = patterns('misago.apps',
     url(r'^tos/$', 'tos.tos', name="tos"),
     url(r'^forum-map/$', 'forummap.forum_map', name="forum_map"),
     url(r'^popular/$', 'popularthreads.popular_threads', name="popular_threads"),
-    url(r'^popular/(?P<page>[0-9]+)/$', 'popularthreads.popular_threads', name="popular_threads"),
+    url(r'^popular/(?P<page>[^0][0-9]+)/$', 'popularthreads.popular_threads', name="popular_threads"),
     url(r'^new/$', 'newthreads.new_threads', name="new_threads"),
-    url(r'^new/(?P<page>[0-9]+)/$', 'newthreads.new_threads', name="new_threads"),
+    url(r'^new/(?P<page>[^0][0-9]+)/$', 'newthreads.new_threads', name="new_threads"),
 )
 
 urlpatterns += patterns('',