From 582ebc0fe3ab61b650807747124f8de02e1e9644 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 4 Feb 2021 10:31:08 -0800 Subject: [PATCH 1/3] Fixes local paths with remote users Fixes #590 --- bookwyrm/models/base_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index ba0a54be2..823721285 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -27,7 +27,7 @@ class BookWyrmModel(models.Model): ''' generate a url that resolves to the local object ''' base_path = 'https://%s' % DOMAIN if hasattr(self, 'user'): - base_path = self.user.remote_id + base_path = self.user.local_path model_name = type(self).__name__.lower() return '%s/%s/%d' % (base_path, model_name, self.id) From d633826a209b0ef729ee7c19099942d0298782d4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 4 Feb 2021 10:48:56 -0800 Subject: [PATCH 2/3] full path in user-based remote id --- bookwyrm/models/base_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 823721285..5c72d5475 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -27,7 +27,7 @@ class BookWyrmModel(models.Model): ''' generate a url that resolves to the local object ''' base_path = 'https://%s' % DOMAIN if hasattr(self, 'user'): - base_path = self.user.local_path + base_path = '%s/%s' % (base_path, self.user.local_path) model_name = type(self).__name__.lower() return '%s/%s/%d' % (base_path, model_name, self.id) From 7c5b9f563fee95a4695c0c311e84f777877a80f9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 10 Feb 2021 11:11:55 -0800 Subject: [PATCH 3/3] Fixes double slash in path --- bookwyrm/models/base_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 5c72d5475..585f6dcc7 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -27,7 +27,7 @@ class BookWyrmModel(models.Model): ''' generate a url that resolves to the local object ''' base_path = 'https://%s' % DOMAIN if hasattr(self, 'user'): - base_path = '%s/%s' % (base_path, self.user.local_path) + base_path = '%s%s' % (base_path, self.user.local_path) model_name = type(self).__name__.lower() return '%s/%s/%d' % (base_path, model_name, self.id)