added Preferences for autojoin_on_invite.

yappo · May 27, 2010 · 7897871 · 7897871
1 parent b0677bc
commit 7897871
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
@@ -2971,13 +2971,15 @@ - (void)receiveInvite:(IRCMessage*)m
 
 	NSString* text = [NSString stringWithFormat:@"%@ has invited you to %@", nick, chname];
 	[self printBoth:self type:LINE_TYPE_INVITE text:text];
-	IRCChannel* c = [self findChannel: chname];
-	if ( !c ) {
-		IRCChannelConfig* seed = [[IRCChannelConfig new] autorelease];
-		seed.name = chname;
-		c = [world createChannel:seed client:self reload:YES adjust:YES];
-		[world save];
-		[self joinChannel: c];
+	if ( [Preferences autoJoinOnInvited] ) {
+		IRCChannel* c = [self findChannel: chname];
+		if ( !c ) {
+			IRCChannelConfig* seed = [[IRCChannelConfig new] autorelease];
+			seed.name = chname;
+			c = [world createChannel:seed client:self reload:YES adjust:YES];
+			[world save];
+			[self joinChannel: c];
+		}
 	}
 
 	[self notifyEvent:GROWL_INVITED target:nil nick:nick text:chname];

diff --git a/Classes/Preferences/Preferences.h b/Classes/Preferences/Preferences.h
@@ -50,6 +50,7 @@ typedef enum {
 + (BOOL)showInlineImages;
 + (BOOL)showJoinLeave;
 + (BOOL)stopGrowlOnActive;
++ (BOOL)autoJoinOnInvited;
 + (TabActionType)tabAction;
 + (BOOL)useHotkey;
 + (BOOL)keywordCurrentNick;

diff --git a/Classes/Preferences/Preferences.m b/Classes/Preferences/Preferences.m
@@ -98,6 +98,13 @@ + (BOOL)stopGrowlOnActive
 	return [ud boolForKey:@"Preferences.General.stop_growl_on_active"];
 }
 
++ (BOOL)autoJoinOnInvited
+{
+	NSUserDefaults* ud = [NSUserDefaults standardUserDefaults];
+	return [ud boolForKey:@"Preferences.General.auto_join_on_invited"];
+}
+
+
 + (TabActionType)tabAction
 {
 	NSUserDefaults* ud = [NSUserDefaults standardUserDefaults];