From a8c61980acaec4b4386d6ad46cba14e0f2bae863 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 22 Aug 2020 18:33:37 +0200
Subject: [PATCH] removed default image uploader

---
 src/singletons/Settings.hpp                     |  7 ++++---
 src/widgets/settingspages/ExternalToolsPage.cpp |  3 +++
 src/widgets/splits/Split.cpp                    | 14 +++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 53c640f57..3e84fba56 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -281,10 +281,11 @@ public:
     QStringSetting customURIScheme = {"/external/urischeme"};
 
     // Image Uploader
-    QStringSetting imageUploaderUrl = {"/external/imageUploader/url",
-                                       "https://i.nuuls.com/upload"};
+    BoolSetting imageUploaderEnabled = {"/external/imageUploader/enabled",
+                                        false};
+    QStringSetting imageUploaderUrl = {"/external/imageUploader/url", ""};
     QStringSetting imageUploaderFormField = {
-        "/external/imageUploader/formField", "attachment"};
+        "/external/imageUploader/formField", ""};
     QStringSetting imageUploaderHeaders = {"/external/imageUploader/headers",
                                            ""};
     QStringSetting imageUploaderLink = {"/external/imageUploader/link", ""};
diff --git a/src/widgets/settingspages/ExternalToolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp
index 90e008849..fb6290a1a 100644
--- a/src/widgets/settingspages/ExternalToolsPage.cpp
+++ b/src/widgets/settingspages/ExternalToolsPage.cpp
@@ -119,6 +119,9 @@ ExternalToolsPage::ExternalToolsPage()
 
         groupLayout->setWidget(0, QFormLayout::SpanningRole, description);
 
+        groupLayout->addRow(this->createCheckBox(
+            "Enable image uploader", getSettings()->imageUploaderEnabled));
+
         groupLayout->addRow(
             "Request URL: ",
             this->createLineEdit(getSettings()->imageUploaderUrl));
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 798a73d02..9704c283c 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -209,6 +209,9 @@ Split::Split(QWidget *parent)
         [this] { this->focusLost.invoke(); });
     this->input_->ui_.textEdit->imagePasted.connect(
         [this](const QMimeData *source) {
+            if (!getSettings()->imageUploaderEnabled)
+                return;
+
             if (getSettings()->askOnImageUpload.getValue())
             {
                 QMessageBox msgBox;
@@ -235,7 +238,10 @@ Split::Split(QWidget *parent)
             }
             upload(source, this->getChannel(), *this->input_->ui_.textEdit);
         });
-    setAcceptDrops(true);
+
+    getSettings()->imageUploaderEnabled.connect(
+        [this](const bool &val) { this->setAcceptDrops(val); },
+        this->managedConnections_);
 }
 
 Split::~Split()
@@ -742,7 +748,8 @@ void Split::reloadChannelAndSubscriberEmotes()
 
 void Split::dragEnterEvent(QDragEnterEvent *event)
 {
-    if (event->mimeData()->hasImage() || event->mimeData()->hasUrls())
+    if (getSettings()->imageUploaderEnabled &&
+        (event->mimeData()->hasImage() || event->mimeData()->hasUrls()))
     {
         event->acceptProposedAction();
     }
@@ -754,7 +761,8 @@ void Split::dragEnterEvent(QDragEnterEvent *event)
 
 void Split::dropEvent(QDropEvent *event)
 {
-    if (event->mimeData()->hasImage() || event->mimeData()->hasUrls())
+    if (getSettings()->imageUploaderEnabled &&
+        (event->mimeData()->hasImage() || event->mimeData()->hasUrls()))
     {
         this->input_->ui_.textEdit->imagePasted.invoke(event->mimeData());
     }