X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=6414b01e79cf2259f3951f070f50fc57269bcac0;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=cd2743ab09d1bbfbbbed25db1632f517ee3542cc;hpb=d5b50d9ed107d6a8b9241a831c1dae713963b524;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index cd2743ab0..6414b01e7 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -53,7 +53,7 @@ class CommandShun : public Command
  public:
 	CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3)
 	{
-		flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
+		flags_needed = 'o'; this->syntax = "<nick!user@host> [<duration> :<reason>]";
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
@@ -81,7 +81,7 @@ class CommandShun : public Command
 			}
 			else
 			{
-				user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H.");
+				user->WriteNotice("*** Shun " + parameters[0] + " not found on the list.");
 				return CMD_FAILURE;
 			}
 		}
@@ -110,15 +110,14 @@ class CommandShun : public Command
 			{
 				if (!duration)
 				{
-					ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s",
+					ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent SHUN for %s: %s",
 						user->nick.c_str(), target.c_str(), expr.c_str());
 				}
 				else
 				{
-					time_t c_requires_crap = duration + ServerInstance->Time();
-					std::string timestr = InspIRCd::TimeString(c_requires_crap);
-					ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s",
-						user->nick.c_str(), target.c_str(), timestr.c_str(), expr.c_str());
+					ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s, expires in %s (on %s): %s",
+						user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(),
+						InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), expr.c_str());
 				}
 			}
 			else
@@ -245,7 +244,7 @@ class ModuleShun : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON);
+		return Version("Provides the SHUN command, which stops a user from executing all except configured commands", VF_VENDOR|VF_COMMON);
 	}
 };