From 8b9e9b273c4e8041cc84c16b8f1dd02626ceb802 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Wed, 27 Nov 2019 18:19:50 +0700
Subject: Fix conflicts with unpulled updates

---
 uncompressed/gmail/README.md  | 4 ++--
 uncompressed/gmail/index.js   | 3 +--
 uncompressed/gmail/webview.js | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'uncompressed')

diff --git a/uncompressed/gmail/README.md b/uncompressed/gmail/README.md
index 907f13c..1dcd235 100644
--- a/uncompressed/gmail/README.md
+++ b/uncompressed/gmail/README.md
@@ -1,5 +1,5 @@
-# Gmail for Franz
-This is the official Franz recipe for Gmail
+# Gmail for Franz/Ferdi
+This is an edited version of the official Franz recipe for Gmail
 
 ### How to create your own Franz recipes:
 * [Read the documentation](https://github.com/meetfranz/plugins)
diff --git a/uncompressed/gmail/index.js b/uncompressed/gmail/index.js
index 4e648b3..e0d8165 100644
--- a/uncompressed/gmail/index.js
+++ b/uncompressed/gmail/index.js
@@ -1,6 +1,5 @@
 module.exports = Franz =>
-  class Instagram extends Franz {
-    // Fixes
+  class Gmail extends Franz {
     overrideUserAgent() {
       return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36";
     }
diff --git a/uncompressed/gmail/webview.js b/uncompressed/gmail/webview.js
index febf64b..25727a4 100644
--- a/uncompressed/gmail/webview.js
+++ b/uncompressed/gmail/webview.js
@@ -1,6 +1,11 @@
 import path from 'path';
 
 module.exports = (Franz) => {
+  // if the user is on gmail's landing page, go to the login page.
+  if (location.hostname == 'www.google.com') {
+    location.href = 'https://accounts.google.com/AccountChooser?service=mail&continue=https://mail.google.com/mail/';
+  }
+  
   const getMessages = function getMessages() {
     let count = 0;
 
-- 
cgit v1.2.3-70-g09d2