From 42238034490fb5479d787bd1695750387d508200 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 24 Nov 2014 14:27:23 -0500 Subject: Rewrite serializable to have field level granularity Represent serializable objects in a digraph, and as a result made most object relationships implicitly defined, and use the graph to trace references between objects to determine relationships. Edges may also be marked as having a dependency of the object they point to, which allows for automatic cleanup and deletion of most objects when no longer needed. Additionally, this allows not having to require in-memory copies of everything when using external databases. db_sql has been rewritten for this and now always requires a database to function. db_sql with MySQL now requires InnoDB to make use of transactions and foreign key constraints. --- modules/commands/hs_del.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'modules/commands/hs_del.cpp') diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp index 907b3e12c..8c9c20c1c 100644 --- a/modules/commands/hs_del.cpp +++ b/modules/commands/hs_del.cpp @@ -36,10 +36,10 @@ class CommandHSDel : public Command return; } - Log(LOG_ADMIN, source, this) << "for user " << na->nick; + Log(LOG_ADMIN, source, this) << "for user " << na->GetNick(); this->OnDeleteVhost(&Event::DeleteVhost::OnDeleteVhost, na); na->RemoveVhost(); - source.Reply(_("Vhost for \002{0}\002 has been removed."), na->nick); + source.Reply(_("Vhost for \002{0}\002 has been removed."), na->GetNick()); } bool OnHelp(CommandSource &source, const Anope::string &subcommand) override @@ -74,14 +74,12 @@ class CommandHSDelAll : public Command } this->ondeletevhost(&Event::DeleteVhost::OnDeleteVhost, na); - const NickServ::Account *nc = na->nc; - for (unsigned i = 0; i < nc->aliases->size(); ++i) - { - na = nc->aliases->at(i); - na->RemoveVhost(); - } - Log(LOG_ADMIN, source, this) << "for all nicks in group " << nc->display; - source.Reply(_("Vhosts for group \002{0}\002 have been removed."), nc->display); + + NickServ::Account *nc = na->GetAccount(); + for (NickServ::Nick *na2 : nc->GetRefs(NickServ::nick)) + na2->RemoveVhost(); + Log(LOG_ADMIN, source, this) << "for all nicks in group " << nc->GetDisplay(); + source.Reply(_("Vhosts for group \002{0}\002 have been removed."), nc->GetDisplay()); } bool OnHelp(CommandSource &source, const Anope::string &subcommand) override -- cgit