fixed todos

Author: dori-dev

auth/views.py

@@ -16,7 +16,7 @@ def register_view(request):
                 return redirect(request.POST.get('next'))
             return redirect("index")
 
-    else:  # TODO remove else: not load last username eneter
+    else:
         form = UserCreationForm()
     arg = {
         "form": form,
@@ -34,7 +34,7 @@ def login_view(request):
             if "next" in request.POST:
                 return redirect(request.POST.get('next'))
             return redirect("index")
-    else:  # TODO remove else: not load last username eneter
+    else:
         form = AuthenticationForm()
     arg = {
         "form": form,

chat/consumer.py

@@ -53,8 +53,9 @@ def fetch_message(self, room_name: str):
     def notification(self, data: dict):
         room: str = data['room_name']
         members: list = Chat.get_members_list(room)
+        listener: Chat = Chat.objects.get(name="listener")
         async_to_sync(self.channel_layer.group_send)(
-            "chat_BFoULH5Z",  # TODO dynamic this url
+            f"chat_{listener.room_id}",
             {
                 'type': 'chat_message',
                 'message': data["message"],

chat/templates/chat/about.html

@@ -18,7 +18,6 @@ <h1>درباره من</h1>
     <p>سلام، من <b>محمد دری</b> ام سازنده <a href="{% url 'index' %}">نیوچت</a></p>
     <p>به <a href="{% url 'index' %}">نیوچت</a> خوش اومدی :)</p>
     <p>امیدوارم که از <a href="{% url 'index' %}">نیوچت</a> لذت ببری!</p>
-    <!-- TODO -->
     <p><a target="_blank" href="">آشنایی بیشتر با پیامرسان نیوچت</a></p>
 </div>
 <br>

chat/templates/chat/room.html

@@ -61,7 +61,7 @@
     );
 
     const chatSocket2 = new WebSocket(
-      "ws://" + window.location.host + "/ws/id/BFoULH5Z/"
+      "ws://" + window.location.host + "/ws/id/{{ listener_id }}/"
     );
 
     chatSocket2.onmessage = function (e) {

chat/views.py

@@ -56,7 +56,11 @@ def create_group(request: object):
 
 @login_required(login_url="auth:register")
 def group_view(request: object, room_id: str):
-    if room_id == "BFoULH5Z":
+    listener_room = Chat.objects.filter(name="listener")
+    if not listener_room.exists():
+        Chat.objects.create(name="listener")
+    listener: Chat = Chat.objects.get(name="listener")
+    if room_id == listener.room_id:
         return redirect("/chat/listener2")
     user = request.user
     chat_model = Chat.objects.filter(room_id=room_id)
@@ -70,6 +74,7 @@ def group_view(request: object, room_id: str):
         "username": mark_safe(json.dumps(username)),
         "name": user,
         "room": chat_model[0].name,
+        "listener_id": listener.room_id
     }
     return render(request, "chat/room.html", context)