Changeset 3638

Timestamp:

04/17/07 01:39:07 (1 year ago)

Author:

timothy

Message:

Adds the basics for Jabber group chat support. #454

Files:

• trunk/Chat Core.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/Chat Core/MVChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.m (modified) (3 diffs)
• trunk/Chat Core/MVChatRoom.h (modified) (2 diffs)
• trunk/Chat Core/MVChatRoom.m (modified) (1 diff)
• trunk/Chat Core/MVChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVChatUserPrivate.h (modified) (1 diff)
• trunk/Chat Core/MVICBChatConnection.m (modified) (1 diff)
• trunk/Chat Core/MVXMPPChatConnection.h (modified) (3 diffs)
• trunk/Chat Core/MVXMPPChatConnection.m (modified) (14 diffs)
• trunk/Chat Core/MVXMPPChatRoom.h (added)
• trunk/Chat Core/MVXMPPChatRoom.m (added)
• trunk/Chat Core/MVXMPPChatUser.h (modified) (1 diff)
• trunk/Chat Core/MVXMPPChatUser.m (modified) (5 diffs)
• trunk/Frameworks/frameworks.tar.gz (modified) (previous)
• trunk/Models/JVSQLChatTranscript.m (modified) (2 diffs)

trunk/Chat Core.xcodeproj/project.pbxproj

@@ -75 +75 @@
-                32C46E1B0B3AB37E00B96B27 /* MVICBChatUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 32C46E190B3AB37E00B96B27 /* MVICBChatUser.m */; };
-                431261C3072EE37A00720AD1 /* MVSILCFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 431261C1072EE37A00720AD1 /* MVSILCFileTransfer.m */; };
+                DD4741310BD35A2E00D93AB9 /* MVXMPPChatRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = DD47412F0BD35A2E00D93AB9 /* MVXMPPChatRoom.m */; };
-                DDF64CE60BD29E41009E8FF6 /* MVXMPPChatConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = DDF64CE40BD29E41009E8FF6 /* MVXMPPChatConnection.m */; };
-                DDF64D530BD2A4F6009E8FF6 /* Acid.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDF64D520BD2A4F6009E8FF6 /* Acid.framework */; };
@@ -164 +165 @@
-                431261C0072EE37A00720AD1 /* MVSILCFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MVSILCFileTransfer.h; path = "Chat Core/MVSILCFileTransfer.h"; sourceTree = "<group>"; };
-                431261C1072EE37A00720AD1 /* MVSILCFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MVSILCFileTransfer.m; path = "Chat Core/MVSILCFileTransfer.m"; sourceTree = "<group>"; };
+                DD47412E0BD35A2E00D93AB9 /* MVXMPPChatRoom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVXMPPChatRoom.h; path = "Chat Core/MVXMPPChatRoom.h"; sourceTree = "<group>"; };
+                DD47412F0BD35A2E00D93AB9 /* MVXMPPChatRoom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVXMPPChatRoom.m; path = "Chat Core/MVXMPPChatRoom.m"; sourceTree = "<group>"; };
-                DDF64CE30BD29E41009E8FF6 /* MVXMPPChatConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVXMPPChatConnection.h; path = "Chat Core/MVXMPPChatConnection.h"; sourceTree = "<group>"; };
-                DDF64CE40BD29E41009E8FF6 /* MVXMPPChatConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVXMPPChatConnection.m; path = "Chat Core/MVXMPPChatConnection.m"; sourceTree = "<group>"; };
@@ -310 +313 @@
-                                DDF64CE40BD29E41009E8FF6 /* MVXMPPChatConnection.m */,
-                                DDF64CE30BD29E41009E8FF6 /* MVXMPPChatConnection.h */,
+                                DD47412F0BD35A2E00D93AB9 /* MVXMPPChatRoom.m */,
+                                DD47412E0BD35A2E00D93AB9 /* MVXMPPChatRoom.h */,
-                                DDF64E180BD2CABE009E8FF6 /* MVXMPPChatUser.m */,
-                                DDF64E170BD2CABE009E8FF6 /* MVXMPPChatUser.h */,
@@ -570 +575 @@
-                                DDF64CE60BD29E41009E8FF6 /* MVXMPPChatConnection.m in Sources */,
-                                DDF64E1A0BD2CABE009E8FF6 /* MVXMPPChatUser.m in Sources */,
+                                DD4741310BD35A2E00D93AB9 /* MVXMPPChatRoom.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Chat Core/MVChatConnection.h

@@ -373 +373 @@
-#pragma mark -
-
+- (MVChatRoom *) joinedChatRoomWithUniqueIdentifier:(id) identifier;
-- (MVChatRoom *) joinedChatRoomWithName:(NSString *) room;
-

trunk/Chat Core/MVChatConnection.m

@@ -633 +633 @@
-}
-
+- (MVChatRoom *) joinedChatRoomWithUniqueIdentifier:(id) identifier {
+        @synchronized( _joinedRooms ) {
+                return [_joinedRooms objectForKey:identifier];
+        } return nil;
+}
+
-- (MVChatRoom *) joinedChatRoomWithName:(NSString *) name {
-        @synchronized( _joinedRooms ) {
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -899 +912 @@
-- (void) _addJoinedRoom:(MVChatRoom *) room {
-        @synchronized( _joinedRooms ) {
-[room name] lowercaseString
+room uniqueIdentifier
-        }
-}
@@ -905 +918 @@
-- (void) _removeJoinedRoom:(MVChatRoom *) room {
-        @synchronized( _joinedRooms ) {
-[room name] lowercaseString
+room uniqueIdentifier
-        }
-}

trunk/Chat Core/MVChatRoom.h

@@ -99 +99 @@
-@property(readonly, ivar) unsigned long modes;
-
+@property(readonly) MVChatUser *localMemberUser;
-@property(readonly) NSSet *memberUsers;
-@property(readonly) NSSet *bannedUsers;
@@ -128 +129 @@
-- (unsigned long) modes;
-
+- (MVChatUser *) localMemberUser;
-- (NSSet *) memberUsers;
-- (NSSet *) bannedUsers;

trunk/Chat Core/MVChatRoom.m

@@ -375 +375 @@
-#pragma mark -
-
+- (MVChatUser *) localMemberUser {
+        return [[self connection] localUser];
+}
+
-- (NSSet *) memberUsers {
-        @synchronized( _memberUsers ) {

trunk/Chat Core/MVChatUser.m

@@ -454 +454 @@
-
-@implementation MVChatUser (MVChatUserPrivate)
+- (void) _setType:(MVChatUserType) type {
+        _type = type;
+}
+
-- (void) _setUniqueIdentifier:(id) identifier {
-        MVSafeAdoptAssign( &_uniqueIdentifier, ( [identifier conformsToProtocol:@protocol( NSCopying )] ? [identifier copyWithZone:nil] : [identifier retain] ) );

trunk/Chat Core/MVChatUserPrivate.h

@@ -2 +2 @@
-
-@interface MVChatUser (MVChatUserPrivate)
+- (void) _setType:(MVChatUserType) type;
-- (void) _setUniqueIdentifier:(id) identifier;
-- (void) _setNickname:(NSString *) name;

trunk/Chat Core/MVICBChatConnection.m

@@ -307 +307 @@
-        NSParameterAssert( [identifier isKindOfClass:[NSString class]] );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        return room;
-}

trunk/Chat Core/MVXMPPChatConnection.h

@@ -4 +4 @@
-@class JabberSession;
-@class JabberID;
+@class XMLElement;
-
-@interface MVXMPPChatConnection : MVChatConnection {
@@ -12 +13 @@
-        NSString *_server;
-        NSString *_username;
+        NSString *_nickname;
-        NSString *_password;
-        NSMutableDictionary *_knownUsers;
@@ -21 +23 @@
-- (JabberSession *) _chatSession;
-- (JabberID *) _localUserID;
+- (XMLElement *) _capabilitiesElement;
+- (XMLElement *) _multiUserChatExtensionElement;
-@end

trunk/Chat Core/MVXMPPChatConnection.m

@@ -3 +3 @@
-#import "MVXMPPChatConnection.h"
-#import "MVXMPPChatUser.h"
+#import "MVXMPPChatRoom.h"
-#import "MVUtilities.h"
-#import "MVChatPluginManager.h"
-#import "NSMethodSignatureAdditions.h"
+#import "NSStringAdditions.h"
-
-@implementation MVXMPPChatConnection
@@ -19 +21 @@
-                _server = @"jabber.org";
-                _username = [NSUserName() retain];
+                _nickname = [_username retain];
-                _session = [[JabberSession alloc] init];
-
@@ -29 +32 @@
-                [_session addObserver:self selector:@selector( outgoingPacket: ) name:JSESSION_RAWDATA_OUT];
-                [_session addObserver:self selector:@selector( incomingPacket: ) name:JSESSION_RAWDATA_IN];
-
+
+
-        }
-
@@ -47 +51 @@
-        [_server release];
-        [_username release];
+        [_nickname release];
-        [_password release];
-        [_knownUsers release];
@@ -54 +59 @@
-        _server = nil;
-        _username = nil;
+        _nickname = nil;
-        _password = nil;
-        _knownUsers = nil;
@@ -106 +112 @@
-
-- (void) setNickname:(NSString *) newNickname {
-
+
+
+
-}
-
-- (NSString *) nickname {
-[self username]
+_nickname
-}
-
-- (NSString *) preferredNickname {
-user
+nick
-}
-
@@ -120 +128 @@
-
-- (void) setNicknamePassword:(NSString *) newPassword {
-[self setPassword:newPassword];
+// not supported
-}
-
-- (NSString *) nicknamePassword {
-[self password]
+nil
-}
-
@@ -186 +194 @@
-        NSParameterAssert( [identifier isKindOfClass:[NSString class]] || [identifier isKindOfClass:[JabberID class]] );
-
-JabberID
-identifier completeID
-ToString
+NSString
+[[JabberID allocWithZone:nil] initWithString:identifier] autorelease
+
-                return [self localUser];
-
@@ -196 +204 @@
-        MVChatUser *user = nil;
-        @synchronized( _knownUsers ) {
-identifier
+[identifier completeID]
-                if( user ) return user;
-
-
-
-
-
+
+
-        }
-
-        return [user autorelease];
+}
+
+#pragma mark -
+
+- (void) joinChatRoomNamed:(NSString *) room withPassphrase:(NSString *) passphrase {
+        NSParameterAssert( room != nil );
+        NSParameterAssert( [room length] > 0 );
+
+        /* Example:
+        <presence from='hag66@shakespeare.lit/pda' to='darkcave@macbeth.shakespeare.lit/thirdwitch'>
+          <x xmlns='http://jabber.org/protocol/muc' />
+        </presence>
+        */
+
+        JabberID *roomId = [[JabberID allocWithZone:nil] initWithString:room];
+        MVXMPPChatRoom *joiningRoom = (MVXMPPChatRoom *)[[self joinedChatRoomWithUniqueIdentifier:roomId] retain];
+        if( joiningRoom && [joiningRoom isJoined] ) {
+                // already joined
+                [joiningRoom release];
+                [roomId release];
+                return;
+        }
+
+        JabberPresence *presence = [[JabberPresence allocWithZone:nil] initWithQName:JABBER_PRESENCE_QN];
+        [presence putAttribute:@"from" withValue:[_localID escapedCompleteID]];
+
+        NSString *localUserStringId = [[NSString allocWithZone:nil] initWithFormat:@"%@/%@", room, [self nickname]];
+        [presence putAttribute:@"to" withValue:localUserStringId];
+
+        [presence addElement:[self _capabilitiesElement]];
+        XMLElement *x = [presence addElement:[self _multiUserChatExtensionElement]];
+
+        if ([passphrase length])
+                [[x addElementWithName:@"password"] addCData:passphrase];
+
+        [_session sendElement:presence];
+        [presence release];
+
+        JabberID *localUserJabberId = [[JabberID allocWithZone:nil] initWithString:localUserStringId];
+        MVXMPPChatUser *localUser = (MVXMPPChatUser *)[self chatUserWithUniqueIdentifier:localUserJabberId];
+        [localUser _setRoomMember:YES];
+        [localUser _setType:MVChatLocalUserType];
+
+        if( ! joiningRoom )
+                joiningRoom = [[MVXMPPChatRoom allocWithZone:nil] initWithJabberID:roomId andConnection:self];
+        [joiningRoom _setLocalMemberUser:localUser];
+        [joiningRoom _setDateJoined:nil];
+        [joiningRoom _setDateParted:nil];
+        [joiningRoom _clearMemberUsers];
+        [joiningRoom _clearBannedUsers];
+
+        [self _addJoinedRoom:joiningRoom];
+
+        // joiningRoom will be released in incomingPresence
+
+        [localUserStringId release];
+        [localUserJabberId release];
+        [roomId release];
-}
-
@@ -235 +299 @@
-
-- (void) outgoingPacket:(NSNotification *) notification {
-
-
+
+
+
-}
-
-- (void) incomingPacket:(NSNotification *) notification {
-
-
-
-
-
+
+
+
+
+
+
-    JabberMessage *message = [notification object];
-
@@ -252 +318 @@
-    case JMEVENT_NONE: {
-                MVChatRoom *room = nil;
-
+
+
+
+
+
+
+
+
+
+
+
-                NSMutableData *msgData = [[[message body] dataUsingEncoding:NSUTF8StringEncoding] mutableCopyWithZone:nil];
-
-                NSMutableDictionary *msgAttributes = [[NSMutableDictionary allocWithZone:nil] init];
-send
+us
-                [msgAttributes setObject:msgData forKey:@"message"];
-
@@ -270 +346 @@
-                if( ! [msgData length] ) return;
-
-
+
+
+
+
+
-
-                [msgData release];
-                [msgAttributes release];
-
-        break;
-        }
@@ -284 +363 @@
-    }
-}
+
+- (void) incomingPresence:(NSNotification *) notification {
+    JabberPresence *presence = [notification object];
+        JabberID *roomID = [[presence from] userhostJID];
+        MVChatRoom *room = [self joinedChatRoomWithUniqueIdentifier:roomID];
+
+        if( ! room ) return;
+
+        if ([[presence getAttribute:@"type"] isCaseInsensitiveEqualToString:@"error"]) {
+                [self _removeJoinedRoom:room];
+                [room release];
+                // handle error...
+                return;
+        }
+
+        MVXMPPChatUser *user = nil;
+        if( [[[room localMemberUser] uniqueIdentifier] isEqual:[presence from]] )
+                user = (MVXMPPChatUser *)[room localMemberUser];
+        else user = (MVXMPPChatUser *)[self chatUserWithUniqueIdentifier:[presence from]];
+
+        if ([[presence getAttribute:@"type"] isCaseInsensitiveEqualToString:@"unavailable"]) {
+                [room _removeMemberUser:user];
+                [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomUserPartedNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:user, @"user", nil]];
+                return;
+        }
+
+        [room retain]; // retain incase the following release is the last reference
+
+        if( ! [room isJoined] ) {
+                [room _setDateJoined:[NSDate date]];
+                [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomJoinedNotification object:room];
+                [room release]; // balance the alloc or retain in joinChatRoomNamed:
+        }
+
+        if( ! [room hasUser:user] ) {
+                [user _setRoomMember:YES];
+                [room _addMemberUser:user];
+                [self _markUserAsOnline:user];
+
+                NSDictionary *userInfo = [NSDictionary dictionaryWithObject:[NSArray arrayWithObject:user] forKey:@"added"];
+                [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomMemberUsersSyncedNotification object:room userInfo:userInfo];
+        }
+
+        [room release];
+}
-@end
-
-
-#pragma mark -
@@ -297 +420 @@
-        return _localID;
-}
+
+- (XMLElement *) _capabilitiesElement {
+        XMLElement *caps = [[XMLElement allocWithZone:nil] initWithQName:JABBER_CLIENTCAP_QN];
+    [caps putAttribute:@"node" withValue:@"http://colloquy.info/caps"];
+    [caps putAttribute:@"ver" withValue:@"2.1"];
+        return [caps autorelease];
+}
+
+- (XMLElement *) _multiUserChatExtensionElement {
+        XMLQName *xQName = [XMLQName construct:@"x" withURI:@"http://jabber.org/protocol/muc"];
+        return [[[XMLElement allocWithZone:nil] initWithQName:xQName] autorelease];
+}
-@end

trunk/Chat Core/MVXMPPChatUser.h

@@ -7 +7 @@
-@interface MVXMPPChatUser : MVChatUser {
-@private
-JabberID *_identifi
+BOOL _roomMemb
-}
-- (id) initLocalUserWithConnection:(MVXMPPChatConnection *) connection;
-- (id) initWithJabberID:(JabberID *) identifier andConnection:(MVXMPPChatConnection *) connection;
-@end
+
+@interface MVXMPPChatUser (MVXMPPChatUserPrivate)
+- (void) _setRoomMember:(BOOL) member;
+- (BOOL) _isRoomMember;
+@end

trunk/Chat Core/MVXMPPChatUser.m

@@ -16 +16 @@
-                _type = MVChatRemoteUserType;
-                _connection = userConnection; // prevent circular retain
-
-
+
-        }
-
@@ -31 +30 @@
-
-- (NSString *) displayName {
-
-
-
+
-}
-
-- (NSString *) nickname {
-
-
-
+
-}
-
@@ -47 +42 @@
-
-- (NSString *) username {
+        if( _roomMember )
+                return [_uniqueIdentifier resource];
-        if( _type == MVChatLocalUserType )
-                return [[self connection] username];
-i
+uniqueI
-}
-
-- (NSString *) address {
-i
+uniqueI
-}
-
-- (NSString *) serverAddress {
-i
+uniqueI
-}
-
@@ -75 +72 @@
-        NSParameterAssert( message != nil );
-
-i
+uniqueI
-        [jabberMsg setType:@"chat"];
-        [jabberMsg addComposingRequest];
@@ -82 +79 @@
-}
-@end
+
+#pragma mark -
+
+@implementation MVXMPPChatUser (MVXMPPChatUserPrivate)
+- (void) _setRoomMember:(BOOL) member {
+        _roomMember = member;
+}
+
+- (BOOL) _isRoomMember {
+        return _roomMember;
+}
+@end

trunk/Models/JVSQLChatTranscript.m

@@ -656 +656 @@
-                senderNickname = [member nickname];
-                senderIdentifier = [[member user] uniqueIdentifier];
-                if( [senderIdentifier isKindOfClass:[NSData class]] )
-                        senderIdentifier = [senderIdentifier base64Encoding];
-                senderHostmask = [member hostmask];
-                if( [member serverOperator] ) senderClass = @"server operator";
@@ -673 +671 @@
-                senderNickname = [chatUser nickname];
-                senderIdentifier = [chatUser uniqueIdentifier];
-                if( [senderIdentifier isKindOfClass:[NSData class]] )
-                        senderIdentifier = [senderIdentifier base64Encoding];
-                if( [[chatUser username] length] && [[chatUser address] length] )
-                        senderHostmask = [NSString stringWithFormat:@"%@@%@", [chatUser username], [chatUser address]];
-                senderLocalUser = [chatUser isLocalUser];
-        }
+
+        if( [senderIdentifier isKindOfClass:[NSData class]] )
+                senderIdentifier = [senderIdentifier base64Encoding];
+        else if( ! [senderIdentifier isKindOfClass:[NSString class]] )
+                senderIdentifier = [senderIdentifier description];
-
-        char userQuery[512] = "";