Merge branch '1.x' of https://github.com/theLMGN/ultraShare into 1.x

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: thelmgn # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: https://paypal.me/thelmgn # Replace with a single custom sponsorship URL

http/staticFiles/dash/apikey.html

@@ -78,7 +78,7 @@ <h2 class="subtitle">Anyone with this API key can control this server as they wi
             "Name": "Ultrashare - Files",
             "DestinationType": "ImageUploader, FileUploader",
             "RequestMethod": "POST",
-            "RequestURL": location.origin + "/api/upload",
+            "RequestURL": localStorage.getItem("apikey").replace(/\$/g,"\\$"),
             "Headers": {
                 "Authorization": localStorage.getItem("apikey"),
                 "fileext": "$filename$"
@@ -91,9 +91,9 @@ <h2 class="subtitle">Anyone with this API key can control this server as they wi
             "Name": "Ultrashare - Shorten",
             "DestinationType": "URLShortener",
             "RequestMethod": "POST",
-            "RequestURL": location.origin + "api/Shorten",
+            "RequestURL": location.origin + "api/shorten",
             "Headers": {
-                "Authorization": localStorage.getItem("apikey"),
+                "Authorization": localStorage.getItem("apikey").replace(/\$/g,"\\$"),
             },
             "Body": "JSON",
             "Data": "$input$",
@@ -106,7 +106,7 @@ <h2 class="subtitle">Anyone with this API key can control this server as they wi
             "RequestMethod": "POST",
             "RequestURL": location.origin + "/api/upload",
             "Headers": {
-                "Authorization": localStorage.getItem("apikey"),
+                "Authorization": localStorage.getItem("apikey").replace(/\$/g,"\\$"),
                 "fileext": "paste"
             },
             "Body": "JSON",
@@ -136,4 +136,4 @@ <h2 class="subtitle">Anyone with this API key can control this server as they wi
     </script>
     <script src="dash.js"></script>
 </body>
-</html>
+</html>

readme.md

@@ -15,11 +15,12 @@ https://ultrashare-public-demo--thelmgn.repl.co
 7. Create a file called `db.json` and in it put `[]`
 8. Fingers crossed, if you do `node index` it should work.
 
-## MagicCap setup guide
+## MagicCap or ShareX setup guide
+
+1. Go to your UltraShare dashboard, and click "Get your API key", or visit yourserver.com/dash/apikey.html
+2. Download the MagicCap mconf or ShareX SXCU's.
+3. For ShareX, extract the zip and open the files with ShareX.
+4. For MagicCap, open the config, click "Uploader Config", then "Import Uploader Configurations", then select the file.
+5. Also for MagicCap, click "UltraShare" and click "Set as default"
+6. Congratulations, you've set up UltraShare for instantly uploading your screenshots!
 
-1. Grab your API key
-2. Update MagicCap to a post-1.0.0 version.
-3. Uploader Config > UltraShare
-4. Set as default
-5. Domain is a link to your server (ex: ultrashare.example.org:8080)
-6. API Key is your API key