Bug fixes and absolute ids

fedireads/models/book.py

@@ -18,6 +18,13 @@ class Shelf(FedireadsModel):
         through_fields=('shelf', 'book')
     )
 
+    @property
+    def absolute_id(self):
+        ''' use shelf identifier as absolute id '''
+        base_path = self.user.absolute_id
+        model_name = type(self).__name__.lower()
+        return '%s/%s/%s' % (base_path, model_name, self.identifier)
+
     class Meta:
         unique_together = ('user', 'identifier')
 
@@ -61,8 +68,8 @@ class Book(FedireadsModel):
     def absolute_id(self):
         ''' constructs the absolute reference to any db object '''
         base_path = 'https://%s' % DOMAIN
-        model_name = self.__name__.lower()
-        return '%s/%s/%d' % (base_path, model_name, self.openlibrary_key)
+        model_name = type(self).__name__.lower()
+        return '%s/%s/%s' % (base_path, model_name, self.openlibrary_key)
 
 
 class Author(FedireadsModel):

fedireads/models/user.py

@@ -38,7 +38,7 @@ class User(AbstractUser):
     @property
     def absolute_id(self):
         ''' users are identified by their username, so overriding this prop '''
-        model_name = type(self).__name__
+        model_name = type(self).__name__.lower()
         return 'https://%s/%s/%s' % (DOMAIN, model_name, self.localname)
 
 
@@ -61,10 +61,10 @@ def execute_before_save(sender, instance, *args, **kwargs):
     # populate fields for local users
     instance.localname = instance.username
     instance.username = '%s@%s' % (instance.username, DOMAIN)
-    instance.actor = 'https://%s/user/%s' % (DOMAIN, instance.localname)
-    instance.inbox = 'https://%s/user/%s/inbox' % (DOMAIN, instance.localname)
+    instance.actor = instance.absolute_id
+    instance.inbox = '%s/inbox' % instance.absolute_id
     instance.shared_inbox = 'https://%s/inbox' % DOMAIN
-    instance.outbox = 'https://%s/user/%s/outbox' % (DOMAIN, instance.localname)
+    instance.outbox = '%s/outbox' % instance.absolute_id
     if not instance.private_key:
         random_generator = Random.new().read
         key = RSA.generate(1024, random_generator)