.

Signed-off-by: ziadhany <ziadhany2016@gmail.com>

Author: ziadhany

purl_sync/Makefile

@@ -60,10 +60,6 @@ black:
 	@echo "-> Apply black code formatter"
 	${VENV}/bin/black .
 
-doc8:
-	@echo "-> Run doc8 validation"
-	@${ACTIVATE} doc8 --max-line-length 100 --ignore-path docs/_build/ --quiet docs/
-
 valid: isort black
 
 check:

purl_sync/private.pem

@@ -7,15 +7,14 @@
 ROOT_DIR = PROJECT_DIR.parent
 # Environment
 
-ENV_FILE = "/etc/purl_sync/.env"
+ENV_FILE = "purl_sync/.env"
 if not Path(ENV_FILE).exists():
     ENV_FILE = ROOT_DIR / ".env"
 
 env = environ.Env()
 environ.Env.read_env(str(ENV_FILE))
 
 DOMAIN = env.str("DOMAIN", "127.0.0.1")
-PUBLIC_KEY = env.str("PUBLIC_KEY")
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

purl_sync/public.pem

@@ -310,9 +310,9 @@ def save(self):
         }
 
         if (
-                (isinstance(actor, Person) and self.object.type in ["Note", "Review"])
-                or (isinstance(actor, Service) and self.object.type == "Repository")
-                or (isinstance(actor, Purl) and self.object.type == "Note")
+            (isinstance(actor, Person) and self.object.type in ["Note", "Review"])
+            or (isinstance(actor, Service) and self.object.type == "Repository")
+            or (isinstance(actor, Purl) and self.object.type == "Note")
         ):
             for key, value in updated_param[self.object.type].items():
                 if value:
@@ -346,9 +346,9 @@ def save(self):
             return self.failed_ap_rs()
 
         if (
-                (type(actor) is Person and self.object.type in ["Note", "Review"])
-                or (type(actor) is Purl and self.object.type in ["Note"])
-                or (type(actor) is Service and self.object.type == ["Repository", "Purl"])
+            (type(actor) is Person and self.object.type in ["Note", "Review"])
+            or (type(actor) is Purl and self.object.type in ["Note"])
+            or (type(actor) is Service and self.object.type == ["Repository", "Purl"])
         ):
             instance = self.object.get_object()
             instance.delete()

purl_sync/purl_sync/settings.py

@@ -77,8 +77,9 @@ class CreateReviewForm(forms.Form):
 
 
 class SubscribePurlForm(forms.Form):
-    acct = forms.CharField(label="Subscribe with a remote account:",
-                           widget=forms.TextInput(
-                               attrs={'placeholder': 'ziadhany@vulnerablecode.io',
-                                      'class': 'input'
-                                      }))
+    acct = forms.CharField(
+        label="Subscribe with a remote account:",
+        widget=forms.TextInput(
+            attrs={"placeholder": "ziadhany@vulnerablecode.io", "class": "input"}
+        ),
+    )

purl_sync/review/activitypub.py

@@ -9,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

purl_sync/review/forms.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("review", "0001_initial"),
     ]

purl_sync/review/migrations/0001_initial.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("review", "0002_alter_person_avatar_alter_purl_avatar"),
     ]

purl_sync/review/migrations/0002_alter_person_avatar_alter_purl_avatar.py

@@ -206,6 +206,10 @@ def outbox_url(self):
     def followers_url(self):
         return full_reverse("purl-followers", self.string)
 
+    @property
+    def key_id(self):
+        return full_reverse("purl-ap-profile", self.string)
+
     @property
     def to_ap(self):
         return {