groupserv: Show GROUPs in CS INFO

Author: siniStar7

modules/third/GroupServ/groupserv.cpp

@@ -48,7 +48,7 @@
  *
  *   # Default flags granted when a user JOINs an open group.
  *   # These are GroupServ access flags (NOT IRC user modes).
- *   # Accepts: +A +i, +ACLVIEW +INVITE, or compact +Ai.
+ *   # Accepts: +A +I, +ACLVIEW +INVITE, or compact +AI.
  *   default_joinflags = "+A"
  *
  *   # Auto-save interval in seconds (0 disables periodic autosave)
@@ -1037,7 +1037,7 @@ class GroupServ final
 	GroupServ(const Anope::string& modname, const Anope::string& creator)
 		: Module(modname, creator, VENDOR)
 		, core(this)
-		, chanaccess(this, "groupserv/chanaccess")
+		, chanaccess(this, "groupserv:chanaccess")
 		, chanaccess_type(chanaccess)
 		, cmd_cs_set_group(this, core, chanaccess)
 		, cmd_cs_set_grouponly(this, core, chanaccess)
@@ -1124,6 +1124,31 @@ class GroupServ final
 		}
 		info["GroupServ"] = out;
 	}
+
+	void OnChanInfo(CommandSource& source, ChannelInfo* ci, InfoFormatter& info, bool show_hidden) override
+	{
+		if (!ci)
+			return;
+
+		auto* d = this->chanaccess.Get(ci);
+		if (!d || d->group.empty())
+			return;
+
+		GSGroupFlags gflags = GSGroupFlags::NONE;
+		if (!this->core.GetGroupFlags(d->group, gflags))
+		{
+			// Only show missing associations to users who can already see hidden details.
+			if (show_hidden)
+				info[_("GroupServ")] = d->group + " (missing)";
+			return;
+		}
+
+		// Mirror NickServ INFO behaviour: only show non-public groups to users who can see hidden details.
+		if (!show_hidden && !HasFlag(gflags, GSGroupFlags::PUBLIC))
+			return;
+
+		info[_("GroupServ")] = d->group;
+	}
 };
 
 MODULE_INIT(GroupServ)

modules/third/GroupServ/groupserv.h

@@ -189,6 +189,7 @@ class GroupServCore final
 	bool SetGroupFlag(CommandSource& source, const Anope::string& groupname, GSGroupFlags flag, bool enabled);
 
 	bool GetGroupVHost(const Anope::string& groupname, Anope::string& out) const;
+	bool GetGroupFlags(const Anope::string& groupname, GSGroupFlags& out) const;
 	void GetGroupsForAccount(const NickCore* nc, std::vector<Anope::string>& out, bool show_hidden) const;
 
 	void SaveDB();

modules/third/GroupServ/groupserv_core.cpp

@@ -1247,6 +1247,16 @@ bool GroupServCore::GetGroupVHost(const Anope::string& groupname, Anope::string&
 	return true;
 }
 
+bool GroupServCore::GetGroupFlags(const Anope::string& groupname, GSGroupFlags& out) const
+{
+	out = GSGroupFlags::NONE;
+	auto it = this->groups.find(NormalizeKey(groupname));
+	if (it == this->groups.end())
+		return false;
+	out = it->second.flags;
+	return true;
+}
+
 void GroupServCore::GetGroupsForAccount(const NickCore* nc, std::vector<Anope::string>& out, bool show_hidden) const
 {
 	out.clear();