jdhore avatar jdhore committed a124600

Change kicknorejoin to be hardcoded to 2 seconds instead of a
configurable opton.

Comments (0)

Files changed (8)

-This is ShadowIRCd 6.1, Copyright (c) 2005-2010 ShadowIRCd team.
+This is ShadowIRCd 6.2, Copyright (c) 2005-2010 ShadowIRCd team.
 See LICENSE for licensing details (GPL v2).
 
+-- shadowircd-6.2.0
+
+other changes
+- change kicknorejoin to not be a config option and be hardcoded to 2 seconds
+  because a longer time is kind of pointless.
+
 -- shadowircd-6.1.0
 
 new configuration options
 	cycle_host_change = yes;
 	host_in_topic = yes;
 	resv_forcepart = yes;
-	kick_no_rejoin_time = 30 seconds;
 };
 
 serverhide {

doc/reference.conf

 	 * when a RESV is issued.
 	 */
 	resv_forcepart = yes;
-
-	/* kick_no_rejoin_time: the amount of time that a user cannot
-	 * rejoin for after being kicked out of a +J channel.
-	 */
-	kick_no_rejoin_time = 30 seconds;
 };
 
 
 	int cycle_host_change;
 	int host_in_topic;
 	int resv_forcepart;
-	int kick_no_rejoin_time;
 
 	int exempt_cmode_c;
 	int exempt_cmode_C;
 		"Force-part local users on channel RESV"
 	},
 	{
-		"kick_no_rejoin_time",
-		OUTPUT_DECIMAL,
-		&ConfigChannel.kick_no_rejoin_time,
-		"The amount of time that a user cannot rejoin a +J channel for after being kicked."
-	},
-	{
 		"disable_hidden",
 		OUTPUT_BOOLEAN_YN,
 		&ConfigServerHide.disable_hidden,
 
 	DICTIONARY_FOREACH(md, &iter, chptr->metadata)
 	{
-		if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))
+		if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time()))
 			return ERR_KICKNOREJOIN;
 		/* cleanup any stale KICKNOREJOIN metadata we find while we're at it */
-		if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))  
+		if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time()))  
 			channel_metadata_delete(chptr, md->name, 0);
 	}
 
 	{ "use_forward",	CF_YESNO, NULL, 0, &ConfigChannel.use_forward		},
 	{ "use_local_channels",	CF_YESNO, NULL, 0, &ConfigChannel.use_local_channels	},
 	{ "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart	},
-	{ "kick_no_rejoin_time", CF_TIME,  NULL, 0, &ConfigChannel.kick_no_rejoin_time	},
 	{ "exempt_cmode_c",	CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_c	},
 	{ "exempt_cmode_C",	CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_C	},
 	{ "exempt_cmode_D",	CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_D	},
 	ConfigChannel.no_join_on_split = NO;
 	ConfigChannel.no_create_on_split = YES;
 	ConfigChannel.resv_forcepart = YES;
-	ConfigChannel.kick_no_rejoin_time = 30;
 
 	ConfigChannel.exempt_cmode_c = NO;
 	ConfigChannel.exempt_cmode_C = NO;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.