From d58e4cc256822143afe3233e50ea04980933a7bc Mon Sep 17 00:00:00 2001
From: VladislavOstapov <dwsbenz@gmail.com>
Date: Sun, 9 Apr 2023 18:21:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=B0=D0=BA=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=83=D0=BD=D1=82=D0=B0,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B6=D0=BA=D0=B0=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D1=84=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=B9=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=84=D0=B8=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api_methods.py | 6 +++---
 api/models.py      | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/api/api_methods.py b/api/api_methods.py
index 60433f4..23e381b 100755
--- a/api/api_methods.py
+++ b/api/api_methods.py
@@ -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
diff --git a/api/models.py b/api/models.py
index 1a38fbf..351017a 100755
--- a/api/models.py
+++ b/api/models.py
@@ -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')