diff options
author | Amine Mouafik <amine@mouafik.fr> | 2019-11-27 18:19:50 +0700 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2019-11-27 18:19:50 +0700 |
commit | 8b9e9b273c4e8041cc84c16b8f1dd02626ceb802 (patch) | |
tree | fd19c300370ad37e8ffc377ed0eae8bf2b9e3598 /uncompressed/gmail | |
parent | Override user agent in Gmail recipe (diff) | |
download | ferdium-recipes-8b9e9b273c4e8041cc84c16b8f1dd02626ceb802.tar.gz ferdium-recipes-8b9e9b273c4e8041cc84c16b8f1dd02626ceb802.tar.zst ferdium-recipes-8b9e9b273c4e8041cc84c16b8f1dd02626ceb802.zip |
Fix conflicts with unpulled updates
Diffstat (limited to 'uncompressed/gmail')
-rw-r--r-- | uncompressed/gmail/README.md | 4 | ||||
-rw-r--r-- | uncompressed/gmail/index.js | 3 | ||||
-rw-r--r-- | uncompressed/gmail/webview.js | 5 |
3 files changed, 8 insertions, 4 deletions
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 @@ | |||
1 | # Gmail for Franz | 1 | # Gmail for Franz/Ferdi |
2 | This is the official Franz recipe for Gmail | 2 | This is an edited version of the official Franz recipe for Gmail |
3 | 3 | ||
4 | ### How to create your own Franz recipes: | 4 | ### How to create your own Franz recipes: |
5 | * [Read the documentation](https://github.com/meetfranz/plugins) | 5 | * [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 @@ | |||
1 | module.exports = Franz => | 1 | module.exports = Franz => |
2 | class Instagram extends Franz { | 2 | class Gmail extends Franz { |
3 | // Fixes | ||
4 | overrideUserAgent() { | 3 | overrideUserAgent() { |
5 | return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36"; | 4 | return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36"; |
6 | } | 5 | } |
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 @@ | |||
1 | import path from 'path'; | 1 | import path from 'path'; |
2 | 2 | ||
3 | module.exports = (Franz) => { | 3 | module.exports = (Franz) => { |
4 | // if the user is on gmail's landing page, go to the login page. | ||
5 | if (location.hostname == 'www.google.com') { | ||
6 | location.href = 'https://accounts.google.com/AccountChooser?service=mail&continue=https://mail.google.com/mail/'; | ||
7 | } | ||
8 | |||
4 | const getMessages = function getMessages() { | 9 | const getMessages = function getMessages() { |
5 | let count = 0; | 10 | let count = 0; |
6 | 11 | ||