Cleanup of cs_tban

1 files changed, 17 insertions, 26 deletions

diff --git a/modules/commands/cs_tban.cpp b/modules/commands/cs_tban.cpp
index 62f241059..109371577 100644
--- a/modules/commands/cs_tban.cpp
+++ b/modules/commands/cs_tban.cpp
@@ -35,23 +35,6 @@ class TempBan : public CallBack
 	}
 };
 
-static bool CanBanUser(CommandSource &source, Channel *c, User *u2)
-{
-	User *u = source.u;
-	ChannelInfo *ci = c->ci;
-	bool ok = false;
-	if (!ci->AccessFor(u).HasPriv("BAN"))
-		source.Reply(ACCESS_DENIED);
-	else if (matches_list(c, u2, CMODE_EXCEPT))
-		source.Reply(CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
-	else if (u2->IsProtected())
-		source.Reply(ACCESS_DENIED);
-	else
-		ok = true;
-
-	return ok;
-}
-
 class CommandCSTBan : public Command
 {
  public:
@@ -71,18 +54,26 @@ class CommandCSTBan : public Command
 		User *u2;
 		if (!c)
 			source.Reply(CHAN_X_NOT_IN_USE, params[0].c_str());
+		else if (!c->ci)
+			source.Reply(CHAN_X_NOT_REGISTERED, c->name.c_str());
+		else if (!c->ci->AccessFor(source.u).HasPriv("BAN"))
+			source.Reply(ACCESS_DENIED);
 		else if (!(u2 = finduser(nick)))
 			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
+		else if (matches_list(c, u2, CMODE_EXCEPT))
+			source.Reply(CHAN_EXCEPTED, u2->nick.c_str(), c->ci->name.c_str());
+		else if (u2->IsProtected())
+			source.Reply(ACCESS_DENIED);
 		else
-			if (CanBanUser(source, c, u2))
-			{
-				Anope::string mask;
-				get_idealban(c->ci, u2, mask);
-				c->SetMode(NULL, CMODE_BAN, mask);
-				new TempBan(dotime(time), c, mask);
-
-				source.Reply(_("%s banned from %s, will auto-expire in %s second(s)."), mask.c_str(), c->name.c_str(), time.c_str());
-			}
+		{
+			time_t t = dotime(time);
+			Anope::string mask;
+			get_idealban(c->ci, u2, mask);
+			c->SetMode(NULL, CMODE_BAN, mask);
+			new TempBan(t, c, mask);
+
+			source.Reply(_("%s banned from %s, will auto-expire in %s."), mask.c_str(), c->name.c_str(), duration(t).c_str());
+		}
 
 		return;
 	}