pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-09 22:43:13 +02:00
Code Activity

Merge branch '2.0' into 2.1.

Browse Source
This commit is contained in:
Sadie Powell
2021-05-31 20:57:48 +01:00
parent 53cd3f47b5 3728a0bda1
commit df4313f5bb
21 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/commands/cs_access.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ class AccessChanAccess : public ChanAccess
return this->ci->GetLevel(name) != ACCESS_INVALID && this->level >= this->ci->GetLevel(name);
}
Anope::string AccessSerialize() const
Anope::string AccessSerialize() const anope_override
{
return stringify(this->level);
}
modules/commands/cs_flags.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ class FlagsChanAccess : public ChanAccess
return false;
}
Anope::string AccessSerialize() const
Anope::string AccessSerialize() const anope_override
{
return Anope::string(this->flags.begin(), this->flags.end());
}
modules/commands/cs_xop.cpp
+2 -2
View File
@@ -37,7 +37,7 @@ class XOPChanAccess : public ChanAccess
return false;
}
Anope::string AccessSerialize() const
Anope::string AccessSerialize() const anope_override
{
return this->type;
}
@@ -489,7 +489,7 @@ class CommandCSXOP : public Command
return Anope::printf(Language::Translate(source.GetAccount(), _("Modify the list of %s users")), source.command.upper().c_str());
}
void Execute(CommandSource &source, const std::vector<Anope::string> &params)
void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
{
ChannelInfo *ci = ChannelInfo::Find(params[0]);
if (ci == NULL)
modules/commands/ns_info.cpp
+1
View File
@@ -60,6 +60,7 @@ class CommandNSInfo : public Command
InfoFormatter info(source.nc);
info[_("Account")] = na->nc->display;
if (nick_online)
{
bool shown = false;
modules/commands/ns_register.cpp
+2
View File
@@ -179,6 +179,7 @@ class CommandNSRegister : public Command
}
if (Config->GetModule("nickserv")->Get<bool>("restrictopernicks"))
{
for (unsigned i = 0; i < Oper::opers.size(); ++i)
{
Oper *o = Oper::opers[i];
@@ -189,6 +190,7 @@ class CommandNSRegister : public Command
return;
}
}
}
unsigned int passlen = Config->GetModule("nickserv")->Get<unsigned>("passlen", "32");
modules/commands/os_news.cpp
+3 -3
View File
@@ -111,12 +111,12 @@ class MyNewsService : public NewsService
return new MyNewsItem();
}
void AddNewsItem(NewsItem *n)
void AddNewsItem(NewsItem *n) anope_override
{
this->newsItems[n->type].push_back(n);
}
void DelNewsItem(NewsItem *n)
void DelNewsItem(NewsItem *n) anope_override
{
std::vector<NewsItem *> &list = this->GetNewsList(n->type);
std::vector<NewsItem *>::iterator it = std::find(list.begin(), list.end(), n);
@@ -125,7 +125,7 @@ class MyNewsService : public NewsService
delete n;
}
std::vector<NewsItem *> &GetNewsList(NewsType t)
std::vector<NewsItem *> &GetNewsList(NewsType t) anope_override
{
return this->newsItems[t];
}
modules/commands/os_sxline.cpp
+3 -3
View File
@@ -253,12 +253,12 @@ class CommandOSSXLineBase : public Command
return;
}
virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) = 0;
virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override = 0;
};
class CommandOSSNLine : public CommandOSSXLineBase
{
XLineManager *xlm()
XLineManager *xlm() anope_override
{
return this->snlines;
}
@@ -484,7 +484,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
class CommandOSSQLine : public CommandOSSXLineBase
{
XLineManager *xlm()
XLineManager *xlm() anope_override
{
return this->sqlines;
}
modules/extra/stats/irc2sql/tables.cpp
+9 -9
View File
@@ -34,7 +34,7 @@ void IRC2SQL::CheckTables()
"`countryname` varchar(50),"
"PRIMARY KEY `end` (`end`),"
"KEY `start` (`start`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_blocks"))
@@ -45,7 +45,7 @@ void IRC2SQL::CheckTables()
"`locId` INT UNSIGNED NOT NULL,"
"PRIMARY KEY `end` (`end`),"
"KEY `start` (`start`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
@@ -60,7 +60,7 @@ void IRC2SQL::CheckTables()
"`longitude` FLOAT,"
"`areaCode` INT,"
"PRIMARY KEY (`locId`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_region"))
@@ -69,7 +69,7 @@ void IRC2SQL::CheckTables()
"`region` CHAR(2) NOT NULL,"
"`regionname` VARCHAR(100) NOT NULL,"
"PRIMARY KEY (`country`,`region`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (!this->HasTable(prefix + "server"))
@@ -87,7 +87,7 @@ void IRC2SQL::CheckTables()
"`ulined` enum('Y','N') NOT NULL DEFAULT 'N',"
"PRIMARY KEY (`id`),"
"UNIQUE KEY `name` (`name`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (!this->HasTable(prefix + "chan"))
@@ -101,7 +101,7 @@ void IRC2SQL::CheckTables()
"`modes` varchar(512) DEFAULT NULL,"
"PRIMARY KEY (`chanid`),"
"UNIQUE KEY `channel`(`channel`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (!this->HasTable(prefix + "user"))
@@ -136,7 +136,7 @@ void IRC2SQL::CheckTables()
"PRIMARY KEY (`nickid`),"
"UNIQUE KEY `nick` (`nick`),"
"KEY `servid` (`servid`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (!this->HasTable(prefix + "ison"))
@@ -147,7 +147,7 @@ void IRC2SQL::CheckTables()
"`modes` varchar(255) NOT NULL default '',"
"PRIMARY KEY (`nickid`,`chanid`),"
"KEY `modes` (`modes`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (!this->HasTable(prefix + "maxusers"))
@@ -158,7 +158,7 @@ void IRC2SQL::CheckTables()
"`maxtime` DATETIME NOT NULL,"
"`lastused` DATETIME NOT NULL,"
"UNIQUE KEY `name` (`name`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
if (this->HasProcedure(prefix + "UserConnect"))
modules/extra/stats/m_chanstats.cpp
+1 -1
View File
@@ -317,7 +317,7 @@ class MChanstats : public Module
"KEY `nick` (`nick`),"
"KEY `chan_` (`chan`),"
"KEY `type` (`type`)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;";
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
this->RunQuery(query);
}
/* There is no CREATE OR REPLACE PROCEDURE in MySQL */
modules/fantasy.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ class Fantasy : public Module
FOREACH_MOD(OnPostCommand, (source, cmd, params));
}
void OnBotInfo(CommandSource &source, BotInfo *bi, ChannelInfo *ci, InfoFormatter &info)
void OnBotInfo(CommandSource &source, BotInfo *bi, ChannelInfo *ci, InfoFormatter &info) anope_override
{
if (fantasy.HasExt(ci))
info.AddOption(_("Fantasy"));
modules/m_httpd.cpp
+1 -1
View File
@@ -326,7 +326,7 @@ class MyHTTPProvider : public HTTPProvider, public Timer
this->pages.erase(page->GetURL());
}
HTTPPage* FindPage(const Anope::string &pname)
HTTPPage* FindPage(const Anope::string &pname) anope_override
{
if (this->pages.count(pname) == 0)
return NULL;
modules/m_xmlrpc.cpp
+3 -3
View File
@@ -39,12 +39,12 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
public:
MyXMLRPCServiceInterface(Module *creator, const Anope::string &sname) : XMLRPCServiceInterface(creator, sname), HTTPPage("/xmlrpc", "text/xml") { }
void Register(XMLRPCEvent *event)
void Register(XMLRPCEvent *event) anope_override
{
this->events.push_back(event);
}
void Unregister(XMLRPCEvent *event)
void Unregister(XMLRPCEvent *event) anope_override
{
std::deque<XMLRPCEvent *>::iterator it = std::find(this->events.begin(), this->events.end(), event);
@@ -182,7 +182,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
return true;
}
void Reply(XMLRPCRequest &request)
void Reply(XMLRPCRequest &request) anope_override
{
if (!request.id.empty())
request.reply("id", request.id);
modules/pseudoclients/memoserv.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ class MemoServCore : public Module, public MemoServService
return MEMO_SUCCESS;
}
void Check(User *u)
void Check(User *u) anope_override
{
const NickCore *nc = u->Account();
if (!nc)
modules/pseudoclients/nickserv.cpp
+2 -2
View File
@@ -495,14 +495,14 @@ class NickServCore : public Module, public NickServService
"after %d days if not used."), nickserv_expire / 86400);
}
void OnNickCoreCreate(NickCore *nc)
void OnNickCoreCreate(NickCore *nc) anope_override
{
/* Set default flags */
for (unsigned i = 0; i < defaults.size(); ++i)
nc->Extend<bool>(defaults[i].upper());
}
void OnUserQuit(User *u, const Anope::string &msg)
void OnUserQuit(User *u, const Anope::string &msg) anope_override
{
if (u->server && !u->server->GetQuitReason().empty() && Config->GetModule(this)->Get<bool>("hidenetsplitquit"))
return;