Merge branch 'main' into csv-import-failures

2021-09-11 07:19:40 -07:00
parent ef1896da18 e515912dbc
commit b36f7d7b69
280 changed files with 10272 additions and 4934 deletions
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@ -188,6 +188,7 @@ class ImportItem(models.Model):
        if start_date and start_date is not None and not self.date_read:
            return [ReadThrough(start_date=start_date)]
        if self.date_read:
+            start_date = start_date if start_date < self.date_read else None
            return [
                ReadThrough(
                    start_date=start_date,