Changeset 3228

Timestamp:

05/06/06 14:42:51 (2 years ago)

Author:

timothy

Message:

More support for different modes. If a server does not support a mode we will not show it in the context menu. Like freenode dosen't support half-operator, so it will no longer show up in the menu if you are a operator.

Files:

• trunk/Chat Core.exp (modified) (1 diff)
• trunk/Chat Core/MVChatRoom.h (modified) (1 diff)
• trunk/Chat Core/MVChatRoom.m (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.h (modified) (2 diffs)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (9 diffs)
• trunk/Models/JVChatMessage.m (modified) (1 diff)
• trunk/Panels/JVChatRoomMember.h (modified) (1 diff)
• trunk/Panels/JVChatRoomMember.m (modified) (4 diffs)

trunk/Chat Core.exp

@@ -31 +31 @@
-_MVChatRoomKickedNotification
-_MVChatRoomInvitedNotification
+_MVChatRoomMemberQuietedFeature
+_MVChatRoomMemberVoicedFeature
+_MVChatRoomMemberHalfOperatorFeature
+_MVChatRoomMemberOperatorFeature
+_MVChatRoomMemberAdministratorFeature
+_MVChatRoomMemberFounderFeature
-_MVChatRoomMemberUsersSyncedNotification
-_MVChatRoomBannedUsersSyncedNotification

trunk/Chat Core/MVChatRoom.h

@@ -21 +21 @@
-        MVChatRoomMemberFounderMode = 1 << 5
-} MVChatRoomMemberMode;
+
+extern NSString *MVChatRoomMemberQuietedFeature;
+extern NSString *MVChatRoomMemberVoicedFeature;
+extern NSString *MVChatRoomMemberHalfOperatorFeature;
+extern NSString *MVChatRoomMemberOperatorFeature;
+extern NSString *MVChatRoomMemberAdministratorFeature;
+extern NSString *MVChatRoomMemberFounderFeature;
-
-extern NSString *MVChatRoomJoinedNotification;

trunk/Chat Core/MVChatRoom.m

@@ -7 +7 @@
-#import "NSDataAdditions.h"
-#import "NSNotificationAdditions.h"
+
+NSString *MVChatRoomMemberQuietedFeature = @"MVChatRoomMemberQuietedFeature";
+NSString *MVChatRoomMemberVoicedFeature = @"MVChatRoomMemberVoicedFeature";
+NSString *MVChatRoomMemberHalfOperatorFeature = @"MVChatRoomMemberHalfOperatorFeature";
+NSString *MVChatRoomMemberOperatorFeature = @"MVChatRoomMemberOperatorFeature";
+NSString *MVChatRoomMemberAdministratorFeature = @"MVChatRoomMemberAdministratorFeature";
+NSString *MVChatRoomMemberFounderFeature = @"MVChatRoomMemberFounderFeature";
-
-NSString *MVChatRoomJoinedNotification = @"MVChatRoomJoinedNotification";

trunk/Chat Core/MVIRCChatConnection.h

@@ -19 +19 @@
-        NSMutableSet *_pendingWhoisUsers;
-        NSMutableSet *_fileTransfers;
+        NSMutableSet *_supportedFeatures;
-        NSMutableDictionary *_serverInformation;
-        NSString *_server;
@@ -65 +66 @@
-- (void) _whoisNextScheduledUser;
-
+- (void) _resetSupportedFeatures;
+
-- (NSString *) _stringFromPossibleData:(id) input;
-@end

trunk/Chat Core/MVIRCChatConnection.m

@@ -91 +91 @@
-                _realName = [NSFullUserName() retain];
-                _threadWaitLock = [[NSConditionLock allocWithZone:nil] initWithCondition:0];
+                _supportedFeatures = [[NSMutableSet allocWithZone:nil] initWithCapacity:10];
+                [self _resetSupportedFeatures];
-        }
-
@@ -126 +128 @@
-        [_roomPrefixes release];
-        [_serverInformation release];
+        [_supportedFeatures release];
-
-        _chatConnection = nil;
@@ -146 +149 @@
-        _roomPrefixes = nil;
-        _serverInformation = nil;
+        _supportedFeatures = nil;
-
-        [super dealloc];
@@ -161 +165 @@
-
-- (NSSet *) supportedFeatures {
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -182 +195 @@
-
-        [self _resetSendQueueInterval];
+        [self _resetSupportedFeatures];
-
-        [self _willConnect]; // call early so other code has a chance to change our info
@@ -1033 +1047 @@
-}
-
+- (void) _resetSupportedFeatures {
+        @synchronized( _supportedFeatures ) {
+                [_supportedFeatures removeAllObjects];
+
+                // all server should support these features per RFC 1459
+                [_supportedFeatures addObject:MVChatRoomMemberVoicedFeature];
+                [_supportedFeatures addObject:MVChatRoomMemberOperatorFeature];
+        }
+}
+
-#pragma mark -
-
@@ -1264 +1288 @@
-                                        [scanner scanString:@")" intoString:NULL];
-
+                                        @synchronized( _supportedFeatures ) {
+                                                // remove these in case the server does not support them when we parse the modes
+                                                [_supportedFeatures removeObject:MVChatRoomMemberVoicedFeature];
+                                                [_supportedFeatures removeObject:MVChatRoomMemberOperatorFeature];
+                                        }
+
-                                        NSMutableDictionary *modesTable = [[NSMutableDictionary allocWithZone:nil] initWithCapacity:[modes length]];
-                                        unsigned length = [modes length];
@@ -1269 +1299 @@
-                                        for( i = 0; i < length; i++ ) {
-                                                MVChatRoomMemberMode mode = MVChatRoomMemberNoModes;
+                                                NSString *modeFeature = nil;
-                                                switch( [modes characterAtIndex:i] ) {
-
-
-
- mode = MVChatRoomMemberAdministratorMode; break;
-
-
+modeFeature = MVChatRoomMemberVoicedFeature; 
+modeFeature = MVChatRoomMemberHalfOperatorFeature; 
+modeFeature = MVChatRoomMemberOperatorFeature; 
+
+modeFeature = MVChatRoomMemberAdministratorFeature; 
+modeFeature = MVChatRoomMemberFounderFeature; 
-                                                        default: break;
-                                                }
@@ -1283 +1314 @@
-                                                        [modesTable setObject:[NSNumber numberWithUnsignedLong:mode] forKey:key];
-                                                        [key release];
+
+                                                        if( modeFeature ) {
+                                                                @synchronized( _supportedFeatures ) {
+                                                                         [_supportedFeatures addObject:modeFeature];
+                                                                }
+                                                        }
-                                                }
-                                        }

trunk/Models/JVChatMessage.m

@@ -571 +571 @@
-                if( [(JVChatRoomMember *)[self sender] serverOperator] ) return @"server operator";
-                else if( [(JVChatRoomMember *)[self sender] roomFounder] ) return @"room founder";
+                else if( [(JVChatRoomMember *)[self sender] roomAdministrator] ) return @"room administrator";
-                else if( [(JVChatRoomMember *)[self sender] operator] ) return @"operator";
-                else if( [(JVChatRoomMember *)[self sender] halfOperator] ) return @"half operator";

trunk/Panels/JVChatRoomMember.h

@@ -44 +44 @@
-- (BOOL) operator;
-- (BOOL) halfOperator;
+- (BOOL) roomAdministrator;
-- (BOOL) roomFounder;
-- (BOOL) serverOperator;

trunk/Panels/JVChatRoomMember.m

@@ -76 +76 @@
-- (NSComparisonResult) compareUsingStatus:(JVChatRoomMember *) member {
-        NSComparisonResult retVal = NSOrderedSame;
-
-
-50 : ( [self operator] ? 10 : ( [self halfOperator] ? 5 : ( [self voice] ? 1 : 0 ) ) )
-50 : ( [member operator] ? 10 : ( [member halfOperator] ? 5 : ( [member voice] ? 1 : 0 ) ) )
+long 
+
+1 << 8 : [[[self room] target] modesForMemberUser:[self user]] & ~MVChatRoomMemberQuietedMode
+1 << 8 : [[[member room] target] modesForMemberUser:[member user]] & ~MVChatRoomMemberQuietedMode
-
-        if( myStatus > yourStatus ) {
@@ -181 +181 @@
-}
-
+- (BOOL) roomAdministrator {
+        return ( [[[self room] target] modesForMemberUser:[self user]] & MVChatRoomMemberAdministratorMode );
+}
+
-- (BOOL) roomFounder {
-        return ( [[[self room] target] modesForMemberUser:[self user]] & MVChatRoomMemberFounderMode );
@@ -252 +256 @@
-- (NSImage *) icon {
-        NSImage *icon = nil;
-
-
-
-
+
+
+
+
+
+
-        else icon = [NSImage imageNamed:@"person"];
-
-/*      if( [[self user] isIdentified] ) {
-                NSImage *badge = [NSImage imageNamed:@"identified-badge"];
-                NSImage *new = [[[NSImage alloc] initWithSize:[icon size]] autorelease];
-                [new lockFocus];
-        [icon compositeToPoint:NSMakePoint( 0., 0. ) operation:NSCompositeCopy];
-        [badge compositeToPoint:NSMakePoint( 0., 0. ) operation:NSCompositeSourceOver];
-                [new unlockFocus];
-                icon = new;
-        } */
-
-        return icon;
@@ -395 +391 @@
-                [menu addItem:[NSMenuItem separatorItem]];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-