From a97f33557936e3c809bd3ba7d4fa4e5f560d845e Mon Sep 17 00:00:00 2001
From: Jae Beojkkoch <jae@jaekr.me>
Date: Sat, 25 Jan 2020 15:27:22 +0100
Subject: [PATCH 1/5] Added support for Imgur token (authed upload) and Imgur
 albums.

---
 index.html        | 17 ++++++++++++++++-
 js/glowingbear.js |  2 ++
 js/imgur.js       | 34 ++++++++++++++++++++++++++++++----
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index f8ffbb5..097ce0e 100644
--- a/index.html
+++ b/index.html
@@ -100,7 +100,6 @@
             <div class="panel-body">
                <form class="form-signin" role="form">
                 <div class="form-group">
-
                   <div class="input-group">
                     <div class="row no-gutter">
                       <div class="col-sm-9">
@@ -113,6 +112,22 @@
                       </div>
                     </div>
                   </div>
+                  <div class="input-group">
+                    <div class="row no-gutter">
+                      <div class="col-sm-9">
+                        <label class="control-label" for="iToken">Imgur Access token</label>
+                        <input type="text" class="form-control favorite-font" id="iToken" ng-model="settings.iToken" placeholder="Token" autocapitalize="off">
+                      </div>
+                    </div>
+                  </div>
+                  <div class="input-group">
+                    <div class="row no-gutter">
+                      <div class="col-sm-9">
+                        <label class="control-label" for="iAlb">Imgur Album hash<a target="_blank" href="https://github.com/Jaekr/glowing-bear/wiki/Getting-a-token-&-Album-Hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
+                        <input type="text" class="form-control favorite-font" id="iAlb" ng-model="settings.iAlb" placeholder="Album hash" autocapitalize="off">
+                      </div>
+                    </div>
+                  </div>
                   <div class="row no-gutter">
                     <div ng-class="settings.useTotp ? 'col-sm-9' : 'col-sm-12'" ng>
                       <label class="control-label" for="password">WeeChat relay password</label>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 4b11a09..04519bb 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -64,6 +64,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         'enableQuickKeys': true,
         'customCSS': '',
         "currentlyViewedBuffers":{},
+        'iToken': '',
+        'iAlb': '',
     });
     $scope.settings = settings;
 
diff --git a/js/imgur.js b/js/imgur.js
index fdcacf6..b320b9a 100644
--- a/js/imgur.js
+++ b/js/imgur.js
@@ -3,7 +3,7 @@
 
 var weechat = angular.module('weechat');
 
-weechat.factory('imgur', ['$rootScope', function($rootScope) {
+weechat.factory('imgur', 'settings', ['$rootScope', function($rootScope) {
 
     var process = function(image, callback) {
 
@@ -26,8 +26,26 @@ weechat.factory('imgur', ['$rootScope', function($rootScope) {
 
     // Upload image to imgur from base64
     var upload = function( base64img, callback ) {
-        // Set client ID (Glowing Bear)
-        var clientId = "164efef8979cd4b";
+
+        // Declaring variables used later
+        var accessToken = "164efef8979cd4b";
+        var albumHash = "";
+        var albEnabled = false;
+        var isClientID = true;
+
+        // Set client ID
+        if(settings.iToken.length > 37){
+            accessToken = settings.iToken;
+            isClientID = false;
+        }
+
+        // Checks for a album hash
+        if(settings.iAlb.length < 6) {
+            albEnabled = false;
+        } else {
+            albEnabled = true;
+            albumHash = settings.iAlb;
+        }
 
         // Progress bars container
         var progressBars = document.getElementById("imgur-upload-progress"),
@@ -45,6 +63,10 @@ weechat.factory('imgur', ['$rootScope', function($rootScope) {
         fd.append("image", base64img); // Append the file
         fd.append("type", "base64"); // Set image type to base64
 
+        if(albEnabled) {
+            fd.append("album", albumHash); // If the user provided an album hash
+        }
+
         // Create new XMLHttpRequest
         var xhttp = new XMLHttpRequest();
 
@@ -52,7 +74,11 @@ weechat.factory('imgur', ['$rootScope', function($rootScope) {
         xhttp.open("POST", "https://api.imgur.com/3/image", true);
 
         // Set headers
-        xhttp.setRequestHeader("Authorization", "Client-ID " + clientId);
+        if(isClientID) {
+            xhttp.setRequestHeader("Authorization", "Client-ID " + accessToken);
+        } else {
+            xhttp.setRequestHeader("Authorization", "Bearer " + accessToken);
+        }
         xhttp.setRequestHeader("Accept", "application/json");
 
         // Handler for response

From 5f1dc5d30d98451af85705f835e146c893dd2382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <huebschle@kit.edu>
Date: Fri, 31 Jan 2020 09:45:21 +0100
Subject: [PATCH 2/5] [imgur] Simplify logic, update wiki URL to main repo

---
 index.html  |  2 +-
 js/imgur.js | 25 +++++++++----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/index.html b/index.html
index 097ce0e..495a9a4 100644
--- a/index.html
+++ b/index.html
@@ -123,7 +123,7 @@
                   <div class="input-group">
                     <div class="row no-gutter">
                       <div class="col-sm-9">
-                        <label class="control-label" for="iAlb">Imgur Album hash<a target="_blank" href="https://github.com/Jaekr/glowing-bear/wiki/Getting-a-token-&-Album-Hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
+                        <label class="control-label" for="iAlb">Imgur Album hash<a target="_blank" href="https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
                         <input type="text" class="form-control favorite-font" id="iAlb" ng-model="settings.iAlb" placeholder="Album hash" autocapitalize="off">
                       </div>
                     </div>
diff --git a/js/imgur.js b/js/imgur.js
index b320b9a..fe7cb48 100644
--- a/js/imgur.js
+++ b/js/imgur.js
@@ -27,26 +27,18 @@ weechat.factory('imgur', 'settings', ['$rootScope', function($rootScope) {
     // Upload image to imgur from base64
     var upload = function( base64img, callback ) {
 
-        // Declaring variables used later
+        // API authorization, either via Client ID (anonymous) or access token
+        // (add to user's imgur account), see also:
+        // https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash
         var accessToken = "164efef8979cd4b";
-        var albumHash = "";
-        var albEnabled = false;
         var isClientID = true;
 
-        // Set client ID
-        if(settings.iToken.length > 37){
+        // Check whether the user has provided an access token
+        if (settings.iToken.length > 37){
             accessToken = settings.iToken;
             isClientID = false;
         }
 
-        // Checks for a album hash
-        if(settings.iAlb.length < 6) {
-            albEnabled = false;
-        } else {
-            albEnabled = true;
-            albumHash = settings.iAlb;
-        }
-
         // Progress bars container
         var progressBars = document.getElementById("imgur-upload-progress"),
             currentProgressBar = document.createElement("div");
@@ -63,8 +55,9 @@ weechat.factory('imgur', 'settings', ['$rootScope', function($rootScope) {
         fd.append("image", base64img); // Append the file
         fd.append("type", "base64"); // Set image type to base64
 
-        if(albEnabled) {
-            fd.append("album", albumHash); // If the user provided an album hash
+        // Add the image to the provided album if configured to do so
+        if (!isClientID && settings.iAlb.length >= 6) {
+            fd.append("album", settings.iAlb);
         }
 
         // Create new XMLHttpRequest
@@ -74,7 +67,7 @@ weechat.factory('imgur', 'settings', ['$rootScope', function($rootScope) {
         xhttp.open("POST", "https://api.imgur.com/3/image", true);
 
         // Set headers
-        if(isClientID) {
+        if (isClientID) {
             xhttp.setRequestHeader("Authorization", "Client-ID " + accessToken);
         } else {
             xhttp.setRequestHeader("Authorization", "Bearer " + accessToken);

From d03421f4fd6d4ede1f1b51e414604bdb7a77d30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <huebschle@kit.edu>
Date: Fri, 31 Jan 2020 10:36:53 +0100
Subject: [PATCH 3/5] Move imgur config to settings dialog

---
 css/glowingbear.css |  6 +++++-
 index.html          | 37 ++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index 700e26d..ba94d13 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -681,6 +681,10 @@ li.buffer.indent.private a {
     font-size: small;
 }
 
+.lessleftpad {
+    padding-left: 5px;
+}
+
 .unselectable {
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -931,4 +935,4 @@ code {
     padding: 0px 2px;
     color: #444;
     border: 1pt solid #444;
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index 495a9a4..4ae19fd 100644
--- a/index.html
+++ b/index.html
@@ -112,22 +112,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="input-group">
-                    <div class="row no-gutter">
-                      <div class="col-sm-9">
-                        <label class="control-label" for="iToken">Imgur Access token</label>
-                        <input type="text" class="form-control favorite-font" id="iToken" ng-model="settings.iToken" placeholder="Token" autocapitalize="off">
-                      </div>
-                    </div>
-                  </div>
-                  <div class="input-group">
-                    <div class="row no-gutter">
-                      <div class="col-sm-9">
-                        <label class="control-label" for="iAlb">Imgur Album hash<a target="_blank" href="https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
-                        <input type="text" class="form-control favorite-font" id="iAlb" ng-model="settings.iAlb" placeholder="Album hash" autocapitalize="off">
-                      </div>
-                    </div>
-                  </div>
                   <div class="row no-gutter">
                     <div ng-class="settings.useTotp ? 'col-sm-9' : 'col-sm-12'" ng>
                       <label class="control-label" for="password">WeeChat relay password</label>
@@ -473,7 +457,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                     </div>
 
                     <label for="size" class="col-sm-1 control-label">Size</label>
-                    <div class="col-sm-2">
+                    <div class="col-sm-3">
                       <input type="text" ng-model="settings.fontsize" class="form-control" id="size">
                     </div>
                   </div>
@@ -483,7 +467,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                 <form class="form-horizontal" role="form">
                   <div class="form-group">
                     <label for="theme" class="col-sm-3 control-label make-thinner">Theme</label>
-                    <div class="col-sm-7">
+                    <div class="col-sm-8">
                       <select id="theme" class="form-control" ng-model="settings.theme" ng-options="theme for theme in themes"></select>
                     </div>
                   </div>
@@ -494,13 +478,28 @@ npm run build-electron-{windows, darwin, linux}</pre>
                 <form class="form-horizontal" role="form">
                   <div class="form-group">
                     <label for="custom-css" class="col-sm-3 control-label make-thinner">Custom CSS</label>
-                    <div class="col-sm-7">
+                    <div class="col-sm-8">
                       <textarea id="custom-css" class="form-control" ng-model="settings.customCSS"></textarea>
                     </div>
                   </div>
                 </form>
               </li>
 
+              <li class="standard-labels">
+                <form class="form-horizontal" role="form">
+                  <div class="form-group">
+                    <label class="control-label col-sm-3" for="iToken">Imgur Token <a target="_blank" href="https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash"><i class="glyphicon glyphicon-info-sign"></i></a></label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" ng-model="settings.iToken" placeholder="Access Token" autocapitalize="off">
+                    </div>
+                    <label class="control-label col-sm-1 lessleftpad" for="iAlb">Album</label>
+                    <div class="col-sm-3">
+                      <input type="text" class="form-control" ng-model="settings.iAlb" placeholder="Album Hash" autocapitalize="off">
+                    </div>
+                  </div>
+                </form>
+              </li>
+
               <li>
                 <form class="form-inline" role="form">
                   <div class="checkbox">

From 57aad0a4b7714927cfc68f38d57c60854e3e809d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <huebschle@kit.edu>
Date: Fri, 31 Jan 2020 10:40:30 +0100
Subject: [PATCH 4/5] Fix glyphicon positioning

---
 css/glowingbear.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index ba94d13..312ef04 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -146,7 +146,7 @@ input[type=text], input[type=password], #sendMessage {
 .col-sm-9 {
     padding-right: 5px !important;
 }
-.glyphicon {
+#topbar .glyphicon {
     top: 0; /* Fixes alignment issue in top bar */
 }
 #topbar {

From 5ae45309849ecad992a717315a4e8d3f884225f5 Mon Sep 17 00:00:00 2001
From: Jae Beojkkoch <jae@jaekr.me>
Date: Fri, 31 Jan 2020 17:12:05 +0100
Subject: [PATCH 5/5] Fixed settings usage.

---
 js/imgur.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/imgur.js b/js/imgur.js
index fe7cb48..0ec0f97 100644
--- a/js/imgur.js
+++ b/js/imgur.js
@@ -3,7 +3,7 @@
 
 var weechat = angular.module('weechat');
 
-weechat.factory('imgur', 'settings', ['$rootScope', function($rootScope) {
+weechat.factory('imgur', ['$rootScope', 'settings', function($rootScope, settings) {
 
     var process = function(image, callback) {