group-related actions, profile pictures and more

Author: hidespb

README.md

@@ -1,4 +1,8 @@
 node-whatsapi
 =============
 
-Node.js version for (https://github.com/venomous0x/WhatsAPI)
+Node.js version for (https://github.com/venomous0x/WhatsAPI)
+
+Install via [npm]:
+
+    npm install whatsapi

challenge

@@ -1 +0,0 @@
-�A�1��@�u%"��P�ޙ

package.json

@@ -2,7 +2,7 @@
   "name": "whatsapi",
   "main": "whatsapi",
   "description": "WhatsApp messenger interface",
-  "version": "0.1.3",
+  "version": "0.1.7",
   "keywords": [
     "WhatsApp",
     "WhatsApi"
@@ -25,6 +25,10 @@
   "bugs": {
     "url": "https://github.com/hidespb/node-whatsapi/issues"
   },
-  "_id": "whatsapi@0.1.2",
-  "_from": "whatsapi@>=0.1.0"
+  "_id": "whatsapi@0.1.3",
+  "_from": "whatsapi@>=0.1.0",
+  "dist": {
+    "shasum": "9965ccf1c8741d57298ddea98369460137c2d457"
+  },
+  "_resolved": "https://registry.npmjs.org/whatsapi/-/whatsapi-0.1.3.tgz"
 }

processors.js

@@ -15,19 +15,14 @@ function Aggregate(list) {
 }
 
 Aggregate.prototype.setAdapter = function(adapter) {
-	this.selfAddress = new RegExp(adapter.config.msisdn + '@' + adapter.config.server);
-	this.adapter     = adapter;
+	this.adapter = adapter;
 
 	this.list.forEach(function(processor) {
 		processor.setAdapter(adapter);
 	}, this);
 };
 
 Aggregate.prototype.process = function(node) {
-	if(!node.attribute('from').match(this.selfAddress)) {
-		this.adapter.sendNode(this.adapter.createReceivedNode(node));
-	}
-
 	this.list.forEach(function(processor) {
 		if(processor.match(node)) {
 			processor.process(node);
@@ -49,7 +44,8 @@ Text.prototype.process = function(node) {
 		node.attribute('from'),
 		node.attribute('id'),
 		node.child('notify').attribute('name'),
-		node.child('body').data()
+		node.child('body').data(),
+		node.attribute('author')
 	);
 };
 
@@ -72,7 +68,8 @@ Location.prototype.process = function(node) {
 		location.attribute('latitude'),
 		location.attribute('longitude'),
 		location.attribute('name'),
-		location.attribute('url')
+		location.attribute('url'),
+		node.attribute('author')
 	);
 };
 
@@ -108,7 +105,8 @@ Image.prototype.process = function(node) {
 		image.attribute('filehash'),
 		image.attribute('width'),
 		image.attribute('height'),
-		image.data()
+		image.data(),
+		node.attribute('author')
 	);
 };
 
@@ -134,7 +132,8 @@ Video.prototype.process = function(node) {
 		video.attribute('duration'),
 		video.attribute('vcodec'),
 		video.attribute('acodec'),
-		video.data()
+		video.data(),
+		node.attribute('author')
 	);
 };
 
@@ -158,7 +157,8 @@ Audio.prototype.process = function(node) {
 		audio.attribute('mimetype'),
 		audio.attribute('filehash'),
 		audio.attribute('duration'),
-		audio.attribute('acodec')
+		audio.attribute('acodec'),
+		node.attribute('author')
 	);
 };
 

protocol.js

@@ -128,6 +128,11 @@ Node.prototype.data = function() {
 	return this.contents.data;
 };
 
+Node.prototype.shouldBeReplied = function() {
+	return this.tag() === 'message'
+		&& (this.child('notify') || this.child('received') || this.child('request'));
+};
+
 Node.prototype.isChallenge = function() {
 	return this.tag() === 'challenge';
 };
@@ -137,7 +142,8 @@ Node.prototype.isSuccess = function() {
 };
 
 Node.prototype.isMessage = function() {
-	return this.tag() === 'message';
+	return this.tag() === 'message' && this.child('notify') &&
+		   this.child('notify').attribute('name') !== null;
 };
 
 Node.prototype.isPing = function() {
@@ -162,6 +168,23 @@ Node.prototype.isGroupAdd = function() {
 		   this.child('body').attribute('event') === 'add';
 };
 
+Node.prototype.isGroupTopic = function() {
+	return this.tag() === 'message' && this.attribute('type') === 'subject' && this.child('body');
+};
+
+Node.prototype.isGroupMembers = function() {
+	return this.tag() === 'iq' && this.attribute('type') === 'result' && this.child(0)
+		&& this.child(0).tag() === 'participant' && this.child(0).attribute('xmlns') === 'w:g';
+};
+
+Node.prototype.isGroupNewcomer = function() {
+	return this.tag() === 'presence' && this.attribute('xmlns') === 'w' && this.attribute('add');
+};
+
+Node.prototype.isGroupOutcomer = function() {
+	return this.tag() === 'presence' && this.attribute('xmlns') === 'w' && this.attribute('remove');
+};
+
 Node.prototype.isLastSeen = function() {
 	return this.child('query') && this.child('query').attribute('xmlns') === 'jabber:iq:last';
 };
@@ -175,6 +198,14 @@ Node.prototype.isFailure = function() {
 	return this.tag() === 'failure';
 };
 
+Node.prototype.isReceived = function() {
+	return this.tag() === 'message' && this.child('received');
+};
+
+Node.prototype.isProfilePicture = function() {
+	return this.tag() === 'iq' && this.child(0) && this.child(0).tag() === 'picture';
+};
+
 Node.prototype.toXml = function(prefix) {
 	prefix = prefix || '';