Rework task system and fetching.

I can taste how close follow is to working.

1 files changed, 24 insertions, 17 deletions

diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
index 364daaa..f5ebf55 100644
--- a/users/migrations/0001_initial.py
+++ b/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.3 on 2022-11-06 19:58
+# Generated by Django 4.1.3 on 2022-11-07 04:19
 
 import functools
 
@@ -56,11 +56,17 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "service_domain",
-                    models.CharField(blank=True, max_length=250, null=True),
+                    models.CharField(
+                        blank=True,
+                        db_index=True,
+                        max_length=250,
+                        null=True,
+                        unique=True,
+                    ),
                 ),
                 ("local", models.BooleanField()),
                 ("blocked", models.BooleanField(default=False)),
-                ("public", models.BooleanField()),
+                ("public", models.BooleanField(default=False)),
                 ("created", models.DateTimeField(auto_now_add=True)),
                 ("updated", models.DateTimeField(auto_now=True)),
                 (
@@ -118,12 +124,7 @@ class Migration(migrations.Migration):
                         verbose_name="ID",
                     ),
                 ),
-                (
-                    "actor_uri",
-                    models.CharField(
-                        blank=True, max_length=500, null=True, unique=True
-                    ),
-                ),
+                ("actor_uri", models.CharField(max_length=500, unique=True)),
                 ("local", models.BooleanField()),
                 ("username", models.CharField(blank=True, max_length=500, null=True)),
                 ("name", models.CharField(blank=True, max_length=500, null=True)),
@@ -192,7 +193,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name="Follow",
+            name="Block",
             fields=[
                 (
                     "id",
@@ -203,6 +204,8 @@ class Migration(migrations.Migration):
                         verbose_name="ID",
                     ),
                 ),
+                ("mute", models.BooleanField()),
+                ("expires", models.DateTimeField(blank=True, null=True)),
                 ("note", models.TextField(blank=True, null=True)),
                 ("created", models.DateTimeField(auto_now_add=True)),
                 ("updated", models.DateTimeField(auto_now=True)),
@@ -210,7 +213,7 @@ class Migration(migrations.Migration):
                     "source",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="outbound_follows",
+                        related_name="outbound_blocks",
                         to="users.identity",
                     ),
                 ),
@@ -218,14 +221,14 @@ class Migration(migrations.Migration):
                     "target",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="inbound_follows",
+                        related_name="inbound_blocks",
                         to="users.identity",
                     ),
                 ),
             ],
         ),
         migrations.CreateModel(
-            name="Block",
+            name="Follow",
             fields=[
                 (
                     "id",
@@ -236,16 +239,17 @@ class Migration(migrations.Migration):
                         verbose_name="ID",
                     ),
                 ),
-                ("mute", models.BooleanField()),
-                ("expires", models.DateTimeField(blank=True, null=True)),
+                ("uri", models.CharField(blank=True, max_length=500, null=True)),
                 ("note", models.TextField(blank=True, null=True)),
+                ("requested", models.BooleanField(default=False)),
+                ("accepted", models.BooleanField(default=False)),
                 ("created", models.DateTimeField(auto_now_add=True)),
                 ("updated", models.DateTimeField(auto_now=True)),
                 (
                     "source",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="outbound_blocks",
+                        related_name="outbound_follows",
                         to="users.identity",
                     ),
                 ),
@@ -253,10 +257,13 @@ class Migration(migrations.Migration):
                     "target",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="inbound_blocks",
+                        related_name="inbound_follows",
                         to="users.identity",
                     ),
                 ),
             ],
+            options={
+                "unique_together": {("source", "target")},
+            },
         ),
     ]