aseda.aboagye
/
Combot
forked from Uncled1023/Combot
Watch 1
Star 0
Fork 0
Code Releases 9 Activity
Browse Source

Modified error messages and some commands to return as silent (notice or priv message)

tags/3.1.0
Teknikode 5 years ago
parent
30ca0c79ae
commit
1a3730c993
8 changed files with 33 additions and 33 deletions
Split View Show Diff Stats
  1. 7
    7
      Modules/Channel Rules/Channel_Rules.cs
  2. 5
    5
      Modules/Introductions/Introductions.cs
  3. 1
    1
      Modules/Messaging/Messaging.cs
  4. 10
    10
      Modules/Moderation/Moderation.cs
  5. 4
    4
      Modules/Owner Control/Owner_Control.cs
  6. 1
    1
      Modules/Sed/Sed.cs
  7. 2
    2
      Modules/Timer/Timer.cs
  8. 3
    3
      Modules/Whois/Whois.cs

+ 7
- 7
Modules/Channel Rules/Channel_Rules.cs View File

@@ -25,13 +25,13 @@ namespace Combot.Modules.Plugins
int index = 1;
foundRules.ForEach(rule =>
{
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, string.Format("Rule \u0002#{0}\u0002: {1}", index, rule["rule"]));
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, string.Format("Rule \u0002#{0}\u0002: {1}", index, rule["rule"]), true);
index++;
});
}
else
{
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, string.Format("There are no rules for \u0002{0}\u0002", channel));
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, string.Format("There are no rules for \u0002{0}\u0002", channel), true);
}
break;
case "Rules Modification":
@@ -54,7 +54,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to \u0002{0}\u000F on \u0002{1}\u000F.", command.Command, channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
break;
}
@@ -96,13 +96,13 @@ namespace Combot.Modules.Plugins
else
{
string invalid = "Invalid Rule ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}
else
{
string invalid = "Invalid Rule ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}

@@ -125,13 +125,13 @@ namespace Combot.Modules.Plugins
else
{
string invalid = "Invalid Rule ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}
else
{
string invalid = "Invalid Rule ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}


+ 5
- 5
Modules/Introductions/Introductions.cs View File

@@ -82,7 +82,7 @@ namespace Combot.Modules.Plugins
else
{
string maxMessage = "You already have the maximum number of introductions for this channel. Delete one before trying to add another.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, maxMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, maxMessage, true);
}
}

@@ -123,7 +123,7 @@ namespace Combot.Modules.Plugins
else
{
string invalid = "Invalid introduction ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}

@@ -144,7 +144,7 @@ namespace Combot.Modules.Plugins
else
{
string invalid = "Invalid introduction ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}

@@ -164,7 +164,7 @@ namespace Combot.Modules.Plugins
else
{
string invalid = "Invalid introduction ID.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}
else
@@ -180,7 +180,7 @@ namespace Combot.Modules.Plugins
else
{
string invalid = "You do not have any introductions set.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, invalid, true);
}
}
}

+ 1
- 1
Modules/Messaging/Messaging.cs View File

@@ -97,7 +97,7 @@ namespace Combot.Modules.Plugins
else
{
string maxMessage = string.Format("You already have sent the maximum number of messages to \u0002{0}\u0002. Wait until they have read their messages before sending another.", command.Arguments["Nickname"]);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, maxMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, maxMessage, true);
}
}


+ 10
- 10
Modules/Moderation/Moderation.cs View File

@@ -131,7 +131,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to set mode \u0002+{0}\u000F for \u0002{1}\u000F on \u0002{2}\u000F.", mode, command.Arguments["Nickname"], channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -151,7 +151,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to \u0002{0}\u000F \u0002{1}\u000F to the \u0002{2}\u000F list on \u0002{3}\u000F.", command.Arguments["Option"].ToLower(), command.Arguments["Nickname"], optionCommand, channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -197,13 +197,13 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to set mode \u0002+{0}\u000F on \u0002{1}\u000F.", mode, channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}
else
{
string noAccessMessage = string.Format("You do not have access to use \u0002{0}\u000F on \u0002{1}\u000F.", command.Command, channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -226,7 +226,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to change the topic on \u0002{0}\u000F.", channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -240,7 +240,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to invite someone to \u0002{0}\u000F.", channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -304,7 +304,7 @@ namespace Combot.Modules.Plugins
banMessage = "unban";
}
string noAccessMessage = string.Format("You do not have access to {0} \u0002{1}\u000F on \u0002{2}\u000F.", banMessage, command.Arguments["Nickname"], channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -326,7 +326,7 @@ namespace Combot.Modules.Plugins
else
{
string notValid = "Please enter a valid time.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, notValid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, notValid, true);
}
}

@@ -357,7 +357,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to kick \u0002{0}\u000F from \u0002{1}\u000F.", command.Arguments["Nickname"], channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}

@@ -384,7 +384,7 @@ namespace Combot.Modules.Plugins
else
{
string noAccessMessage = string.Format("You do not have access to clear \u0002{0}\u000F on \u0002{1}\u000F.", command.Arguments["Target"], channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, noAccessMessage, true);
}
}
}

+ 4
- 4
Modules/Owner Control/Owner_Control.cs View File

@@ -26,11 +26,11 @@ namespace Combot.Modules.Plugins
if (!Bot.ServerConfig.Owners.Contains(command.Nick.Nickname))
{
Bot.ServerConfig.Owners.Add(command.Nick.Nickname);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, "You are now identified as an owner.");
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, "You are now identified as an owner.", true);
}
else
{
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, "You are already identified as an owner.");
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, "You are already identified as an owner.", true);
}
foreach (Channel chan in Bot.IRC.Channels)
{
@@ -68,7 +68,7 @@ namespace Combot.Modules.Plugins
else
{
string message = string.Format("I am not in \u0002{0}\u000F.", channel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, message);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, message, true);
}
break;
case "Speak":
@@ -105,7 +105,7 @@ namespace Combot.Modules.Plugins
else
{
string message = string.Format("I am not in \u0002{0}\u000F.", cycleChannel);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, message);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, message, true);
}
break;
case "server":

+ 1
- 1
Modules/Sed/Sed.cs View File

@@ -70,7 +70,7 @@ namespace Combot.Modules.Plugins
else
{
string noMatch = string.Format("You do not have any previous messages that match \u0002{0}\u0002.", match);
SendResponse(MessageType.Channel, message.Channel, message.Sender.Nickname, noMatch);
SendResponse(MessageType.Channel, message.Channel, message.Sender.Nickname, noMatch, true);
}
}
}

+ 2
- 2
Modules/Timer/Timer.cs View File

@@ -32,7 +32,7 @@ namespace Combot.Modules.Plugins
string cmd = message.Split(new [] { ' ' }, StringSplitOptions.RemoveEmptyEntries).First();
if (foundCommand.Triggers.Contains(cmd.TrimStart(Bot.ServerConfig.CommandPrefix.ToCharArray())))
{
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, "Recursion is bad.");
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, "Recursion is bad.", true);
break;
}
}
@@ -50,7 +50,7 @@ namespace Combot.Modules.Plugins
else
{
string notValid = "Please enter a valid time.";
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, notValid);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, notValid, true);
}
break;
}

+ 3
- 3
Modules/Whois/Whois.cs View File

@@ -27,17 +27,17 @@ namespace Combot.Modules.Plugins
if (nicksList.Any() && (string.IsNullOrEmpty(option) || option.ToLower() == "nicks"))
{
string nicksFound = string.Format("\u0002{0}\u0002 has been seen as: \u0002{1}\u0002", mask, string.Join(", ", nicksList));
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, nicksFound);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, nicksFound, true);
}
if (hostList.Any() && (string.IsNullOrEmpty(option) || option.ToLower() == "hosts"))
{
string hostsFound = string.Format("\u0002{0}\u0002 has used the following hosts: \u0002{1}\u0002", mask, string.Join(", ", hostList));
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, hostsFound);
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, hostsFound, true);
}
}
else
{
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, string.Format("I have no information about \u0002{0}\u0002", mask));
SendResponse(command.MessageType, command.Location, command.Nick.Nickname, string.Format("I have no information about \u0002{0}\u0002", mask), true);
}
break;
}

Write Preview
Loading…
Cancel
Save