Feat reviews

backend/backend/settings.py

@@ -14,8 +14,24 @@
 
 DEBUG = os.getenv('DEBUG', default=False)
 
-ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', default='localhost,127.0.0.1,').split(',')
-
+ALLOWED_HOSTS = os.getenv(
+    'ALLOWED_HOSTS', default='localhost,127.0.0.1,').split(',')
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'file': {
+            'level': 'DEBUG',
+            'class': 'logging.FileHandler',
+            'filename': 'debug.log',
+        },
+    },
+    'root': {
+        'handlers': ['file'],
+        'level': 'DEBUG',
+    },
+}
 INSTALLED_APPS = [
     "daphne",
     'django.contrib.admin',

backend/chats/admin.py

@@ -1,15 +1,45 @@
-"""Административные настройки приложения chats."""
-
 from django.contrib import admin
-from django.contrib.auth import get_user_model
 
 from .models import Attachment, Chat, GroupChat, Message, PersonalChat
 
-User = get_user_model()
 
+class ChatAdmin(admin.ModelAdmin):
+    filter_horizontal = ('blocked_users',)
+
+    def get_name(self, obj):
+        return str(obj)
+
+    get_name.short_description = 'Имя'
+
+    def get_blocked_users(self, obj):
+        return ", ".join([str(user) for user in obj.blocked_users.all()])
+
+    get_blocked_users.short_description = 'Заблокированные участники'
+
+    def initiator(self, obj):
+        return obj.initiator
+
+    initiator.short_description = 'Инициатор'
+    initiator.admin_order_field = 'initiator'
+
+
+class PersonalChatAdmin(ChatAdmin):
+    list_display = ('id', 'get_name', 'get_blocked_users',
+                    'initiator', 'receiver', 'date_created')
+
+
+class GroupChatAdmin(ChatAdmin):
+    list_display = ('id', 'get_name', 'get_blocked_users',
+                    'initiator', 'display_members', 'date_created')
+
+    def display_members(self, obj):
+        return ", ".join([str(user) for user in obj.members.all()])
+
+    display_members.short_description = 'Участники'
 
-admin.site.register(Chat)
+
+admin.site.register(Chat, ChatAdmin)
 admin.site.register(Attachment)
 admin.site.register(Message)
-admin.site.register(PersonalChat)
-admin.site.register(GroupChat)
+admin.site.register(PersonalChat, PersonalChatAdmin)
+admin.site.register(GroupChat, GroupChatAdmin)

backend/chats/consumers.py

@@ -41,6 +41,19 @@ def disconnect(self, close_code):
     def receive(self, text_data=None, bytes_data=None):
         # parse the json data into dictionary object
         text_data_json = json.loads(text_data)
+        if text_data_json['type'] == 'block_user':
+            user_slug = text_data_json['user_slug']
+            blocked = text_data_json['blocked']
+
+            # Отправить уведомление о блокировке/разблокировке через WebSocket
+            async_to_sync(self.channel_layer.group_send)(
+                self.room_group_name,
+                {
+                    'type': 'block_user_notification',
+                    'user_slug': user_slug,
+                    'blocked': blocked,
+                }
+            )
 
         # Send message to room group
         chat_type = {"type": "chat_message"}
@@ -90,3 +103,12 @@ def chat_message(self, event):
                 serializer.data
             )
         )
+
+    def block_user_notification(self, event):
+        user_slug = event['user_slug']
+        blocked = event['blocked']
+        self.send(text_data=json.dumps({
+            'type': 'block_user',
+            'user_slug': user_slug,
+            'blocked': blocked
+        }))

backend/chats/models.py

@@ -20,6 +20,24 @@ class Chat(DateCreatedModel, DateEditedModel):
         null=True,
         related_name="chat_starter"
     )
+    blocked_users = models.ManyToManyField(
+        User,
+        verbose_name='Заблокированные пользователи',
+        related_name='bloked_chats',
+        blank=True,
+        help_text='Список пользователей, которых вы заблокировали в этом чате.'
+    )
+
+    def block_user(self, user):
+        if user not in self.blocked_users.all():
+            self.blocked_users.add(user)
+
+    def unblock_user(self, user):
+        if user in self.blocked_users.all():
+            self.blocked_users.remove(user)
+
+    def is_user_blocked(self, user):
+        return user in self.blocked_users.all()
 
     objects = InheritanceManager()
 
@@ -49,6 +67,10 @@ class Meta:
         verbose_name = 'Личный чат'
         verbose_name_plural = 'Личные чаты'
 
+    def block_user(self, user):
+        if user not in [self.initiator, self.receiver]:
+            self.blocked_users.add(user)
+
 
 class GroupChat(Chat):
     """Модель группового чата."""
@@ -124,6 +146,19 @@ class Message(DateEditedModel):
         verbose_name='Фото для отправки',
         help_text='Фото для отправки'
     )
+    voice_message = models.FileField(
+        upload_to='voice_messages/',
+        blank=True,
+        null=True,
+        verbose_name='Голосовое сообщение',
+        help_text='Голосовое сообщение'
+    )
+    emojis = models.CharField(
+        max_length=255,
+        blank=True,
+        verbose_name='Смайлы',
+        help_text='Текстовые символы смайлов'
+    )
     responding_to = models.ForeignKey(
         'self',
         on_delete=models.CASCADE,