ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2022-06-22 00:40:13 +01:00
commit 5536a73230
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/conf/inspircd.conf.example
View File

@ -349,6 +349,7 @@
# used in your MOTD:
# Bold: \b
# Color: \c<fg>[,<bg>]
# Hex Color: \h<fg>[,<bg>]
# Italic: \i
# Monospace: \m (not widely supported)
# Reset: \x

2
docs/conf/modules.conf.example
View File

@ -1830,7 +1830,7 @@
# Repeat module: Allows to block, kick or ban upon similar messages
# being uttered several times. Provides channel mode +E.
#
# Syntax: [~|*]<lines>:<sec>[:<difference>][:<backlog>]
# Syntax: [~|*]<lines>:<duration>[:<difference>][:<backlog>]
# ~ is to block, * is to ban, default is kick.
# lines - In mode 1, the amount of lines that has to match consecutively.
# In mode 2, the size of the backlog to keep for matching.

2
src/configparser.cpp
View File

@ -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" },

1
src/helperfuncs.cpp
View File

@ -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

2
src/modules/m_repeat.cpp
View File

@ -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

8
win/conanfile.txt
View File

@ -1,4 +1,4 @@
# Last updated: 2022-04-27
# Last updated: 2022-06-22
#
# Modules we can't legally ship: geo_maxmind, ssl_mbedtls, ssl_openssl
# Modules which don't apply to Windows: regex_posix, sslrehashsignal
@ -7,14 +7,14 @@
[requires]
argon2/20190702
## libmaxminddb/1.6.0
libmysqlclient/8.0.25
libmysqlclient/8.0.29
libpq/14.2
## mbedtls/3.1.0
## openssl/1.1.1n # unable to upgrade yet because of dependency issues
## openssl/1.1.1o # unable to upgrade yet because of dependency issues
pcre2/10.40
rapidjson/cci.20211112
re2/20220201
sqlite3/3.38.1
sqlite3/3.38.5
[options]
argon2:shared=True