Misc additions and improvements

README.md

@@ -17,7 +17,7 @@ Demo:
 ## Requirements:
 
 - python 3.10
-- django 4.1
+- django 5
 - channels
 - htmx > 1.8.5
 
@@ -36,10 +36,11 @@ python -m venv venv
 source venv/bin/activate
 ```
 
-3. Install the required dependencies:
+3. Install the required dependencies, we use pip-tools for managing dependencies
 
 ```
-pip install -r requirements.txt
+pip install pip-tools
+pip-sync
 ```
 
 4. Make Migrations:
@@ -54,3 +55,10 @@ python manage.py migrate
 python manage.py runserver
 ```
 
+6. Create an admin user:
+
+```
+python manage.py createsuperuser
+```
+
+7. Visit the admin panel at http://localhost:8000/admin

accounts/admin.py

@@ -1,3 +1,30 @@
 from django.contrib import admin
 
-# Register your models here.
+from accounts.models import User
+
+
+@admin.register(User)
+class UserAdmin(admin.ModelAdmin):
+    list_display = ("username", "email", "is_superuser", "is_staff")
+    search_fields = (
+        "username",
+        "email",
+    )
+    list_filter = ("is_superuser", "is_staff")
+
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "username",
+                    "email",
+                    "is_superuser",
+                    "is_staff",
+                    "is_active",
+                    "last_login",
+                    "date_joined",
+                )
+            },
+        ),
+    )

accounts/forms.py

@@ -1,8 +1,8 @@
 from accounts.models import User
 from django.contrib.auth.forms import UserCreationForm
 
-class UserRegisterForm(UserCreationForm):
 
+class UserRegisterForm(UserCreationForm):
     class Meta:
-        model= User
-        fields = ['username', 'password1', 'password2']
+        model = User
+        fields = ["username", "password1", "password2"]

accounts/migrations/0001_initial.py

@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

accounts/models.py

@@ -1,4 +1,5 @@
 from django.contrib.auth.models import AbstractUser
 
+
 class User(AbstractUser):
     pass

accounts/views.py

@@ -14,10 +14,10 @@ def register(request):
             user = authenticate(username=username, password=raw_password)
             login(request, user)
             messages.success(
-                request, f"Your account has been created and you are now logged in as {username}"
+                request,
+                f"Your account has been created and you are now logged in as {username}",
             )
             return redirect("index")
     else:
         form = UserRegisterForm()
     return render(request, "accounts/register.html", {"form": form})
-

backchat/asgi.py

@@ -3,16 +3,14 @@
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backchat.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backchat.settings")
 
 from chat import routing
 
 
-application = ProtocolTypeRouter({
-    'http': get_asgi_application(),
-    "websocket":AuthMiddlewareStack(
-        URLRouter(
-            routing.websocket_urlpatterns
-        )
-    )
-})
+application = ProtocolTypeRouter(
+    {
+        "http": get_asgi_application(),
+        "websocket": AuthMiddlewareStack(URLRouter(routing.websocket_urlpatterns)),
+    }
+)

backchat/settings.py

@@ -16,9 +16,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-
     "channels",
-
     "accounts",
     "chat",
 ]
@@ -38,7 +36,9 @@
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": ["templates",],
+        "DIRS": [
+            "templates",
+        ],
         "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [
@@ -94,7 +94,7 @@
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 CHANNEL_LAYERS = {
-    'default': {
+    "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer",
     }
 }

backchat/urls.py

@@ -3,6 +3,6 @@
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("auth/", include('accounts.urls')),
-    path("", include('chat.urls')),
+    path("auth/", include("accounts.urls")),
+    path("", include("chat.urls")),
 ]

chat/admin.py

@@ -1,3 +1,52 @@
 from django.contrib import admin
 
-# Register your models here.
+from chat.models import Message
+from chat.models import Room
+
+
+@admin.register(Room)
+class RoomAdmin(admin.ModelAdmin):
+    list_display = (
+        "name",
+        "slug",
+    )
+    search_fields = (
+        "name",
+        "slug",
+    )
+    filter_horizontal = ("users",)
+
+
+@admin.register(Message)
+class MessageAdmin(admin.ModelAdmin):
+    readonly_fields = ["created_at"]
+
+    list_display = (
+        "room",
+        "user",
+        "message",
+
+    )
+    search_fields = (
+        "room",
+        "user",
+        "message",
+    )
+    list_filter = (
+        "room",
+        "user",
+    )
+
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "room",
+                    "user",
+                    "message",
+                    "created_at",
+                )
+            },
+        ),
+    )

chat/consumers.py

@@ -12,19 +12,22 @@ async def connect(self):
         self.room_group_name = "chat_%s" % self.room_name
         self.user = self.scope["user"]
 
-        await self.channel_layer.group_add(
-            self.room_group_name, self.channel_name
-        )
+        await self.channel_layer.group_add(self.room_group_name, self.channel_name)
 
         await self.add_user(self.room_name, self.user)
-
         await self.accept()
 
+        messages = await self.get_room_messages(self.room_name)
+        for message in messages:
+            message_html = (
+                f"<div hx-swap-oob='beforeend:#messages'>"
+                f"<p><b>{message['username']}</b>: {message['text']}</p></div>"
+            )
+            await self.send(text_data=json.dumps({"history": message_html}))
+
     async def disconnect(self, close_code):
         await self.remove_user(self.room_name, self.user)
-        await self.channel_layer.group_discard(
-            self.room_group_name, self.channel_name
-        )
+        await self.channel_layer.group_discard(self.room_group_name, self.channel_name)
 
     async def receive(self, text_data):
         text_data_json = json.loads(text_data)
@@ -33,35 +36,44 @@ async def receive(self, text_data):
         username = user.username
         room = self.room_name
 
-        #await self.save_message(room, user, message)
+        await self.save_message(room, user, message)
 
         await self.channel_layer.group_send(
-            self.room_group_name, 
+            self.room_group_name,
             {
                 "type": "chat_message",
                 "message": message,
-                #"room": room,
+                "room": room,
                 "username": username,
-            }
+            },
         )
 
     async def chat_message(self, event):
         message = event["message"]
-        #room = event["room"]
+        room = event["room"]
         username = event["username"]
 
-
-        message_html = f"<div hx-swap-oob='beforeend:#messages'><p><b>{username}</b>: {message}</p></div>"
+        message_html = (
+            f"<div hx-swap-oob='beforeend:#messages'>"
+            f"<p><b>{username}</b>: {message}</p></div>"
+        )
         await self.send(
             text_data=json.dumps(
-                {
-                    "message": message_html,
-                    #"room": room,
-                    "username": username
-                }
+                {"message": message_html, "room": room, "username": username}
             )
         )
 
+    @sync_to_async
+    def get_room_messages(self, room_slug):
+        room = Room.objects.get(slug=room_slug)
+        messages = Message.objects.filter(room=room).order_by("-created_at")[
+            :50
+        ]  # Adjust the number of messages as needed
+        return [
+            {"text": message.message, "username": message.user.username}
+            for message in messages
+        ]
+
     @sync_to_async
     def save_message(self, room, user, message):
         room = Room.objects.get(slug=room)

chat/migrations/0001_initial.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

chat/migrations/0002_room_users_message.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("chat", "0001_initial"),

chat/models.py

@@ -1,6 +1,7 @@
 from django.db import models
 from accounts.models import User
 
+
 class Room(models.Model):
     name = models.CharField(max_length=128)
     slug = models.SlugField(unique=True)
@@ -17,4 +18,4 @@ class Message(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        return (self.room.name + " - " + str(self.user.username) + " : " + str(self.message))
+        return f"{self.room.name} - {str(self.user.username)} : {str(self.message)}"

chat/routing.py

@@ -3,5 +3,5 @@
 from chat import consumers
 
 websocket_urlpatterns = [
-    path('chat/<str:room_slug>/', consumers.ChatConsumer.as_asgi()),
+    path("chat/<str:room_slug>/", consumers.ChatConsumer.as_asgi()),
 ]

chat/urls.py

@@ -4,8 +4,9 @@
 
 
 urlpatterns = [
-    path("", TemplateView.as_view(template_name="base.html"), name='index'),
-    path("chat/room/<str:slug>/", views.index, name='chat'),
-    path("create/", views.room_create, name='room-create'),
-    path("join/", views.room_join, name='room-join'),
+    path("", TemplateView.as_view(template_name="base.html"), name="index"),
+
+    path("chat/room/<str:slug>/", views.index, name="chat"),
+    path("create/", views.room_create, name="room-create"),
+    path("join/", views.room_join, name="room-join"),
 ]