изменено поле аккаунта, исправлена поддержка расширений для фотографий профиля
This commit is contained in:
parent
9fdb209754
commit
d58e4cc256
@ -54,7 +54,7 @@ class ApiAccount:
|
||||
"city": {"code": user.city, "name": CITIES_CHOICES[user.city]} if user.city is not None else None,
|
||||
"register_datetime": int(time.mktime(user.register_datetime.timetuple())),
|
||||
"role": user.role,
|
||||
"confirmed": user.confirmed
|
||||
"verified": user.verified
|
||||
}
|
||||
|
||||
if hasattr(user, 'accountavatar'):
|
||||
@ -222,7 +222,7 @@ class ApiAccount:
|
||||
if p is None:
|
||||
raise Exception(API_ERROR_NOT_FOUND, 'field "photo" not found')
|
||||
|
||||
if p.owner.id == user.id and (p.extension == 'jpeg' or p.extension == 'png'):
|
||||
if p.owner.id == user.id and p.extension in Media.PHOTO_EXTENSIONS:
|
||||
if not hasattr(user, 'accountavatar'):
|
||||
user.accountavatar = await AccountAvatar.objects.acreate(account=user)
|
||||
user.accountavatar.photo = p
|
||||
@ -235,7 +235,7 @@ class ApiAccount:
|
||||
if p is None:
|
||||
raise Exception(API_ERROR_NOT_FOUND, 'field "profile_background" not found')
|
||||
|
||||
if p.owner.id == user.id and p.extension == 'jpeg':
|
||||
if p.owner.id == user.id and p.extension in Media.PHOTO_EXTENSIONS:
|
||||
if not hasattr(user, 'accountavatar'):
|
||||
user.accountavatar = await AccountAvatar.objects.acreate(account=user)
|
||||
user.accountavatar.profile_background = p
|
||||
|
@ -41,7 +41,7 @@ class Account(models.Model):
|
||||
|
||||
register_datetime = models.DateTimeField(default=datetime.now, editable=False)
|
||||
|
||||
confirmed = models.BooleanField(default=False, verbose_name="Подтвержденный аккаунт")
|
||||
verified = models.BooleanField(default=False, verbose_name="Подтвержденный аккаунт")
|
||||
|
||||
@staticmethod
|
||||
def create_user(phone: str, **kvargs):
|
||||
@ -103,6 +103,8 @@ class Media(models.Model):
|
||||
size = models.IntegerField(verbose_name='Размер в байтах')
|
||||
upload_datetime = models.DateTimeField(default=datetime.now, editable=False)
|
||||
|
||||
PHOTO_EXTENSIONS = ['jpg', 'jpeg', 'png']
|
||||
|
||||
@staticmethod
|
||||
async def get_by_id(user_id: int, media_id: int):
|
||||
m = Media.objects.filter(user_id=user_id, id=media_id).select_related('executoraccount', 'city')
|
||||
|
Reference in New Issue
Block a user