Changeset 3579

Timestamp:

02/07/07 20:53:25 (2 years ago)

Author:

rinoa

Message:

Adds context menus for Founders and Admins. Adds the chat event for Admins. Removes the demote before promote that everyone hates.

Files:

• trunk/Models/JVSQLChatTranscript.m (modified) (1 diff)
• trunk/Panels/JVChatRoomMember.m (modified) (2 diffs)
• trunk/Panels/JVChatRoomPanel.m (modified) (3 diffs)
• trunk/Resources/info.colloquy.plist (modified) (1 diff)
• trunk/Resources/notifications.plist (modified) (2 diffs)

trunk/Models/JVSQLChatTranscript.m

@@ -658 +658 @@
-                if( [member serverOperator] ) senderClass = @"server operator";
-                else if( [member roomFounder] ) senderClass = @"room founder";
+                else if( [member roomAdministrator] ) senderClass = @"room administrator";
-                else if( [member operator] ) senderClass = @"operator";
-                else if( [member halfOperator] ) senderClass = @"half operator";

trunk/Panels/JVChatRoomMember.m

@@ -413 +413 @@
-        NSSet *features = [[self connection] supportedFeatures];
-
+        if( ( localUserIsFounder ) && ( [features containsObject:MVChatRoomMemberFounderFeature] ) ) {
+                item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Founder", "founder contextual menu - admin only") action:@selector( toggleFounderStatus: ) keyEquivalent:@""];
+                [item setTarget:self];
+                [menu addItem:item];
+                [item release];
+        }
+
+        if( ( ( localUserIsAdministrator || localUserIsFounder ) && (localUserIsAdministrator && ! [self roomFounder]) ) && ( [features containsObject:MVChatRoomMemberAdministratorFeature] ) ) {
+                item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Administrator", "administrator contextual menu - admin only") action:@selector( toggleAdministratorStatus: ) keyEquivalent:@""];
+                [item setTarget:self];
+                [menu addItem:item];
+                [item release];
+        }
+
-        if( ( localUserIsOperator || localUserIsAdministrator || localUserIsFounder ) && ( (localUserIsOperator && ! ([self roomAdministrator] || [self roomFounder])) || (localUserIsAdministrator && ! [self roomFounder]) ) ) {
-                if( [features containsObject:MVChatRoomMemberOperatorFeature] ) {
@@ -518 +532 @@
-#pragma mark Operator Actions
-
+- (IBAction) toggleFounderStatus:(id) sender {
+        if( [self founder] ) [[_room target] removeMode:MVChatRoomMemberFounderMode forMemberUser:_user];
+        else [[_room target] setMode:MVChatRoomMemberFounderMode forMemberUser:_user];
+}
+
+- (IBAction) toggleAdministratorStatus:(id) sender {
+        if( [self administrator] ) [[_room target] removeMode:MVChatRoomMemberAdministratorMode forMemberUser:_user];
+        else [[_room target] setMode:MVChatRoomMemberAdministratorMode forMemberUser:_user];
+}
+
-- (IBAction) toggleOperatorStatus:(id) sender {
-        if( [self operator] ) [[_room target] removeMode:MVChatRoomMemberOperatorMode forMemberUser:_user];
-
-
-
-
-
+
-}
-
-- (IBAction) toggleHalfOperatorStatus:(id) sender {
-        if( [self halfOperator] ) [[_room target] removeMode:MVChatRoomMemberHalfOperatorMode forMemberUser:_user];
-
-
-
-
-
+
-}
-
-- (IBAction) toggleVoiceStatus:(id) sender {
-        if( [self voice] ) [[_room target] removeMode:MVChatRoomMemberVoicedMode forMemberUser:_user];
-
-
-
-
-
+
-}
-
-- (IBAction) toggleQuietedStatus:(id) sender {
-        if( [self quieted] ) [[_room target] removeMode:MVChatRoomMemberQuietedMode forMemberUser:_user];
-
-
-
+
-}
-

trunk/Panels/JVChatRoomPanel.m

@@ -1141 +1141 @@
-        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVSortRoomMembersByStatus"] )
-                [self resortMembers];
-
+
-        MVChatUser *user = [[notification userInfo] objectForKey:@"who"];
-        MVChatUser *byUser = [[notification userInfo] objectForKey:@"by"];
@@ -1184 +1184 @@
-                        message = [NSString stringWithFormat:NSLocalizedString( @"<span class=\"member\">%@</span> was demoted from room founder by <span class=\"member\">%@</span>.", "user is no longer a chat room founder status message" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] )];
-                }
+        } else if( mode == MVChatRoomMemberAdministratorMode && enabled ) {
+                name = @"memberPromotedToAdministrator";
+                notificationKey = @"JVChatMemberPromotedAdministrator";
+                title = NSLocalizedString( @"New Room Administrator", "room administrator promoted title" );
+                description = [NSString stringWithFormat:NSLocalizedString( @"%@ was promoted to administrator by %@ in %@.", "bubble message member administrator promotion string" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] ), [self title]];
+                if( [mbr isLocalUser] && [byMbr isLocalUser] ) { // only server oppers would ever see this
+                        message = NSLocalizedString( @"You promoted yourself to Administrator.", "we gave ourself the chat room administrator privilege status message" );
+                        name = @"promotedToAdministrator";
+                } else if( [mbr isLocalUser] ) {
+                        message = [NSString stringWithFormat:NSLocalizedString( @"You were promoted to administrator by <span class=\"member\">%@</span>.", "we are now a chat room administrator status message" ), ( byMbr ? [byMbr title] : [byUser nickname] )];
+                        name = @"promotedToAdministrator";
+                } else if( [byMbr isLocalUser] ) {
+                        message = [NSString stringWithFormat:NSLocalizedString( @"<span class=\"member\">%@</span> was promoted to administrator by you.", "we gave user chat room administrator status message" ), ( mbr ? [mbr title] : [user nickname] )];
+                } else {
+                        message = [NSString stringWithFormat:NSLocalizedString( @"<span class=\"member\">%@</span> was promoted to administrator by <span class=\"member\">%@</span>.", "user is now a chat room administrator status message" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] )];
+                }
+        } else if( mode == MVChatRoomMemberAdministratorMode && ! enabled ) {
+                name = @"memberDemotedFromAdministrator";
+                notificationKey = @"JVChatMemberDemotedAdministrator";
+                title = NSLocalizedString( @"Room Administrator Demoted", "room administrator demoted title" );
+                description = [NSString stringWithFormat:NSLocalizedString( @"%@ was demoted from administrator by %@ in %@.", "bubble message member administrator demotion string" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] ), [self title]];
+                if( [mbr isLocalUser] && [byMbr isLocalUser] ) {
+                        message = NSLocalizedString( @"You demoted yourself from administrator.", "we removed our chat room administrator privilege status message" );
+                        name = @"demotedFromAdministrator";
+                } else if( [mbr isLocalUser] ) {
+                        message = [NSString stringWithFormat:NSLocalizedString( @"You were demoted from administrator by <span class=\"member\">%@</span>.", "we are no longer a chat room administrator status message" ), ( byMbr ? [byMbr title] : [byUser nickname] )];
+                        name = @"demotedFromAdministrator";
+                } else if( [byMbr isLocalUser] ) {
+                        message = [NSString stringWithFormat:NSLocalizedString( @"<span class=\"member\">%@</span> was demoted from administrator by you.", "we removed user's chat room administrator status message" ), ( mbr ? [mbr title] : [user nickname] )];
+                } else {
+                        message = [NSString stringWithFormat:NSLocalizedString( @"<span class=\"member\">%@</span> was demoted from administrator by <span class=\"member\">%@</span>.", "user is no longer a chat room administrator status message" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] )];
+                }
-        } else if( mode == MVChatRoomMemberOperatorMode && enabled ) {
-                name = @"memberPromotedToOperator";
-
+Operator
-                title = NSLocalizedString( @"New Room Operator", "member promoted title" );
-                description = [NSString stringWithFormat:NSLocalizedString( @"%@ was promoted to operator by %@ in %@.", "bubble message member operator promotion string" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] ), [self title]];
@@ -1202 +1234 @@
-        } else if( mode == MVChatRoomMemberOperatorMode && ! enabled ) {
-                name = @"memberDemotedFromOperator";
-
+Operator
-                title = NSLocalizedString( @"Room Operator Demoted", "room operator demoted title" );
-                description = [NSString stringWithFormat:NSLocalizedString( @"%@ was demoted from operator by %@ in %@.", "bubble message member operator demotion string" ), ( mbr ? [mbr title] : [user nickname] ), ( byMbr ? [byMbr title] : [byUser nickname] ), [self title]];

trunk/Resources/info.colloquy.plist

@@ -175 +175 @@
-                <string>Whip.aiff</string>
-        </dict>
-
+Operator
-        <dict>
-                <key>playSound</key>

trunk/Resources/notifications.plist

@@ -65 +65 @@
-        <dict>
-                <key>identifier</key>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <key>title</key>
-                <string>Member Promoted to Operator</string>
@@ -71 +83 @@
-        <dict>
-                <key>identifier</key>
-
+Operator
-                <key>title</key>
-                <string>Member Demoted from Operator</string>