Adding a few more convenience methods.

robbiehanson · Aug 24, 2011 · d10a11d · d10a11d
1 parent d560d0f
commit d10a11d
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 16 deletions.
diff --git a/Core/XMPPIQ.h b/Core/XMPPIQ.h
@@ -23,6 +23,7 @@
  * If the type or elementID parameters are nil, those attributes will not be added.
 **/
 + (XMPPIQ *)iq;
++ (XMPPIQ *)iqWithType:(NSString *)type;
 + (XMPPIQ *)iqWithType:(NSString *)type to:(XMPPJID *)jid;
 + (XMPPIQ *)iqWithType:(NSString *)type to:(XMPPJID *)jid elementID:(NSString *)eid;
 + (XMPPIQ *)iqWithType:(NSString *)type to:(XMPPJID *)jid elementID:(NSString *)eid child:(NSXMLElement *)childElement;
@@ -32,6 +33,7 @@
  * If the type or elementID parameters are nil, those attributes will not be added.
 **/
 - (id)init;
+- (id)initWithType:(NSString *)type;
 - (id)initWithType:(NSString *)type to:(XMPPJID *)jid;
 - (id)initWithType:(NSString *)type to:(XMPPJID *)jid elementID:(NSString *)eid;
 - (id)initWithType:(NSString *)type to:(XMPPJID *)jid elementID:(NSString *)eid child:(NSXMLElement *)childElement;

diff --git a/Core/XMPPIQ.m b/Core/XMPPIQ.m
@@ -41,6 +41,11 @@ + (XMPPIQ *)iq
 	return [[[XMPPIQ alloc] initWithType:nil to:nil elementID:nil child:nil] autorelease];
 }
 
++ (XMPPIQ *)iqWithType:(NSString *)type
+{
+	return [[[XMPPIQ alloc] initWithType:type to:nil elementID:nil child:nil] autorelease];
+}
+
 + (XMPPIQ *)iqWithType:(NSString *)type to:(XMPPJID *)jid
 {
 	return [[[XMPPIQ alloc] initWithType:type to:jid elementID:nil child:nil] autorelease];
@@ -61,6 +66,11 @@ - (id)init
 	return [self initWithType:nil to:nil elementID:nil child:nil];
 }
 
+- (id)initWithType:(NSString *)type
+{
+	return [self initWithType:type to:nil elementID:nil child:nil];
+}
+
 - (id)initWithType:(NSString *)type to:(XMPPJID *)jid
 {
 	return [self initWithType:type to:jid elementID:nil child:nil];

diff --git a/Core/XMPPJID.h b/Core/XMPPJID.h
@@ -1,5 +1,16 @@
 #import <Foundation/Foundation.h>
 
+enum XMPPJIDCompareOptions
+{
+	XMPPJIDCompareUser     = 1, // 001
+	XMPPJIDCompareDomain   = 2, // 010
+	XMPPJIDCompareResource = 4, // 100
+
+	XMPPJIDCompareBare     = 3, // 011
+	XMPPJIDCompareFull     = 7, // 111
+};
+typedef enum XMPPJIDCompareOptions XMPPJIDCompareOptions;
+
 
 @interface XMPPJID : NSObject <NSCoding, NSCopying>
 {
@@ -33,6 +44,7 @@
 /**
  * When you know both objects are JIDs, this method is a faster way to check equality than isEqual:.
 **/
-- (BOOL)isEqualToJID:(XMPPJID *)aJID; 
+- (BOOL)isEqualToJID:(XMPPJID *)aJID;
+- (BOOL)isEqualToJID:(XMPPJID *)aJID options:(XMPPJIDCompareOptions)mask;
 
 @end
diff --git a/Core/XMPPJID.m b/Core/XMPPJID.m
@@ -361,28 +361,42 @@ - (BOOL)isEqual:(id)anObject
 }
 
 - (BOOL)isEqualToJID:(XMPPJID *)aJID
+{
+	return [self isEqualToJID:aJID options:XMPPJIDCompareFull];
+}
+
+- (BOOL)isEqualToJID:(XMPPJID *)aJID options:(XMPPJIDCompareOptions)mask
 {
 	if (aJID == nil) return NO;
 
-	if (user) {
+	if (mask & XMPPJIDCompareUser)
-		if (![user isEqualToString:aJID->user]) return NO;
+	{
-	}
+		if (user) {
-	else {
+			if (![user isEqualToString:aJID->user]) return NO;
-		if (aJID->user) return NO;
+		}
+		else {
+			if (aJID->user) return NO;
+		}
 	}
 
-	if (domain) {
+	if (mask & XMPPJIDCompareDomain)
-		if (![domain isEqualToString:aJID->domain]) return NO;
+	{
-	}
+		if (domain) {
-	else {
+			if (![domain isEqualToString:aJID->domain]) return NO;
-		if (aJID->domain) return NO;
+		}
+		else {
+			if (aJID->domain) return NO;
+		}
 	}
 
-	if (resource) {
+	if (mask & XMPPJIDCompareResource)
-		if (![resource isEqualToString:aJID->resource]) return NO;
+	{
-	}
+		if (resource) {
-	else {
+			if (![resource isEqualToString:aJID->resource]) return NO;
-		if (aJID->resource) return NO;
+		}
+		else {
+			if (aJID->resource) return NO;
+		}
 	}
 
 	return YES;