aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Sadie Powell2022-06-22 00:40:13 +0100
committerGravatar Sadie Powell2022-06-22 00:40:13 +0100
commit5536a7323079b51913a4019fc7a644db79484cb8 (patch)
treed325d57e47767c9fb93cd1d8b1c9195aa4ad57c5 /src
parentStore the shun cleanedcommands/enabledcommands in a token list. (diff)
parentUpdate Windows dependencies. (diff)
Merge branch 'insp3' into master.
Diffstat (limited to 'src')
-rw-r--r--src/configparser.cpp2
-rw-r--r--src/helperfuncs.cpp1
-rw-r--r--src/modules/m_repeat.cpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/configparser.cpp b/src/configparser.cpp
index ce5718ce6..1ab4b811c 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -487,6 +487,8 @@ ParseStack::ParseStack(ServerConfig* conf)
{ "irc.bold", "\x02" },
{ "irc.color", "\x03" },
{ "irc.colour", "\x03" },
+ { "irc.hexcolor", "\x04" },
+ { "irc.hexcolour", "\x04" },
{ "irc.italic", "\x1D" },
{ "irc.monospace", "\x11" },
{ "irc.reset", "\x0F" },
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index e8bcd28e8..ac2293722 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -118,6 +118,7 @@ void InspIRCd::ProcessColors(std::vector<std::string>& input)
} special[] = {
special_chars("\\b", "\x02"), // Bold
special_chars("\\c", "\x03"), // Color
+ special_chars("\\h", "\x04"), // Hex Color
special_chars("\\i", "\x1D"), // Italic
special_chars("\\m", "\x11"), // Monospace
special_chars("\\r", "\x16"), // Reverse
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index db7a76ed9..16e1ec1c2 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -134,7 +134,7 @@ public:
: ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >(Creator, "repeat", 'E')
, MemberInfoExt(Creator, "repeat", ExtensionType::MEMBERSHIP)
{
- syntax = "[~|*]<lines>:<sec>[:<difference>][:<backlog>]";
+ syntax = "[~|*]<lines>:<duration>[:<difference>][:<backlog>]";
}
void OnUnset(User* source, Channel* chan) override