From fd2b066b9f33891e88ace9f63e86d7aa8de7a21f Mon Sep 17 00:00:00 2001
From: Pheuw1 <gabrieldelaflotte@gmail.com>
Date: Fri, 17 Mar 2023 15:26:30 +0100
Subject: [PATCH] ch

---
 back/volume/src/chat/entity/channel.entity.ts |  5 +++++
 front/volume/src/App.svelte                   |  2 +-
 front/volume/src/components/Channels.svelte   | 11 +++++------
 front/volume/src/components/Chat.svelte       |  3 ++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/back/volume/src/chat/entity/channel.entity.ts b/back/volume/src/chat/entity/channel.entity.ts
index 384f8d7..7e3c3e9 100644
--- a/back/volume/src/chat/entity/channel.entity.ts
+++ b/back/volume/src/chat/entity/channel.entity.ts
@@ -13,6 +13,11 @@ import User from 'src/users/entity/user.entity'
 import Message from './message.entity'
 import * as bcrypt from 'bcrypt'
 
+export interface Ban {
+  user: User
+  duration: number
+}
+
 @Entity()
 export default class Channel {
   @PrimaryGeneratedColumn()
diff --git a/front/volume/src/App.svelte b/front/volume/src/App.svelte
index e1f3d3f..31e7c93 100644
--- a/front/volume/src/App.svelte
+++ b/front/volume/src/App.svelte
@@ -167,7 +167,7 @@
   let selectedChannel: ChannelsType;
   const handleSelectChannel = (channel: ChannelsType) => {
     selectedChannel = channel;
-    setAppState(APPSTATE.CHANNELS + "#" + channel.id);
+    setAppState(APPSTATE.CHANNELS + "#" + channel.name);
   };
 
   // GAME
diff --git a/front/volume/src/components/Channels.svelte b/front/volume/src/components/Channels.svelte
index bf89fbb..1753a91 100644
--- a/front/volume/src/components/Channels.svelte
+++ b/front/volume/src/components/Channels.svelte
@@ -56,7 +56,7 @@
 <script lang="ts">
   //--------------------------------------------------------------------------------/
   let channelMode = "";
-  const channelOptions = ["public", "private"];
+  const channelOptions = ["public", "private", "protected"];
 
   const joinChannel = async (id: number) => {
     socket.emit("joinChannel", {
@@ -100,10 +100,11 @@
 
   const createChannel = async () => {
     let name;
+    let password = "";
     name = prompt("Enter a name for the new channel:");
     if (name) {
-      let password = "";
-      password = prompt("Enter a password for the new channel:");
+      if (channelMode === 'protected')
+        password = prompt("Enter a password for the new channel:");
       name = "🚪 " + name;
       const response = await fetch(API_URL + "/channels", {
         credentials: "include",
@@ -212,12 +213,10 @@
               on:click={() => removeChannel(channel.id)}
               on:keydown={() => removeChannel(channel.id)}>🗑️</button
             >
-            {#if channel.isPrivate == true}
+            {#if channel.isPrivate == false}
             <button on:click={() => inviteChannel(channel.id)}>🤝</button>
             {/if}
-            {#if channel.password !== ''}
             <button on:click={() => changePassword(channel.id)}>🔑</button>
-            {/if}
 
             </div>
           </li>
diff --git a/front/volume/src/components/Chat.svelte b/front/volume/src/components/Chat.svelte
index f825318..3d8ec20 100644
--- a/front/volume/src/components/Chat.svelte
+++ b/front/volume/src/components/Chat.svelte
@@ -154,6 +154,7 @@
     });
     if (response.ok) {
       const target = await response.json();
+      const duration = prompt("Enter a time for which the user will be banned from this channel")
       response = await fetch(API_URL + "/channels/" + channel.id + "/ban", {
         credentials: "include",
         method: "POST",
@@ -163,7 +164,7 @@
         },
         body: JSON.stringify({ id: target.ftId }),
       });
-      socket.emit("kickUser", channel.id, $store.ftId, target.ftId);
+      socket.emit("kickUser", channel.id, $store.ftId, target.ftId, duration);
     }
     if (response.ok) {
       alert("User banned");