diff options
| author | Haru <haru@dotalux.com> | 2016-04-25 01:35:49 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-04-25 01:35:49 +0200 |
| commit | 9fbce660453b952e49beb5f6c29fa245060f757e (patch) | |
| tree | 69cb298fae9c5d7815e6d20ae873bbd38b42f057 /src/map/channel.c | |
| parent | 31e27a130676e3e416b583bb947f9dd87efdce81 (diff) | |
| parent | f0de696ce5cf22b4d9b3baac50a30c138a9b4ffd (diff) | |
| download | hercules-9fbce660453b952e49beb5f6c29fa245060f757e.tar.gz hercules-9fbce660453b952e49beb5f6c29fa245060f757e.tar.bz2 hercules-9fbce660453b952e49beb5f6c29fa245060f757e.tar.xz hercules-9fbce660453b952e49beb5f6c29fa245060f757e.zip | |
Merge branch 'irc_delay' into hercules
Diffstat (limited to 'src/map/channel.c')
| -rw-r--r-- | src/map/channel.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/map/channel.c b/src/map/channel.c index e4e3d069d..f36388bca 100644 --- a/src/map/channel.c +++ b/src/map/channel.c @@ -609,7 +609,10 @@ void read_channels_config(void) local_autojoin = 0, ally_autojoin = 0, allow_user_channel_creation = 0, irc_enabled = 0, - irc_autojoin = 0; + irc_autojoin = 0, + irc_flood_protection_rate = 0, + irc_flood_protection_burst = 0, + irc_flood_protection_enabled = 0; if( !libconfig->setting_lookup_string(settings, "map_local_channel_name", &local_name) ) local_name = "map"; @@ -686,7 +689,6 @@ void read_channels_config(void) libconfig->setting_lookup_bool(settings, "map_local_channel_autojoin", &local_autojoin); libconfig->setting_lookup_bool(settings, "ally_channel_autojoin", &ally_autojoin); libconfig->setting_lookup_bool(settings, "irc_channel_autojoin", &irc_autojoin); - if (local_autojoin) channel->config->local_autojoin = true; if (ally_autojoin) @@ -694,6 +696,26 @@ void read_channels_config(void) if (irc_autojoin) channel->config->irc_autojoin = true; + libconfig->setting_lookup_int(settings, "irc_flood_protection_burst", &irc_flood_protection_burst); + + if (irc_flood_protection_enabled) { + ircbot->flood_protection_enabled = true; + + libconfig->setting_lookup_bool(settings, "irc_flood_protection_enabled", &irc_flood_protection_enabled); + libconfig->setting_lookup_int(settings, "irc_flood_protection_rate", &irc_flood_protection_rate); + + if (irc_flood_protection_rate > 0) + ircbot->flood_protection_rate = irc_flood_protection_rate; + else + ircbot->flood_protection_rate = 1000; + if (irc_flood_protection_burst > 0) + ircbot->flood_protection_burst = irc_flood_protection_burst; + else + ircbot->flood_protection_burst = 3; + } else { + ircbot->flood_protection_enabled = false; + } + libconfig->setting_lookup_bool(settings, "allow_user_channel_creation", &allow_user_channel_creation); if( allow_user_channel_creation ) |