Revert "add clipboard permission"

This reverts commit b0a8815bb8.

assets/de.shorsh.discord-screenaudio.metainfo.xml.in

@@ -4,6 +4,7 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>discord-screenaudio</name>
+  <developer_name>Malte Jürgens</developer_name>
   <releases>
     <release version="${DISCORD_SCEENAUDIO_VERSION_FULL}" timestamp="${TIMESTAMP}" />
   </releases>

assets/userscript.js

@@ -183,14 +183,21 @@ setInterval(() => {
     el.appendChild(div);
   }
 
-  const muteBtn = document.getElementsByClassName(
+  const buttonContainer = document.getElementsByClassName("container-YkUktl")[0];
+  if (!buttonContainer) {
+    console.log('dsa: Cannot locate Mute/Deafen/Settings button container, please report this on GitHub');
+  }
+  
+  const muteBtn = buttonContainer ? buttonContainer.getElementsByClassName(
     "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
-  )[0];
-  window.discordScreenaudioToggleMute = () => muteBtn.click();
-  const deafenBtn = document.getElementsByClassName(
+  )[0] : null;
+  window.discordScreenaudioToggleMute = () => muteBtn && muteBtn.click();
+  
+  const deafenBtn = buttonContainer ? buttonContainer.getElementsByClassName(
     "button-12Fmur enabled-9OeuTA button-f2h6uQ lookBlank-21BCro colorBrand-I6CyqQ grow-2sR_-F"
-  )[1];
-  window.discordScreenaudioToggleDeafen = () => deafenBtn.click();
+  )[1] : null;
+  
+  window.discordScreenaudioToggleDeafen = () => deafenBtn && deafenBtn.click();
 
   if (window.discordScreenaudioResolutionString) {
     for (const el of document.getElementsByClassName(

src/discordpage.cpp

@@ -20,6 +20,7 @@
 #include <QDesktopServices>
 #include <QFile>
 #include <QMessageBox>
+#include <QNetworkReply>
 #include <QTimer>
 #include <QWebChannel>
 #include <QWebEngineScript>
@@ -128,14 +129,13 @@ void DiscordPage::injectScriptText(QString name, QString content) {
 }
 
 void DiscordPage::injectScriptFile(QString name, QString source) {
-  QFile userscript(source);
+  QFile file(source);
 
-  if (!userscript.open(QIODevice::ReadOnly)) {
+  if (!file.open(QIODevice::ReadOnly)) {
     qFatal("Failed to load %s with error: %s", source.toLatin1().constData(),
-           userscript.errorString().toLatin1().constData());
+           file.errorString().toLatin1().constData());
   } else {
-    QByteArray userscriptJs = userscript.readAll();
-    injectScriptText(name, userscriptJs);
+    injectScriptText(name, file.readAll());
   }
 }
 

src/discordpage.h

@@ -37,8 +37,8 @@ private:
   javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
                            const QString &message, int lineNumber,
                            const QString &sourceID) override;
-  void injectScriptText(QString name, QString source);
-  void injectScriptFile(QString name, QString content);
+  void injectScriptText(QString name, QString content);
+  void injectScriptFile(QString name, QString source);
   void stopVirtmic();
   void startVirtmic(QString target);
   void toggleMute();

src/main.cpp

@@ -30,6 +30,9 @@ int main(int argc, char *argv[]) {
   QCommandLineOption degubOption("remote-debugging",
                                  "Open Chromium Remote Debugging on port 9222");
   parser.addOption(degubOption);
+  QCommandLineOption notifySendOption(
+      "notify-send", "Use notify-send instead of QT/KF5 notifications");
+  parser.addOption(notifySendOption);
 
   parser.process(app);
 
@@ -46,7 +49,7 @@ int main(int argc, char *argv[]) {
             "--remote-debugging-port=9222 " +
                 qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
 
-  MainWindow w;
+  MainWindow w(parser.isSet(notifySendOption));
   w.show();
 
   return app.exec();

src/mainwindow.cpp

@@ -24,9 +24,11 @@
 
 MainWindow *MainWindow::m_instance = nullptr;
 
-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
+MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
+    : QMainWindow(parent) {
   assert(MainWindow::m_instance == nullptr);
   MainWindow::m_instance = this;
+  m_useNotifySend = useNotifySend;
   setupWebView();
   resize(1000, 700);
   showMaximized();
@@ -40,22 +42,36 @@ void MainWindow::setupWebView() {
   m_webView = new QWebEngineView(this);
   m_webView->setPage(page);
 
+  if (m_useKF5Notifications || m_useNotifySend)
+    QWebEngineProfile::defaultProfile()->setNotificationPresenter(
+        [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
+          if (m_useNotifySend) {
+            auto title = notificationInfo->title();
+            auto message = notificationInfo->message();
+            auto image_path =
+                QString("/tmp/discord-screenaudio-%1.png").arg(title);
+            notificationInfo->icon().save(image_path);
+            QProcess::execute("notify-send",
+                              {"--icon", image_path, "--app-name",
+                               "discord-screenaudio", title, message});
+          } else if (m_useKF5Notifications) {
 #ifdef KNOTIFICATIONS
-  QWebEngineProfile::defaultProfile()->setNotificationPresenter(
-      [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
-        KNotification *notification = new KNotification("discordNotification");
-        notification->setTitle(notificationInfo->title());
-        notification->setText(notificationInfo->message());
-        notification->setPixmap(QPixmap::fromImage(notificationInfo->icon()));
-        notification->setDefaultAction("View");
-        connect(notification, &KNotification::defaultActivated,
-                [&, notificationInfo = std::move(notificationInfo)]() {
-                  notificationInfo->click();
-                  activateWindow();
-                });
-        notification->sendEvent();
-      });
+            KNotification *notification =
+                new KNotification("discordNotification");
+            notification->setTitle(notificationInfo->title());
+            notification->setText(notificationInfo->message());
+            notification->setPixmap(
+                QPixmap::fromImage(notificationInfo->icon()));
+            notification->setDefaultAction("View");
+            connect(notification, &KNotification::defaultActivated,
+                    [&, notificationInfo = std::move(notificationInfo)]() {
+                      notificationInfo->click();
+                      activateWindow();
+                    });
+            notification->sendEvent();
 #endif
+          }
+        });
 
   setCentralWidget(m_webView);
 }

src/mainwindow.h

@@ -14,7 +14,7 @@ class MainWindow : public QMainWindow {
   Q_OBJECT
 
 public:
-  explicit MainWindow(QWidget *parent = nullptr);
+  explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
   static MainWindow *instance();
 
 private:
@@ -25,6 +25,12 @@ private:
   void closeEvent(QCloseEvent *event) override;
   bool m_wasMaximized;
   static MainWindow *m_instance;
+  bool m_useNotifySend;
+#ifdef KNOTIFICATIONS
+  bool m_useKF5Notifications = true;
+#else
+  bool m_useKF5Notifications = false;
+#endif
 
 private Q_SLOTS:
   void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);