Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2b6ac4a
Updated electron and made WhatsApp Web think it is run on the right b…
marco-calautti Jan 20, 2019
7db7766
Fixed window restore on second instance.
marco-calautti Jan 20, 2019
a7553cf
Bumped version to 0.6.0.
marco-calautti Jan 20, 2019
f05eff0
Update readme.md
marco-calautti Jan 20, 2019
25aa236
Update readme.md
marco-calautti Jan 20, 2019
58b2721
Bump electron from 4.0.1 to 4.0.4
dependabot-support Feb 9, 2019
058bd12
[Security] Bump cryptiles from 3.1.2 to 3.1.4
dependabot-support Feb 9, 2019
645d426
[Security] Bump extend from 3.0.1 to 3.0.2
dependabot-support Feb 9, 2019
0a79db3
[Security] Bump hoek from 4.2.0 to 4.2.1
dependabot-support Feb 9, 2019
f0b0be4
[Security] Bump lodash from 4.17.4 to 4.17.11
dependabot-support Feb 9, 2019
eadb2f2
[Security] Bump sshpk from 1.13.1 to 1.16.1
dependabot-support Feb 9, 2019
e8f2f88
[Security] Bump stringstream from 0.0.5 to 0.0.6
dependabot-support Feb 9, 2019
9462499
Merge pull request #7 from pjclutterbuck/dependabot/npm_and_yarn/stri…
Feb 9, 2019
ba1a2a4
Merge pull request #6 from pjclutterbuck/dependabot/npm_and_yarn/sshp…
Feb 9, 2019
1752ff4
Merge pull request #5 from pjclutterbuck/dependabot/npm_and_yarn/loda…
Feb 9, 2019
3f482f0
Merge pull request #4 from pjclutterbuck/dependabot/npm_and_yarn/hoek…
Feb 9, 2019
5f6da5b
Merge pull request #3 from pjclutterbuck/dependabot/npm_and_yarn/exte…
Feb 9, 2019
dc71b78
Merge pull request #2 from pjclutterbuck/dependabot/npm_and_yarn/cryp…
Feb 9, 2019
5412c8a
Merge pull request #1 from pjclutterbuck/dependabot/npm_and_yarn/elec…
Feb 9, 2019
7af1261
Merge pull request #1 from pjclutterbuck/master
marco-calautti Feb 9, 2019
f7d5282
removed fixed electron version.
marco-calautti Feb 9, 2019
40b8d2a
Merge branch 'master' of git@github.com:marco-calautti/Whatsapp-Deskt…
Wohlstand May 15, 2019
2d9a3db
Note about Windows 7
Wohlstand May 15, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,21 @@

const userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36'

const isAlreadyRunning = app.makeSingleInstance((argv, workingDir) => {
const gotTheLock = app.requestSingleInstanceLock()

if (!gotTheLock) {
app.quit()
return;
}


app.on('second-instance', (event, argv, workingDirectory) => {
// Someone tried to run a second instance, we should focus our window.
if (whatsApp.window) {
if (whatsApp.window.isMinimized()) {
whatsApp.window.restore();
}
whatsApp.window.show();
if (whatsApp.window.isMinimized()) {
whatsApp.window.restore();
}
whatsApp.window.show();
}

var groupLinkOpenRequested = null;
Expand All @@ -54,10 +63,7 @@
}
});

if (isAlreadyRunning) {
app.quit();
}


app.setAppUserModelId("it.enrico204.whatsapp-desktop");
app.setAsDefaultProtocolClient("whatsapp");

Expand Down Expand Up @@ -869,6 +875,14 @@
}

app.on('ready', () => {
var electronSession = require('electron').session;

/* Make WhatsApp Web think it is run on the desired browser */
electronSession.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => {
details.requestHeaders['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.80 Safari/537.36';
callback({ cancel: false, requestHeaders: details.requestHeaders });
});

whatsApp.init();
// setting of globalShortcut
session.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => {
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "whatsapp-desktop",
"version": "0.5.0",
"version": "0.6.0",
"license": "GPL-3.0",
"repository": {
"type": "git",
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
whatsapp-desktop (0.6.0-1) unstable; urgency=high

* Make the client compatible again with WhatsApp Web

-- Marco <marco.calautti AT gmail DOT com> Sun, 20 Jan 2019 17:00:00 GMT

whatsapp-desktop (0.5.0-1) unstable; urgency=low

* Bugfix
Expand Down
1 change: 1 addition & 0 deletions it.enrico204.whatsapp-desktop.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<update_contact>enrico204_at_gmail.com</update_contact>
<translation type="gettext">inkscape</translation>
<releases>
<release version="v0.6.0" date="2019-01-20"/>
<release version="v0.5.0" date="2018-03-31"/>
<release version="v0.4.2" date="2018-01-03"/>
<release version="v0.4.1" date="2018-01-02"/>
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "whatsapp-desktop",
"version": "0.5.0",
"version": "0.6.0",
"repository": "https://github.com/Enrico204/Whatsapp-Desktop.git",
"description": "Unofficial WhatsApp Desktop Client. Build with Electron.",
"main": "main.js",
Expand All @@ -9,18 +9,18 @@
"preinstall": "cd app && yarn",
"gettext": "xgettext app/*.js -j --omit-header -o app/locale/messages.pot && xgettext app/html/*.html -L JavaScript -j --omit-header -o app/locale/messages.pot",
"clean": "node clean.js",
"build:win": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=win32 --arch=x64 --electron-version=1.7.8 --icon=assets/win/whatsapp.ico",
"build:osx": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=darwin --arch=x64 --electron-version=1.7.8 --icon=assets/osx/whatsapp.icns",
"build:linux": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=linux --arch=x64 --electron-version=1.7.8 --icon=assets/win/whatsapp.ico",
"build:linux32": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=linux --arch=ia32 --electron-version=1.7.8 --icon=assets/win/whatsapp.ico",
"build:linuxarmv7l": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=linux --arch=armv7l --electron-version=1.7.8 --icon=assets/win/whatsapp.ico",
"build:appimage": "electron-packager ./app \"whatsapp-desktop\" --out=dist --package-manager=yarn --platform=linux --arch=x64 --electron-version=1.7.8 --icon=assets/win/whatsapp.ico && ./node_modules/.bin/electron-builder --publish=never --pd dist/whatsapp-desktop-linux-x64/ --linux AppImage",
"build:flatpak64": "electron-packager ./app \"whatsapp-desktop\" --out=dist --package-manager=yarn --platform=linux --arch=x64 --electron-version=1.7.8 --icon=assets/win/whatsapp.ico && cp it.enrico204.whatsapp-desktop.appdata.xml dist/whatsapp-desktop-linux-x64/ && electron-installer-flatpak --src dist/whatsapp-desktop-linux-x64/ --dest dist/ --arch x64 --config flatpak.config.json"
"build:win": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=win32 --arch=x64 --icon=assets/win/whatsapp.ico",
"build:osx": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=darwin --arch=x64 --icon=assets/osx/whatsapp.icns",
"build:linux": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=linux --arch=x64 --icon=assets/win/whatsapp.ico",
"build:linux32": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=linux --arch=ia32 --icon=assets/win/whatsapp.ico",
"build:linuxarmv7l": "electron-packager ./app \"WhatsApp\" --out=dist --package-manager=yarn --platform=linux --arch=armv7l --icon=assets/win/whatsapp.ico",
"build:appimage": "electron-packager ./app \"whatsapp-desktop\" --out=dist --package-manager=yarn --platform=linux --arch=x64 --icon=assets/win/whatsapp.ico && ./node_modules/.bin/electron-builder --publish=never --pd dist/whatsapp-desktop-linux-x64/ --linux AppImage",
"build:flatpak64": "electron-packager ./app \"whatsapp-desktop\" --out=dist --package-manager=yarn --platform=linux --arch=x64 --icon=assets/win/whatsapp.ico && cp it.enrico204.whatsapp-desktop.appdata.xml dist/whatsapp-desktop-linux-x64/ && electron-installer-flatpak --src dist/whatsapp-desktop-linux-x64/ --dest dist/ --arch x64 --config flatpak.config.json"
},
"devDependencies": {
"electron": "^1.7.8",
"electron-installer-flatpak": "^0.8.0",
"electron-packager": "^8.5.0"
"electron": "*",
"electron-installer-flatpak": "*",
"electron-packager": "*"
},
"build": {
"appId": "it.enrico204.whatsapp-desktop",
Expand All @@ -30,8 +30,8 @@
}
},
"dependencies": {
"electron-builder": "^19.50.0",
"process-nextick-args": "^1.0.7",
"util-deprecate": "^1.0.2"
"electron-builder": "*",
"process-nextick-args": "*",
"util-deprecate": "*"
}
}
11 changes: 9 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Whats Desktop [![Build Status](https://travis-ci.org/Enrico204/Whatsapp-Desktop.svg?branch=master)](https://travis-ci.org/Enrico204/Whatsapp-Desktop)

WhatsApp desktop client, based on the official WhatsApp web app. Build with [Electron](http://electron.atom.io/).

**This is a fork** of the WhatsApp desktop client by Enrico204, based on the official WhatsApp web app. Build with [Electron](http://electron.atom.io/).

**This fork makes the client work again with the current iteration of the WhatsApp web app.**

**No prebuilt binaries are released here, due to Facebook DCMA. Feel free to clone and build the source code.**

**This client is made obsolete on Windows 8+ and macOS by the official desktop client. This is only relevant for Linux and Windows 7 users.**

This is **NOT** an official product. This project does not attempt to reverse engineer the WhatsApp API or attempt to reimplement any part of the WhatsApp client. Any communication between the user and WhatsApp servers is handled by official WhatsApp Web itself; this is just a native wrapper for WhatsApp Web, like a browser.

Expand Down Expand Up @@ -128,7 +135,7 @@ If you're a developer, you may want to use directly `yarn run dev` (in project r

### Cross-build for Windows (from Linux/macOS)

Wine needs to be installed. On macOS, it is installable via Homebrew:
Wine needs to be installed. On macOS, it is installable via Homebrew:

brew install wine

Expand Down
5 changes: 4 additions & 1 deletion whatsapp-desktop.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Summary: WhatsApp Desktop
Name: WhatsApp
Version: 0.5.0
Version: 0.6.0
Release: 1
License: GPL
Group: None
Expand Down Expand Up @@ -56,6 +56,9 @@ rm -rf %{buildroot}
/usr/share/icons/hicolor/64x64/apps/whatsapp.png

%changelog
* Sun Jan 20 2019 marco.calautti <marco.calautti AT gmail DOT com> 0.6.0-1
- See debian changelog in repo

* Sat Mar 31 2018 Enrico204 <enrico204@gmail.com> 0.5.0-1
- See debian changelog in repo

Expand Down
Loading