00dani/lemoncurry
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Run Black over the whole codebase

Browse source
This commit is contained in:
Danielle McLean 2023-08-10 16:52:37 +10:00
parent cd990e4e2f
commit 2e7d12b3e6
Signed by: 00dani
GPG key ID: 52C059C3B22A753E
109 changed files with 1539 additions and 1209 deletions
Download patch file Download diff file Expand all files Collapse all files

117
users/models.py
View file

@ -10,7 +10,7 @@ from lemoncurry import utils
def avatar_path(instance, name):
return 'avatars/{id}/{name}'.format(id=instance.id, name=name)
return "avatars/{id}/{name}".format(id=instance.id, name=name)
class Site(models.Model):
@ -19,7 +19,7 @@ class Site(models.Model):
domain = models.CharField(max_length=100, blank=True)
url_template = models.CharField(max_length=100)
def format(self, username=''):
def format(self, username=""):
return self.url_template.format(domain=self.domain, username=username)
@property
@ -30,12 +30,14 @@ class Site(models.Model):
return self.name
class Meta:
ordering = ('name',)
ordering = ("name",)
class UserManager(DjangoUserManager):
def get_queryset(self):
return super(UserManager, self).get_queryset().prefetch_related('keys', 'profiles')
return (
super(UserManager, self).get_queryset().prefetch_related("keys", "profiles")
)
class User(ModelMeta, AbstractUser):
@ -44,52 +46,56 @@ class User(ModelMeta, AbstractUser):
generated based on all their associated information and may author as many
h-entries (:model:`entries.Entry`) as they wish.
"""
objects = UserManager()
avatar = models.ImageField(
upload_to=avatar_path,
help_text='an avatar or photo that represents this user'
upload_to=avatar_path, help_text="an avatar or photo that represents this user"
)
note = models.TextField(
blank=True,
help_text='a bio or short description provided by the user'
blank=True, help_text="a bio or short description provided by the user"
)
xmpp = models.EmailField(
blank=True,
help_text='an XMPP address through which the user may be reached'
blank=True, help_text="an XMPP address through which the user may be reached"
)
# This is gonna need to change if I ever decide to add multiple-user support ;)
url = '/'
url = "/"
email_md5 = ComputedCharField(
compute_from='calc_email_md5', max_length=32, unique=True,
help_text="MD5 hash of the user's email, used for Libravatar"
compute_from="calc_email_md5",
max_length=32,
unique=True,
help_text="MD5 hash of the user's email, used for Libravatar",
)
email_sha256 = ComputedCharField(
compute_from='calc_email_sha256', max_length=64, unique=True,
help_text="SHA-256 hash of the user's email, used for Libravatar"
compute_from="calc_email_sha256",
max_length=64,
unique=True,
help_text="SHA-256 hash of the user's email, used for Libravatar",
)
openid_sha256 = ComputedCharField(
compute_from='calc_openid_sha256', max_length=64, unique=True,
help_text="SHA-256 hash of the user's OpenID URL, used for Libravatar"
compute_from="calc_openid_sha256",
max_length=64,
unique=True,
help_text="SHA-256 hash of the user's OpenID URL, used for Libravatar",
)
@property
def calc_email_md5(self):
return md5(self.email.lower().encode('utf-8')).hexdigest()
return md5(self.email.lower().encode("utf-8")).hexdigest()
@property
def calc_email_sha256(self):
return sha256(self.email.lower().encode('utf-8')).hexdigest()
return sha256(self.email.lower().encode("utf-8")).hexdigest()
@property
def calc_openid_sha256(self):
return sha256(self.full_url.encode('utf-8')).hexdigest()
return sha256(self.full_url.encode("utf-8")).hexdigest()
@property
def name(self):
return '{0} {1}'.format(self.first_name, self.last_name)
return "{0} {1}".format(self.first_name, self.last_name)
def get_absolute_url(self):
return self.absolute_url
@ -100,7 +106,7 @@ class User(ModelMeta, AbstractUser):
@property
def full_url(self):
base = 'https://' + DjangoSite.objects.get_current().domain
base = "https://" + DjangoSite.objects.get_current().domain
return urljoin(base, self.url)
@property
@ -114,45 +120,45 @@ class User(ModelMeta, AbstractUser):
@cached_property
def facebook_id(self):
for p in self.profiles.all():
if p.site.name == 'Facebook':
if p.site.name == "Facebook":
return p.username
return None
@cached_property
def twitter_username(self):
for p in self.profiles.all():
if p.site.name == 'Twitter':
return '@' + p.username
if p.site.name == "Twitter":
return "@" + p.username
return None
@property
def json_ld(self):
base = 'https://' + DjangoSite.objects.get_current().domain
base = "https://" + DjangoSite.objects.get_current().domain
return {
'@context': 'http://schema.org',
'@type': 'Person',
'@id': self.full_url,
'url': self.full_url,
'name': self.name,
'email': self.email,
'image': urljoin(base, self.avatar.url),
'givenName': self.first_name,
'familyName': self.last_name,
'sameAs': [profile.url for profile in self.profiles.all()]
"@context": "http://schema.org",
"@type": "Person",
"@id": self.full_url,
"url": self.full_url,
"name": self.name,
"email": self.email,
"image": urljoin(base, self.avatar.url),
"givenName": self.first_name,
"familyName": self.last_name,
"sameAs": [profile.url for profile in self.profiles.all()],
}
_metadata = {
'image': 'avatar_url',
'description': 'description',
'og_type': 'profile',
'og_profile_id': 'facebook_id',
'twitter_creator': 'twitter_username',
"image": "avatar_url",
"description": "description",
"og_type": "profile",
"og_profile_id": "facebook_id",
"twitter_creator": "twitter_username",
}
class ProfileManager(models.Manager):
def get_queryset(self):
return super(ProfileManager, self).get_queryset().select_related('site')
return super(ProfileManager, self).get_queryset().select_related("site")
class Profile(models.Model):
@ -163,26 +169,22 @@ class Profile(models.Model):
representative h-card. Additionally, :model:`entries.Syndication` is
tracked by linking each syndication to a particular profile.
"""
objects = ProfileManager()
user = models.ForeignKey(
User,
related_name='profiles',
on_delete=models.CASCADE
)
user = models.ForeignKey(User, related_name="profiles", on_delete=models.CASCADE)
site = models.ForeignKey(Site, on_delete=models.CASCADE)
username = models.CharField(
max_length=100,
help_text="the user's actual handle or ID on the remote site"
max_length=100, help_text="the user's actual handle or ID on the remote site"
)
display_name = models.CharField(
max_length=100,
blank=True,
help_text="overrides the username for display - useful for sites that use ugly IDs"
help_text="overrides the username for display - useful for sites that use ugly IDs",
)
def __str__(self):
if self.site.domain:
return self.name + '@' + self.site.domain
return self.name + "@" + self.site.domain
return self.name
@property
@ -194,7 +196,7 @@ class Profile(models.Model):
return self.site.format(username=self.username)
class Meta:
ordering = ('site', 'username')
ordering = ("site", "username")
class PgpKey(models.Model):
@ -203,13 +205,10 @@ class PgpKey(models.Model):
key will be added to the user's h-card with rel="pgpkey", a format
compatible with IndieAuth.com.
"""
user = models.ForeignKey(
User,
related_name='keys',
on_delete=models.CASCADE
)
user = models.ForeignKey(User, related_name="keys", on_delete=models.CASCADE)
fingerprint = models.CharField(max_length=40)
file = models.FileField(upload_to='keys')
file = models.FileField(upload_to="keys")
@property
def key_id(self):
@ -231,4 +230,4 @@ class PgpKey(models.Model):
same way GnuPG does. This can make reading the fingerprint a little
friendlier.
"""
return " ".join(self.fingerprint[i:i+4] for i in range(0, 40, 4))
return " ".join(self.fingerprint[i : i + 4] for i in range(0, 40, 4))