From a67b0ae8a781f6e240671a7485c0998d89bbce3d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 24 Mar 2021 08:29:12 -0700 Subject: [PATCH 1/3] Adds stream length to .env --- .env.example | 1 + bookwyrm/settings.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 7f80a72c..cf3705af 100644 --- a/.env.example +++ b/.env.example @@ -23,6 +23,7 @@ POSTGRES_DB=fedireads POSTGRES_HOST=db # Redis activity stream manager +MAX_STREAM_LENGTH=200 REDIS_ACTIVITY_HOST=redis_activity REDIS_ACTIVITY_PORT=6379 diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 36806435..b615fa29 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -96,7 +96,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application" REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost") REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379) -MAX_STREAM_LENGTH = env("MAX_STREAM_LENGTH", 200) +MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200)) STREAMS = ["home", "local", "federated"] # Database From 1707bba8a8aa610006808c0ed7d144f6f14a52e8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 24 Mar 2021 08:37:25 -0700 Subject: [PATCH 2/3] Adds ordering to status model --- bookwyrm/migrations/0058_auto_20210324_1536.py | 17 +++++++++++++++++ bookwyrm/models/status.py | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 bookwyrm/migrations/0058_auto_20210324_1536.py diff --git a/bookwyrm/migrations/0058_auto_20210324_1536.py b/bookwyrm/migrations/0058_auto_20210324_1536.py new file mode 100644 index 00000000..d69dbab0 --- /dev/null +++ b/bookwyrm/migrations/0058_auto_20210324_1536.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.6 on 2021-03-24 15:36 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0057_user_discoverable'), + ] + + operations = [ + migrations.AlterModelOptions( + name='status', + options={'ordering': ('-published_date',)}, + ), + ] diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 77ac4b58..e90c2dec 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -58,6 +58,10 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): serialize_reverse_fields = [("attachments", "attachment", "id")] deserialize_reverse_fields = [("attachments", "attachment")] + class Meta: + """ default sorting """ + ordering = ("-published_date",) + def save(self, *args, **kwargs): """ save and notify """ super().save(*args, **kwargs) From 320dfd1a59f06148ea8cab988e4ccf80886e0526 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 24 Mar 2021 08:39:37 -0700 Subject: [PATCH 3/3] Python formatting --- bookwyrm/migrations/0058_auto_20210324_1536.py | 6 +++--- bookwyrm/models/status.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/migrations/0058_auto_20210324_1536.py b/bookwyrm/migrations/0058_auto_20210324_1536.py index d69dbab0..0fa8c90b 100644 --- a/bookwyrm/migrations/0058_auto_20210324_1536.py +++ b/bookwyrm/migrations/0058_auto_20210324_1536.py @@ -6,12 +6,12 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0057_user_discoverable'), + ("bookwyrm", "0057_user_discoverable"), ] operations = [ migrations.AlterModelOptions( - name='status', - options={'ordering': ('-published_date',)}, + name="status", + options={"ordering": ("-published_date",)}, ), ] diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index e90c2dec..0ddcfd17 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -60,6 +60,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): class Meta: """ default sorting """ + ordering = ("-published_date",) def save(self, *args, **kwargs):