From 9129a0f0605b71aba4a58b09aac809880c2414f6 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 00:05:22 -0500
Subject: [PATCH 01/11] added textarea for streamer to enter description

---
 src/views/Streamer.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/Streamer.vue b/src/views/Streamer.vue
index f0742e3f..e029aae2 100644
--- a/src/views/Streamer.vue
+++ b/src/views/Streamer.vue
@@ -165,6 +165,7 @@ div
     :privacy="privacy"
     :enableVideo="enableVideo"
     :enableAudio="enableAudio"
+    :streamDescription="streamDescription"
     :isP2POnly="isP2POnly"
     @sessionId="onSessionId"
     @viewerCount="onViewerCount"
@@ -229,6 +230,12 @@ div
               label.row-start
                 input(type="checkbox" v-model="enableMic")
                 | Enable Microphone
+              label.row-start
+                textarea(
+                  maxlength="50"
+                  v-model="streamDescription"
+                  placeholder="Add a room description"
+                )
             .col-xs-1-2
               label.row-start.mb-10
                 | Codec
@@ -348,6 +355,7 @@ export default {
       privacy: 'private',
       useridAlreadyTaken: '',
       enableMic: false,
+      streamDescription: '',
       showAdvancedOptions: false,
       isP2POnly: false,
     };

From bc19c1b51cb7acd0c9663a1997ea06b748cc45ee Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 00:06:48 -0500
Subject: [PATCH 02/11] added room description to connection extra

---
 src/components/StreamerConnection.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/StreamerConnection.vue b/src/components/StreamerConnection.vue
index f77fc3c3..a268c73a 100644
--- a/src/components/StreamerConnection.vue
+++ b/src/components/StreamerConnection.vue
@@ -37,6 +37,10 @@ export default {
       type: Boolean,
       default: false, 
     },
+    streamDescription: {
+      type: String,
+      default: '',
+    },
     isP2POnly: {
       type: Boolean,
       default: false,
@@ -60,6 +64,7 @@ export default {
   },
   methods: {
     shareStreamUsingRTCMultiConnection(stream) {
+
       // www.RTCMultiConnection.org/docs/
       this.connection = new RTCMultiConnection();
       this.connection.socketURL = 'https://api.2n.fm:9001/';
@@ -289,6 +294,9 @@ export default {
           this.connection.isInitiator ? participantsCount : 0,
         );
       };
+      console.log('111111', this.connection);
+      this.connection.extra.roomDescription = this.streamDescription;
+
     },
     setViewerCount(count) {
       this.$emit('viewerCount', count);

From 31aee66b64141f8d3efbeaf97789a1c34d669ce8 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 00:29:02 -0500
Subject: [PATCH 03/11] added room description to reciever connection and
 passed it to stream using emit, console loged stream in reciever to look at
 description

---
 src/components/ReceiverConnection.vue | 6 +++++-
 src/views/Receiver.vue                | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/ReceiverConnection.vue b/src/components/ReceiverConnection.vue
index f3f71d93..00e8696e 100644
--- a/src/components/ReceiverConnection.vue
+++ b/src/components/ReceiverConnection.vue
@@ -189,6 +189,8 @@ export default {
       };
 
       this.connection.onstream = (e) => {
+        console.log('33333333', e.extra);
+
         if (e.extra.containsVideo) {
           e.stream.containsVideo = e.extra.containsVideo;
         }
@@ -198,9 +200,11 @@ export default {
         if (e.extra.containsMic) {
           e.stream.containsMic = e.extra.containsMic;
         }
+        if (e.extra.roomDescription) {
+          e.stream.roomDescription = e.extra.roomDescription;
+        }
         this.$emit('stream', e.stream);
       };
-
       this.connection.onExtraDataUpdated = (e) => {
         this.$emit('receiverViewerCount', e.extra.receiverViewerCount);
       };
diff --git a/src/views/Receiver.vue b/src/views/Receiver.vue
index 420b30f7..9973f3d2 100644
--- a/src/views/Receiver.vue
+++ b/src/views/Receiver.vue
@@ -237,6 +237,7 @@ export default {
     },
     onStream(stream) {
       this.stream = stream;
+      console.log('22222222222', stream);
     },
     onPresenceCheckWait(newValue) {
       this.presenceCheckWait = newValue;

From b526a3dd1cac6c4659319a329dc5d332a0558b89 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 15:40:10 -0500
Subject: [PATCH 04/11] added stream prop to extra control to get room
 description and displayed it WIP

---
 src/components/Player/ExtraControls.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/Player/ExtraControls.vue b/src/components/Player/ExtraControls.vue
index 62462677..66505c67 100644
--- a/src/components/Player/ExtraControls.vue
+++ b/src/components/Player/ExtraControls.vue
@@ -22,6 +22,7 @@
       )
   .viewer-count
     | {{ receiverViewerCount + 1 }} {{ receiverViewerCount + 1 === 1 ? 'Viewer' : 'Viewers' }}
+  div {{ stream.roomDescription }}
 </template>
 
 <script>
@@ -37,9 +38,14 @@ export default {
       type: Boolean,
       default: true,
     },
+    stream: {
+      type: MediaStream,
+      default: null,
+    },
   },
   methods: {
     toggleAutoplay() {
+      console.log('444444', this.stream.roomDescription);
       this.$emit('update:autoplay', !this.autoplay);
       this.$nextTick(() => {
         window.localStorage.setItem('autoplay', this.autoplay);

From 81aadc330d5fa8d092e78ed146b6db88de00e794 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 15:41:03 -0500
Subject: [PATCH 05/11] passed stream to extracontrols and console log to track
 where room description was, remove consolelog before pr

---
 src/components/Player/Player.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/Player/Player.vue b/src/components/Player/Player.vue
index 2275b042..164833ed 100644
--- a/src/components/Player/Player.vue
+++ b/src/components/Player/Player.vue
@@ -39,6 +39,7 @@
     v-if="showExtraControls"
     :autoplay.sync="autoplay"
     :receiverViewerCount="receiverViewerCount"
+    :stream="stream"
   )
 </template>
 
@@ -111,6 +112,7 @@ export default {
       }
     },
     onStream() {
+      console.log('121212', this.stream.roomDescription);
       if (typeof this.stream.mute === 'function' && !navigator.mozGetUserMedia) {
         // HACK: Avoids double audio in Chrome-based browsers
         console.warn('Avoiding double audio in Chrome via RTCMultiConnection#mute');

From 7d246852d92e3cc7e1ea869da97a18574c31abbe Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 15:41:41 -0500
Subject: [PATCH 06/11] simple console log to track room description, remove
 before pr

---
 src/views/Receiver.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Receiver.vue b/src/views/Receiver.vue
index 9973f3d2..a0398942 100644
--- a/src/views/Receiver.vue
+++ b/src/views/Receiver.vue
@@ -237,7 +237,7 @@ export default {
     },
     onStream(stream) {
       this.stream = stream;
-      console.log('22222222222', stream);
+      console.log('22222222222', stream.roomDescription);
     },
     onPresenceCheckWait(newValue) {
       this.presenceCheckWait = newValue;

From 6d02c2d3f4d70c52e6668598805ff58dfa572a8e Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 17:10:57 -0500
Subject: [PATCH 07/11] removed console logs

---
 src/components/Player/ExtraControls.vue | 6 ------
 src/components/ReceiverConnection.vue   | 2 --
 src/components/StreamerConnection.vue   | 2 +-
 src/views/Receiver.vue                  | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/Player/ExtraControls.vue b/src/components/Player/ExtraControls.vue
index 66505c67..62462677 100644
--- a/src/components/Player/ExtraControls.vue
+++ b/src/components/Player/ExtraControls.vue
@@ -22,7 +22,6 @@
       )
   .viewer-count
     | {{ receiverViewerCount + 1 }} {{ receiverViewerCount + 1 === 1 ? 'Viewer' : 'Viewers' }}
-  div {{ stream.roomDescription }}
 </template>
 
 <script>
@@ -38,14 +37,9 @@ export default {
       type: Boolean,
       default: true,
     },
-    stream: {
-      type: MediaStream,
-      default: null,
-    },
   },
   methods: {
     toggleAutoplay() {
-      console.log('444444', this.stream.roomDescription);
       this.$emit('update:autoplay', !this.autoplay);
       this.$nextTick(() => {
         window.localStorage.setItem('autoplay', this.autoplay);
diff --git a/src/components/ReceiverConnection.vue b/src/components/ReceiverConnection.vue
index 00e8696e..ce78f641 100644
--- a/src/components/ReceiverConnection.vue
+++ b/src/components/ReceiverConnection.vue
@@ -189,8 +189,6 @@ export default {
       };
 
       this.connection.onstream = (e) => {
-        console.log('33333333', e.extra);
-
         if (e.extra.containsVideo) {
           e.stream.containsVideo = e.extra.containsVideo;
         }
diff --git a/src/components/StreamerConnection.vue b/src/components/StreamerConnection.vue
index a268c73a..c011107d 100644
--- a/src/components/StreamerConnection.vue
+++ b/src/components/StreamerConnection.vue
@@ -294,7 +294,7 @@ export default {
           this.connection.isInitiator ? participantsCount : 0,
         );
       };
-      console.log('111111', this.connection);
+
       this.connection.extra.roomDescription = this.streamDescription;
 
     },
diff --git a/src/views/Receiver.vue b/src/views/Receiver.vue
index a0398942..420b30f7 100644
--- a/src/views/Receiver.vue
+++ b/src/views/Receiver.vue
@@ -237,7 +237,6 @@ export default {
     },
     onStream(stream) {
       this.stream = stream;
-      console.log('22222222222', stream.roomDescription);
     },
     onPresenceCheckWait(newValue) {
       this.presenceCheckWait = newValue;

From a253c05a5daf3960e2bdedf657ef6887ed2c4052 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 17:11:56 -0500
Subject: [PATCH 08/11] added room description to be viewed, removed stream
 prop from extracontrols

---
 src/components/Player/Player.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Player/Player.vue b/src/components/Player/Player.vue
index 164833ed..81b1b212 100644
--- a/src/components/Player/Player.vue
+++ b/src/components/Player/Player.vue
@@ -39,8 +39,8 @@
     v-if="showExtraControls"
     :autoplay.sync="autoplay"
     :receiverViewerCount="receiverViewerCount"
-    :stream="stream"
   )
+  | {{ stream.roomDescription}}
 </template>
 
 <script>

From f0cd5671138c119cdcf715aad685b7801d4826a5 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 17:21:01 -0500
Subject: [PATCH 09/11] removed description from player and display only in
 reciever

---
 src/components/Player/Player.vue | 2 --
 src/views/Receiver.vue           | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Player/Player.vue b/src/components/Player/Player.vue
index 81b1b212..2275b042 100644
--- a/src/components/Player/Player.vue
+++ b/src/components/Player/Player.vue
@@ -40,7 +40,6 @@
     :autoplay.sync="autoplay"
     :receiverViewerCount="receiverViewerCount"
   )
-  | {{ stream.roomDescription}}
 </template>
 
 <script>
@@ -112,7 +111,6 @@ export default {
       }
     },
     onStream() {
-      console.log('121212', this.stream.roomDescription);
       if (typeof this.stream.mute === 'function' && !navigator.mozGetUserMedia) {
         // HACK: Avoids double audio in Chrome-based browsers
         console.warn('Avoiding double audio in Chrome via RTCMultiConnection#mute');
diff --git a/src/views/Receiver.vue b/src/views/Receiver.vue
index 420b30f7..166b7e2c 100644
--- a/src/views/Receiver.vue
+++ b/src/views/Receiver.vue
@@ -102,6 +102,7 @@ div
     router-link.create-message(v-if="!isStream", to="/streamer")
       | Create your own room
     PublicRooms.mt-40(v-if="!isStream")
+    | {{ stream.roomDescription}}
 </template>
 
 <script>

From 76b190010c7300a7f7cfc2e9470e27da8556ac8e Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 17:27:02 -0500
Subject: [PATCH 10/11] changed char limit to 280 and edit placeholder

---
 src/views/Streamer.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Streamer.vue b/src/views/Streamer.vue
index e029aae2..2a585f70 100644
--- a/src/views/Streamer.vue
+++ b/src/views/Streamer.vue
@@ -232,9 +232,9 @@ div
                 | Enable Microphone
               label.row-start
                 textarea(
-                  maxlength="50"
+                  maxlength="280"
                   v-model="streamDescription"
-                  placeholder="Add a room description"
+                  placeholder="Add an optional room description"
                 )
             .col-xs-1-2
               label.row-start.mb-10

From f105cce839c29576a140c317f947fbdbae38df58 Mon Sep 17 00:00:00 2001
From: Tom <tom@pop-os.localdomain>
Date: Tue, 30 Jun 2020 17:28:50 -0500
Subject: [PATCH 11/11] removed extra spacing

---
 src/components/StreamerConnection.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/StreamerConnection.vue b/src/components/StreamerConnection.vue
index c011107d..3702c0b0 100644
--- a/src/components/StreamerConnection.vue
+++ b/src/components/StreamerConnection.vue
@@ -64,7 +64,6 @@ export default {
   },
   methods: {
     shareStreamUsingRTCMultiConnection(stream) {
-
       // www.RTCMultiConnection.org/docs/
       this.connection = new RTCMultiConnection();
       this.connection.socketURL = 'https://api.2n.fm:9001/';