From 25bf2c4297487e7bfdf588a8d8948343bda8180d Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sat, 24 Nov 2018 22:52:06 +0300
Subject: [PATCH] Only URL encode input and filename

---
 .../CustomUploader/CustomUploaderParser.cs    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderParser.cs b/ShareX.UploadersLib/CustomUploader/CustomUploaderParser.cs
index 51259f317..5e463afc5 100644
--- a/ShareX.UploadersLib/CustomUploader/CustomUploaderParser.cs
+++ b/ShareX.UploadersLib/CustomUploader/CustomUploaderParser.cs
@@ -126,11 +126,7 @@ public string Parse(string text, bool isOutput)
 
                             if (!string.IsNullOrEmpty(syntaxResult))
                             {
-                                if (URLEncode)
-                                {
-                                    syntaxResult = URLHelpers.URLEncode(syntaxResult);
-                                }
-                                else if (JSONEncode)
+                                if (JSONEncode)
                                 {
                                     syntaxResult = URLHelpers.JSONEncode(syntaxResult);
                                 }
@@ -205,13 +201,13 @@ private string ParseSyntax(string syntax, bool isOutput)
             {
                 if (CheckKeyword(syntax, "input")) // Example: $input$
                 {
-                    return Input;
+                    return AutoEncode(Input);
                 }
             }
 
             if (CheckKeyword(syntax, "filename")) // Example: $filename$
             {
-                return Filename;
+                return AutoEncode(Filename);
             }
             else if (CheckKeyword(syntax, "random", out value)) // Example: $random:domain1.com|domain2.com$
             {
@@ -234,6 +230,16 @@ private string ParseSyntax(string syntax, bool isOutput)
             return null;
         }
 
+        private string AutoEncode(string text)
+        {
+            if (URLEncode)
+            {
+                return URLHelpers.URLEncode(text);
+            }
+
+            return text;
+        }
+
         private bool CheckKeyword(string syntax, string keyword)
         {
             return CheckKeyword(syntax, keyword, out _);