From e5c99c14952ba3a35174ac686b6192e2dec81835 Mon Sep 17 00:00:00 2001
From: Miroslav Pejic <miroslav.pejic.85@gmail.com>
Date: Mon, 20 Jan 2025 17:21:57 +0100
Subject: [PATCH] [mirotalkbro] - #10 refactoring

---
 app/server.js          |  2 +-
 package.json           |  2 +-
 public/css/common.css  |  4 ++++
 public/js/broadcast.js |  2 +-
 public/js/utils.js     | 22 ++++------------------
 public/js/viewer.js    |  2 +-
 6 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/app/server.js b/app/server.js
index ce0da55..257f21b 100644
--- a/app/server.js
+++ b/app/server.js
@@ -8,7 +8,7 @@
  * @license For open source under AGPL-3.0
  * @license For private project or commercial purposes contact us at: license.mirotalk@gmail.com
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.1.17
+ * @version 1.1.18
  */
 
 require('dotenv').config();
diff --git a/package.json b/package.json
index 96bb2c5..fc0fa4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalkbro",
-    "version": "1.1.17",
+    "version": "1.1.18",
     "description": "P2P WebRTC audio, video and screen live broadcast",
     "main": "app/server.js",
     "scripts": {
diff --git a/public/css/common.css b/public/css/common.css
index 645b03d..0aae12d 100644
--- a/public/css/common.css
+++ b/public/css/common.css
@@ -206,6 +206,10 @@ input:checked + .slider:before {
     padding: 0.5rem;
 }
 
+a {
+    color: #0969b4;
+}
+
 .swal2-title,
 .swal2-content {
     background-color: var(--panel-color) !important;
diff --git a/public/js/broadcast.js b/public/js/broadcast.js
index f069367..0736559 100644
--- a/public/js/broadcast.js
+++ b/public/js/broadcast.js
@@ -1112,7 +1112,7 @@ function handleMediaDeviceError(error) {
     if (screenShareEnabled) {
         toggleScreen();
     } else {
-        handleMediaStreamError('Audio/Video', error);
+        handleMediaStreamError(error);
     }
 }
 
diff --git a/public/js/utils.js b/public/js/utils.js
index 51fc6b7..d499269 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -111,7 +111,7 @@ function stopVideoTrack(mediaStream) {
     }
 }
 
-function handleMediaStreamError(mediaStreamType, error) {
+function handleMediaStreamError(error) {
     let errorMessage = error;
     let shouldHandleGetUserMediaError = true;
 
@@ -138,25 +138,11 @@ function handleMediaStreamError(mediaStreamType, error) {
             break;
     }
 
-    let popupContent = `
-    <ul style="text-align: left">
-        <li>Media type: ${mediaStreamType}</li>
-        <li>Error name: ${error.name}</li>
-        <li>
-            Error message:
-            <p style="color: red">${errorMessage}</p>
-        </li>`;
-
     if (shouldHandleGetUserMediaError) {
-        popupContent += `
-        <li>Common: <a href="https://blog.addpipe.com/common-getusermedia-errors" target="_blank">getUserMedia errors</a></li>`;
+        errorMessage += `
+        Check the common <a href="https://blog.addpipe.com/common-getusermedia-errors" target="_blank">getUserMedia errors</a></li>`;
     }
-
-    popupContent += `
-        </ul>
-    `;
-
-    popupMessage('warning', 'Access denied', popupContent, 'center');
+    popupMessage('warning', 'Ops', errorMessage, 'center');
 }
 
 function saveDataToFile(dataURL, fileName) {
diff --git a/public/js/viewer.js b/public/js/viewer.js
index 0208524..98e51c2 100644
--- a/public/js/viewer.js
+++ b/public/js/viewer.js
@@ -403,7 +403,7 @@ async function getStream() {
         return stream;
     } catch (error) {
         console.error('Failed to access media devices:', error.message);
-        handleMediaStreamError('Audio/Video', error);
+        handleMediaStreamError(error);
         hideVideoAudioButtons();
         return null;
     }