From a460fd08ce528b07486fbda992b435c745a6e5e0 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Thu, 16 Jul 2020 23:14:26 -0400
Subject: [PATCH] Fix channel banners and temporarily remove RPM for testing

---
 .github/workflows/build.yml           | 56 +++++++++++++--------------
 _scripts/build.js                     |  2 +-
 src/renderer/views/Channel/Channel.js |  8 +++-
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3b9e1fe..29b3a1d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,34 +49,34 @@ jobs:
       with:
         name: freetube-vue_0.8.0_static_web
         path: dist/web
-#     - name: Build on ARMv7 
-#       uses: uraimo/run-on-arch-action@v1.0.9
-#       if: startsWith(matrix.os, 'ubuntu')
-#       with:
-#         architecture: aarch64
-#         distribution: ubuntu20.04
-#         run: |
-#           export DEBIAN_FRONTEND=noninteractive
-#           export TZ=Europe/Kiev
-#           apt update
-#           apt install -y curl
-#           echo 'installing node 12x'
-#           curl -sL https://deb.nodesource.com/setup_12.x | bash
-#           echo 'finished installing node'
-#           apt update
-#           apt install -y nodejs
-#           apt install -y build-essential
-#           apt install -y libopenjp2-7
-#           node --version
-#           npm install
-#           npm run lint
-#           npm run build --if-present
-#     - name: Upload Linux ARM64 .deb Artifact
-#       uses: actions/upload-artifact@v2
-#       if: startsWith(matrix.os, 'ubuntu-latest')
-#       with:
-#         name: freetube-vue_0.8.0_arm64.deb
-#         path: build/freetube-vue_0.8.0_arm64.deb
+    - name: Build on ARMv7
+      uses: uraimo/run-on-arch-action@v1.0.9
+      if: startsWith(matrix.os, 'ubuntu')
+      with:
+        architecture: aarch64
+        distribution: ubuntu20.04
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          export TZ=Europe/Kiev
+          apt update
+          apt install -y curl
+          echo 'installing node 12x'
+          curl -sL https://deb.nodesource.com/setup_12.x | bash
+          echo 'finished installing node'
+          apt update
+          apt install -y nodejs
+          apt install -y build-essential
+          apt install -y libopenjp2-7
+          node --version
+          npm install
+          npm run lint
+          npm run build --if-present
+    - name: Upload Linux ARM64 .deb Artifact
+      uses: actions/upload-artifact@v2
+      if: startsWith(matrix.os, 'ubuntu-latest')
+      with:
+        name: freetube-vue_0.8.0_arm64.deb
+        path: build/freetube-vue_0.8.0_arm64.deb
     - name: Upload Windows .exe Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'windows')
diff --git a/_scripts/build.js b/_scripts/build.js
index 4883be7f..4a372e1e 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -47,7 +47,7 @@ const config = {
   linux: {
     category: 'Network',
     icon: '_icons/icon.png',
-    target: ['deb', 'rpm', 'zip', 'AppImage'],
+    target: ['deb', 'zip', 'AppImage'], // re-add RPM after testiing
   },
   mac: {
     category: 'public.app-category.utilities',
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 7224b7c6..5f9f3975 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -178,7 +178,13 @@ export default Vue.extend({
         this.relatedChannels = response.relatedChannels
 
         if (response.authorBanners !== null) {
-          this.bannerUrl = `https://${response.authorBanners[response.authorBanners.length - 1].url}`
+          const bannerUrl = response.authorBanners[response.authorBanners.length - 1].url
+
+          if (!bannerUrl.includes('https')) {
+            this.bannerUrl = `https://${bannerUrl}`
+          } else {
+            this.bannerUrl = bannerUrl
+          }
         } else {
           this.bannerUrl = null
         }