1
0
mirror of https://github.com/anope/anope.git synced 2026-07-07 19:03:14 +02:00

Cleaned up some things, made the protocol modules use some basic inheritance to cut back on their code duplication. More work can be done in the future to remove even more of it.

This commit is contained in:
Adam
2010-12-06 17:06:57 -05:00
parent a507816701
commit aed53dbb47
45 changed files with 3101 additions and 4147 deletions
+7 -7
View File
@@ -587,8 +587,8 @@ XLine *SNLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
User *user = *it;
++it;
if (!is_oper(user) && Anope::Match(user->realname, x->Mask))
kill_user(Config->ServerName, user->nick, rreason);
if (!user->HasMode(UMODE_OPER) && Anope::Match(user->realname, x->Mask))
kill_user(Config->ServerName, user, rreason);
}
}
@@ -605,7 +605,7 @@ void SNLineManager::OnMatch(User *u, XLine *x)
ircdproto->SendSGLine(x);
Anope::string reason = "G-Lined: " + x->Reason;
kill_user(Config->s_OperServ, u->nick, reason);
kill_user(Config->s_OperServ, u, reason);
}
void SNLineManager::OnExpire(XLine *x)
@@ -675,7 +675,7 @@ XLine *SQLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
UserContainer *uc = *it;
++it;
if (is_oper(uc->user))
if (uc->user->HasMode(UMODE_OPER))
continue;
c->Kick(NULL, uc->user, "%s", reason.c_str());
}
@@ -688,8 +688,8 @@ XLine *SQLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
User *user = *it;
++it;
if (!is_oper(user) && Anope::Match(user->nick, x->Mask))
kill_user(Config->ServerName, user->nick, rreason);
if (!user->HasMode(UMODE_OPER) && Anope::Match(user->nick, x->Mask))
kill_user(Config->ServerName, user, rreason);
}
}
}
@@ -709,7 +709,7 @@ void SQLineManager::OnMatch(User *u, XLine *x)
ircdproto->SendSQLine(x);
Anope::string reason = "Q-Lined: " + x->Reason;
kill_user(Config->s_OperServ, u->nick, reason);
kill_user(Config->s_OperServ, u, reason);
}
void SQLineManager::OnExpire(XLine *x)