Personal Whatsapp Login

From 5cd74a67cbea288bb6f557527a9401cc89cd6bcc Mon Sep 17 00:00:00 2001 From: ducch Date: Fri, 8 May 2015 15:42:44 +0300 Subject: [PATCH 369/436] update phpdoc --- examples/whatsapp.php | 4 ++-- src/whatsprot.class.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/examples/whatsapp.php b/examples/whatsapp.php index 3ec7f0de..7582940d 100755 --- a/examples/whatsapp.php +++ b/examples/whatsapp.php @@ -719,7 +719,7 @@ private function webLogout() /** * Show Web app Login page * - * @return void + * @return string */ public function showWebLoginForm($error = null) { @@ -818,7 +818,7 @@ public function showWebLoginForm($error = null) /** * Show main Web App. * - * @return void + * @return string */ private function showWebForm() { diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index a719c568..60e1e120 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -74,7 +74,7 @@ class WhatsProt * The user name. * @param $debug * Debug on or off, false by default. - * @param string $identityFile + * @param mixed $identityFile * Path to identity file, overrides default path */ public function __construct($number, $nickname, $debug = false, $identityFile = false) @@ -1504,8 +1504,8 @@ public function sendMessage($to, $txt, $id = null) /** * Send a read receipt to a message. * - * @param $to The recipient. - * @param $id + * @param string $to The recipient. + * @param string $id */ public function sendMessageRead($to, $id) { @@ -2248,7 +2248,7 @@ protected function isLoggedIn(){ /** * Create an identity string * - * @param string $identity_file IdentityFile (optional). + * @param mixed $identity_file IdentityFile (optional). * @return string Correctly formatted identity * * @throws Exception Error when cannot write identity data to file. @@ -3399,7 +3399,8 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru } /** - * @param $node ProtocolNode + * @param $node ProtocolNode + * @param $class string */ protected function sendAck($node, $class) { @@ -3851,6 +3852,7 @@ protected function sendMessageNode($to, $node, $id = null) * @param ProtocolNode $node The ProtocolTreeNode that contains the message. * @param string $type * @param string $participant + * @param string $callId */ protected function sendReceipt($node, $type = "read", $participant = null, $callId = null) { @@ -3986,6 +3988,7 @@ public static function parseJID($jid) /** * @param ProtocolNode $groupNode + * @param string $fromGetGroups */ protected function handleGroupV2InfoResponse(ProtocolNode $groupNode, $fromGetGroups = false) { From ca137ab52c74b44c4d8c6ca01bfeffd26022b28c Mon Sep 17 00:00:00 2001 From: ducch Date: Fri, 8 May 2015 15:50:12 +0300 Subject: [PATCH 370/436] remove redundant variable declaration --- src/tokenmap.class.php | 3 ++- src/whatsprot.class.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokenmap.class.php b/src/tokenmap.class.php index 6218b455..c6d1a063 100755 --- a/src/tokenmap.class.php +++ b/src/tokenmap.class.php @@ -489,7 +489,7 @@ public static function GetToken($token, &$subdict, &$string) if (!$subdict && $token >= 236 && $token < (236 + count(self::$secondaryStrings))) { $subdict = true; } - $tokenMap = array(); + if ($subdict) { $tokenMap = self::$secondaryStrings; } else { @@ -499,6 +499,7 @@ public static function GetToken($token, &$subdict, &$string) if ($token < 0 || $token > count($tokenMap)) { return;//fail } + $string = $tokenMap[$token]; if (!$string) { throw new Exception("Invalid token/length in GetToken"); diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index a719c568..3d0413f2 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -3561,7 +3561,6 @@ protected function processUploadResponse($node) $filepath = $this->mediaQueue[$id]['filePath']; $to = $this->mediaQueue[$id]['to']; - $icon = ""; switch ($filetype) { case "image": $caption = $this->mediaQueue[$id]['caption']; From 7f988e439fdf342c1c0da7be5a6ba17aa33314ce Mon Sep 17 00:00:00 2001 From: mgp25 Date: Mon, 11 May 2015 15:14:05 +0200 Subject: [PATCH 371/436] Fixes #713 --- src/whatsprot.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 315b8e9a..2f365d5a 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -248,7 +248,7 @@ public function codeRegister($code) $this->phoneNumber, $response->status, $response->reason, - $response->retry_after + isset($response->retry_after) ? $response->retry_after : null )); $this->debugPrint($query); From 6cf1ea23766377178045c02c612e01917e2f5701 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Tue, 12 May 2015 18:53:53 +0200 Subject: [PATCH 372/436] Fix typo --- src/whatsprot.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 2f365d5a..e5b1fde7 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -398,12 +398,12 @@ public function codeRequest($method = 'sms', $carrier = "T-Mobile5") public function update() { $WAData = json_decode(file_get_contents(Constants::WHATSAPP_VER_CHECKER), true); - $Waver = $WAData['e']; + $WAver = $WAData['e']; if(Constants::WHATSAPP_VER != $WAver) { updateData('token.php', null, $WAData['h']); - updateData('Constants.php', $Waver); + updateData('Constants.php', $WAver); } } From f37c99d4456570f9ee019de1caf701adbedbe601 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Thu, 14 May 2015 19:43:24 +0200 Subject: [PATCH 373/436] correct iq id --- src/whatsprot.class.php | 87 ++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index e5b1fde7..e14bf752 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -51,6 +51,7 @@ class WhatsProt protected $mediaFileInfo = array(); // Media File Information protected $mediaQueue = array(); // Queue for media message nodes protected $messageCounter = 1; // Message counter for auto-id. + protected $iqCounter = 1; protected $messageQueue = array(); // Queue for received messages. protected $name; // The user name. protected $newMsgBind = false; // @@ -586,7 +587,7 @@ public function sendActiveStatus() */ public function sendGetCipherKeysFromUser($number) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $userNode = new ProtocolNode("user", array( @@ -733,7 +734,7 @@ public function sendBroadcastVideo($targets, $path, $storeURLmedia = false, $fsi */ public function sendDeleteBroadcastLists($lists) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $listNode = array(); if ($lists != null && count($lists) > 0) { for ($i = 0; $i < count($lists); $i++) { @@ -761,7 +762,7 @@ public function sendDeleteBroadcastLists($lists) */ protected function sendClearDirty($categories) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $catnodes = array(); foreach ($categories as $category) { @@ -787,7 +788,7 @@ public function sendClientConfig() $child = new ProtocolNode("config", $attr, null, ""); $node = new ProtocolNode("iq", array( - "id" => $this->createMsgId(), + "id" => $this->createIqId(), "type" => "set", "xmlns" => "urn:xmpp:whatsapp:push", "to" => Constants::WHATSAPP_SERVER @@ -798,7 +799,7 @@ public function sendClientConfig() public function sendGetClientConfig() { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $child = new ProtocolNode("config", null, null, null); $node = new ProtocolNode("iq", array( @@ -820,7 +821,7 @@ public function sendGetClientConfig() */ public function sendChangeNumber($number, $identity) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $usernameNode = new ProtocolNode("username", null, null, $number); $passwordNode = new ProtocolNode("password", null, null, urldecode($identity)); @@ -856,7 +857,7 @@ public function sendGetGroups() */ public function sendGetGroupV2Info($groupID) { - $msgId = $this->nodeId['get_groupv2_info'] = $this->createMsgId(); + $msgId = $this->nodeId['get_groupv2_info'] = $this->createIqId(); $queryNode = new ProtocolNode("query", array( @@ -880,7 +881,7 @@ public function sendGetGroupV2Info($groupID) */ public function sendGetPrivacyBlockedList() { - $msgId = $this->nodeId['privacy'] = $this->createMsgId(); + $msgId = $this->nodeId['privacy'] = $this->createIqId(); $child = new ProtocolNode("list", array( "name" => "default" @@ -903,7 +904,7 @@ public function sendGetPrivacyBlockedList() */ public function sendGetPrivacySettings() { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $privacyNode = new ProtocolNode("privacy", null, null, null); $node = new ProtocolNode("iq", array( @@ -927,7 +928,7 @@ public function sendGetPrivacySettings() */ public function sendSetPrivacySettings($category, $value) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $categoryNode = new ProtocolNode("category", array( "name" => $category, @@ -957,7 +958,7 @@ public function sendSetPrivacySettings($category, $value) */ public function sendGetProfilePicture($number, $large = false) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $hash = array(); $hash["type"] = "image"; @@ -988,7 +989,7 @@ public function sendGetProfilePhotoIds($numbers) $numbers = array($numbers); } - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $userNode = array(); for ($i=0; $i < count($numbers); $i++) { @@ -1023,7 +1024,7 @@ public function sendGetProfilePhotoIds($numbers) */ public function sendGetRequestLastSeen($to) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $queryNode = new ProtocolNode("query", null, null, null); @@ -1044,7 +1045,7 @@ public function sendGetRequestLastSeen($to) */ public function sendGetServerProperties() { - $id = $this->createMsgId(); + $id = $this->createIqId(); $child = new ProtocolNode("props", null, null, null); $node = new ProtocolNode("iq", array( @@ -1068,7 +1069,7 @@ public function sendGetServerProperties() public function sendGetServicePricing($lg, $lc) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $pricingNode = new ProtocolNode("pricing", array( "lg" => $lg, @@ -1091,7 +1092,7 @@ public function sendGetServicePricing($lg, $lc) public function sendExtendAccount() { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $extendingNode = new ProtocolNode("extend", null, null, null); $node = new ProtocolNode("iq", array( @@ -1109,7 +1110,7 @@ public function sendExtendAccount() */ public function sendGetBroadcastLists() { - $msgId = $this->nodeId['get_lists'] = $this->createMsgId(); + $msgId = $this->nodeId['get_lists'] = $this->createIqId(); $listsNode = new ProtocolNode("lists", null, null, null); $node = new ProtocolNode("iq", array( @@ -1130,7 +1131,7 @@ public function sendGetBroadcastLists() */ public function sendGetNormalizedJid($countryCode, $number) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $ccNode = new ProtocolNode("cc", null, null, $countryCode); $inNode = new ProtocolNode("in", null, null, $number); $normalizeNode = new ProtocolNode("normalize", null, array($ccNode, $inNode), null); @@ -1154,7 +1155,7 @@ public function sendGetNormalizedJid($countryCode, $number) */ public function sendRemoveAccount($lg = null, $lc = null, $feedback = null) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); if ($feedback != null && strlen($feedback) > 0) { if ($lg == null) { @@ -1192,7 +1193,7 @@ public function sendRemoveAccount($lg = null, $lc = null, $feedback = null) */ public function sendPing() { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $pingNode = new ProtocolNode("ping", null, null, null); $node = new ProtocolNode("iq", array( @@ -1213,7 +1214,7 @@ public function sendPing() public function sendGetHasVoipEnabled($jids) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); if (!is_array($jids)) { @@ -1258,7 +1259,7 @@ public function sendGetStatuses($jids) "to" => Constants::WHATSAPP_SERVER, "type" => "get", "xmlns" => "status", - "id" => $this->createMsgId() + "id" => $this->createIqId() ), array( new ProtocolNode("status", null, $children, null) ), null); @@ -1290,7 +1291,7 @@ public function sendGroupsChatCreate($subject, $participants) ), null, null); } - $id = $this->nodeId['groupcreate'] = $this->createMsgId(); + $id = $this->nodeId['groupcreate'] = $this->createIqId(); $createNode = new ProtocolNode("create", array( @@ -1329,7 +1330,7 @@ public function sendSetGroupSubject($gjid, $subject) $child = new ProtocolNode("subject", null, null, $subject); $node = new ProtocolNode("iq", array( - "id" => $this->createMsgId(), + "id" => $this->createIqId(), "type" => "set", "to" => $this->getJID($gjid), "xmlns" => "w:g2" @@ -1345,7 +1346,7 @@ public function sendSetGroupSubject($gjid, $subject) */ public function sendGroupsLeave($gjids) { - $msgId = $this->nodeId['leavegroup'] = $this->createMsgId(); + $msgId = $this->nodeId['leavegroup'] = $this->createIqId(); if (!is_array($gjids)) { $gjids = array($this->getJID($gjids)); @@ -1443,7 +1444,7 @@ public function sendDemoteParticipants($gId, $participants) */ public function sendLockGroup($gId) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $lockedNode = new ProtocolNode("locked", null, null, null); $node = new ProtocolNode("iq", array( @@ -1465,7 +1466,7 @@ public function sendLockGroup($gId) */ public function sendUnlockGroup($gId) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $unlockedNode = new ProtocolNode("unlocked", null, null, null); $node = new ProtocolNode("iq", array( @@ -1799,7 +1800,7 @@ public function sendSetPrivacyBlockedList($blockedJids = array()) $child2 = new ProtocolNode("query", null, array($child), null); $node = new ProtocolNode("iq", array( - "id" => $this->createMsgId(), + "id" => $this->createIqId(), "xmlns" => "jabber:iq:privacy", "type" => "set" ), array($child2), null); @@ -1822,7 +1823,7 @@ public function sendSetProfilePicture($path) */ public function sendRemoveProfilePicture() { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $picture = new ProtocolNode("picture", null, null, null); @@ -1856,7 +1857,7 @@ public function sendSetRecoveryToken($token) $node = new ProtocolNode("iq", array( - "id" => $this->createMsgId(), + "id" => $this->createIqId(), "type" => "set", "to" => Constants::WHATSAPP_SERVER ), array($child), null); @@ -1876,7 +1877,7 @@ public function sendStatusUpdate($txt) array( "to" => Constants::WHATSAPP_SERVER, "type" => "set", - "id" => $this->createMsgId(), + "id" => $this->createIqId(), "xmlns" => "status" ), array($child), null); @@ -2070,6 +2071,20 @@ protected function createMsgId() return $this->loginTime . "-" . $msgid; } + /** + * iq id + * + * @return string + * Iq id + */ + protected function createIqId() + { + $iqId = $this->iqCounter; + $this->iqCounter++; + + return dechex($iqId); + } + /** * Print a message to the debug console. * @@ -2333,7 +2348,7 @@ public function sendSync(array $numbers, array $deletedNumbers = null, $syncType $context = "background"; } - $id = $this->createMsgId(); + $id = $this->createIqId(); $node = new ProtocolNode("iq", array( @@ -3124,7 +3139,7 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru } if ($node->getTag() == "message" && $node->getAttribute('type') == "media" && $node->getChild(0)->getAttribute('type') == "image" ) { - $msgId = $this->createMsgId(); + $msgId = $this->createIqId(); $ackNode = new ProtocolNode("ack", array( @@ -3765,7 +3780,7 @@ protected function sendData($data) */ protected function sendGetGroupsFiltered($type) { - $msgID = $this->nodeId['getgroups'] = $this->createMsgId(); + $msgID = $this->nodeId['getgroups'] = $this->createIqId(); $child = new ProtocolNode($type, null, null, null); $node = new ProtocolNode("iq", array( @@ -3908,7 +3923,7 @@ protected function sendNode($node, $encrypt = true) */ protected function sendRequestFileUpload($b64hash, $type, $size, $filepath, $to, $caption = "") { - $id = $this->createMsgId(); + $id = $this->createIqId(); if (!is_array($to)) { $to = $this->getJID($to); @@ -3952,7 +3967,7 @@ protected function sendRequestFileUpload($b64hash, $type, $size, $filepath, $to, */ protected function sendSetPicture($jid, $filepath) { - $nodeID = $this->createMsgId(); + $nodeID = $this->createIqId(); $data = preprocessProfilePicture($filepath); $preview = createIconGD($filepath, 96, true); From b9bb9c2641b6a58df6c0e25697a87abce5689000 Mon Sep 17 00:00:00 2001 From: ducch Date: Sat, 16 May 2015 18:51:10 +0300 Subject: [PATCH 374/436] update phpdoc --- src/whatsprot.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 60e1e120..5b072dec 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1206,7 +1206,7 @@ public function sendPing() } /** - * Get VOIP information of a number or numbers. + * Get VoIP information of a number or numbers. * * @param mixed $jids */ @@ -3988,7 +3988,7 @@ public static function parseJID($jid) /** * @param ProtocolNode $groupNode - * @param string $fromGetGroups + * @param mixed $fromGetGroups */ protected function handleGroupV2InfoResponse(ProtocolNode $groupNode, $fromGetGroups = false) { From f1d923f353d5254e59d35270dd89868e690a1887 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Mon, 18 May 2015 10:23:35 +0200 Subject: [PATCH 375/436] 2.12.82 data --- src/Constants.php | 4 ++-- src/token.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index 1e506373..2b5bbb96 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -19,8 +19,8 @@ class Constants const WHATSAPP_REQUEST_HOST = 'v.whatsapp.net/v2/code'; // The request code host. const WHATSAPP_SERVER = 's.whatsapp.net'; // The hostname used to login/send messages. const WHATSAPP_DEVICE = 'S40'; // The device name. - const WHATSAPP_VER = '2.12.81'; // The WhatsApp version. - const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.81 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. + const WHATSAPP_VER = '2.12.82'; // The WhatsApp version. + const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.82 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_scratch'; // Check WhatsApp version } diff --git a/src/token.php b/src/token.php index 9fadc320..68b9b916 100755 --- a/src/token.php +++ b/src/token.php @@ -20,7 +20,7 @@ function generateRequestToken($country, $phone) // return base64_encode($output); $const = 'PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk'; - $releaseTime = '1430860548912'; + $releaseTime = '1431039885607'; $token = md5($const . $releaseTime . $phone); return $token; From c1efc16163911133e80c0087c612b52292d5fd63 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Tue, 19 May 2015 14:27:47 +0200 Subject: [PATCH 376/436] getMediaFile updated --- src/whatsprot.class.php | 55 +++++++++++------------------------------ 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 05b83e77..225413bc 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2408,70 +2408,45 @@ protected function getJID($number) * * @return bool false if file information can not be obtained. */ - protected function getMediaFile($filepath, $maxsizebytes = 1048576) + protected function getMediaFile($filepath, $maxsizebytes = 5242880) { if (filter_var($filepath, FILTER_VALIDATE_URL) !== false) { $this->mediaFileInfo = array(); $this->mediaFileInfo['url'] = $filepath; - //File is a URL. Create a curl connection but DON'T download the body content - //because we want to see if file is too big. - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, "$filepath"); - curl_setopt($curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11"); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curl, CURLOPT_HEADER, false); - curl_setopt($curl, CURLOPT_NOBODY, true); + $image = file_get_contents($filepath); + $filesize = strlen($image); - if (curl_exec($curl) === false) { - return false; - } + $file_info = new finfo(FILEINFO_MIME_TYPE); + $mime_type = $file_info->buffer($image); - //While we're here, get mime type and filesize and extension - $info = curl_getinfo($curl); - $this->mediaFileInfo['filesize'] = $info['download_content_length']; - $this->mediaFileInfo['filemimetype'] = $info['content_type']; - $this->mediaFileInfo['fileextension'] = pathinfo(parse_url($this->mediaFileInfo['url'], PHP_URL_PATH), PATHINFO_EXTENSION); + $this->mediaFileInfo['filemimetype'] = $mime_type; - //Only download file if it's not too big - //TODO check what max file size whatsapp server accepts. if ($this->mediaFileInfo['filesize'] < $maxsizebytes) { - //Create temp file in media folder. Media folder must be writable! $this->mediaFileInfo['filepath'] = tempnam(__DIR__ . DIRECTORY_SEPARATOR . Constants::DATA_FOLDER . DIRECTORY_SEPARATOR . Constants::MEDIA_FOLDER, 'WHA'); - $fp = fopen($this->mediaFileInfo['filepath'], 'w'); - if ($fp) { - curl_setopt($curl, CURLOPT_NOBODY, false); - curl_setopt($curl, CURLOPT_BUFFERSIZE, 1024); - curl_setopt($curl, CURLOPT_FILE, $fp); - curl_exec($curl); - fclose($fp); - } else { - unlink($this->mediaFileInfo['filepath']); - curl_close($curl); - return false; - } - //Success - curl_close($curl); + file_put_contents($this->mediaFileInfo['filepath'], $image); + $size = getimagesize($this->mediaFileInfo['filepath']); + $extension = ltrim (image_type_to_extension($size[2]), '.'); + + $this->mediaFileInfo['fileextension'] = $extension; + $this->mediaFileInfo['filesize'] = $filesize; + unlink($this->mediaFileInfo['filepath']); return true; } else { - //File too big. Don't Download. - curl_close($curl); return false; } } else if (file_exists($filepath)) { //Local file $this->mediaFileInfo['filesize'] = filesize($filepath); if ($this->mediaFileInfo['filesize'] < $maxsizebytes) { - $this->mediaFileInfo['filepath'] = $filepath; + $this->mediaFileInfo['filepath'] = $filepath; $this->mediaFileInfo['fileextension'] = pathinfo($filepath, PATHINFO_EXTENSION); - $this->mediaFileInfo['filemimetype'] = get_mime($filepath); + $this->mediaFileInfo['filemimetype'] = get_mime($filepath); return true; } else { - //File too big return false; } } - //Couldn't tell what file was, local or URL. return false; } From 34d9d179793b6152d2fe0ffeb555b158640c71e1 Mon Sep 17 00:00:00 2001 From: ludufre Date: Tue, 19 May 2015 17:23:54 -0300 Subject: [PATCH 377/436] Fix Send Media issues - Fix `Undefined index: filesize` in getMediaFile() - Fix `failed to open stream: No such file or directory` in getMediaFile() - Fix missing '.' in stored media extension --- src/whatsprot.class.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 225413bc..2ff7419c 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2404,7 +2404,7 @@ protected function getJID($number) * Retrieves media file and info from either a URL or localpath * * @param string $filepath The URL or path to the mediafile you wish to send - * @param integer $maxsizebytes The maximum size in bytes the media file can be. Default 1MB + * @param integer $maxsizebytes The maximum size in bytes the media file can be. Default 5MB * * @return bool false if file information can not be obtained. */ @@ -2415,7 +2415,7 @@ protected function getMediaFile($filepath, $maxsizebytes = 5242880) $this->mediaFileInfo['url'] = $filepath; $image = file_get_contents($filepath); - $filesize = strlen($image); + $this->mediaFileInfo['filesize'] = strlen($image); $file_info = new finfo(FILEINFO_MIME_TYPE); $mime_type = $file_info->buffer($image); @@ -2427,10 +2427,7 @@ protected function getMediaFile($filepath, $maxsizebytes = 5242880) file_put_contents($this->mediaFileInfo['filepath'], $image); $size = getimagesize($this->mediaFileInfo['filepath']); $extension = ltrim (image_type_to_extension($size[2]), '.'); - $this->mediaFileInfo['fileextension'] = $extension; - $this->mediaFileInfo['filesize'] = $filesize; - unlink($this->mediaFileInfo['filepath']); return true; } else { return false; @@ -3467,7 +3464,7 @@ protected function processTempMediaFile($storeURLmedia) if (isset($this->mediaFileInfo['url'])) { if ($storeURLmedia) { if (is_file($this->mediaFileInfo['filepath'])) { - rename($this->mediaFileInfo['filepath'], $this->mediaFileInfo['filepath'] . $this->mediaFileInfo['fileextension']); + rename($this->mediaFileInfo['filepath'], $this->mediaFileInfo['filepath'].'.'.$this->mediaFileInfo['fileextension']); } } else { if (is_file($this->mediaFileInfo['filepath'])) { From d22e69f33b82465bc6f28c48d88414bd98fc34cf Mon Sep 17 00:00:00 2001 From: Felipe Rodrigues Date: Thu, 21 May 2015 10:51:03 -0300 Subject: [PATCH 378/436] Send receipt before fire event Actually, if we handle the received messages and answer that, the answer message is sent before the receipt node. --- src/whatsprot.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 2ff7419c..914a5862 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2603,6 +2603,9 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru } if ($node->getAttribute("type") == "text" && $node->getChild('body') != null) { $author = $node->getAttribute("participant"); + if ($autoReceipt) { + $this->sendReceipt($node, $type, $author); + } if ($author == "") { //private chat message $this->eventManager()->fire("onGetMessage", @@ -2634,9 +2637,6 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru )); } - if ($autoReceipt) { - $this->sendReceipt($node, $type, $author); - } } if ($node->getAttribute("type") == "text" && $node->getChild(0)->getTag() == 'enc') { // TODO From e48aa47c1bfa61d2edc0a15815ba1230a22df88e Mon Sep 17 00:00:00 2001 From: gerhard Date: Fri, 22 May 2015 09:04:52 +0200 Subject: [PATCH 379/436] fixed onGetGroupMessage fire to save incoming messages to messageStore. --- src/whatsprot.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 2ff7419c..7161df69 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2632,6 +2632,9 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getAttribute("notify"), $node->getChild("body")->getData() )); + if ($this->messageStore !== null) { + $this->messageStore->saveMessage($author,$node->getAttribute('from'), $node->getChild("body")->getData(), $node->getAttribute('id'), $node->getAttribute('t')); + } } if ($autoReceipt) { From ec1a438d6405e15a52faae5ce82d15fa7c3bc524 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sat, 23 May 2015 10:19:56 +0200 Subject: [PATCH 380/436] fix glitch lastseen --- src/whatsprot.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 2ff7419c..b455f7fc 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2949,6 +2949,7 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $this->phoneNumber, $blockedJids )); + return; } $this->eventManager()->fire("onGetRequestLastSeen", array( @@ -2957,7 +2958,6 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getAttribute('id'), $node->getChild(0)->getAttribute('seconds') )); - array_push($this->messageQueue, $node); } if ($node->getChild("props") != null) { //server properties From e5157ff4212670fd11fcf3aea094335b5ac759f1 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sat, 23 May 2015 10:35:38 +0200 Subject: [PATCH 381/436] Added waitForServer --- src/whatsprot.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 4a90fdcb..35b93ca5 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1013,6 +1013,7 @@ public function sendGetProfilePhotoIds($numbers) ), array($listNode), null); $this->sendNode($iqNode); + $this->waitForServer($msgId); return true; } @@ -1254,17 +1255,20 @@ public function sendGetStatuses($jids) $children[] = new ProtocolNode("user", array("jid" => $this->getJID($jid)), null, null); } + $iqId = $this->createIqId(); + $node = new ProtocolNode("iq", array( "to" => Constants::WHATSAPP_SERVER, "type" => "get", "xmlns" => "status", - "id" => $this->createIqId() + "id" => $iqId; ), array( new ProtocolNode("status", null, $children, null) ), null); $this->sendNode($node); + $this->waitForServer($iqId); } /** From bac10291c15cf8fd51710a2b313df6af6684cef8 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sat, 23 May 2015 17:04:35 +0200 Subject: [PATCH 382/436] fix typo --- src/whatsprot.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index f6149135..872444cf 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1262,7 +1262,7 @@ public function sendGetStatuses($jids) "to" => Constants::WHATSAPP_SERVER, "type" => "get", "xmlns" => "status", - "id" => $iqId; + "id" => $iqId ), array( new ProtocolNode("status", null, $children, null) ), null); From 69b388e4bf7e7ffd39352cfa6c703b49f1266e76 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sat, 23 May 2015 23:37:24 +0200 Subject: [PATCH 383/436] Update saveMessage --- src/whatsprot.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 872444cf..774fa4cb 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2624,7 +2624,7 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru )); if ($this->messageStore !== null) { - $this->messageStore->saveMessage($node->getAttribute('from'), $this->phoneNumber, $node->getChild("body")->getData(), $node->getAttribute('id'), $node->getAttribute('t')); + $this->messageStore->saveMessage(ExtractNumber($node->getAttribute('from')), $this->phoneNumber, $node->getChild("body")->getData(), $node->getAttribute('id'), $node->getAttribute('t')); } } else { //group chat message @@ -2640,7 +2640,7 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getChild("body")->getData() )); if ($this->messageStore !== null) { - $this->messageStore->saveMessage($author,$node->getAttribute('from'), $node->getChild("body")->getData(), $node->getAttribute('id'), $node->getAttribute('t')); + $this->messageStore->saveMessage($author, $node->getAttribute('from'), $node->getChild("body")->getData(), $node->getAttribute('id'), $node->getAttribute('t')); } } From b9ff95aa60b211b508acde06a19e2c5c3bb50680 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sun, 24 May 2015 12:01:47 +0200 Subject: [PATCH 384/436] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index af3b1fe0..29e01382 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,7 @@ MIT - You will NOT use this API for marketing purposes (spam, massive sending...). - We do NOT give support to anyone that wants this API to send massive messages or similar. - We reserve the right to block any user of this repository that does not meet these conditions. + +## Legal + +This code is in no way affiliated with, authorized, maintained, sponsored or endorsed by WhatsApp or any of its affiliates or subsidiaries. This is an independent and unofficial API. Use at your own risk. From 876af9640e6befd3ec2151804d53a976b6118296 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sun, 24 May 2015 18:27:14 +0200 Subject: [PATCH 385/436] Full CLI Client Hope you like it :) --- examples/WA CLI Client/client.php | 731 +++++++++++++++++++++ examples/WA CLI Client/data/media/.gitkeep | 0 2 files changed, 731 insertions(+) create mode 100755 examples/WA CLI Client/client.php create mode 100644 examples/WA CLI Client/data/media/.gitkeep diff --git a/examples/WA CLI Client/client.php b/examples/WA CLI Client/client.php new file mode 100755 index 00000000..c595c7fb --- /dev/null +++ b/examples/WA CLI Client/client.php @@ -0,0 +1,731 @@ + PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $db->exec('CREATE TABLE data (`username` TEXT, `password` TEXT, `nickname` TEXT, `login` TEXT)'); + $sql = 'INSERT INTO data (`username`, `password`, `nickname`, `login`) VALUES (:username, :password, :nickname, :login)'; + $query = $db->prepare($sql); + + $query->execute( + array( + ':username' => $argv[1], + ':password' => $argv[2], + ':nickname' => $argv[3], + ':login' => '1' + ) + ); + } +} + +if ((!file_exists($fileName))) +{ + + echo "Welcome to CLI WA Client\n"; + echo "========================\n\n\n"; + echo "Your number > "; + $number = trim(fgets(STDIN)); + $w = new WhatsProt($number, $nickname, $debug); + + try + { + $result = $w->codeRequest('sms'); + } catch (Exception $e) + { + echo "there is an error" . $e; + } + echo "\nEnter sms code you have received > "; + $code = trim(str_replace("-", "", fgets(STDIN))); + try + { + $result = $w->codeRegister($code); + } catch (Exception $e) + { + echo "there is an error"; + } + + echo "\nYour nickname > "; + $nickname = trim(fgets(STDIN)); + do + { + echo "Is '$nickname' right?\n"; + echo "yes/no > "; + $right = trim(fgets(STDIN)); + if ($right != 'yes') + { + echo "\nYour nickname > "; + $nickname = trim(fgets(STDIN)); + } + + } while ($right != 'yes'); + + $db = new \PDO("sqlite:" . $fileName, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $db->exec('CREATE TABLE data (`username` TEXT, `password` TEXT, `nickname` TEXT, `login` TEXT)'); + + $sql = 'INSERT INTO data (`username`, `password`, `nickname`, `login`) VALUES (:username, :password, :nickname, :login)'; + $query = $db->prepare($sql); + + $query->execute( + array( + ':username' => $number, + ':password' => $result->pw, + ':nickname' => $nickname, + ':login' => '1' + ) + ); +} + +$db = new \PDO("sqlite:" . $fileName, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); +$sql = 'SELECT username, password, nickname, login FROM data'; +$row = $db->query($sql); +$result = $row->fetchAll(); +$username = $result[0]['username']; +$password = $result[0]['password']; +$nickname = $result[0]['nickname']; +$login = $result[0]['login']; + +$w = new WhatsProt($username, $nickname, $debug); +$GLOBALS["wa"] = $w; +$w->setMessageStore(new SqliteMessageStore($username)); +$events = new MyEvents($w); +$w->eventManager()->bind('onGetSyncResult', 'onSyncResult'); +$w->eventManager()->bind('onGetRequestLastSeen', 'onGetRequestLastSeen'); +$w->eventManager()->bind('onPresenceAvailable', 'onPresenceAvailable'); +$w->eventManager()->bind('onPresenceUnavailable', 'onPresenceUnavailable'); +$w->eventManager()->bind('onGetImage', 'onGetImage'); +$w->eventManager()->bind('onGetVideo', 'onGetVideo'); +$w->eventManager()->bind('onGetAudio', 'onGetAudio'); + +$w->connect(); +try +{ + $w->loginWithPassword($password); +} +catch (Exception $e) +{ + echo "Error: $e"; + exit(); +} +echo "\nConnected to WA\n\n"; +if ($login == '1') +{ + $w->sendGetClientConfig(); + $w->sendGetServerProperties(); + $w->sendGetGroups(); + $w->sendGetBroadcastLists(); + + $sql = "UPDATE data SET login=?"; + $query = $db->prepare($sql); + $query->execute(array('0')); +} +$w->sendGetPrivacyBlockedList(); +$w->sendAvailableForChat($nickname); +$show = true; +global $onlineContacts; +$GLOBALS["online_contacts"] = array(); +$GLOBALS["current_contact"]; +$poll = 0; +do +{ + if ($show) + { + showContacts(); + $show = false; + } + $poll++; + if ($poll == 10) + { + $w->pollMessage(); + $poll = 0; + } + $mainCmd = fgets_u(STDIN); + switch ($mainCmd) { + case '/add': + echo "\nEnter the number you want to add > "; + $numberToAdd = trim(fgets(STDIN)); + do { + echo "\nIs it right yes/no > "; + $check = trim(fgets(STDIN)); + if ($check != 'yes') + { + echo "\nEnter the number you want to add > "; + $numberToAdd = trim(fgets(STDIN)); + } + } while ($check != 'yes'); + echo "\nEnter the nickname/name > "; + $nickname = trim(fgets(STDIN)); + $w->sendSync(array($numberToAdd), null, 3); + if ($existUser) + { + $w->sendPresenceSubscription($numberToAdd); + addContact($numberToAdd, $nickname); + } + break; + case '/delete': + echo "\nEnter the nickname you want to remove > "; + $nickname = trim(fgets(STDIN)); + do { + echo "\nIs it right yes/no > "; + $check = trim(fgets(STDIN)); + if ($check != 'yes') + { + echo "\nEnter the nickname you want to remove > "; + $nickname = trim(fgets(STDIN)); + } + } while ($check != 'yes'); + $numberToRemove = findPhoneByNickname($nickname); + $w->sendSync(array(), array($numberToRemove), 3); + $w->sendPresenceUnsubscription($numberToRemove); + $contactsDB = __DIR__ . DIRECTORY_SEPARATOR . 'contacts.db'; + $cDB = new \PDO("sqlite:" . $contactsDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $sql = "DELETE FROM contacts WHERE nickname = :nickname"; + $query = $cDB->prepare($sql); + $query->execute(array(':nickname' => $nickname)); + break; + case '/contacts': + $show = true; + break; + case '/status': + echo "\nEnter your status > "; + $status = trim(fgets(STDIN)); + do { + echo "\nIs it right yes/no > "; + $check = trim(fgets(STDIN)); + if ($check != 'yes') + { + echo "\nEnter your status > "; + $status = trim(fgets(STDIN)); + } + } while ($check != 'yes'); + $w->sendStatusUpdate($status); + break; + case '/profile': + echo "\nEnter your profile picture URL > "; + $profile = trim(fgets(STDIN)); + do { + echo "\nIs it right yes/no > "; + $check = trim(fgets(STDIN)); + if ($check != 'yes') + { + echo "\nEnter your profile picture URL > "; + $profile = trim(fgets(STDIN)); + } + } while ($check != 'yes'); + if (!filter_var($profile, FILTER_VALIDATE_URL) === false) { + if(@getimagesize($profile) !== false) { + $w->sendSetProfilePicture($profile); + } + } + else { + echo "$profile is NOT a valid URL\n\n"; + } + break; + case '/credits': + echo "\nSpecials thanks to 0xtryCatch :D\n"; + break; + case '/secret'; + echo "If you are a spammer or bulk sender, this is your lucky day! Follow the link:\n"; + echo "http://bit.ly/1dOj8e0\n\n"; + echo ":)\n\n"; + exit(); + break; + case '/chat': + echo "\nEnter the name of the contact > "; + $nickname = trim(fgets(STDIN)); + do { + echo "\nIs it right yes/no > "; + $check = trim(fgets(STDIN)); + if ($check != 'yes') + { + echo "\nEnter the number you want to add > "; + $nickname = trim(fgets(STDIN)); + } + } while ($check != 'yes'); + + echo "\n\n"; + echo "You are chatting with $nickname\n"; + echo "=================================\n\n"; + $contact = findPhoneByNickname($nickname); + $latestMsgs = getLatestMessages($contact); + $GLOBALS["current_contact"] = $contact; + foreach ($latestMsgs as $msg) + { + echo "\n- ".$nickname.": ".$msg['message']." ".date('t/m/Y h:i:s A', $msg['t'])."\n"; + } + $pn = new ProcessNode($w, $contact); + $w->setNewMessageBind($pn); + $chatting = true; + $compose = true; + $lastSeen = true; + while ($chatting) { + $w->pollMessage(); + $msgs = $w->getMessages(); + foreach ($msgs as $m) { + # process inbound messages + //print($m->NodeString("") . "\n"); + } + if ($compose) + { + $w->sendMessageComposing($contact); + $compose = false; + } + if ($lastSeen) + { + if (!in_array($contact, $GLOBALS["online_contacts"])) + $w->sendGetRequestLastSeen($contact); + $lastSeen = false; + } + $line = fgets_u(STDIN); + /* + $typing = true; + while (($c = fread(STDIN, 1)) && ($w->pollMessage())) + { + if ($typing) + $w->sendMessageComposing($contact); + switch (ord($c)) { + case 8: + // Backspace + $text = substr($line, 0, -1); + break; + case 10: + // Newline + $line = $text; + $text = ""; + $w->sendMessagePaused($contact); + break 2; + default: + $text .= $c; + break; + } + $typing = false; + } + */ + if ($line != "") { + if (strrchr($line, " ")) { + $command = trim(strstr($line, ' ', TRUE)); + } else { + $command = $line; + } + switch ($command) { + case "/current": + $nickname = findNicknameByPhone($contact); + echo "[] Interactive conversation with $nickname:\n"; + break; + case "/lastseen": + echo "[] Last seen $contact: "; + $w->sendMessagePaused($contact); + $compose = true; + $w->sendGetRequestLastSeen($contact); + break; + case "/block": + echo "< User is now blocked >\n"; + $w->sendMessagePaused($contact); + $compose = true; + $blocked = privacySettings($contact, 'block'); + $w->sendSetPrivacyBlockedList($blocked); + break; + case "/unblock": + echo "< User is now unblocked >\n"; + $w->sendMessagePaused($contact); + $compose = true; + $blocked = privacySettings($contact, 'unblock'); + $w->sendSetPrivacyBlockedList($blocked); + break; + case "/back": + echo "\nYou are now in the main menu\n"; + echo "================================\n\n"; + $chatting = false; + break; + case '/time': + echo date("l jS \of F Y h:i:s A") . "\n\n"; + break; + case '/help': + echo "Available commands\n"; + echo "==================\n\n"; + echo "/query - Shows the number you are chatting with\n"; + echo "/lastseen - Last seen of the user\n"; + echo "/block - Blocks the user\n"; + echo "/unblock - Unblocks user\n"; + echo "/time - Current time\n"; + echo "/back - Return to main menu\n\n"; + break; + default: + $w->sendMessagePaused($contact); + if (!filter_var($line, FILTER_VALIDATE_URL) === false) { + if(@getimagesize($line) !== false) { + $w->sendMessageImage($contact, $line); + } + } + else + $w->sendMessage($contact , $line); + $compose = true; + break; + } + } + } + break; + case '/time': + echo date("l jS \of F Y h:i:s A") . "\n\n"; + break; + case '/help': + echo "Available commands\n"; + echo "==================\n\n"; + echo "/add - Adds a contact\n"; + echo "/delete - Removes a contact\n"; + echo "/chat - Starts a conversation\n"; + echo "/contacts - Shows all contacts\n"; + echo "/status - Change status\n"; + echo "/profile - Change profile image\n"; + echo "/time - Current time\n"; + echo "/credits - Credits & special thanks\n"; + echo "/exit - Close WA CLI Client\n\n"; + break; + default: + //code + break; + } +} while (($mainCmd != '/exit')); + +$w->disconnect(); +echo "Disconnected. Bye! :D\n"; + +function showContacts() +{ + $contactsDB = __DIR__ . DIRECTORY_SEPARATOR . 'contacts.db'; + if (file_exists($contactsDB)) + { + + $cDB = new \PDO("sqlite:" . $contactsDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $sql = 'SELECT nickname FROM contacts'; + $row = $cDB->query($sql); + $contacts = $row->fetchAll(); + echo "\n Contacts\n"; + echo "==================\n\n"; + foreach ($contacts as $contact) + { + echo "- " . $contact['nickname'] . "\n"; + } + echo "\n\n"; + } +} + +function fgets_u($pStdn) +{ + $pArr = array($pStdn); + + if (false === ($num_changed_streams = stream_select($pArr, $write = NULL, $except = NULL, 0))) { + print("\$ 001 Socket Error : UNABLE TO WATCH STDIN.\n"); + + return FALSE; + } elseif ($num_changed_streams > 0) { + return trim(fgets($pStdn, 1024)); + } + return null; +} + +function addContact($number, $name) +{ + $contactsDB = __DIR__ . DIRECTORY_SEPARATOR . 'contacts.db'; + if (!file_exists($contactsDB)) + { + $db = new \PDO("sqlite:" . $contactsDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $db->exec('CREATE TABLE contacts (`phone` TEXT, `nickname` TEXT)'); + } + else { + $db = new \PDO("sqlite:" . $contactsDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + } + $sql = 'INSERT INTO contacts (`phone`, `nickname`) VALUES (:phone, :nickname)'; + $query = $db->prepare($sql); + + $query->execute( + array( + ':phone' => $number, + ':nickname' => $name + ) + ); + +} + +function findPhoneByNickname($contact) +{ + $contactsDB = __DIR__ . DIRECTORY_SEPARATOR . 'contacts.db'; + if (file_exists($contactsDB)) + { + $cDB = new \PDO("sqlite:" . $contactsDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $sql = 'SELECT phone FROM contacts WHERE nickname = :nickname'; + $query = $cDB->prepare($sql); + $query->execute(array(':nickname' => $contact)); + $contact = $query->fetchAll(); + $contact = $contact[0]['phone']; + + return $contact; + } +} + +function findNicknameByPhone($phone) +{ + $contactsDB = __DIR__ . DIRECTORY_SEPARATOR . 'contacts.db'; + if (file_exists($contactsDB)) + { + $cDB = new \PDO("sqlite:" . $contactsDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $sql = 'SELECT nickname FROM contacts WHERE phone = :phone'; + $query = $cDB->prepare($sql); + $query->execute(array(':phone' => $phone)); + $contact = $query->fetchAll(); + $contact = $contact[0]['nickname']; + + return $contact; + } +} + +function getLatestMessages($phone) +{ + $msgDB = $GLOBALS["msg_db"]; + if (file_exists($msgDB)) + { + $cDB = new \PDO("sqlite:" . $msgDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $sql = 'SELECT message, t FROM messages WHERE `from` = :phone LIMIT 20'; + $query = $cDB->prepare($sql); + $query->execute(array(':phone' => $phone)); + $messages = $query->fetchAll(); + + return $messages; + } +} + +function privacySettings($number, $option) +{ + if ($option == 'block') + { + $privacyDB = __DIR__ . DIRECTORY_SEPARATOR . 'privacy.db'; + if (!file_exists($privacyDB)) + { + $pDB = new \PDO("sqlite:" . $privacyDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $pDB->exec('CREATE TABLE blocked (`phone` TEXT)'); + } + else { + $pDB = new \PDO("sqlite:" . $privacyDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + } + $sql = 'INSERT INTO blocked (`phone`) VALUES (:phone)'; + $query = $pDB->prepare($sql); + + $query->execute( + array( + ':phone' => $number + ) + ); + + $sql = 'SELECT phone FROM blocked'; + $query = $pDB->prepare($sql); + $query->execute(); + $blocked = $query->fetchAll(); + $i = 0; + for ($i; $i < count($blocked); $i++) + { + $blockedList[] = $blocked[$i]['phone']; + } + + return $blockedList; + } + else { + $privacyDB = __DIR__ . DIRECTORY_SEPARATOR . 'privacy.db'; + if (file_exists($privacyDB)) + { + $pDB = new \PDO("sqlite:" . $privacyDB, null, null, array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); + $sql = "DELETE FROM blocked WHERE phone = :phone"; + $query = $pDB->prepare($sql); + $query->execute(array(':phone' => $number)); + + $sql = 'SELECT phone FROM blocked'; + $query = $pDB->prepare($sql); + $query->execute(); + $blocked = $query->fetchAll(); + $i = 0; + for ($i; $i < count($blocked); $i++) + { + $blockedList[] = $blocked[$i]['phone']; + } + + return $blockedList; + } + } + +} + +function onSyncResult($result) +{ + foreach ($result->existing as $number) { + global $existUser; + $existUser = true; + } +} + +function onGetRequestLastSeen( $mynumber, $from, $id, $seconds ) +{ + $nickname = findNicknameByPhone(ExtractNumber($from)); + if (($seconds != "") || ($seconds != null)) + echo "$nickname last seen: " . gmdate('l jS \of F Y h:i:s A', intval($seconds)). "\n"; +} + +function onPresenceAvailable($mynumber, $from) +{ + $number = ExtractNumber($from); + if (!in_array($number, $GLOBALS["online_contacts"])) + array_push($GLOBALS["online_contacts"], $number); + $nickname = findNicknameByPhone($number); + echo " < $nickname is now online >\n"; +} + +function onPresenceUnavailable($mynumber, $from, $last) +{ + $number = ExtractNumber($from); + if(($key = array_search($number, $GLOBALS["online_contacts"])) !== false) { + unset($GLOBALS["online_contacts"][$key]); + } + $nickname = findNicknameByPhone($number); + echo " < $nickname is now offline >\n"; +} + +function onGetMessage($mynumber, $from, $id, $type, $time, $name, $body) +{ + $number = ExtractNumber($from); + if ($number != $GLOBALS["current_contact"]) + { + $nickname = findNicknameByPhone($number); + if (($nickname != "") || ($nickname != null)) + echo " < New message from $nickname >"; + else{ + echo " < New message from $name ($number) >"; + do{ + echo "\nDo you want to add $name ($number)? add/block/nothing\n"; + echo "> "; + $option = trim(fgets(STDIN)); + } while(($option != 'add') || ($option != 'block') || ($option != 'nothing')); + + switch ($option) + { + case 'add': + echo "\nEnter the nickname/name > "; + $nickname = trim(fgets(STDIN)); + addContact($number, $nickname); + $GLOBALS['wa']->sendSync(array($number), null, 3); + $GLOBALS['wa']->sendPresenceSubscription($number); + break; + case 'block': + $blockedContacts = privacySettings($number, 'block'); + $GLOBALS['wa']->sendSetPrivacyBlockedList($blockedContacts); + echo "$name ($number) is now blocked\n"; + break; + } + + } + } +} + +function onGetImage($mynumber, $from, $id, $type, $time, $name, $size, $url, $file, $mimeType, $fileHash, $width, $height, $preview, $caption) +{ + $number = ExtractNumber($from); + $nickname = findNicknameByPhone($number); + $path = __DIR__ . DIRECTORY_SEPARATOR . "data/media/$nickname/"; + if (!file_exists($path)) + mkdir($path); + $filename = $path . time() . ".jpg"; + $data = file_get_contents($url); + $fp = @fopen($filename, "w"); + if ($fp) { + fwrite($fp, $data); + fclose($fp); + } + echo " < Received image from $nickname >\n"; +} + +function onGetVideo($mynumber, $from, $id, $type, $time, $name, $url, $file, $size, $mimeType, $fileHash, $duration, $vcodec, $acodec, $preview, $caption) +{ + $number = ExtractNumber($from); + $nickname = findNicknameByPhone($number); + $path = "data/media/$nickname/"; + if (!file_exists($path)) + mkdir($path); + $filename = __DIR__ . DIRECTORY_SEPARATOR . $path . time() . ".jpg"; + $data = file_get_contents($url); + $fp = @fopen($filename, "w"); + if ($fp) { + fwrite($fp, $data); + fclose($fp); + } + echo " < Received video from $nickname >\n"; +} + +function onGetAudio($mynumber, $from, $id, $type, $time, $name, $size, $url, $file, $mimeType, $fileHash, $duration, $acodec, $fromJID_ifGroup = null) +{ + $number = ExtractNumber($from); + $nickname = findNicknameByPhone($number); + $path = "data/media/$nickname/"; + if (!file_exists($path)) + mkdir($path); + $filename = __DIR__ . DIRECTORY_SEPARATOR . $path . time() . ".jpg"; + $data = file_get_contents($url); + $fp = @fopen($filename, "w"); + if ($fp) { + fwrite($fp, $data); + fclose($fp); + } + echo " < Received audio from $nickname >\n"; +} + +class ProcessNode +{ + protected $wp = false; + protected $target = false; + + public function __construct($wp, $target) + { + $this->wp = $wp; + $this->target = $target; + } + + public function process($node) + { + if ($node->getAttribute("type") == 'text') + { + $text = $node->getChild('body'); + $text = $text->getData(); + $number = ExtractNumber($node->getAttribute("from")); + $nickname = findNicknameByPhone($number); + + echo "\n- ".$nickname.": ".$text." ".date('H:i')."\n"; + } + + } +} diff --git a/examples/WA CLI Client/data/media/.gitkeep b/examples/WA CLI Client/data/media/.gitkeep new file mode 100644 index 00000000..e69de29b From 62b23555ff3477cae73ff63416be43bc4c71ab5b Mon Sep 17 00:00:00 2001 From: mgp25 Date: Mon, 25 May 2015 21:40:33 +0200 Subject: [PATCH 386/436] Fixes #754 --- examples/exampleFunctional.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/examples/exampleFunctional.php b/examples/exampleFunctional.php index bf36bfb2..01534e0a 100755 --- a/examples/exampleFunctional.php +++ b/examples/exampleFunctional.php @@ -159,21 +159,23 @@ public function process($node) { // Example of process function, you have to guess a number (psss it's 5) // If you guess it right you get a gift - $text = $node->getChild('body'); - $text = $text->getData(); - if ($text && ($text == "5" || trim($text) == "5")) { - $this->wp->sendMessageImage($this->target, "https://s3.amazonaws.com/f.cl.ly/items/2F3U0A1K2o051q1q1e1G/baby-nailed-it.jpg"); - $this->wp->sendMessage($this->target, "Congratulations you guessed the right number!"); + if ($node->getAttribute("type") == 'text') + { + $text = $node->getChild('body'); + $text = $text->getData(); + if ($text && ($text == "5" || trim($text) == "5")) { + $this->wp->sendMessageImage($this->target, "https://s3.amazonaws.com/f.cl.ly/items/2F3U0A1K2o051q1q1e1G/baby-nailed-it.jpg"); + $this->wp->sendMessage($this->target, "Congratulations you guessed the right number!"); + } + elseif (ctype_digit($text)) { + if ((int)$text != "5") + $this->wp->sendMessage($this->target, "I'm sorry, try again!"); + } + $text = $node->getChild('body'); + $text = $text->getData(); + $notify = $node->getAttribute("notify"); + + echo "\n- ".$notify.": ".$text." ".date('H:i')."\n"; } - elseif (ctype_digit($text)) { - if ((int)$text != "5") - $this->wp->sendMessage($this->target, "I'm sorry, try again!"); - } - $text = $node->getChild('body'); - $text = $text->getData(); - $notify = $node->getAttribute("notify"); - - echo "\n- ".$notify.": ".$text." ".date('H:i')."\n"; - } } From cf9cf605786e93b9c8273b381da6c2ce0010000e Mon Sep 17 00:00:00 2001 From: Emanuele Gaspari Date: Tue, 26 May 2015 09:58:22 +0200 Subject: [PATCH 387/436] typo --- examples/exampleRegister.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/exampleRegister.php b/examples/exampleRegister.php index 199da01a..9a4d9c97 100755 --- a/examples/exampleRegister.php +++ b/examples/exampleRegister.php @@ -18,7 +18,7 @@ $username = '34666554433'; // Telephone number including the country code without '+' or '00'. $nickname = 'John Doe'; // This is the username displayed by WhatsApp clients. -// Create a instance of WhastPort. +// Create an instance of WhatsProt. $w = new WhatsProt($username, $nickname, $debug); // How to create an account __ONLY__ if you do not have a associated to our phone number. From 276b2d86575b2d075d163cdb198b90174c18379c Mon Sep 17 00:00:00 2001 From: mgp25 Date: Tue, 26 May 2015 13:03:10 +0200 Subject: [PATCH 388/436] Fixes #736 --- src/events/AllEvents.php | 2 +- src/whatsprot.class.php | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/events/AllEvents.php b/src/events/AllEvents.php index abc046d6..401b1639 100644 --- a/src/events/AllEvents.php +++ b/src/events/AllEvents.php @@ -54,7 +54,7 @@ public function onDissectPhone($mynumber, $phonecountry, $phonecc, $phone, $phon public function onDissectPhoneFailed($mynumber) {} public function onGetAudio($mynumber, $from, $id, $type, $time, $name, $size, $url, $file, $mimeType, $fileHash, $duration, $acodec, $fromJID_ifGroup = null) {} public function onGetBroadcastLists($mynumber, $broadcastLists){} - public function onGetError($mynumber, $from, $id, $data) {} + public function onGetError($mynumber, $from, $id, $data, $errorType = null) {} public function onGetExtendAccount($mynumber, $kind, $status, $creation, $expiration) {} public function onGetFeature($mynumber, $from, $encrypt) {} public function onGetGroupMessage($mynumber, $from_group_jid, $from_user_jid, $id, $type, $time, $name, $body) {} diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 774fa4cb..a97431dc 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -904,7 +904,7 @@ public function sendGetPrivacyBlockedList() */ public function sendGetPrivacySettings() { - $msgId = $this->createIqId(); + $msgId = $this->nodeId['privacy_settings'] = $this->createIqId(); $privacyNode = new ProtocolNode("privacy", null, null, null); $node = new ProtocolNode("iq", array( @@ -958,7 +958,7 @@ public function sendSetPrivacySettings($category, $value) */ public function sendGetProfilePicture($number, $large = false) { - $msgId = $this->createIqId(); + $msgId = $this->nodeId['getprofilepic'] = $this->createIqId(); $hash = array(); $hash["type"] = "image"; @@ -1025,7 +1025,7 @@ public function sendGetProfilePhotoIds($numbers) */ public function sendGetRequestLastSeen($to) { - $msgId = $this->createIqId(); + $msgId = $this->nodeId['getlastseen'] = $this->createIqId(); $queryNode = new ProtocolNode("query", null, null, null); @@ -1255,7 +1255,7 @@ public function sendGetStatuses($jids) $children[] = new ProtocolNode("user", array("jid" => $this->getJID($jid)), null, null); } - $iqId = $this->createIqId(); + $iqId = $this->nodeId['getstatuses'] = $this->createIqId(); $node = new ProtocolNode("iq", array( @@ -3108,12 +3108,20 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru } } if ($node->getTag() == "iq" && $node->getAttribute('type') == "error") { + $errorType=null; + foreach ($this->nodeId AS $type => $nodeID) { + if ($nodeID == $node->getAttribute('id')) { + $errorType = $type; + break; + } + } $this->eventManager()->fire("onGetError", array( $this->phoneNumber, $node->getAttribute('from'), $node->getAttribute('id'), - $node->getChild(0) + $node->getChild(0), + $errorType )); } From 32e3a8e0cde252c36bf8864f75eb9096dbb4b835 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Thu, 28 May 2015 21:17:10 +0200 Subject: [PATCH 389/436] fix uploading videos and audios --- src/func.php | 29 +++++++++++++++++++++++++++++ src/whatsprot.class.php | 16 +++++----------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/func.php b/src/func.php index 7deeda84..6c43edcf 100755 --- a/src/func.php +++ b/src/func.php @@ -211,3 +211,32 @@ function get_mime($file) return false; } + +function getExtensionFromMime($mime) +{ + $extensions = array( + 'audio/3gpp' => '3gp', + 'audio/x-caf' => 'caf', + 'audio/wav' => 'wav', + 'audio/mpeg' => 'mp3', + 'audio/mpeg3' => 'mp3', + 'audio/x-mpeg-3' => 'mp3', + 'audio/x-ms-wma' => 'wma', + 'audio/ogg' => 'ogg', + 'audio/aiff' => 'aif', + 'audio/x-aiff' => 'aif', + 'audio/aac' => 'aac', + 'audio/mp4' => 'm4a', + 'image/jpeg' => 'jpg', + 'image/gif' => 'gif', + 'image/png' => 'png', + 'video/3gpp' => '3gp', + 'video/mp4' => 'mp4', + 'video/quicktime' => 'mov', + 'video/avi' => 'avi', + 'video/msvideo' => 'avi', + 'video/x-msvideo' => 'avi' + ); + + return $extensions[$mime]; +} diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index a97431dc..6cb14de5 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2418,20 +2418,14 @@ protected function getMediaFile($filepath, $maxsizebytes = 5242880) $this->mediaFileInfo = array(); $this->mediaFileInfo['url'] = $filepath; - $image = file_get_contents($filepath); - $this->mediaFileInfo['filesize'] = strlen($image); - - $file_info = new finfo(FILEINFO_MIME_TYPE); - $mime_type = $file_info->buffer($image); - - $this->mediaFileInfo['filemimetype'] = $mime_type; + $media = file_get_contents($filepath); + $this->mediaFileInfo['filesize'] = strlen($media); if ($this->mediaFileInfo['filesize'] < $maxsizebytes) { $this->mediaFileInfo['filepath'] = tempnam(__DIR__ . DIRECTORY_SEPARATOR . Constants::DATA_FOLDER . DIRECTORY_SEPARATOR . Constants::MEDIA_FOLDER, 'WHA'); - file_put_contents($this->mediaFileInfo['filepath'], $image); - $size = getimagesize($this->mediaFileInfo['filepath']); - $extension = ltrim (image_type_to_extension($size[2]), '.'); - $this->mediaFileInfo['fileextension'] = $extension; + file_put_contents($this->mediaFileInfo['filepath'], $media); + $this->mediaFileInfo['filemimetype'] = get_mime($this->mediaFileInfo['filepath']); + $this->mediaFileInfo['fileextension'] = getExtensionFromMime($this->mediaFileInfo['filemimetype']); return true; } else { return false; From 320166d34863f1e9f496d4521dcb0b8c173b0a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=BCschel?= Date: Fri, 29 May 2015 12:53:59 +0200 Subject: [PATCH 390/436] always wait for response from server after sending the auth response --- src/whatsprot.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 6cb14de5..6f187683 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2236,7 +2236,7 @@ protected function doLogin() $this->sendNode($data); $this->reader->setKey($this->inputKey); $this->writer->setKey($this->outputKey); - $this->pollMessage(); + while (!$this->pollMessage()) {}; } if ($this->loginStatus === Constants::DISCONNECTED_STATUS) { From 1170d14f448f550d8f0c0cbccf532e07d4cf7a42 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Mon, 1 Jun 2015 19:19:48 +0000 Subject: [PATCH 391/436] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 29e01382..0ff3660f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Interface to WhatsApp Messenger For new WhatsApp updates check **[WhatsApp incoming updates log](https://github.com/mgp25/Chat-API/wiki/WhatsApp-incoming-updates)** +**Do you like this project? Support it by donating BTC** to 1HcEX9foem5atreEg1gbQ6xVeosN5WEcjs ![btc](http://www.montrealbitcoin.com/img/favicon.ico) + ---------- ### Special thanks From e09d8f325657fbc5b616e3574ee7b563bb088466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sun, 14 Jun 2015 14:14:55 +0200 Subject: [PATCH 392/436] Wait for Server after status update Status updates will be taken directly --- src/whatsprot.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 6f187683..37b74a75 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1877,15 +1877,17 @@ public function sendSetRecoveryToken($token) public function sendStatusUpdate($txt) { $child = new ProtocolNode("status", null, null, $txt); + $nodeID = $this->createIqId(); $node = new ProtocolNode("iq", array( "to" => Constants::WHATSAPP_SERVER, "type" => "set", - "id" => $this->createIqId(), + "id" => $nodeID, "xmlns" => "status" ), array($child), null); $this->sendNode($node); + $this->waitForServer($nodeID); $this->eventManager()->fire("onSendStatusUpdate", array( $this->phoneNumber, From e8712d8675b1d71b6369eebacaf23545527a9d4d Mon Sep 17 00:00:00 2001 From: Carson Full Date: Tue, 16 Jun 2015 14:30:41 -0500 Subject: [PATCH 393/436] Update composer links and package name --- composer.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 1ec01af1..9f4718ce 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "mgp25/whatsapi", - "description": "The php WhatsApp library ", + "name": "whatsapp/chat-api", + "description": "The PHP WhatsApp library", "license": "MIT", "keywords": [ "WhatsApp", @@ -10,18 +10,17 @@ { "role": "Contributors", "name": "Chat API Contributing Team", - "homepage": "https://github.com/mgp25/Chat-API/graphs/contributors" + "homepage": "https://github.com/WHAnonymous/Chat-API/graphs/contributors" } ], "support": { - "issues": "https://github.com/mgp25/Chat-API/issues", - "wiki": "https://github.com/mgp25/Chat-API/wiki", - "source": "https://github.com/mgp25/Chat-API" + "issues": "https://github.com/WHAnonymous/Chat-API/issues", + "wiki": "https://github.com/WHAnonymous/Chat-API/wiki", + "source": "https://github.com/WHAnonymous/Chat-API" }, "autoload": { "classmap": [ - "src/", - "src/events" + "src/" ] }, "require": { From 8ea1de69c2ea7edc7f88c2b9d86c7e99ec561c02 Mon Sep 17 00:00:00 2001 From: Carson Full Date: Tue, 16 Jun 2015 14:31:24 -0500 Subject: [PATCH 394/436] Update readme links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ff3660f..4dbdbfeb 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ Interface to WhatsApp Messenger -**Read the [wiki](https://github.com/mgp25/Chat-API/wiki)** and previous issues before opening a new one! Maybe your issue is already answered. +**Read the [wiki](https://github.com/WHAnonymous/Chat-API/wiki)** and previous issues before opening a new one! Maybe your issue is already answered. -For new WhatsApp updates check **[WhatsApp incoming updates log](https://github.com/mgp25/Chat-API/wiki/WhatsApp-incoming-updates)** +For new WhatsApp updates check **[WhatsApp incoming updates log](https://github.com/WHAnonymous/Chat-API/wiki/WhatsApp-incoming-updates)** **Do you like this project? Support it by donating BTC** to 1HcEX9foem5atreEg1gbQ6xVeosN5WEcjs ![btc](http://www.montrealbitcoin.com/img/favicon.ico) From b92f8f981c8beabe0ae0c1443ad758367ab12a99 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Thu, 25 Jun 2015 11:04:21 +0000 Subject: [PATCH 395/436] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4dbdbfeb..a93afda2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Chat API +# Chat API [![Latest Stable Version](https://poser.pugx.org/whatsapp/chat-api/v/stable)](https://packagist.org/packages/whatsapp/chat-api) [![Total Downloads](https://poser.pugx.org/whatsapp/chat-api/downloads)](https://packagist.org/packages/whatsapp/chat-api) [![License](https://poser.pugx.org/whatsapp/chat-api/license)](https://packagist.org/packages/whatsapp/chat-api) Interface to WhatsApp Messenger @@ -9,6 +9,11 @@ For new WhatsApp updates check **[WhatsApp incoming updates log](https://github. **Do you like this project? Support it by donating BTC** to 1HcEX9foem5atreEg1gbQ6xVeosN5WEcjs ![btc](http://www.montrealbitcoin.com/img/favicon.ico) ---------- +### Installation + +```sh +composer require whatsapp/chat-api +``` ### Special thanks From 4e146b0f64716062b0d67a0b336e5b455ce4233c Mon Sep 17 00:00:00 2001 From: BartS23 Date: Tue, 30 Jun 2015 12:15:19 +0200 Subject: [PATCH 396/436] send additional video infos to events OnGetVideo and onGetGroupVideo --- src/whatsprot.class.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 37b74a75..89f77e4c 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2709,7 +2709,14 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getChild("media")->getAttribute('vcodec'), $node->getChild("media")->getAttribute('acodec'), $node->getChild("media")->getData(), - $node->getChild("media")->getAttribute('caption') + $node->getChild("media")->getAttribute('caption'), + $node->getChild("media")->getAttribute('width'), + $node->getChild("media")->getAttribute('height'), + $node->getChild("media")->getAttribute('fps'), + $node->getChild("media")->getAttribute('vbitrate'), + $node->getChild("media")->getAttribute('asampfreq'), + $node->getChild("media")->getAttribute('asampfmt'), + $node->getChild("media")->getAttribute('abitrate') )); } else { $this->eventManager()->fire("onGetGroupVideo", @@ -2730,7 +2737,14 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getChild("media")->getAttribute('vcodec'), $node->getChild("media")->getAttribute('acodec'), $node->getChild("media")->getData(), - $node->getChild("media")->getAttribute('caption') + $node->getChild("media")->getAttribute('caption'), + $node->getChild("media")->getAttribute('width'), + $node->getChild("media")->getAttribute('height'), + $node->getChild("media")->getAttribute('fps'), + $node->getChild("media")->getAttribute('vbitrate'), + $node->getChild("media")->getAttribute('asampfreq'), + $node->getChild("media")->getAttribute('asampfmt'), + $node->getChild("media")->getAttribute('abitrate') )); } } elseif ($node->getChild("media")->getAttribute('type') == 'audio') { From 5d51914037eca653cb73c73d205a43cd2df86eec Mon Sep 17 00:00:00 2001 From: mgp25 Date: Fri, 3 Jul 2015 11:32:33 +0200 Subject: [PATCH 397/436] Fixed #823 --- src/events/AllEvents.php | 1 + src/whatsprot.class.php | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/events/AllEvents.php b/src/events/AllEvents.php index 401b1639..660d6dd5 100644 --- a/src/events/AllEvents.php +++ b/src/events/AllEvents.php @@ -83,6 +83,7 @@ public function onGroupisCreated($mynumber, $creator, $gid, $subject, $admin, $c public function onGroupsChatCreate($mynumber, $gid) {} public function onGroupsChatEnd($mynumber, $gid) {} public function onGroupsParticipantsAdd($mynumber, $groupId, $jid) {} + public function onGroupsParticipantChangedNumber($mynumber, $groupId, $time, $oldNumber, $notify, $newNumber) {} public function onGroupsParticipantsPromote($myNumber, $groupJID, $time, $issuerJID, $issuerName, $promotedJIDs = array()) {} public function onGroupsParticipantsRemove($mynumber, $groupId, $jid) {} public function onLogin($mynumber) {} diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 89f77e4c..58ddc985 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -2716,7 +2716,7 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getChild("media")->getAttribute('vbitrate'), $node->getChild("media")->getAttribute('asampfreq'), $node->getChild("media")->getAttribute('asampfmt'), - $node->getChild("media")->getAttribute('abitrate') + $node->getChild("media")->getAttribute('abitrate') )); } else { $this->eventManager()->fire("onGetGroupVideo", @@ -2744,7 +2744,7 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru $node->getChild("media")->getAttribute('vbitrate'), $node->getChild("media")->getAttribute('asampfreq'), $node->getChild("media")->getAttribute('asampfmt'), - $node->getChild("media")->getAttribute('abitrate') + $node->getChild("media")->getAttribute('abitrate') )); } } elseif ($node->getChild("media")->getAttribute('type') == 'audio') { @@ -3306,6 +3306,18 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru ) ); } + else if ($node->hasChild('modify')) { + $this->eventManager()->fire("onGroupsParticipantChangedNumber", + array( + $this->phoneNumber, + $node->getAttribute('from'), + $node->getAttribute('t'), + $node->getAttribute('participant'), + $node->getAttribute('notify'), + $node->getChild(0)->getChild(0)->getAttribute('jid') + ) + ); + } break; case "account": if (($node->getChild(0)->getAttribute('author')) == "") From 552c76c2f9874fb2bcee469096ff72ee6f4cae3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=BCschel?= Date: Mon, 6 Jul 2015 13:48:50 +0200 Subject: [PATCH 398/436] fix double wait after sendMessage --- src/whatsprot.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 58ddc985..123648fd 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1497,7 +1497,6 @@ public function sendMessage($to, $txt, $id = null) { $bodyNode = new ProtocolNode("body", null, null, $txt); $id = $this->sendMessageNode($to, $bodyNode, $id); - $this->waitForServer($id); if ($this->messageStore !== null) { $this->messageStore->saveMessage($this->phoneNumber, $to, $txt, $id, time()); From 5f9ddf71dc49509b2802d1af2d595137a392cead Mon Sep 17 00:00:00 2001 From: mgp25 Date: Tue, 7 Jul 2015 15:06:28 +0200 Subject: [PATCH 399/436] Fixes #824 --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9f4718ce..ae76ae84 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,12 @@ { "name": "whatsapp/chat-api", + "version": "2.5", "description": "The PHP WhatsApp library", "license": "MIT", "keywords": [ "WhatsApp", - "WhatsAPI" + "WhatsAPI", + "Chat-API" ], "authors": [ { From 7b1473718d40df3adc7da4c5791630ec4c299e00 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Thu, 9 Jul 2015 12:21:27 +0200 Subject: [PATCH 400/436] Update to 2.12.88 --- src/Constants.php | 2 +- src/token.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index 2b5bbb96..93450865 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -19,7 +19,7 @@ class Constants const WHATSAPP_REQUEST_HOST = 'v.whatsapp.net/v2/code'; // The request code host. const WHATSAPP_SERVER = 's.whatsapp.net'; // The hostname used to login/send messages. const WHATSAPP_DEVICE = 'S40'; // The device name. - const WHATSAPP_VER = '2.12.82'; // The WhatsApp version. + const WHATSAPP_VER = '2.12.88'; // The WhatsApp version. const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.82 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_scratch'; // Check WhatsApp version diff --git a/src/token.php b/src/token.php index 68b9b916..7192e88c 100755 --- a/src/token.php +++ b/src/token.php @@ -20,7 +20,7 @@ function generateRequestToken($country, $phone) // return base64_encode($output); $const = 'PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk'; - $releaseTime = '1431039885607'; + $releaseTime = '1435097139726'; $token = md5($const . $releaseTime . $phone); return $token; From 3e195d16a50a9b131d5213170477d34cf3134c05 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Thu, 9 Jul 2015 17:20:49 +0200 Subject: [PATCH 401/436] Fixes #838 --- src/Constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Constants.php b/src/Constants.php index 93450865..34fe80ce 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -20,7 +20,7 @@ class Constants const WHATSAPP_SERVER = 's.whatsapp.net'; // The hostname used to login/send messages. const WHATSAPP_DEVICE = 'S40'; // The device name. const WHATSAPP_VER = '2.12.88'; // The WhatsApp version. - const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.82 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. + const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.88 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_scratch'; // Check WhatsApp version } From 0c20fd21772325dd7b705b2bcb7038f20d83d39a Mon Sep 17 00:00:00 2001 From: Quentin Ligier Date: Tue, 14 Jul 2015 18:31:25 +0200 Subject: [PATCH 402/436] Update README.md --- README.md | 52 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index a93afda2..1fe10af6 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,3 @@ -# Chat API [![Latest Stable Version](https://poser.pugx.org/whatsapp/chat-api/v/stable)](https://packagist.org/packages/whatsapp/chat-api) [![Total Downloads](https://poser.pugx.org/whatsapp/chat-api/downloads)](https://packagist.org/packages/whatsapp/chat-api) [![License](https://poser.pugx.org/whatsapp/chat-api/license)](https://packagist.org/packages/whatsapp/chat-api) +# Chat API -Interface to WhatsApp Messenger - -**Read the [wiki](https://github.com/WHAnonymous/Chat-API/wiki)** and previous issues before opening a new one! Maybe your issue is already answered. - -For new WhatsApp updates check **[WhatsApp incoming updates log](https://github.com/WHAnonymous/Chat-API/wiki/WhatsApp-incoming-updates)** - -**Do you like this project? Support it by donating BTC** to 1HcEX9foem5atreEg1gbQ6xVeosN5WEcjs ![btc](http://www.montrealbitcoin.com/img/favicon.ico) - ----------- -### Installation - -```sh -composer require whatsapp/chat-api -``` - -### Special thanks - -- [CODeRUS](https://github.com/CODeRUS) -- [tgalal](https://github.com/tgalal) -- [SikiFn](https://github.com/SikiFn) -- [0xTryCatch](https://github.com/0xTryCatch) -- [Shirioko](https://github.com/shirioko) - -Also Ahmed Moh'd (fb.com/ahmed.mhd) and Ali Hubail (@hubail) for making this project possible. - -And everyone that contributes to it. - ----------- - -### What is WhatsApp? -According to [the company](http://www.whatsapp.com/): - -> “WhatsApp Messenger is a cross-platform mobile messenger that replaces SMS and works through the existing internet data plan of your device. WhatsApp is available for iPhone, BlackBerry, Android, Windows Phone, Nokia Symbian60 & S40 phones. Because WhatsApp Messenger uses the same internet data plan that you use for email and web browsing, there is no cost to message and stay in touch with your friends.” - -Jan. 2015: 30 billion messages per day, ~700 million users. - -# License - -MIT - -# Terms and conditions - -- You will NOT use this API for marketing purposes (spam, massive sending...). -- We do NOT give support to anyone that wants this API to send massive messages or similar. -- We reserve the right to block any user of this repository that does not meet these conditions. - -## Legal - -This code is in no way affiliated with, authorized, maintained, sponsored or endorsed by WhatsApp or any of its affiliates or subsidiaries. This is an independent and unofficial API. Use at your own risk. +Fork of [WHAnonymous/Chat-API](https://github.com/WHAnonymous/Chat-API) From 09c7e98fa7279d67d1c841c7de3c676340e8bdf2 Mon Sep 17 00:00:00 2001 From: Quentin Ligier Date: Tue, 14 Jul 2015 18:34:37 +0200 Subject: [PATCH 403/436] Create smileys.class.php Add smileys to Whatsapp --- src/smileys.class.php | 903 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 903 insertions(+) create mode 100644 src/smileys.class.php diff --git a/src/smileys.class.php b/src/smileys.class.php new file mode 100644 index 00000000..c5953ef6 --- /dev/null +++ b/src/smileys.class.php @@ -0,0 +1,903 @@ +SMILEY_XXX where XXX is the index): + * $s = new Smileys; + * echo $s->GRINNING_FACE_WITH_SMILING_EYES; + * // or + * echo $s->SMILEY_23; + * + * Complete list with images: + * http://www.typografie.info/3/page/artikel.htm/_/wissen/unicode-emoji-deutsch + * http://appamatix.com/843-whatsapp-emoticons-meanings-emoji-list/ + */ + +class SmileyNotFoundException extends Exception {}; + +class Smileys { + private $listSmileys = array( + 'SMILING_FACE_WITH_OPEN_MOUTH_AND_SMILING_EYES' => 0x1F604, // Smiley 1 + 'SMILING_FACE_WITH_OPEN_MOUTH' => 0x1F603, // Smiley 2 + 'GRINNING_FACE_WITH_SMILING_EYES' => 0x1F600, // Smiley 3 + 'SMILING_FACE_WITH_SMILING_EYES' => 0x1F60A, // Smiley 4 + 'WHITE_SMILING_FACE' => 0x263A, // Smiley 5 + 'WINKING_FACE' => 0x1F609, // Smiley 6 + 'SMILING_FACE_WITH_HEART_SHAPED_EYES' => 0x1F60D, // Smiley 7 + 'FACE_THROWING_A_KISS' => 0x1F618, // Smiley 8 + 'KISSING_FACE_WITH_CLOSED_EYES' => 0x1F61A, // Smiley 9 + 'KISSING_FACE' => 0x1F617, // Smiley 10 + 'KISSING_FACE_WITH_SMILING_EYES' => 0x1F619, // Smiley 11 + 'FACE_WITH_STUCK_OUT_TONGUE_AND_WINKING_EYE' => 0x1F61C, // Smiley 12 + 'FACE_WITH_STUCK_OUT_TONGUE_AND_TIGHTLY_CLOSED_EYES' => 0x1F61D, // Smiley 13 + 'FACE_WITH_STUCK_OUT_TONGUE' => 0x1F61B, // Smiley 14 + 'FLUSHED_FACE' => 0x1F633, // Smiley 15 + 'GRINNING_FACE_WITH_SMILING_EYES' => 0x1F601, // Smiley 16 + 'PENSIVE_FACE' => 0x1F614, // Smiley 17 + 'RELIEVED_FACE' => 0x1F60C, // Smiley 18 + 'UNAMUSED_FACE' => 0x1F612, // Smiley 19 + 'DISAPPOINTED_FACE' => 0x1F61E, // Smiley 20 + 'PERSEVERING_FACE' => 0x1F623, // Smiley 21 + 'CRYING_FACE' => 0x1F622, // Smiley 22 + 'FACE_WITH_TEARS_OF_JOY' => 0x1F602, // Smiley 23 + 'LOUDLY_CRYING_FACE' => 0x1F62D, // Smiley 24 + 'SLEEPY_FACE' => 0x1F62A, // Smiley 25 + 'DISAPPOINTED_BUT_RELIEVED_FACE' => 0x1F625, // Smiley 26 + 'FACE_WITH_OPEN_MOUTH_AND_COLD_SWEAT' => 0x1F630, // Smiley 27 + 'SMILING_FACE_WITH_OPEN_MOUTH_AND_COLD_SWEAT' => 0x1F605, // Smiley 28 + 'FACE_WITH_COLD_SWEAT' => 0x1F613, // Smiley 29 + 'WEARY_FACE' => 0x1F629, // Smiley 30 + 'TIRED_FACE' => 0x1F62B, // Smiley 31 + 'FEARFUL_FACE' => 0x1F628, // Smiley 32 + 'FACE_SCREAMING_IN_FEAR' => 0x1F631, // Smiley 33 + 'ANGRY_FACE' => 0x1F620, // Smiley 34 + 'POUTING_FACE' => 0x1F621, // Smiley 35 + 'FACE_WITH_LOOK_OF_TRIUMPH' => 0x1F624, // Smiley 36 + 'CONFOUNDED_FACE' => 0x1F616, // Smiley 37 + 'SMILING_FACE_WITH_OPEN_MOUTH_AND_TIGHTLY_CLOSED_EYES' => 0x1F606, // Smiley 38 + 'FACE_SAVOURING_DELICIOUS_FOOD' => 0x1F60B, // Smiley 39 + 'FACE_WITH_MEDICAL_MASK' => 0x1F637, // Smiley 40 + 'SMILING_FACE_WITH_SUNGLASSES' => 0x1F60E, // Smiley 41 + 'SLEEPING_FACE' => 0x1F634, // Smiley 42 + 'DIZZY_FACE' => 0x1F635, // Smiley 43 + 'ASTONISHED_FACE' => 0x1F632, // Smiley 44 + 'WORRIED_FACE' => 0x1F61F, // Smiley 45 + 'FROWNING_FACE_WITH_OPEN_MOUTH' => 0x1F626, // Smiley 46 + 'ANGUISHED_FACE' => 0x1F627, // Smiley 47 + 'SMILING_FACE_WITH_HORNS' => 0x1F608, // Smiley 48 + 'IMP' => 0x1F47F, // Smiley 49 + 'FACE_WITH_OPEN_MOUTH' => 0x1F62E, // Smiley 50 + 'GRIMACING_FACE' => 0x1F62C, // Smiley 51 + 'NEUTRAL_FACE' => 0x1F610, // Smiley 52 + 'CONFUSED_FACE' => 0x1F615, // Smiley 53 + 'HUSHED_FACE' => 0x1F62F, // Smiley 54 + 'FACE_WITHOUT_MOUTH' => 0x1F636, // Smiley 55 + 'SMILING_FACE_WITH_HALO' => 0x1F607, // Smiley 56 + 'SMIRKING_FACE' => 0x1F60F, // Smiley 57 + 'EXPRESSIONLESS_FACE' => 0x1F611, // Smiley 58 + 'MAN_WITH_GUA_PI_MAO' => 0x1F472, // Smiley 59 + 'MAN_WITH_TURBAN' => 0x1F473, // Smiley 60 + 'POLICE_OFFICER' => 0x1F46E, // Smiley 61 + 'CONSTRUCTION_WORKER' => 0x1F477, // Smiley 62 + 'GUARDSMAN' => 0x1F482, // Smiley 63 + 'BABY' => 0x1F476, // Smiley 64 + 'BOY' => 0x1F466, // Smiley 65 + 'GIRL' => 0x1F467, // Smiley 66 + 'MAN' => 0x1F468, // Smiley 67 + 'WOMAN' => 0x1F469, // Smiley 68 + 'OLDER_MAN' => 0x1F474, // Smiley 69 + 'OLDER_WOMAN' => 0x1F475, // Smiley 70 + 'PERSON_WITH_BLONDE_HAIR' => 0x1F471, // Smiley 71 + 'BABY_ANGEL' => 0x1F47C, // Smiley 72 + 'PRINCESS' => 0x1F478, // Smiley 73 + 'SMILING_CAT_FACE_WITH_OPEN_MOUTH' => 0x1F63A, // Smiley 74 + 'GRINNING_CAT_FACE_WITH_SMILING_EYES' => 0x1F638, // Smiley 75 + 'SMILING_FACE_FACE_WITH_HEART_SHAPED_EYES' => 0x1F63B, // Smiley 76 + 'KISSING_CAT_FACE_WITH_CLOSED_EYES' => 0x1F63D, // Smiley 77 + 'CAT_FACE_WITH_WRY_SMILE' => 0x1F63C, // Smiley 78 + 'WEARY_CAT_FACE' => 0x1F640, // Smiley 79 + 'CRYING_CAT_FACE' => 0x1F63F, // Smiley 80 + 'CAT_FACE_WITH_TEARS_OF_JOY' => 0x1F639, // Smiley 81 + 'POUTING_CAT_FACE' => 0x1F63E, // Smiley 82 + 'JAPANESE_OGRE' => 0x1F479, // Smiley 83 + 'JAPANESE_GOBLIN' => 0x1F47A, // Smiley 84 + 'SEE_NO_EVIL_MONKEY' => 0x1F648, // Smiley 85 + 'HEAR_NO_EVIL_MONKEY' => 0x1F649, // Smiley 86 + 'SPEAK_NO_EVIL_MONKEY' => 0x1F64A, // Smiley 87 + 'SKULL' => 0x1F480, // Smiley 88 + 'EXTRATERRESTRIAL_ALIEN' => 0x1F47D, // Smiley 89 + 'PILE_OF_POO' => 0x1F4A9, // Smiley 90 + 'FIRE' => 0x1F525, // Smiley 91 + 'SPARKLES' => 0x2728, // Smiley 92 + 'GLOWING_STAR' => 0x1F31F, // Smiley 93 + 'DIZZY_SYMBOL' => 0x1F4AB, // Smiley 94 + 'COLLISION_SYMBOL' => 0x1F4A5, // Smiley 95 + 'ANGER_SYMBOL' => 0x1F4A2, // Smiley 96 + 'SPLASHING_SWEAT_SYMBOL' => 0x1F4A6, // Smiley 97 + 'DROPLET' => 0x1F4A7, // Smiley 98 + 'SLEEPING_SYMBOL' => 0x1F4A4, // Smiley 99 + 'DASH_SYMBOL' => 0x1F4A8, // Smiley 100 + 'EAR' => 0x1F442, // Smiley 101 + 'EYES' => 0x1F440, // Smiley 102 + 'NOSE' => 0x1F443, // Smiley 103 + 'TONGUE' => 0x1F445, // Smiley 104 + 'MOUTH' => 0x1F444, // Smiley 105 + 'THUMBS_UP_SIGN' => 0x1F44D, // Smiley 106 + 'THUMBS_DOWN_SIGN' => 0x1F44E, // Smiley 107 + 'OK_HAND_SIGN' => 0x1F44C, // Smiley 108 + 'FISTED_HAND_SIGN' => 0x1F44A, // Smiley 109 + 'RAISED_FIST' => 0x270A, // Smiley 110 + 'VICTORY_HAND' => 0x270C, // Smiley 111 + 'WAVING_HAND_SIGN' => 0x1F44B, // Smiley 112 + 'RAISED_HAND' => 0x270B, // Smiley 113 + 'OPEN_HANDS_SIGN' => 0x1F450, // Smiley 114 + 'WHITE_UP_POINTING_BACKHAND_INDEX' => 0x1F446, // Smiley 115 + 'WHITE_DOWN_POINTING_BACKHAND_INDEX' => 0x1F447, // Smiley 116 + 'WHITE_RIGHT_POINTING_BACKHAND_INDEX' => 0x1F449, // Smiley 117 + 'WHITE_LEFT_POINTING_BACKHAND_INDEX' => 0x1F448, // Smiley 118 + 'PERSON_RAISING_BOTH_HANDS_IN_CELEBRATION' => 0x1F64C, // Smiley 119 + 'PERSON_WITH_FOLDED_HANDS' => 0x1F64F, // Smiley 120 + 'WHITE_UP_POINTING_INDEX' => 0x261D, // Smiley 121 + 'CLAPPING_HANDS_SIGN' => 0x1F44F, // Smiley 122 + 'FLEXED_BICEPS' => 0x1F4AA, // Smiley 123 + 'PEDESTRIAN' => 0x1F6B6, // Smiley 124 + 'RUNNER' => 0x1F3C3, // Smiley 125 + 'DANCER' => 0x1F483, // Smiley 126 + 'MAN_AND_WOMAN_HOLDING_HANDS' => 0x1F46B, // Smiley 127 + 'FAMILY' => 0x1F46A, // Smiley 128 + 'TWO_MEN_HOLDING_HANDS' => 0x1F46C, // Smiley 129 + 'TWO_WOMEN_HOLDING_HANDS' => 0x1F46D, // Smiley 130 + 'KISS' => 0x1F48F, // Smiley 131 + 'COUPLE_WITH_HEART' => 0x1F491, // Smiley 132 + 'WOMEN_WITH_BUNNY_EARS' => 0x1F46F, // Smiley 133 + 'FACE_WITH_OK_GESTURE' => 0x1F646, // Smiley 134 + 'FACE_WITH_NO_GOOD_GESTURE' => 0x1F645, // Smiley 135 + 'INFORMATION_DESK_PERSON' => 0x1F481, // Smiley 136 + 'HAPPY_PERSON_RAISING_ONE_HAND' => 0x1F64B, // Smiley 137 + 'FACE_MASSAGE' => 0x1F486, // Smiley 138 + 'HAIRCUT' => 0x1F487, // Smiley 139 + 'NAIL_POLISH' => 0x1F485, // Smiley 140 + 'BRIDE_WITH_VEIL' => 0x1F470, // Smiley 141 + 'PERSON_WITH_POUTING_FACE' => 0x1F64E, // Smiley 142 + 'PERSON_FROWNING' => 0x1F64D, // Smiley 143 + 'PERSON_BOWING_DEEPLY' => 0x1F647, // Smiley 144 + 'TOP_HAT' => 0x1F3A9, // Smiley 145 + 'CROWN' => 0x1F451, // Smiley 146 + 'WOMANS_HAT' => 0x1F452, // Smiley 147 + 'ATHLETIC_SHOE' => 0x1F45F, // Smiley 148 + 'MENS_SHOE' => 0x1F45E, // Smiley 149 + 'WOMANS_SANDAL' => 0x1F461, // Smiley 150 + 'HIGH_HEELED_SHOE' => 0x1F460, // Smiley 151 + 'WOMANS_BOOTS' => 0x1F462, // Smiley 152 + 'T_SHIRT' => 0x1F455, // Smiley 153 + 'NECKTIE' => 0x1F454, // Smiley 154 + 'WOMANS_CLOTHES' => 0x1F45A, // Smiley 155 + 'DRESS' => 0x1F457, // Smiley 156 + 'RUNNING_SHIRT_WITH_SASH' => 0x1F3BD, // Smiley 157 + 'JEANS' => 0x1F456, // Smiley 158 + 'KIMONO' => 0x1F458, // Smiley 159 + 'BIKINI' => 0x1F459, // Smiley 160 + 'BRIEFCASE' => 0x1F4BC, // Smiley 161 + 'HANDBAG' => 0x1F45C, // Smiley 162 + 'POUCH' => 0x1F45D, // Smiley 163 + 'PURSE' => 0x1F45B, // Smiley 164 + 'EYEGLASSES' => 0x1F453, // Smiley 165 + 'RIBBON' => 0x1F380, // Smiley 166 + 'CLOSED_UMBRELLA' => 0x1F302, // Smiley 167 + 'LIPSTICK' => 0x1F484, // Smiley 168 + 'YELLOW_HEART' => 0x1F49B, // Smiley 169 + 'BLUE_HEART' => 0x1F499, // Smiley 170 + 'PURPLE_HEART' => 0x1F49C, // Smiley 171 + 'GREEN_HEART' => 0x1F49A, // Smiley 172 + 'HEAVY_BLACK_HEART' => 0x2764, // Smiley 173 + 'BROKEN_HEART' => 0x1F494, // Smiley 174 + 'GROWING_HEART' => 0x1F497, // Smiley 175 + 'BEATING_HEART' => 0x1F493, // Smiley 176 + 'TWO_HEARTS' => 0x1F495, // Smiley 177 + 'SPARKLING_HEARTS' => 0x1F496, // Smiley 178 + 'REVOLVING_HEARTS' => 0x1F49E, // Smiley 179 + 'HEART_WITH_ARROW' => 0x1F498, // Smiley 180 + 'LOVE_LETTER' => 0x1F48C, // Smiley 181 + 'KISS_MARK' => 0x1F48B, // Smiley 182 + 'RING' => 0x1F48D, // Smiley 183 + 'GEM_STONE' => 0x1F48E, // Smiley 184 + 'BUST_IN_SILHOUETTE' => 0x1F464, // Smiley 185 + 'BUSTS_IN_SILHOUETTE' => 0x1F465, // Smiley 186 + 'SPEECH_BALLOON' => 0x1F4AC, // Smiley 187 + 'FOOTPRINTS' => 0x1F463, // Smiley 188 + 'THOUGHT_BALLOON' => 0x1F4AD, // Smiley 189 + 'DOG_FACE' => 0x1F436, // Smiley 190 + 'WOLF_FACE' => 0x1F43A, // Smiley 191 + 'CAT_FACE' => 0x1F431, // Smiley 192 + 'MOUSE_FACE' => 0x1F42D, // Smiley 193 + 'HAMSTER_FACE' => 0x1F439, // Smiley 194 + 'RABBIT_FACE' => 0x1F430, // Smiley 195 + 'FROG_FACE' => 0x1F438, // Smiley 196 + 'TIGER_FACE' => 0x1F42F, // Smiley 197 + 'KOALA' => 0x1F428, // Smiley 198 + 'BEAR_FACE' => 0x1F43B, // Smiley 199 + 'PIG_FACE' => 0x1F437, // Smiley 200 + 'PIG_NOSE' => 0x1F43D, // Smiley 201 + 'COW_FACE' => 0x1F42E, // Smiley 202 + 'BOAR' => 0x1F417, // Smiley 203 + 'MONKEY_FACE' => 0x1F435, // Smiley 204 + 'MONKEY' => 0x1F412, // Smiley 205 + 'HORSE_FACE' => 0x1F434, // Smiley 206 + 'SHEEP' => 0x1F411, // Smiley 207 + 'ELEPHANT' => 0x1F418, // Smiley 208 + 'PANDA_FACE' => 0x1F43C, // Smiley 209 + 'PENGUIN' => 0x1F427, // Smiley 210 + 'BIRD' => 0x1F426, // Smiley 211 + 'BABY_CHICK' => 0x1F424, // Smiley 212 + 'FRONT_FACING_BABY_CHICK' => 0x1F425, // Smiley 213 + 'HATCHING_CHICK' => 0x1F423, // Smiley 214 + 'CHICKEN' => 0x1F414, // Smiley 215 + 'SNAKE' => 0x1F40D, // Smiley 216 + 'TURTLE' => 0x1F422, // Smiley 217 + 'BUG' => 0x1F41B, // Smiley 218 + 'HONEYBEE' => 0x1F41D, // Smiley 219 + 'ANT' => 0x1F41C, // Smiley 220 + 'LADY_BEETLE' => 0x1F41E, // Smiley 221 + 'SNAIL' => 0x1F40C, // Smiley 222 + 'OCTOPUS' => 0x1F419, // Smiley 223 + 'SPIRAL_SHELL' => 0x1F41A, // Smiley 224 + 'TROPICAL_FISH' => 0x1F420, // Smiley 225 + 'FISH' => 0x1F41F, // Smiley 226 + 'DOLPHIN' => 0x1F42C, // Smiley 227 + 'SPOUTING_WHALE' => 0x1F433, // Smiley 228 + 'WHALE' => 0x1F40B, // Smiley 229 + 'COW' => 0x1F404, // Smiley 230 + 'RAM' => 0x1F40F, // Smiley 231 + 'RAT' => 0x1F400, // Smiley 232 + 'WATER_BUFFALO' => 0x1F403, // Smiley 233 + 'TIGER' => 0x1F405, // Smiley 234 + 'RABBIT' => 0x1F407, // Smiley 235 + 'DRAGON' => 0x1F409, // Smiley 236 + 'HORSE' => 0x1F40E, // Smiley 237 + 'GOAT' => 0x1F410, // Smiley 238 + 'ROOSTER' => 0x1F413, // Smiley 239 + 'DOG' => 0x1F415, // Smiley 240 + 'PIG' => 0x1F416, // Smiley 241 + 'MOUSE' => 0x1F401, // Smiley 242 + 'OX' => 0x1F402, // Smiley 243 + 'DRAGON_FACE' => 0x1F432, // Smiley 244 + 'BLOWFISH' => 0x1F421, // Smiley 245 + 'CROCODILE' => 0x1F40A, // Smiley 246 + 'BACTRIAN_CAMEL' => 0x1F42B, // Smiley 247 + 'DROMEDARY_CAMEL' => 0x1F42A, // Smiley 248 + 'LEOPARD' => 0x1F406, // Smiley 249 + 'CAT' => 0x1F408, // Smiley 250 + 'POODLE' => 0x1F429, // Smiley 251 + 'PAW_PRINTS' => 0x1F43E, // Smiley 252 + 'BOUQET' => 0x1F490, // Smiley 253 + 'CHERRY_BLOSSOM' => 0x1F338, // Smiley 254 + 'TULIP' => 0x1F337, // Smiley 255 + 'FOUR_LEAF_CLOVER' => 0x1F340, // Smiley 256 + 'ROSE' => 0x1F339, // Smiley 257 + 'SUNFLOWER' => 0x1F33B, // Smiley 258 + 'HIBISCUS' => 0x1F33A, // Smiley 259 + 'MAPLE_LEAF' => 0x1F341, // Smiley 260 + 'LEAF_FLUTTERING_IN_WIND' => 0x1F343, // Smiley 261 + 'FALLEN_LEAF' => 0x1F342, // Smiley 262 + 'HERB' => 0x1F33F, // Smiley 263 + 'EAR_OF_RICE' => 0x1F33E, // Smiley 264 + 'MUSHROOM' => 0x1F344, // Smiley 265 + 'CACTUS' => 0x1F335, // Smiley 266 + 'PALM_TREE' => 0x1F334, // Smiley 267 + 'EVERGREEN_TREE' => 0x1F332, // Smiley 268 + 'DECIDUOUS_TREE' => 0x1F333, // Smiley 269 + 'CHESTNUT' => 0x1F330, // Smiley 270 + 'SEEDLING' => 0x1F331, // Smiley 271 + 'BLOSSOM' => 0x1F33C, // Smiley 272 + 'GLOBE_WITH_MERIDIANS' => 0x1F310, // Smiley 273 + 'SUN_WITH_FACE' => 0x1F31E, // Smiley 274 + 'FULL_MOON_WITH_FACE' => 0x1F31D, // Smiley 275 + 'NEW_MOON_WITH_FACE' => 0x1F31A, // Smiley 276 + 'NEW_MOON_SYMBOL' => 0x1F311, // Smiley 277 + 'WAXING_CRESCENDING_MOON_SYMBOL' => 0x1F312, // Smiley 278 + 'FIRST_QUARTER_MOON_SYMBOL' => 0x1F313, // Smiley 279 + 'WAXING_GIBBOUS_MOON_SYMBOL' => 0x1F314, // Smiley 280 + 'FULL_MOON_SYMBOL' => 0x1F315, // Smiley 281 + 'WANNING_GIBBOUS_MOON_SYMBOL' => 0x1F316, // Smiley 282 + 'LAST_QUARTER_MOON_SYMBOL' => 0x1F317, // Smiley 283 + 'WANNING_CRESCENT_MOON_SYMBOL' => 0x1F318, // Smiley 284 + 'LAST_QUARTER_MOON_WITH_FACE' => 0x1F31C, // Smiley 285 + 'FIRST_QUARTER_MOON_WITH_FACE' => 0x1F31B, // Smiley 286 + 'CRESCENT_MOON' => 0x1F319, // Smiley 287 + 'EARTH_GLOBE_EUROPE_AFRICA' => 0x1F30D, // Smiley 288 + 'EARTH_GLOBE_AMERICAS' => 0x1F30E, // Smiley 289 + 'EARTH_GLOBE_ASIA_AUSTRALIA' => 0x1F30F, // Smiley 290 + 'VOLCANO' => 0x1F30B, // Smiley 291 + 'MILKY_WAY' => 0x1F30C, // Smiley 292 + 'SHOOTING_STAR' => 0x1F320, // Smiley 293 + 'WHITE_MEDIUM_STAR' => 0x2B50, // Smiley 294 + 'BLACK_SUN_WITH_RAYS' => 0x2600, // Smiley 295 + 'SUN_BEHIND_CLOUD' => 0x26C5, // Smiley 296 + 'CLOUD' => 0x2601, // Smiley 297 + 'HIGH_VOLTAGE_SIGN' => 0x26A1, // Smiley 298 + 'UMBRELLA_WITH_RAIN_DROPS' => 0x2614, // Smiley 299 + 'SNOW_FLAKE' => 0x2744, // Smiley 300 + 'SNOWMAN_WITHOUT_SNOW' => 0x26C4, // Smiley 301 + 'CYCLONE' => 0x1F300, // Smiley 302 + 'FOGGY' => 0x1F301, // Smiley 303 + 'RAINBOW' => 0x1F308, // Smiley 304 + 'WATER_WAVE' => 0x1F30A, // Smiley 305 + 'PINE_DECORATION' => 0x1F38D, // Smiley 306 + 'HEART_WITH_RIBBON' => 0x1F49D, // Smiley 307 + 'JAPANESE_DOLLS' => 0x1F38E, // Smiley 308 + 'SCHOOL_SATCHEL' => 0x1F392, // Smiley 309 + 'GRADUATION_CAP' => 0x1F393, // Smiley 310 + 'CARP_STREAMER' => 0x1F38F, // Smiley 311 + 'FIREWORKS' => 0x1F386, // Smiley 312 + 'FIREWORKS_SPARKLER' => 0x1F387, // Smiley 313 + 'WIND_CHIME' => 0x1F390, // Smiley 314 + 'MOON_VIEWING_CEREMONY' => 0x1F391, // Smiley 315 + 'JACK_O_LANTERN' => 0x1F383, // Smiley 316 + 'GHOST' => 0x1F47B, // Smiley 317 + 'FATHER_CHRISTMAS' => 0x1F385, // Smiley 318 + 'CHRISTMAS_TREE' => 0x1F384, // Smiley 319 + 'WRAPPED_PRESENT' => 0x1F381, // Smiley 320 + 'TANABATA_TREE' => 0x1F38B, // Smiley 321 + 'PARTY_POPPER' => 0x1F389, // Smiley 322 + 'CONFETTI_BALL' => 0x1F38A, // Smiley 323 + 'BALLOON' => 0x1F388, // Smiley 324 + 'CROSSED_FLAGS' => 0x1F38C, // Smiley 325 + 'CRYSTAL_BALL' => 0x1F52E, // Smiley 326 + 'MOVIE_CAMERA' => 0x1F3A5, // Smiley 327 + 'CAMERA' => 0x1F4F7, // Smiley 328 + 'VIDEO_CAMERA' => 0x1F4F9, // Smiley 329 + 'VIDEOCASSETTE' => 0x1F4FC, // Smiley 330 + 'OPTICAL_DISC' => 0x1F4BF, // Smiley 331 + 'DVD' => 0x1F4C0, // Smiley 332 + 'MINIDISC' => 0x1F4BD, // Smiley 333 + 'FLOPPY_DISK' => 0x1F4BE, // Smiley 334 + 'PERSONAL_COMPUTER' => 0x1F4BB, // Smiley 335 + 'MOBILE_PHONE' => 0x1F4F1, // Smiley 336 + 'BLACK_TELEPHONE' => 0x260E, // Smiley 337 + 'TELEPHONE_RECEIVER' => 0x1F4DE, // Smiley 338 + 'PAGER' => 0x1F4DF, // Smiley 339 + 'FAX_MACHINE' => 0x1F4E0, // Smiley 340 + 'SATELLITE_ANTENNA' => 0x1F4E1, // Smiley 341 + 'TELEVISION' => 0x1F4FA, // Smiley 342 + 'RADIO' => 0x1F4FB, // Smiley 343 + 'SPEAKER_WITH_THREE_SOUND_WAVES' => 0x1F50A, // Smiley 344 + 'SPEAKER_WITH_ONE_SOUND_WAVE' => 0x1F509, // Smiley 345 + 'SPEAKER' => 0x1F508, // Smiley 346 + 'SPEAKER_WITH_CANCELLATION_STROKE' => 0x1F507, // Smiley 347 + 'BELL' => 0x1F514, // Smiley 348 + 'BELL_WITH_CANCELLATION_STROKE' => 0x1F515, // Smiley 349 + 'PUBLIC_ADDRESS_LOUDSPEAKER' => 0x1F4E2, // Smiley 350 + 'CHEERING_MEGAPHONE' => 0x1F4E3, // Smiley 351 + 'HOURGLASS_WITH_FLOWING_SAND' => 0x23F3, // Smiley 352 + 'HOURGLASS' => 0x231B, // Smiley 353 + 'ALARM_CLOCK' => 0x23F0, // Smiley 354 + 'WATCH' => 0x231A, // Smiley 355 + 'OPEN_LOCK' => 0x1F513, // Smiley 356 + 'LOCK' => 0x1F512, // Smiley 357 + 'LOCK_WITH_INK_PEN' => 0x1F50F, // Smiley 358 + 'CLOSED_LOCK_WITH_KEY' => 0x1F510, // Smiley 359 + 'KEY' => 0x1F511, // Smiley 360 + 'RIGHT_POINTING_MAGNIFYING_GLASS' => 0x1F50E, // Smiley 361 + 'ELECTRIC_LIGHT_BULB' => 0x1F4A1, // Smiley 362 + 'ELECTRIC_TORCH' => 0x1F526, // Smiley 363 + 'HIGH_BRIGHTNESS_SYMBOL' => 0x1F506, // Smiley 364 + 'LOW_BRIGHTNESS_SYMBOL' => 0x1F505, // Smiley 365 + 'ELECTRIC_PLUG' => 0x1F50C, // Smiley 366 + 'BATTERY' => 0x1F50B, // Smiley 367 + 'LEFT_POINTING_MAGNIFYING_GLASS' => 0x1F50D, // Smiley 368 + 'BATHTUB' => 0x1F6C1, // Smiley 369 + 'BATH' => 0x1F6C0, // Smiley 370 + 'SHOWER' => 0x1F6BF, // Smiley 371 + 'TOILET' => 0x1F6BD, // Smiley 372 + 'WRENCH' => 0x1F527, // Smiley 373 + 'NUT_AND_BOLT' => 0x1F529, // Smiley 374 + 'HAMMER' => 0x1F528, // Smiley 375 + 'DOOR' => 0x1F6AA, // Smiley 376 + 'SMOKING_SYMBOL' => 0x1F6AC, // Smiley 377 + 'BOMB' => 0x1F4A3, // Smiley 378 + 'PISTOL' => 0x1F52B, // Smiley 379 + 'HOCHO' => 0x1F52A, // Smiley 380 + 'PILL' => 0x1F48A, // Smiley 381 + 'SYRINGE' => 0x1F489, // Smiley 382 + 'MONEY_BAG' => 0x1F4B0, // Smiley 383 + 'BANKNOTE_WITH_YEN_SIGN' => 0x1F4B4, // Smiley 384 + 'BANKNOTE_WITH_DOLLAR_SIGN' => 0x1F4B5, // Smiley 385 + 'BANKNOTE_WITH_POUND_SIGN' => 0x1F4B7, // Smiley 386 + 'BANKNOTE_WITH_EURO_SIGN' => 0x1F4B6, // Smiley 387 + 'CREDIT_CARD' => 0x1F4B3, // Smiley 388 + 'MONEY_WITH_WINGS' => 0x1F4B8, // Smiley 389 + 'MOBILE_PHONE_WITH_RIGHTWARDS_ARROW' => 0x1F4F2, // Smiley 390 + 'E_MAIL_SYMBOL' => 0x1F4E7, // Smiley 391 + 'INBOX_TRAY' => 0x1F4E5, // Smiley 392 + 'OUTBOX_TRAY' => 0x1F4E4, // Smiley 393 + 'ENVELOPE' => 0x2709, // Smiley 394 + 'ENVELOPE_WITH_DOWNWARDS_ARROW_ABOVE' => 0x1F4E9, // Smiley 395 + 'INCOMING_ENVELOPE' => 0x1F4E8, // Smiley 396 + 'POSTAL_HORN' => 0x1F4EF, // Smiley 397 + 'CLOSED_MAILBOX_WITH_RAISED_FLAG' => 0x1F4EB, // Smiley 398 + 'CLOSED_MAILBOX_WITH_LOWERED_FLAG' => 0x1F4EA, // Smiley 399 + 'OPEN_MAILBOX_WITH_RAISED_FLAG' => 0x1F4EC, // Smiley 400 + 'OPEN_MAILBOX_WITH_LOWERED_FLAG' => 0x1F4ED, // Smiley 401 + 'POSTBOX' => 0x1F4EE, // Smiley 402 + 'PACKAGE' => 0x1F4E6, // Smiley 403 + 'MEMO' => 0x1F4DD, // Smiley 404 + 'PAGE_FACING_UP' => 0x1F4C4, // Smiley 405 + 'PAGE_WITH_CURL' => 0x1F4C3, // Smiley 406 + 'BOOKMARK_TABS' => 0x1F4D1, // Smiley 407 + 'BAR_CHART' => 0x1F4CA, // Smiley 408 + 'CHART_WITH_UPWARDS_TREND' => 0x1F4C8, // Smiley 409 + 'CHART_WITH_DOWNWARD_TREND' => 0x1F4C9, // Smiley 410 + 'SCROLL' => 0x1F4DC, // Smiley 411 + 'CLIPBOARD' => 0x1F4CB, // Smiley 412 + 'CALENDAR' => 0x1F4C5, // Smiley 413 + 'TEAR_OFF_CALENDAR' => 0x1F4C6, // Smiley 414 + 'CARD_INDEX' => 0x1F4C7, // Smiley 415 + 'FILE_FOLDER' => 0x1F4C1, // Smiley 416 + 'OPEN_FILE_FOLDER' => 0x1F4C2, // Smiley 417 + 'BLACK_SCISSORS' => 0x2702, // Smiley 418 + 'PUSHPIN' => 0x1F4CC, // Smiley 419 + 'PAPERCLIP' => 0x1F4CE, // Smiley 420 + 'BLACK_NIB' => 0x2712, // Smiley 421 + 'PENCIL' => 0x270F, // Smiley 422 + 'STRAIGHT_RULER' => 0x1F4CF, // Smiley 423 + 'TRIANGULAR_RULER' => 0x1F4D0, // Smiley 424 + 'CLOSED_BOOK' => 0x1F4D5, // Smiley 425 + 'GREEN_BOOK' => 0x1F4D7, // Smiley 426 + 'BLUE_BOOK' => 0x1F4D8, // Smiley 427 + 'ORANGE_BOOK' => 0x1F4D9, // Smiley 428 + 'NOTEBOOK' => 0x1F4D3, // Smiley 429 + 'NOTEBOOK_WITH_DECORATIVE_COVER' => 0x1F4D4, // Smiley 430 + 'LEDGER' => 0x1F4D2, // Smiley 431 + 'BOOKS' => 0x1F4DA, // Smiley 432 + 'OPEN_BOOK' => 0x1F4D6, // Smiley 433 + 'BOOKMARK' => 0x1F516, // Smiley 434 + 'NAME_BADGE' => 0x1F4DB, // Smiley 435 + 'MICROSCOPE' => 0x1F52C, // Smiley 436 + 'TELESCOPE' => 0x1F52D, // Smiley 437 + 'NEWSPAPER' => 0x1F4F0, // Smiley 438 + 'ARTIST_PALETTE' => 0x1F3A8, // Smiley 439 + 'CLAPPER_BOARD' => 0x1F3AC, // Smiley 440 + 'MICROPHONE' => 0x1F3A4, // Smiley 441 + 'HEADPHONE' => 0x1F3A7, // Smiley 442 + 'MUSICAL_SCORE' => 0x1F3BC, // Smiley 443 + 'MUSICAL_NOTE' => 0x1F3B5, // Smiley 444 + 'MULTIPLE_MUSICAL_NOTES' => 0x1F3B6, // Smiley 445 + 'MUSICAL_KEYBOARD' => 0x1F3B9, // Smiley 446 + 'VIOLIN' => 0x1F3BB, // Smiley 447 + 'TRUMPET' => 0x1F3BA, // Smiley 448 + 'SAXOPHONE' => 0x1F3B7, // Smiley 449 + 'GUITAR' => 0x1F3B8, // Smiley 450 + 'ALIEN_MONSTER' => 0x1F47E, // Smiley 451 + 'VIDEO_GAME' => 0x1F3AE, // Smiley 452 + 'PLAYING_CARD_BLACK_JOKER' => 0x1F0CF, // Smiley 453 + 'FLOWER_PLAYING_CARDS' => 0x1F3B4, // Smiley 454 + 'MAHJONG_TILE_RED_DRAGON' => 0x1F004, // Smiley 455 + 'GAME_DIE' => 0x1F3B2, // Smiley 456 + 'DIRECT_HIT' => 0x1F3AF, // Smiley 457 + 'AMERICAN_FOOTBALL' => 0x1F3C8, // Smiley 458 + 'BASKETBALL_AND_HOOP' => 0x1F3C0, // Smiley 459 + 'SOCCER_BALL' => 0x26BD, // Smiley 460 + 'BASEBALL' => 0x26BE, // Smiley 461 + 'GREEN_BOOK' => 0x1F4D7, // Smiley 462 + 'TENNIS_RACQUET_AND_BALL' => 0x1F3BE, // Smiley 463 + 'BILLIARDS' => 0x1F3B1, // Smiley 464 + 'RUGBY_FOOTBALL' => 0x1F3C9, // Smiley 465 + 'BOWLING' => 0x1F3B3, // Smiley 466 + 'FLAG_IN_HOLE' => 0x26F3, // Smiley 467 + 'MOUNTAIN_BYCICLIST' => 0x1F6B5, // Smiley 468 + 'BYCICLIST' => 0x1F6B4, // Smiley 469 + 'CHECKERED_FLAG' => 0x1F3C1, // Smiley 470 + 'HORSE_RACING' => 0x1F3C7, // Smiley 471 + 'TROPHY' => 0x1F3C6, // Smiley 472 + 'SKI_AND_SKI_BOOT' => 0x1F3BF, // Smiley 473 + 'SNOWBOARDER' => 0x1F3C2, // Smiley 474 + 'SWIMMER' => 0x1F3CA, // Smiley 475 + 'SURFER' => 0x1F3C4, // Smiley 476 + 'FISHING_POLE_AND_FISH' => 0x1F3A3, // Smiley 477 + 'HOT_BEVERAGE' => 0x2615, // Smiley 478 + 'TEACUP_WITHOUT_HANDLE' => 0x1F375, // Smiley 479 + 'SAKE_BOTTLE_AND_CUP' => 0x1F376, // Smiley 480 + 'BABY_BOTTLE' => 0x1F37C, // Smiley 481 + 'BEER_MUG' => 0x1F37A, // Smiley 482 + 'CLINKING_BEER_MUGS' => 0x1F37B, // Smiley 483 + 'TROPICAL_DRINK' => 0x1F379, // Smiley 484 + 'WINE_GLASS' => 0x1F377, // Smiley 485 + 'FORK_AND_KNIFE' => 0x1F374, // Smiley 486 + 'SLICE_OF_PIZZA' => 0x1F355, // Smiley 487 + 'HAMBURGER' => 0x1F354, // Smiley 488 + 'FRENCH_FRIES' => 0x1F35F, // Smiley 489 + 'POULTRY_LEG' => 0x1F357, // Smiley 490 + 'MEAT_ON_BONE' => 0x1F356, // Smiley 491 + 'SPAGHETTI' => 0x1F35D, // Smiley 492 + 'CURRY_AND_RICE' => 0x1F35B, // Smiley 493 + 'FRIED_SHRIMP' => 0x1F364, // Smiley 494 + 'BENTO_BOX' => 0x1F371, // Smiley 495 + 'SUSHI' => 0x1F363, // Smiley 496 + 'FISH_CAKE_WITH_SWIRL_DESIGN' => 0x1F365, // Smiley 497 + 'RICE_BALL' => 0x1F359, // Smiley 498 + 'RICE_CRACKER' => 0x1F358, // Smiley 499 + 'COOKED_RICE' => 0x1F35A, // Smiley 500 + 'STEAMING_BOWL' => 0x1F35C, // Smiley 501 + 'POT_OF_FOOD' => 0x1F372, // Smiley 502 + 'ODEN' => 0x1F362, // Smiley 503 + 'DANGO' => 0x1F361, // Smiley 504 + 'COOKING' => 0x1F373, // Smiley 505 + 'BREAD' => 0x1F35E, // Smiley 506 + 'DOUGHNUT' => 0x1F369, // Smiley 507 + 'CUSTARD' => 0x1F36E, // Smiley 508 + 'SOFT_ICE_CREAM' => 0x1F366, // Smiley 509 + 'ICE_CREAM' => 0x1F368, // Smiley 510 + 'SHAVED_ICE' => 0x1F367, // Smiley 511 + 'BIRTHDAY_CAKE' => 0x1F382, // Smiley 512 + 'SHORTCAKE' => 0x1F370, // Smiley 513 + 'COOKIE' => 0x1F36A, // Smiley 514 + 'CHOCOLATE_BAR' => 0x1F36B, // Smiley 515 + 'CANDY' => 0x1F36C, // Smiley 516 + 'LOLLIPOP' => 0x1F36D, // Smiley 517 + 'HONEY_POT' => 0x1F36F, // Smiley 518 + 'RED_APPLE' => 0x1F34E, // Smiley 519 + 'GREEN_APPLE' => 0x1F34F, // Smiley 520 + 'TANGERINE' => 0x1F34A, // Smiley 521 + 'LEMON' => 0x1F34B, // Smiley 522 + 'CHERRIES' => 0x1F352, // Smiley 523 + 'GRAPES' => 0x1F347, // Smiley 524 + 'WATERMELON' => 0x1F349, // Smiley 525 + 'STRAWBERRY' => 0x1F353, // Smiley 526 + 'PEACH' => 0x1F351, // Smiley 527 + 'MELON' => 0x1F348, // Smiley 528 + 'BANANA' => 0x1F34C, // Smiley 529 + 'PEAR' => 0x1F350, // Smiley 530 + 'PINEAPPLE' => 0x1F34D, // Smiley 531 + 'ROASTED_SWEET_POTATO' => 0x1F360, // Smiley 532 + 'AUBERGINE' => 0x1F346, // Smiley 533 + 'TOMATO' => 0x1F345, // Smiley 534 + 'EAR_OF_MAIZE' => 0x1F33D, // Smiley 535 + 'HOUSE_BUILDING' => 0x1F3E0, // Smiley 536 + 'HOUSE_WITH_GARDEN' => 0x1F3E1, // Smiley 537 + 'SCHOOL' => 0x1F3EB, // Smiley 538 + 'OFFICE_BUILDING' => 0x1F3E2, // Smiley 539 + 'JAPANESE_POST_OFFICE' => 0x1F3E3, // Smiley 540 + 'HOSPITAL' => 0x1F3E5, // Smiley 541 + 'BANK' => 0x1F3E6, // Smiley 542 + 'CONVINIENCE_STORE' => 0x1F3EA, // Smiley 543 + 'LOVE_HOTEL' => 0x1F3E9, // Smiley 544 + 'HOTEL' => 0x1F3E8, // Smiley 545 + 'WEDDING' => 0x1F492, // Smiley 546 + 'CHURCH' => 0x26EA, // Smiley 547 + 'DEPARTMENT_STORE' => 0x1F3EC, // Smiley 548 + 'EUROPEAN_POST_OFFICE' => 0x1F3E4, // Smiley 549 + 'SUNSET_OVER_BUILDINGS' => 0x1F307, // Smiley 550 + 'CITYSCAPE_AT_DUSK' => 0x1F306, // Smiley 551 + 'JAPANESE_CASTLE' => 0x1F3EF, // Smiley 552 + 'EUROPEAN_CASTLE' => 0x1F3F0, // Smiley 553 + 'TENT' => 0x26FA, // Smiley 554 + 'FACTORY' => 0x1F3ED, // Smiley 555 + 'TOKYO_TOWER' => 0x1F5FC, // Smiley 556 + 'SILHOUETTE_OF_JAPAN' => 0x1F5FE, // Smiley 557 + 'MOUNT_FUJI' => 0x1F5FB, // Smiley 558 + 'SUNRISE_OVER_MOUNTAINS' => 0x1F304, // Smiley 559 + 'SUNRISE' => 0x1F305, // Smiley 560 + 'NIGHT_WITH_STARS' => 0x1F303, // Smiley 561 + 'STATUE_OF_LIBERTY' => 0x1F5FD, // Smiley 562 + 'BRIDGE_AT_NIGHT' => 0x1F309, // Smiley 563 + 'CAROUSEL_HORSE' => 0x1F3A0, // Smiley 564 + 'FERRIS_WHEEL' => 0x1F3A1, // Smiley 565 + 'FOUNTAIN' => 0x26F2, // Smiley 566 + 'ROLLER_COASTER' => 0x1F3A2, // Smiley 567 + 'SHIP' => 0x1F6A2, // Smiley 568 + 'SAILBOAT' => 0x26F5, // Smiley 569 + 'SPEEDBOAT' => 0x1F6A4, // Smiley 570 + 'ROWBOAT' => 0x1F6A3, // Smiley 571 + 'ANCHOR' => 0x2693, // Smiley 572 + 'ROCKET' => 0x1F680, // Smiley 573 + 'AIRPLANE' => 0x2708, // Smiley 574 + 'SEAT' => 0x1F4BA, // Smiley 575 + 'HELICOPTER' => 0x1F681, // Smiley 576 + 'STEAM_LOCOMOTIVE' => 0x1F682, // Smiley 577 + 'TRAM' => 0x1F68A, // Smiley 578 + 'STATION' => 0x1F689, // Smiley 579 + 'MOUNTAIN_RAILWAY' => 0x1F69E, // Smiley 580 + 'TRAIN' => 0x1F686, // Smiley 581 + 'HIGH_SPEED_TRAIN' => 0x1F684, // Smiley 582 + 'HIGH_SPEED_TRAIN_WITH_BULLET_NOSE' => 0x1F685, // Smiley 583 + 'LIGHT_RAIL' => 0x1F688, // Smiley 584 + 'METRO' => 0x1F687, // Smiley 585 + 'MONO_RAIL' => 0x1F69D, // Smiley 586 + 'TRAM_CAR' => 0x1F68B, // Smiley 587 + 'RAILWAY_CAR' => 0x1F683, // Smiley 588 + 'TROLLEYBUS' => 0x1F68E, // Smiley 589 + 'BUS' => 0x1F68C, // Smiley 590 + 'ONCOMING_BUS' => 0x1F68D, // Smiley 591 + 'RECREATION_VEHICLE' => 0x1F699, // Smiley 592 + 'ONCOMING_AUTOMOBILE' => 0x1F698, // Smiley 593 + 'AUTOMOBILE' => 0x1F697, // Smiley 594 + 'TAXI' => 0x1F695, // Smiley 595 + 'ONCOMING_TAXI' => 0x1F696, // Smiley 596 + 'ARTICULATED_LORRY' => 0x1F69B, // Smiley 597 + 'DELIVERY_TRUCK' => 0x1F69A, // Smiley 598 + 'POLICE_CARS_REVOLVING_LIGHT' => 0x1F6A8, // Smiley 599 + 'POLICE_CAR' => 0x1F693, // Smiley 600 + 'ONCOMING_POLICE_CAR' => 0x1F694, // Smiley 601 + 'FIRE_ENGINE' => 0x1F692, // Smiley 602 + 'AMBULANCE' => 0x1F691, // Smiley 603 + 'MINBUS' => 0x1F690, // Smiley 604 + 'BICYCLE' => 0x1F6B2, // Smiley 605 + 'AERIAL_TRAMWAY' => 0x1F6A1, // Smiley 606 + 'SUSPENSION_RAILWAY' => 0x1F69F, // Smiley 607 + 'MOUNTAIN_CABLEWAY' => 0x1F6A0, // Smiley 608 + 'TRACTOR' => 0x1F69C, // Smiley 609 + 'BARBER_POLE' => 0x1F488, // Smiley 610 + 'BUS_STOP' => 0x1F68F, // Smiley 611 + 'TICKET' => 0x1F3AB, // Smiley 612 + 'VERTICAL_TRAFFIC_LIGHT' => 0x1F6A6, // Smiley 613 + 'HORIZONTAL_TRAFFIC_LIGHT' => 0x1F6A5, // Smiley 614 + 'WARNING_SIGN' => 0x26A0, // Smiley 615 + 'CONSTRUCTION_SIGN' => 0x1F6A7, // Smiley 616 + 'JAPANESE_SYMBOL_FOR_BEGINNER' => 0x1F530, // Smiley 617 + 'FUEL_PUMP' => 0x26FD, // Smiley 618 + 'IZAKAYA_LANTERN' => 0x1F3EE, // Smiley 619 + 'SLOT_MACHINE' => 0x1F3B0, // Smiley 620 + 'HOT_SPRINGS' => 0x2668, // Smiley 621 + 'MOYAI' => 0x1F5FF, // Smiley 622 + 'CIRCUS_TENT' => 0x1F3AA, // Smiley 623 + 'PERFORMING_ARTS' => 0x1F3AD, // Smiley 624 + 'ROUND_PUSHPIN' => 0x1F4CD, // Smiley 625 + 'TRIANGULAR_FLAG_ON_POST' => 0x1F6A9, // Smiley 626 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_JP' => [0xD83C, 0xDDEF, 0xD83C, 0xDDF5], // Smiley 627 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_KR' => [0xD83C, 0xDDF0, 0xD83C, 0xDDF7], // Smiley 628 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_DE' => [0xD83C, 0xDDE9, 0xD83C, 0xDDEA], // Smiley 629 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_CN' => [0xD83C, 0xDDE8, 0xD83C, 0xDDF3], // Smiley 630 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_US' => [0xD83C, 0xDDFA, 0xD83C, 0xDDF8], // Smiley 631 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_FR' => [0xD83C, 0xDDEB, 0xD83C, 0xDDF7], // Smiley 632 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_ES' => [0xD83C, 0xDDEA, 0xD83C, 0xDDF8], // Smiley 633 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_IT' => [0xD83C, 0xDDEE, 0xD83C, 0xDDF9], // Smiley 634 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_RU' => [0xD83C, 0xDDF7, 0xD83C, 0xDDFA], // Smiley 635 + 'REGIONAL_INDICATOR_SYMBOL_LETTERS_GB' => [0xD83C, 0xDDEC, 0xD83C, 0xDDE7], // Smiley 636 + 'KEYCAP_1' => [0x0031, 0x20E3], // Smiley 637 + 'KEYCAP_2' => [0x0032, 0x20E3], // Smiley 638 + 'KEYCAP_3' => [0x0033, 0x20E3], // Smiley 639 + 'KEYCAP_4' => [0x0034, 0x20E3], // Smiley 640 + 'KEYCAP_5' => [0x0035, 0x20E3], // Smiley 641 + 'KEYCAP_6' => [0x0036, 0x20E3], // Smiley 642 + 'KEYCAP_7' => [0x0037, 0x20E3], // Smiley 643 + 'KEYCAP_8' => [0x0038, 0x20E3], // Smiley 644 + 'KEYCAP_9' => [0x0039, 0x20E3], // Smiley 645 + 'KEYCAP_0' => [0x0030, 0x20E3], // Smiley 646 + 'KEYCAP_10' => 0x1F51F, // Smiley 647 + 'INPUT_SYMBOL_FOR_NUMBERS' => 0x1F522, // Smiley 648 + 'HASH_KEY' => [0x0023, 0x20E3], // Smiley 649 + 'INPUT_SYMBOL_FOR_SYMBOLS' => 0x1F523, // Smiley 650 + 'UPWARDS_BLACK_ARROW' => 0x2B06, // Smiley 651 + 'DOWNWARDS_BLACK_ARROW' => 0x2B07, // Smiley 652 + 'LEFTWARDS_BLACK_ARROW' => 0x2B05, // Smiley 653 + 'BLACK_RIGHTWARDS_ARROW' => 0x27A1, // Smiley 654 + 'INPUT_SYMBOL_FOR_LATIN_CAPITAL_LETTERS' => 0x1F520, // Smiley 655 + 'INPUT_SYMBOL_FOR_LATIN_SMALL_LETTERS' => 0x1F521, // Smiley 656 + 'INPUT_SYMBOL_FOR_LATIN_LETTERS' => 0x1F524, // Smiley 657 + 'NORTH_EAST_ARROW' => 0x2197, // Smiley 658 + 'NORTH_WEST_ARROW' => 0x2196, // Smiley 659 + 'SOUTH_EAST_ARROW' => 0x2198, // Smiley 660 + 'SOUTH_WEST_ARROW' => 0x2199, // Smiley 661 + 'LEFT_RIGHT_ARROW' => 0x2194, // Smiley 662 + 'UP_DOWN_ARROW' => 0x2195, // Smiley 663 + 'ANTICLOCKWISE_DOWNWARDS_AND_UPWARDS_OPEN_CIRCLE_ARROWS' => 0x1F504, // Smiley 664 + 'BLACK_LEFT_POINTING_TRIANGLE' => 0x25C0, // Smiley 665 + 'BLACK_RIGHT_POINTING_TRIANGLE' => 0x25B6, // Smiley 666 + 'UP_POINTING_SMALL_RED_TRIANGLE' => 0x1F53C, // Smiley 667 + 'DOWN_POINTING_SMALL_RED_TRIANGLE' => 0x1F53D, // Smiley 668 + 'LEFTWARDS_ARROW_WITH_HOOK' => 0x21A9, // Smiley 669 + 'RIGHTWARDS_ARROW_WITH_HOOK' => 0x21AA, // Smiley 670 + 'INFORMATION_SOURCE' => 0x2139, // Smiley 671 + 'BLACK_LEFT_POINTING_DOUBLE_TRIANGLE' => 0x23EA, // Smiley 672 + 'BLACK_RIGHT_POINTING_DOUBLE_TRIANGLE' => 0x23E9, // Smiley 673 + 'BLACK_UP_POINTING_DOUBLE_TRIANGLE' => 0x23EB, // Smiley 674 + 'BLACK_DOWN_POINTING_DOUBLE_TRIANGLE' => 0x23EC, // Smiley 675 + 'ARROW_POINTING_RIGHTWARDS_THEN_CURVING_DOWNWARDS' => 0x2935, // Smiley 676 + 'ARROW_POINTING_RIGHTWARDS_THEN_CURVING_UPWARDS' => 0x2934, // Smiley 677 + 'SQUARED_OK' => 0x1F197, // Smiley 678 + 'TWISTED_RIGHTWARDS_ARROWS' => 0x1F500, // Smiley 679 + 'CLOCKWISE_RIGHTWARDS_AND_LEFTWARDS_OPEN_CIRCLE_ARROWS' => 0x1F501, // Smiley 680 + 'CLOCKWISE_RIGHTWARDS_AND_LEFTWARDS_ARTOWS_WITH_CIRCLED_ONE_OVERLAY'=> 0x1F502, // Smiley 681 + 'SQUARED_NEW' => 0x1F195, // Smiley 682 + 'SQUARED_UP_WITH_EXCLAMATION_MARK' => 0x1F199, // Smiley 683 + 'SQUARED_COOL' => 0x1F192, // Smiley 684 + 'SQUARED_FREE' => 0x1F193, // Smiley 685 + 'SQUARED_NG' => 0x1F196, // Smiley 686 + 'ANTENNA_WITH_BARS' => 0x1F4F6, // Smiley 687 + 'CINEMA' => 0x1F3A6, // Smiley 688 + 'SQUARED_KATAKANA_KOKO' => 0x1F201, // Smiley 689 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_6307' => 0x1F22F, // Smiley 690 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_7A7A' => 0x1F233, // Smiley 691 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_6E80' => 0x1F235, // Smiley 692 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_5408' => 0x1F234, // Smiley 693 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_7981' => 0x1F232, // Smiley 694 + 'CIRCLED_IDEOGRAPH_ADVANTAGE' => 0x1F250, // Smiley 695 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_5272' => 0x1F239, // Smiley 696 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_55B6' => 0x1F23A, // Smiley 697 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_6709' => 0x1F236, // Smiley 698 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_7121' => 0x1F21A, // Smiley 699 + 'RESTROOM' => 0x1F6BB, // Smiley 700 + 'MENS_SYMBOL' => 0x1F6B9, // Smiley 701 + 'WOMENS_SYMBOL' => 0x1F6BA, // Smiley 702 + 'BABY_SYMBOL' => 0x1F6BC, // Smiley 703 + 'WATER_CLOSET' => 0x1F6BE, // Smiley 704 + 'POTABLE_WATER_SYMBOL' => 0x1F6B0, // Smiley 705 + 'PUT_LITTER_IN_ITS_PLACE_SYMBOL' => 0x1F6AE, // Smiley 706 + 'NEGATIVE_SQUARED_LATIN_CAPITAL_LETTER_P' => 0x1F17F, // Smiley 707 + 'WHEELCHAIR_SYMBOL' => 0x267F, // Smiley 708 + 'NO_SMOKING_SYMBOL' => 0x1F6AD, // Smiley 709 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_6708' => 0x1F237, // Smiley 710 + 'SQUARED_CJK_UNIFIED_IDEOGRAPH_6533' => 0x1F238, // Smiley 711 + 'SQUARED_KATAKANA_SA' => 0x1F202, // Smiley 712 + 'CIRCLED_LATIN_CAPITAL_LETTER_M' => 0x24C2, // Smiley 713 + 'PASSPORT_CONTROL' => 0x1F6C2, // Smiley 714 + 'BAGGAGE_CLAIM' => 0x1F6C4, // Smiley 715 + 'LEFT_LUGGAGE' => 0x1F6C5, // Smiley 716 + 'CUSTOMS' => 0x1F6C3, // Smiley 717 + 'CIRCLED_IDEOGRAPH_ACCEPT' => 0x1F251, // Smiley 718 + 'CIRCLED_IDEOGRAPH_SECRET' => 0x3299, // Smiley 719 + 'CIRCLED_IDEOGRAPH_CONGRATULATIONS' => 0x3297, // Smiley 720 + 'SQUARED_CL' => 0x1F191, // Smiley 721 + 'SQUARED_SOS' => 0x1F198, // Smiley 722 + 'SQUARED_ID' => 0x1F194, // Smiley 723 + 'NO_ENTRY_SIGN' => 0x1F6AB, // Smiley 724 + 'NO_ONE_UNDER_EIGHTEEN_SYMBOL' => 0x1F51E, // Smiley 725 + 'NO_MOBILE_PHONES' => 0x1F4F5, // Smiley 726 + 'DO_NOT_LITTER_SYMBOL' => 0x1F6AF, // Smiley 727 + 'NON_POTABLE_WATER_SYMBOL' => 0x1F6B1, // Smiley 728 + 'NO_BICYCLES' => 0x1F6B3, // Smiley 729 + 'NO_PEDESTRIANS' => 0x1F6B7, // Smiley 730 + 'CHILDREN_CROSSING' => 0x1F6B8, // Smiley 731 + 'NO_ENTRY' => 0x26D4, // Smiley 732 + 'EIGHT_SPOKED_ASTERISK' => 0x2733, // Smiley 733 + 'SPARKLE' => 0x2747, // Smiley 734 + 'NEGATIVE_SQUARED_CROSS_MARK' => 0x274E, // Smiley 735 + 'WHITE_HEAVY_CHECK_MARK' => 0x2705, // Smiley 736 + 'EIGHT_POINTED_BLACK_STAR' => 0x2734, // Smiley 737 + 'HEART_DECORATION' => 0x1F49F, // Smiley 738 + 'SQUARED_VS' => 0x1F19A, // Smiley 739 + 'VIBRATION_MODE' => 0x1F4F3, // Smiley 740 + 'MOBILE_PHONE_OFF' => 0x1F4F4, // Smiley 741 + 'NEGATIVE_SQUARED_LATIN_CAPITAL_LETTER_A' => 0x1F170, // Smiley 742 + 'NEGATIVE_SQUARED_LATIN_CAPITAL_LETTER_B' => 0x1F171, // Smiley 743 + 'NEGATIVE_SQUARED_AB' => 0x1F18E, // Smiley 744 + 'NEGATIVE_SQUARED_LATIN_CAPITAL_LETTER_O' => 0x1F17E, // Smiley 745 + 'DIAMOND_SHAPE_WITH_A_DOT_INSIDE' => 0x1F4A0, // Smiley 746 + 'DOUBLE_CURLY_LOOP' => 0x27BF, // Smiley 747 + 'BLACK_UNIVERSAL_RECYCLING_SYMBOL' => 0x267B, // Smiley 748 + 'ARIES' => 0x2648, // Smiley 749 + 'TAURUS' => 0x2649, // Smiley 750 + 'GEMINI' => 0x264A, // Smiley 751 + 'CANCER' => 0x264B, // Smiley 752 + 'LEO' => 0x264C, // Smiley 753 + 'VIRGO' => 0x264D, // Smiley 754 + 'LIBRA' => 0x264E, // Smiley 755 + 'SCORPIUS' => 0x264F, // Smiley 756 + 'SAGITTARIUS' => 0x2650, // Smiley 757 + 'CAPRICORN' => 0x2651, // Smiley 758 + 'AQUARIUS' => 0x2652, // Smiley 759 + 'PISCES' => 0x2653, // Smiley 760 + 'OPHIUCHUS' => 0x26CE, // Smiley 761 + 'SIX_POINTED_STAR_WITH_MIDDLE_DOT' => 0x1F52F, // Smiley 762 + 'AUTOMATED_TELLER_MACHINE' => 0x1F3E7, // Smiley 763 + 'CHART_WITH_UPWARDS_TREND_AND_YEN_SIGN' => 0x1F4B9, // Smiley 764 + 'HEAVY_DOLLAR_SIGN' => 0x1F4B2, // Smiley 765 + 'CURRENCY_EXCHANGE' => 0x1F4B1, // Smiley 766 + 'COPYRIGHT_SIGN' => 0x00A9, // Smiley 767 + 'REGISTERED_SIGN' => 0x00AE, // Smiley 768 + 'TRADEMARK_SIGN' => 0x2122, // Smiley 769 + 'CROSS_MARK' => 0x274C, // Smiley 770 + 'DOUBLE_EXCLAMATION_MARK' => 0x203C, // Smiley 771 + 'EXCLAMATION_QUESTION_MARK' => 0x2049, // Smiley 772 + 'HEAVY_EXCLAMATION_MARK_SYMBOL' => 0x2757, // Smiley 773 + 'BLACK_QUESTION_MARK_ORNAMENT' => 0x2753, // Smiley 774 + 'WHITE_EXCLAMATION_MARK_ORNAMENT' => 0x2755, // Smiley 775 + 'WHITE_QUESTION_MARK_ORNAMENT' => 0x2754, // Smiley 776 + 'HEAVY_LARGE_CIRCLE' => 0x2B55, // Smiley 777 + 'TOP_WITH_UPWARDS_ARROW_ABOVE' => 0x1F51D, // Smiley 778 + 'END_WITH_LEFTWARDS_ARROW_ABOVE' => 0x1F51A, // Smiley 779 + 'BACK_WITH_LEFTWARDS_ARROW_ABOVE' => 0x1F519, // Smiley 780 + 'ON_WITH_EXCLAMATION_MARK_WITH_LEFT_RIGHT_ARROW_ABOVE' => 0x1F51B, // Smiley 781 + 'SOON_WITH_RIGHTWARDS_ARROW_ABOVE' => 0x1F51C, // Smiley 782 + 'CLOCKWISE_DOWNWARDS_AND_UPWARDS_OPEN_CIRCLE_ARROWS' => 0x1F503, // Smiley 783 + 'CLOCK_FACE_TWELVE_OCLOCK' => 0x1F55B, // Smiley 784 + 'CLOCK_FACE_TWELVE_THIRTY' => 0x1F567, // Smiley 785 + 'CLOCK_FACE_ONE_OCLOCK' => 0x1F550, // Smiley 786 + 'CLOCK_FACE_ONE_THIRTY' => 0x1F55C, // Smiley 787 + 'CLOCK_FACE_TWO_OCLOCK' => 0x1F551, // Smiley 788 + 'CLOCK_FACE_TWO_THIRTY' => 0x1F55D, // Smiley 789 + 'CLOCK_FACE_THREE_OCLOCK' => 0x1F552, // Smiley 790 + 'CLOCK_FACE_THREE_THIRTY' => 0x1F55E, // Smiley 791 + 'CLOCK_FACE_FOUR_OCLOCK' => 0x1F553, // Smiley 792 + 'CLOCK_FACE_FOUR_THIRTY' => 0x1F55F, // Smiley 793 + 'CLOCK_FACE_FIVE_OCLOCK' => 0x1F554, // Smiley 794 + 'CLOCK_FACE_FIVE_THIRTY' => 0x1F560, // Smiley 795 + 'CLOCK_FACE_SIX_OCLOCK' => 0x1F555, // Smiley 796 + 'CLOCK_FACE_SEVEN_OCLOCK' => 0x1F556, // Smiley 797 + 'CLOCK_FACE_EIGHT_OCLOCK' => 0x1F557, // Smiley 798 + 'CLOCK_FACE_NINE_OCLOCK' => 0x1F558, // Smiley 799 + 'CLOCK_FACE_TEN_OCLOCK' => 0x1F559, // Smiley 800 + 'CLOCK_FACE_ELEVEN_OCLOCK' => 0x1F55A, // Smiley 801 + 'CLOCK_FACE_SIX_THIRTY' => 0x1F561, // Smiley 802 + 'CLOCK_FACE_SEVEN_THIRTY' => 0x1F562, // Smiley 803 + 'CLOCK_FACE_EIGHT_THIRTY' => 0x1F563, // Smiley 804 + 'CLOCK_FACE_NINE_THIRTY' => 0x1F564, // Smiley 805 + 'CLOCK_FACE_TEN_THIRTY' => 0x1F565, // Smiley 806 + 'CLOCK_FACE_ELEVEN_THIRTY' => 0x1F566, // Smiley 807 + 'HEAVY_MULTIPLICATION_SIGN' => 0x2716, // Smiley 808 + 'HEAVY_PLUS_SIGN' => 0x2795, // Smiley 809 + 'HEAVY_MINUS_SIGN' => 0x2796, // Smiley 810 + 'HEAVY_DIVISION_SIGN' => 0x2797, // Smiley 811 + 'BLACK_SPADE_SUIT' => 0x2660, // Smiley 812 + 'BLACK_HEART_SUIT' => 0x2665, // Smiley 813 + 'BLACK_CLUB_SUIT' => 0x2663, // Smiley 814 + 'BLACK_DIAMOND_SUITE' => 0x2666, // Smiley 815 + 'WHITE_FLOWER' => 0x1F4AE, // Smiley 816 + 'HUNDRED_POINTS_SYMBOL' => 0x1F4AF, // Smiley 817 + 'HEAVY_CHECK_MARK' => 0x2714, // Smiley 818 + 'BALLOT_BOX_WITH_CHECK' => 0x2611, // Smiley 819 + 'RADIO_BUTTON' => 0x1F518, // Smiley 820 + 'LINK_SYMBOL' => 0x1F517, // Smiley 821 + 'CURLY_LOOP' => 0x27B0, // Smiley 822 + 'WAVY_DASH' => 0x3030, // Smiley 823 + 'PART_ALTERNATION_MARK' => 0x303D, // Smiley 824 + 'TRIDENT_EMBLEM' => 0x1F531, // Smiley 825 + 'BLACK_MEDIUM_SQUARE' => 0x25FC, // Smiley 826 + 'WHITE_MEDIUM_SQUARE' => 0x25FB, // Smiley 827 + 'BLACK_MEDIUM_SMALL_SQUARE' => 0x25FE, // Smiley 828 + 'WHITE_MEDIUM_SMALL_SQUARE' => 0x25FD, // Smiley 829 + 'BLACK_SMALL_SQUARE' => 0x25AA, // Smiley 830 + 'WHILTE_SMALL_SQUARE' => 0x25AB, // Smiley 831 + 'UP_POINTING_RED_TRIANGLE' => 0x1F53A, // Smiley 832 + 'BLACK_SQUARE_BUTTON' => 0x1F532, // Smiley 833 + 'WHILTE_SQUARE_BUTTON' => 0x1F533, // Smiley 834 + 'MEDIUM_BLACK_CIRCLE' => 0x26AB, // Smiley 835 + 'MEDIUM_WHITE_CIRCLE' => 0x26AA, // Smiley 836 + 'LARGE_RED_CIRCLE' => 0x1F534, // Smiley 837 + 'LARGE_BLUE_CIRCLE' => 0x1F535, // Smiley 838 + 'DOWN_POINTING_RED_TRIANGLE' => 0x1F53B, // Smiley 839 + 'WHITE_LARGE_SQUARE' => 0x2B1C, // Smiley 840 + 'BLACK_LARGE_SQUARE' => 0x2B1B, // Smiley 841 + 'LARGE_ORANGE_DIAMOND' => 0x1F536, // Smiley 842 + 'LARGE_BLUE_DIAMOND' => 0x1F537, // Smiley 843 + 'SMALL_ORANGE_DIAMOND' => 0x1F538, // Smiley 844 + 'SMALL_BLUE_DIAMOND' => 0x1F539, // Smiley 845 + ); + private $listKeys = array(); + + public function __construct() { + $this->listKeys = array_keys($this->listSmileys); + } + + public function __get($name) { + if (mb_strlen($name) > 7 && substr($name, 0, 7) === 'SMILEY_' && is_numeric(substr($name, 7))) { + $id = (int)substr($name, 7) - 1; + echo 'id '.$id; + if ($id >= 0 && $id < count($this->listSmileys)) + return $this->__get($this->listKeys[$id]); + throw new SmileyNotFoundException; + } + + if (!isset($this->listSmileys[$name])) + throw new SmileyNotFoundException; + + if (is_array($this->listSmileys[$name])) + return implode(array_map(array($this, 'ord_unicode'), $this->listSmileys[$name])); + + return $this->ord_unicode($this->listSmileys[$name]); + } + + // Source: http://stackoverflow.com/a/7153133/4990350 + private function ord_unicode($num) { + if ($num <= 0x7F) + return chr($num); + if ($num <= 0x7FF) + return chr(($num>>6)+192).chr(($num&63)+128); + if ($num <= 0xFFFF) + return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128); + if ($num <= 0x1FFFFF) + return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128).chr(($num&63)+128); + return ''; + } +} From d2776328c9d657c522d2796f46427d9e47911ffa Mon Sep 17 00:00:00 2001 From: Quentin Ligier Date: Tue, 14 Jul 2015 18:40:06 +0200 Subject: [PATCH 404/436] Undoing changes --- README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fe10af6..a93afda2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,51 @@ -# Chat API +# Chat API [![Latest Stable Version](https://poser.pugx.org/whatsapp/chat-api/v/stable)](https://packagist.org/packages/whatsapp/chat-api) [![Total Downloads](https://poser.pugx.org/whatsapp/chat-api/downloads)](https://packagist.org/packages/whatsapp/chat-api) [![License](https://poser.pugx.org/whatsapp/chat-api/license)](https://packagist.org/packages/whatsapp/chat-api) -Fork of [WHAnonymous/Chat-API](https://github.com/WHAnonymous/Chat-API) +Interface to WhatsApp Messenger + +**Read the [wiki](https://github.com/WHAnonymous/Chat-API/wiki)** and previous issues before opening a new one! Maybe your issue is already answered. + +For new WhatsApp updates check **[WhatsApp incoming updates log](https://github.com/WHAnonymous/Chat-API/wiki/WhatsApp-incoming-updates)** + +**Do you like this project? Support it by donating BTC** to 1HcEX9foem5atreEg1gbQ6xVeosN5WEcjs ![btc](http://www.montrealbitcoin.com/img/favicon.ico) + +---------- +### Installation + +```sh +composer require whatsapp/chat-api +``` + +### Special thanks + +- [CODeRUS](https://github.com/CODeRUS) +- [tgalal](https://github.com/tgalal) +- [SikiFn](https://github.com/SikiFn) +- [0xTryCatch](https://github.com/0xTryCatch) +- [Shirioko](https://github.com/shirioko) + +Also Ahmed Moh'd (fb.com/ahmed.mhd) and Ali Hubail (@hubail) for making this project possible. + +And everyone that contributes to it. + +---------- + +### What is WhatsApp? +According to [the company](http://www.whatsapp.com/): + +> “WhatsApp Messenger is a cross-platform mobile messenger that replaces SMS and works through the existing internet data plan of your device. WhatsApp is available for iPhone, BlackBerry, Android, Windows Phone, Nokia Symbian60 & S40 phones. Because WhatsApp Messenger uses the same internet data plan that you use for email and web browsing, there is no cost to message and stay in touch with your friends.” + +Jan. 2015: 30 billion messages per day, ~700 million users. + +# License + +MIT + +# Terms and conditions + +- You will NOT use this API for marketing purposes (spam, massive sending...). +- We do NOT give support to anyone that wants this API to send massive messages or similar. +- We reserve the right to block any user of this repository that does not meet these conditions. + +## Legal + +This code is in no way affiliated with, authorized, maintained, sponsored or endorsed by WhatsApp or any of its affiliates or subsidiaries. This is an independent and unofficial API. Use at your own risk. From 3a2942cdcec69bbeeb3fcea3c6f82918f4ef84dd Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sun, 19 Jul 2015 17:36:55 +0200 Subject: [PATCH 405/436] Fixes #642 --- src/whatsprot.class.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 123648fd..0f081469 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -64,6 +64,7 @@ class WhatsProt protected $messageStore; protected $nodeId = array(); protected $loginTime; + protected $timeout; public $reader; // An instance of the BinaryTreeNodeReader class. /** @@ -461,6 +462,15 @@ public function isConnected() return ($this->socket !== null); } + /** + * Reconnect + */ + public function reconnect() + { + $this->connect(); + $this->loginWithPassword($this->password); + } + /** * Disconnect from the WhatsApp network. */ @@ -558,8 +568,9 @@ public function pollMessage($autoReceipt = true, $type = "read") $r = array($this->socket); $w = array(); $e = array(); + $s = socket_select($r, $w, $e, Constants::TIMEOUT_SEC, Constants::TIMEOUT_USEC); - if (socket_select($r, $w, $e, Constants::TIMEOUT_SEC, Constants::TIMEOUT_USEC)) { + if ($s) { // Something to read if ($stanza = $this->readStanza()) { $this->processInboundData($stanza, $autoReceipt, $type); @@ -567,6 +578,22 @@ public function pollMessage($autoReceipt = true, $type = "read") } } + if ($s == 0) + { + if (!isset($this->timeout)) + $this->timeout = time(); + + if ((time() - $this->timeout) > 300) + { + $this->timeout = null; + $this->disconnect(); + throw new ConnectionException('Connectivity error'); + } + } + else { + $this->timeout = null; + } + return false; } From 96febf5e3bd8c44e8287b5bbc70575f852ed0e0a Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sun, 19 Jul 2015 18:01:35 +0200 Subject: [PATCH 406/436] Update version composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ae76ae84..55c5f713 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "whatsapp/chat-api", - "version": "2.5", + "version": "2.5.1", "description": "The PHP WhatsApp library", "license": "MIT", "keywords": [ From f0e5c5ddd9409e784fb15bf770e54d3da1818465 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Tue, 21 Jul 2015 11:12:13 +0200 Subject: [PATCH 407/436] Fixes #870 --- src/whatsprot.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 0f081469..429c30d7 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -574,8 +574,12 @@ public function pollMessage($autoReceipt = true, $type = "read") // Something to read if ($stanza = $this->readStanza()) { $this->processInboundData($stanza, $autoReceipt, $type); + $this->timeout = null; return true; } + else { + $s = 0; + } } if ($s == 0) @@ -590,9 +594,6 @@ public function pollMessage($autoReceipt = true, $type = "read") throw new ConnectionException('Connectivity error'); } } - else { - $this->timeout = null; - } return false; } From 79c32a3493ec244baf9de5f7ee7ab5ac56ebe6c1 Mon Sep 17 00:00:00 2001 From: SikiFn Date: Wed, 22 Jul 2015 15:32:33 +0300 Subject: [PATCH 408/436] Get mime type without charset Using: file -bi FILENAME.jpg will output the following: image/text; charset=utf-8 which will cause problems to the function getExtensionFromMime() and files wouldn't be sent. However, "file -b --mime-type FILENAME.jpg" will return the mimetype only. --- src/func.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/func.php b/src/func.php index 6c43edcf..9fff1597 100755 --- a/src/func.php +++ b/src/func.php @@ -205,7 +205,7 @@ function get_mime($file) if (!strncasecmp(PHP_OS, 'WIN', 3) == 0 && !stristr(ini_get("disable_functions"), "shell_exec")) { $file = escapeshellarg($file); - $mime = shell_exec("file -bi " . $file); + $mime = shell_exec("file -b --mime-type " . $file); return $mime; } From 2f43bbe769021a7817f31a3a41dc8ba2375de5f7 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Wed, 22 Jul 2015 15:06:37 +0200 Subject: [PATCH 409/436] New release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 55c5f713..c61196df 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "whatsapp/chat-api", - "version": "2.5.1", + "version": "2.5.2", "description": "The PHP WhatsApp library", "license": "MIT", "keywords": [ From 59344fcb167d67b92532d0348664278a6b5023f2 Mon Sep 17 00:00:00 2001 From: SikiFn Date: Thu, 23 Jul 2015 11:35:42 +0300 Subject: [PATCH 410/436] Trim mimetype from command line getExtensionFromMime will not recognize the mimetype returned from command line due to hidden whitespace characters. Trimming it will do the trick. --- src/func.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/func.php b/src/func.php index 9fff1597..0d41b788 100755 --- a/src/func.php +++ b/src/func.php @@ -206,7 +206,7 @@ function get_mime($file) if (!strncasecmp(PHP_OS, 'WIN', 3) == 0 && !stristr(ini_get("disable_functions"), "shell_exec")) { $file = escapeshellarg($file); $mime = shell_exec("file -b --mime-type " . $file); - return $mime; + return trim($mime); } return false; From 7a25c06952e34d7b6c957163e09e287c16cd8a31 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Wed, 29 Jul 2015 01:43:40 +0200 Subject: [PATCH 411/436] script for resetting account --- examples/resetAccount.php | 44 +++++++++++++++++++++++++++++++++++++++ src/whatsprot.class.php | 1 + 2 files changed, 45 insertions(+) create mode 100644 examples/resetAccount.php diff --git a/examples/resetAccount.php b/examples/resetAccount.php new file mode 100644 index 00000000..8ecf6f06 --- /dev/null +++ b/examples/resetAccount.php @@ -0,0 +1,44 @@ +loginWithPassword($pw); +} +catch (Exception $e) +{ + echo "Failed to login, make sure your account is not blocked (use blockChecker.php) or check if your password is right\n\n"; + exit(0); +} + +$w->sendRemoveAccount(); + +$i = 0; +for ($i; $i < 5; $i++) +{ + $w->pollMessage(); +} + +$w->disconnect(); + +unlink("../src/wadata/id.$username.dat"); +unlink("../src/wadata/nextChallenge.$username.dat"); + +echo "\n\n OK! Now use registerTool.php \n\n"; diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 429c30d7..5a6fab62 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1215,6 +1215,7 @@ public function sendRemoveAccount($lg = null, $lc = null, $feedback = null) ), array($removeNode), null); $this->sendNode($node); + $this->waitForServer($msgId); } /** From 6b5574460164b2439f425a63e46fa9a1c6962ef5 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Thu, 30 Jul 2015 11:46:40 +0200 Subject: [PATCH 412/436] Update resetAccount.php --- examples/resetAccount.php | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/resetAccount.php b/examples/resetAccount.php index 8ecf6f06..8ba128af 100644 --- a/examples/resetAccount.php +++ b/examples/resetAccount.php @@ -18,6 +18,7 @@ echo "\n\nYour accounts password: "; $pw = trim(fgets(STDIN)); +$w->connect(); try { $w->loginWithPassword($pw); From 5a5e7a0891715fa27a6ba29144c679fd65bff141 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Sat, 8 Aug 2015 08:00:46 +0000 Subject: [PATCH 413/436] Update token 2.12.89 --- src/token.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/token.php b/src/token.php index 7192e88c..ca834168 100755 --- a/src/token.php +++ b/src/token.php @@ -20,7 +20,7 @@ function generateRequestToken($country, $phone) // return base64_encode($output); $const = 'PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk'; - $releaseTime = '1435097139726'; + $releaseTime = '1435688502926'; $token = md5($const . $releaseTime . $phone); return $token; From dcaa8ecc6ece38516573b25bf57a6a41c078cb49 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Sat, 8 Aug 2015 08:01:44 +0000 Subject: [PATCH 414/436] Update WA ver and UA --- src/Constants.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index 34fe80ce..61d6d55e 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -19,8 +19,8 @@ class Constants const WHATSAPP_REQUEST_HOST = 'v.whatsapp.net/v2/code'; // The request code host. const WHATSAPP_SERVER = 's.whatsapp.net'; // The hostname used to login/send messages. const WHATSAPP_DEVICE = 'S40'; // The device name. - const WHATSAPP_VER = '2.12.88'; // The WhatsApp version. - const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.88 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. + const WHATSAPP_VER = '2.12.89'; // The WhatsApp version. + const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.89 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_scratch'; // Check WhatsApp version } From d79981acf1c454be9662a0159205a21787452a02 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Thu, 13 Aug 2015 18:27:16 +0000 Subject: [PATCH 415/436] Update registerTool.php --- examples/registerTool.php | 41 ++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/examples/registerTool.php b/examples/registerTool.php index bbd9f742..ad0f5091 100644 --- a/examples/registerTool.php +++ b/examples/registerTool.php @@ -11,27 +11,46 @@ echo "\n\nUsername (country code + number without + or 00): "; $username = trim(fgets(STDIN)); +if (!preg_match('!^\d+$!', $username)) +{ + echo "Wrong number. Do NOT use '+' or '00' before your number\n"; + exit(0); +} +$identityExists = file_exists("../src/wadata/id.$username.dat"); // Create a instance of WhastPort. $w = new WhatsProt($username, '', $debug); -echo "\n\nType sms or voice: "; -$option = fgets(STDIN); +if (!$identityExists) +{ + echo "\n\nType sms or voice: "; + $option = fgets(STDIN); -try { + try { $w->codeRequest(trim($option)); -} catch(Exception $e) { + } catch(Exception $e) { echo $e->getMessage(); exit(0); -} + } -echo "\n\nEnter the received code: "; -$code = str_replace("-", "", fgets(STDIN)); + echo "\n\nEnter the received code: "; + $code = str_replace("-", "", fgets(STDIN)); -try { + try { $result = $w->codeRegister(trim($code)); - echo "\nYour password is: ".$result->pw."\n"; -} catch(Exception $e) { - echo $e->getMessage(); + echo "\nYour username is: ".$result->login."\n"; + echo "Your password is: ".$result->pw."\n"; + } catch(Exception $e) { + echo $e->getMessage() . "\n"; + exit(0); + } +} else { + try { + $result = $w->checkCredentials(); + } catch (Exception $e) { + echo $e->getMessage() . "\n"; exit(0); + } + echo "\nYour username is: ".$result->login."\n"; + echo "Your password is: ".$result->pw."\n"; } From faba4bf1cff727d24364abfe90fd115b0a12356f Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Thu, 13 Aug 2015 18:33:15 +0000 Subject: [PATCH 416/436] Update registerTool.php --- examples/registerTool.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/registerTool.php b/examples/registerTool.php index ad0f5091..f9adc2c7 100644 --- a/examples/registerTool.php +++ b/examples/registerTool.php @@ -51,6 +51,4 @@ echo $e->getMessage() . "\n"; exit(0); } - echo "\nYour username is: ".$result->login."\n"; - echo "Your password is: ".$result->pw."\n"; } From 1d11d0d3ffe115483afe7af124368c59b0103fd8 Mon Sep 17 00:00:00 2001 From: 0xTryCatch <0xtrycatch@gmail.com> Date: Thu, 20 Aug 2015 15:07:07 +0200 Subject: [PATCH 417/436] New message id format --- src/whatsprot.class.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 5a6fab62..4ef0db61 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -50,7 +50,7 @@ class WhatsProt protected $loginStatus; // Holds the login status. protected $mediaFileInfo = array(); // Media File Information protected $mediaQueue = array(); // Queue for media message nodes - protected $messageCounter = 1; // Message counter for auto-id. + protected $messageCounter = 0; // Message counter for auto-id. protected $iqCounter = 1; protected $messageQueue = array(); // Queue for received messages. protected $name; // The user name. @@ -63,7 +63,7 @@ class WhatsProt protected $writer; // An instance of the BinaryTreeNodeWriter class. protected $messageStore; protected $nodeId = array(); - protected $loginTime; + protected $messageId; protected $timeout; public $reader; // An instance of the BinaryTreeNodeReader class. @@ -2099,10 +2099,7 @@ protected function createFeaturesNode() */ protected function createMsgId() { - $msgid = $this->messageCounter; - $this->messageCounter++; - - return $this->loginTime . "-" . $msgid; + return $this->messageId . dechex($this->messageCounter++); } /** @@ -2278,7 +2275,7 @@ protected function doLogin() $this->phoneNumber )); $this->sendAvailableForChat(); - $this->loginTime = time(); + $this->messageId = substr(base64_encode(mcrypt_create_iv(64, MCRYPT_DEV_URANDOM)), 0, 12); return true; } From 391963186c6c5e2d44256f1e12bee6b861e083b7 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Thu, 20 Aug 2015 22:50:53 +0000 Subject: [PATCH 418/436] WUpdate to QA --- src/Constants.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index 61d6d55e..28745cec 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -19,8 +19,8 @@ class Constants const WHATSAPP_REQUEST_HOST = 'v.whatsapp.net/v2/code'; // The request code host. const WHATSAPP_SERVER = 's.whatsapp.net'; // The hostname used to login/send messages. const WHATSAPP_DEVICE = 'S40'; // The device name. - const WHATSAPP_VER = '2.12.89'; // The WhatsApp version. - const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.89 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. + const WHATSAPP_VER = '2.12.96'; // The WhatsApp version. + const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.96 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_scratch'; // Check WhatsApp version } From 8b602a16693d2c285c28d3a260d5cc95ce6a664b Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Thu, 20 Aug 2015 22:52:08 +0000 Subject: [PATCH 419/436] Update token to 2.12.96 WA ver --- src/token.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/token.php b/src/token.php index ca834168..969b2ac9 100755 --- a/src/token.php +++ b/src/token.php @@ -20,7 +20,7 @@ function generateRequestToken($country, $phone) // return base64_encode($output); $const = 'PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk'; - $releaseTime = '1435688502926'; + $releaseTime = '1439921717185'; $token = md5($const . $releaseTime . $phone); return $token; From 48ecf4f61636ab075301f39413cc2617d063b4dc Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Thu, 20 Aug 2015 23:17:02 +0000 Subject: [PATCH 420/436] New release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c61196df..9c60785c 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "whatsapp/chat-api", - "version": "2.5.2", + "version": "2.5.3", "description": "The PHP WhatsApp library", "license": "MIT", "keywords": [ From 47181a5284e3929ab2569d80ff70698d57d9fe62 Mon Sep 17 00:00:00 2001 From: Joel Ahlstedt Date: Sun, 23 Aug 2015 11:22:55 +0300 Subject: [PATCH 421/436] Update registerTool.php Add line break (on code request error; too_recent, etc.) and other --- examples/registerTool.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/registerTool.php b/examples/registerTool.php index f9adc2c7..e0be6770 100644 --- a/examples/registerTool.php +++ b/examples/registerTool.php @@ -9,8 +9,8 @@ echo "# #\n"; echo "####################\n"; -echo "\n\nUsername (country code + number without + or 00): "; -$username = trim(fgets(STDIN)); +echo "\n\nUsername (country code + number, do not use + or 00): "; +$username = str_replace("+", "", trim(fgets(STDIN))); if (!preg_match('!^\d+$!', $username)) { echo "Wrong number. Do NOT use '+' or '00' before your number\n"; @@ -29,7 +29,7 @@ try { $w->codeRequest(trim($option)); } catch(Exception $e) { - echo $e->getMessage(); + echo $e->getMessage() . "\n"; exit(0); } From 42cbde7aa41c18fb227801a6e04161f303f58ebf Mon Sep 17 00:00:00 2001 From: Joel Date: Mon, 24 Aug 2015 15:48:46 +0300 Subject: [PATCH 422/436] Update smileys.class.php Add new middle finger emoji and vulcan salute emoji (only available on Android and Whatsapp Web) --- src/smileys.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/smileys.class.php b/src/smileys.class.php index c5953ef6..65b4bb99 100644 --- a/src/smileys.class.php +++ b/src/smileys.class.php @@ -863,6 +863,8 @@ class Smileys { 'LARGE_BLUE_DIAMOND' => 0x1F537, // Smiley 843 'SMALL_ORANGE_DIAMOND' => 0x1F538, // Smiley 844 'SMALL_BLUE_DIAMOND' => 0x1F539, // Smiley 845 + 'MIDDLEFINGER' => 0x1F595, // Smiley xxx + 'VULCAN_SALUTE' => 0x1F596, // Smiley xxx ); private $listKeys = array(); From 7334703e306b089c37250164a8f2de4df2d84c3e Mon Sep 17 00:00:00 2001 From: Carson Full Date: Mon, 24 Aug 2015 13:43:05 -0500 Subject: [PATCH 423/436] Requiring mcrypt extension from 1d11d0d change --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9c60785c..5acc8c93 100644 --- a/composer.json +++ b/composer.json @@ -29,9 +29,10 @@ "php": ">=5.3", "ext-curl": "*", "ext-gd" : "*", - "ext-sockets" : "*", + "ext-mcrypt": "*", "ext-openssl" : "*", "ext-pdo" : "*", + "ext-sockets" : "*", "ext-sqlite3" : "*" } } From e34385f81252af5033e56ec95daf4b8f5c4c9957 Mon Sep 17 00:00:00 2001 From: Carson Full Date: Mon, 24 Aug 2015 13:45:22 -0500 Subject: [PATCH 424/436] Removing version as it's not needed or recommended. git tags are enough --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 5acc8c93..5bf39337 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,5 @@ { "name": "whatsapp/chat-api", - "version": "2.5.3", "description": "The PHP WhatsApp library", "license": "MIT", "keywords": [ From 582494add602a5863e1cad0bd388012332ef4559 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Tue, 1 Sep 2015 22:12:35 +0000 Subject: [PATCH 425/436] send voice message using sendMessageAudio --- src/whatsprot.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 4ef0db61..e8bad4ee 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -65,6 +65,7 @@ class WhatsProt protected $nodeId = array(); protected $messageId; protected $timeout; + protected $voice; public $reader; // An instance of the BinaryTreeNodeReader class. /** @@ -1560,10 +1561,13 @@ public function sendMessageRead($to, $id) * @param bool $storeURLmedia Keep copy of file * @param int $fsize * @param string $fhash * + * @param bool $voice * @return string|null Message ID if successfully, null if not. */ - public function sendMessageAudio($to, $filepath, $storeURLmedia = false, $fsize = 0, $fhash = "") + public function sendMessageAudio($to, $filepath, $storeURLmedia = false, $fsize = 0, $fhash = "", $voice = false) { + $this->voice = $voice; + if ($fsize == 0 || $fhash == "") { $allowedExtensions = array('3gp', 'caf', 'wav', 'mp3', 'wma', 'ogg', 'aif', 'aac', 'm4a'); $size = 10 * 1024 * 1024; // Easy way to set maximum file size for this media type. @@ -3607,6 +3611,11 @@ protected function processUploadResponse($node) if ($this->mediaQueue[$id]['caption'] != '') { $mediaAttribs["caption"] = $this->mediaQueue[$id]['caption']; } + if ($this->voice == true) + { + $mediaAttribs["origin"] = 'live'; + $this->voice = false; + } $filepath = $this->mediaQueue[$id]['filePath']; $to = $this->mediaQueue[$id]['to']; From 054f2d7841b65080029c293b7a61ba8b59abd686 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Fri, 4 Sep 2015 20:44:52 +0000 Subject: [PATCH 426/436] sendGroupsParticipantsRemove updates Now you can only remove one user per request --- src/whatsprot.class.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index e8bad4ee..510dfe36 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1430,15 +1430,12 @@ public function sendGroupsParticipantsAdd($groupId, $participants) * Remove participant(s) from a group. * * @param string $groupId The group ID. - * @param mixed $participants An array with the participants numbers to remove + * @param string $participant The number of the participant you want to remove */ - public function sendGroupsParticipantsRemove($groupId, $participants) + public function sendGroupsParticipantsRemove($groupId, $participant) { $msgId = $this->createMsgId(); - if (!is_array($participants)) { - $participants = array($participants); - } - $this->sendGroupsChangeParticipants($groupId, $participants, 'remove', $msgId); + $this->sendGroupsChangeParticipants($groupId, (array) $participant, 'remove', $msgId); } /** From c7c14b85f890e5c5fd505f4f110a0fb3e50415e2 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Sat, 5 Sep 2015 08:55:58 +0000 Subject: [PATCH 427/436] Update functions that interact with group participants --- src/whatsprot.class.php | 49 ++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 510dfe36..b9851fbf 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1415,19 +1415,16 @@ public function sendGroupsLeave($gjids) * Add participant(s) to a group. * * @param string $groupId The group ID. - * @param mixed $participants An array with the participants numbers to add + * @param string $participants An array with the participants numbers to add */ - public function sendGroupsParticipantsAdd($groupId, $participants) + public function sendGroupsParticipantsAdd($groupId, $participant) { $msgId = $this->createMsgId(); - if (!is_array($participants)) { - $participants = array($participants); - } - $this->sendGroupsChangeParticipants($groupId, $participants, 'add', $msgId); + $this->sendGroupsChangeParticipants($groupId, $participant, 'add', $msgId); } /** - * Remove participant(s) from a group. + * Remove participant from a group. * * @param string $groupId The group ID. * @param string $participant The number of the participant you want to remove @@ -1435,37 +1432,31 @@ public function sendGroupsParticipantsAdd($groupId, $participants) public function sendGroupsParticipantsRemove($groupId, $participant) { $msgId = $this->createMsgId(); - $this->sendGroupsChangeParticipants($groupId, (array) $participant, 'remove', $msgId); + $this->sendGroupsChangeParticipants($groupId, $participant, 'remove', $msgId); } /** - * Promote participant(s) of a group; Make a participant an admin of a group. + * Promote participant of a group; Make a participant an admin of a group. * * @param string $gId The group ID. - * @param mixed $participants An array with the participants numbers to promote + * @param string $participant The number of the participant you want to promote */ - public function sendPromoteParticipants($gId, $participants) + public function sendPromoteParticipants($gId, $participant) { $msgId = $this->createMsgId(); - if (!is_array($participants)) { - $participants = array($participants); - } - $this->sendGroupsChangeParticipants($gId, $participants, "promote", $msgId); + $this->sendGroupsChangeParticipants($gId, $participant, "promote", $msgId); } /** - * Demote participant(s) of a group; remove participant of being admin of a group. + * Demote participant of a group; remove participant of being admin of a group. * * @param string $gId The group ID. - * @param array $participants An array with the participants numbers to demote + * @param string $participant The number of the participant you want to demote */ - public function sendDemoteParticipants($gId, $participants) + public function sendDemoteParticipants($gId, $participant) { $msgId = $this->createMsgId(); - if (!is_array($participants)) { - $participants = array($participants); - } - $this->sendGroupsChangeParticipants($gId, $participants, "demote", $msgId); + $this->sendGroupsChangeParticipants($gId, $participant, "demote", $msgId); } /** @@ -3838,19 +3829,17 @@ protected function sendGetGroupsFiltered($type) * Change participants of a group. * * @param string $groupId The group ID. - * @param array $participants An array with the participants. - * @param string $tag The tag action. 'add' or 'remove' + * @param string $participant The participant. + * @param string $tag The tag action. 'add', 'remove', 'promote' or 'demote' * @param $id */ - protected function sendGroupsChangeParticipants($groupId, $participants, $tag, $id) + protected function sendGroupsChangeParticipants($groupId, $participant, $tag, $id) { - $_participants = array(); - foreach ($participants as $participant) { - $_participants[] = new ProtocolNode("participant", array("jid" => $this->getJID($participant)), null, ""); - } + + $participants = new ProtocolNode("participant", array("jid" => $this->getJID($participant)), null, ""); $childHash = array(); - $child = new ProtocolNode($tag, $childHash, $_participants, ""); + $child = new ProtocolNode($tag, $childHash, $participants, ""); $node = new ProtocolNode("iq", array( From a56e559d0636d2121f841950b4afddd5ad6f9c3d Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Mon, 7 Sep 2015 10:52:31 +0000 Subject: [PATCH 428/436] Fixes #986 checkCredentials updated --- src/whatsprot.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index b9851fbf..547fbf99 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -152,10 +152,6 @@ public function checkCredentials() $countryCode = ($phone['ISO3166'] != '') ? $phone['ISO3166'] : 'US'; $langCode = ($phone['ISO639'] != '') ? $phone['ISO639'] : 'en'; - if ($phone['cc'] == '77' || $phone['cc'] == '79') { - $phone['cc'] = '7'; - } - // Build the url. $host = 'https://' . Constants::WHATSAPP_CHECK_HOST; $query = array( From 51c36e4acae248732ff3017fe5fe9492c3c4eda5 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Wed, 9 Sep 2015 12:21:45 +0000 Subject: [PATCH 429/436] Fixes #990 --- src/whatsprot.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 547fbf99..161e937f 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -152,6 +152,10 @@ public function checkCredentials() $countryCode = ($phone['ISO3166'] != '') ? $phone['ISO3166'] : 'US'; $langCode = ($phone['ISO639'] != '') ? $phone['ISO639'] : 'en'; + if ($phone['cc'] == '77' || $phone['cc'] == '79') { + $phone['cc'] = '7'; + } + // Build the url. $host = 'https://' . Constants::WHATSAPP_CHECK_HOST; $query = array( @@ -2874,20 +2878,20 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru && strncmp($node->getAttribute('from'), $this->phoneNumber, strlen($this->phoneNumber)) != 0 && strpos($node->getAttribute('from'), "-") !== false && $node->getAttribute('type') != null) { - $groupId = Constants::parseJID($node->getAttribute('from')); + $groupId = $this->parseJID($node->getAttribute('from')); if ($node->getAttribute('add') != null) { $this->eventManager()->fire("onGroupsParticipantsAdd", array( $this->phoneNumber, $groupId, - Constants::parseJID($node->getAttribute('add')) + $this->parseJID($node->getAttribute('add')) )); } elseif ($node->getAttribute('remove') != null) { $this->eventManager()->fire("onGroupsParticipantsRemove", array( $this->phoneNumber, $groupId, - Constants::parseJID($node->getAttribute('remove')) + $this->parseJID($node->getAttribute('remove')) )); } } @@ -4016,7 +4020,7 @@ protected function sendSetPicture($jid, $filepath) * * @return string */ - public static function parseJID($jid) + private function parseJID($jid) { $parts = explode('@', $jid); $parts = reset($parts); From d7e0a49b318afcca6e46595b01a276eaecd70f51 Mon Sep 17 00:00:00 2001 From: WHAnonymous Date: Wed, 9 Sep 2015 12:23:34 +0000 Subject: [PATCH 430/436] Update (bad git) --- src/whatsprot.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 161e937f..455d3a92 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -152,10 +152,6 @@ public function checkCredentials() $countryCode = ($phone['ISO3166'] != '') ? $phone['ISO3166'] : 'US'; $langCode = ($phone['ISO639'] != '') ? $phone['ISO639'] : 'en'; - if ($phone['cc'] == '77' || $phone['cc'] == '79') { - $phone['cc'] = '7'; - } - // Build the url. $host = 'https://' . Constants::WHATSAPP_CHECK_HOST; $query = array( From 5fa986c725157486b096e4ccdd6d41d65301829a Mon Sep 17 00:00:00 2001 From: mgp25 Date: Fri, 11 Sep 2015 10:42:29 +0200 Subject: [PATCH 431/436] Not required anymore Check issue #938 for more information --- src/whatsprot.class.php | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 455d3a92..6a17f791 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -1043,29 +1043,6 @@ public function sendGetProfilePhotoIds($numbers) return true; } - /** - * Request to retrieve the last online time of specific user. - * - * @param string $to Number or JID of user - */ - public function sendGetRequestLastSeen($to) - { - $msgId = $this->nodeId['getlastseen'] = $this->createIqId(); - - $queryNode = new ProtocolNode("query", null, null, null); - - $messageNode = new ProtocolNode("iq", - array( - "to" => $this->getJID($to), - "type" => "get", - "id" => $msgId, - "xmlns" => "jabber:iq:last" - ), array($queryNode), ""); - - $this->sendNode($messageNode); - $this->waitForServer($msgId); - } - /** * Send a request to get the current server properties. */ From 538263cb7193c866403abf757cbf02ad21ba161c Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sun, 13 Sep 2015 13:24:55 +0200 Subject: [PATCH 432/436] Update ver. to 2.13.4 Nokia data --- src/Constants.php | 4 ++-- src/token.php | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index 28745cec..f5438559 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -19,8 +19,8 @@ class Constants const WHATSAPP_REQUEST_HOST = 'v.whatsapp.net/v2/code'; // The request code host. const WHATSAPP_SERVER = 's.whatsapp.net'; // The hostname used to login/send messages. const WHATSAPP_DEVICE = 'S40'; // The device name. - const WHATSAPP_VER = '2.12.96'; // The WhatsApp version. - const WHATSAPP_USER_AGENT = 'WhatsApp/2.12.96 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. + const WHATSAPP_VER = '2.13.4'; // The WhatsApp version. + const WHATSAPP_USER_AGENT = 'WhatsApp/2.13.4 S40Version/14.26 Device/Nokia302'; // User agent used in request/registration code. const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_scratch'; // Check WhatsApp version } diff --git a/src/token.php b/src/token.php index 969b2ac9..2406483a 100755 --- a/src/token.php +++ b/src/token.php @@ -3,25 +3,27 @@ function generateRequestToken($country, $phone) { - // $signature = "MIIDMjCCAvCgAwIBAgIETCU2pDALBgcqhkjOOAQDBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMRYwFAYDVQQKEw1XaGF0c0FwcCBJbmMuMRQwEgYDVQQLEwtFbmdpbmVlcmluZzEUMBIGA1UEAxMLQnJpYW4gQWN0b24wHhcNMTAwNjI1MjMwNzE2WhcNNDQwMjE1MjMwNzE2WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFjAUBgNVBAoTDVdoYXRzQXBwIEluYy4xFDASBgNVBAsTC0VuZ2luZWVyaW5nMRQwEgYDVQQDEwtCcmlhbiBBY3RvbjCCAbgwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GFAAKBgQDRGYtLgWh7zyRtQainJfCpiaUbzjJuhMgo4fVWZIvXHaSHBU1t5w//S0lDK2hiqkj8KpMWGywVov9eZxZy37V26dEqr/c2m5qZ0E+ynSu7sqUD7kGx/zeIcGT0H+KAVgkGNQCo5Uc0koLRWYHNtYoIvt5R3X6YZylbPftF/8ayWTALBgcqhkjOOAQDBQADLwAwLAIUAKYCp0d6z4QQdyN74JDfQ2WCyi8CFDUM4CaNB+ceVXdKtOrNTQcc0e+t"; - // $classesMd5 = "R7MxKWjKZns6728qXwgRRQ=="; // 2.11.489 + /* + $signature = "MIIDMjCCAvCgAwIBAgIETCU2pDALBgcqhkjOOAQDBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMRYwFAYDVQQKEw1XaGF0c0FwcCBJbmMuMRQwEgYDVQQLEwtFbmdpbmVlcmluZzEUMBIGA1UEAxMLQnJpYW4gQWN0b24wHhcNMTAwNjI1MjMwNzE2WhcNNDQwMjE1MjMwNzE2WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFjAUBgNVBAoTDVdoYXRzQXBwIEluYy4xFDASBgNVBAsTC0VuZ2luZWVyaW5nMRQwEgYDVQQDEwtCcmlhbiBBY3RvbjCCAbgwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GFAAKBgQDRGYtLgWh7zyRtQainJfCpiaUbzjJuhMgo4fVWZIvXHaSHBU1t5w//S0lDK2hiqkj8KpMWGywVov9eZxZy37V26dEqr/c2m5qZ0E+ynSu7sqUD7kGx/zeIcGT0H+KAVgkGNQCo5Uc0koLRWYHNtYoIvt5R3X6YZylbPftF/8ayWTALBgcqhkjOOAQDBQADLwAwLAIUAKYCp0d6z4QQdyN74JDfQ2WCyi8CFDUM4CaNB+ceVXdKtOrNTQcc0e+t"; + $classesMd5 = "vBDjXjeeoc4D0w/12fWnPg=="; // 2.12.278 - // $key2 = base64_decode("/UIGKU1FVQa+ATM2A0za7G2KI9S/CwPYjgAbc67v7ep42eO/WeTLx1lb1cHwxpsEgF4+PmYpLd2YpGUdX/A2JQitsHzDwgcdBpUf7psX1BU="); - // $data = base64_decode($signature) . base64_decode($classesMd5) . $phone; + $key2 = base64_decode("/UIGKU1FVQa+ATM2A0za7G2KI9S/CwPYjgAbc67v7ep42eO/WeTLx1lb1cHwxpsEgF4+PmYpLd2YpGUdX/A2JQitsHzDwgcdBpUf7psX1BU="); + $data = base64_decode($signature) . base64_decode($classesMd5) . $phone; - // $opad = str_repeat(chr(0x5C), 64); - // $ipad = str_repeat(chr(0x36), 64); - // for ($i = 0; $i < 64; $i++) { - // $opad[$i] = $opad[$i] ^ $key2[$i]; - // $ipad[$i] = $ipad[$i] ^ $key2[$i]; - // } + $opad = str_repeat(chr(0x5C), 64); + $ipad = str_repeat(chr(0x36), 64); + for ($i = 0; $i < 64; $i++) { + $opad[$i] = $opad[$i] ^ $key2[$i]; + $ipad[$i] = $ipad[$i] ^ $key2[$i]; + } - // $output = hash("sha1", $opad . hash("sha1", $ipad . $data, true), true); + $output = hash("sha1", $opad . hash("sha1", $ipad . $data, true), true); - // return base64_encode($output); - $const = 'PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk'; - $releaseTime = '1439921717185'; - $token = md5($const . $releaseTime . $phone); + return base64_encode($output); + */ + $const = 'PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk'; + $releaseTime = '1441745119487'; + $token = md5($const . $releaseTime . $phone); return $token; } From 9161ba46d58966f40f6d37cfec98617f7ed1be78 Mon Sep 17 00:00:00 2001 From: Giovanni Terlingen Date: Wed, 16 Sep 2015 16:24:53 +0200 Subject: [PATCH 433/436] Fixed MCC codes --- src/countries.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/countries.csv b/src/countries.csv index fee9acf6..a9e318bb 100755 --- a/src/countries.csv +++ b/src/countries.csv @@ -6,7 +6,7 @@ "Andorra",376,213,"AD","ca","003" "Angola",244,631,"AO","pt","002" "Anguilla",1264,"365","AI","en","840" -"Antarctica (Australian bases)",6721,232,"AQ","en","001" +"Antarctica (Australian bases)",6721,901,"AQ","en","001" "Antigua and Barbuda",1268,"344","AG","en","050" "Argentina",54,722,"AR","es","010" "Armenia",374,283,"AM","hy","010" @@ -248,7 +248,7 @@ "Vietnam",84,452,"VN","vi","001" "U.S. Virgin Islands",1340,"332","VI","en","001" "Wallis and Futuna",681,543,"WF","fr","001" -"West Bank",970,0,"PS","ar","001" +"West Bank",970,425,"PS","ar","001" "Yemen",967,421,"YE","ar","001" "Zambia",260,645,"ZM","en","001" "Zimbabwe",263,648,"ZW","en","001" From fc84aa441b79bd5a515f1d99a676235f4b6b8704 Mon Sep 17 00:00:00 2001 From: ottowayne Date: Fri, 18 Sep 2015 17:44:23 +0200 Subject: [PATCH 434/436] Fix sendGroupsChangeParticipants --- src/whatsprot.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php index 6a17f791..65e3ca5f 100755 --- a/src/whatsprot.class.php +++ b/src/whatsprot.class.php @@ -3812,7 +3812,7 @@ protected function sendGroupsChangeParticipants($groupId, $participant, $tag, $i $participants = new ProtocolNode("participant", array("jid" => $this->getJID($participant)), null, ""); $childHash = array(); - $child = new ProtocolNode($tag, $childHash, $participants, ""); + $child = new ProtocolNode($tag, $childHash, array($participants), ""); $node = new ProtocolNode("iq", array( From ddab7f1896a8cfdf71d576dbfeeda3f3e4bcd2d2 Mon Sep 17 00:00:00 2001 From: ottowayne Date: Fri, 18 Sep 2015 19:52:34 +0200 Subject: [PATCH 435/436] ProtocolNode - typehint children as array --- src/protocol.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocol.class.php b/src/protocol.class.php index 3ed24ad6..f6f66d04 100755 --- a/src/protocol.class.php +++ b/src/protocol.class.php @@ -78,7 +78,7 @@ public function getChildren() return $this->children; } - public function __construct($tag, $attributeHash, $children, $data) + public function __construct($tag, $attributeHash, array $children, $data) { $this->tag = $tag; $this->attributeHash = $attributeHash; From bdde6dd6a2cba9646eaaba473753a311c5f7c918 Mon Sep 17 00:00:00 2001 From: mgp25 Date: Sat, 19 Sep 2015 13:00:46 +0200 Subject: [PATCH 436/436] sendGroupsChangeParticipants fix --- src/protocol.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocol.class.php b/src/protocol.class.php index f6f66d04..3ed24ad6 100755 --- a/src/protocol.class.php +++ b/src/protocol.class.php @@ -78,7 +78,7 @@ public function getChildren() return $this->children; } - public function __construct($tag, $attributeHash, array $children, $data) + public function __construct($tag, $attributeHash, $children, $data) { $this->tag = $tag; $this->attributeHash = $attributeHash;

Whatsapp! Messenger

Whatsapp! Login

Whatsapp! Messenger

Whatsapp! Messenger