#include "stdinc.h"
#include "channel.h"
#include "client.h"
-#include "common.h"
#include "hash.h"
#include "match.h"
#include "ircd.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
+#include "s_newconf.h"
-static int m_names(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char names_desc[] = "Provides the NAMES command to view users on a channel";
+
+static void m_names(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message names_msgtab = {
"NAMES", 0, 0, 0, 0,
};
mapi_clist_av1 names_clist[] = { &names_msgtab, NULL };
-DECLARE_MODULE_AV1(names, NULL, NULL, names_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(names, NULL, NULL, names_clist, NULL, NULL, NULL, NULL, names_desc);
static void names_global(struct Client *source_p);
* m_names
* parv[1] = channel
*/
-static int
+static void
m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static time_t last_used = 0;
sendto_one_numeric(source_p, ERR_BADCHANNAME,
form_str(ERR_BADCHANNAME),
(unsigned char *) p);
- return 0;
+ return;
}
if((chptr = find_channel(p)) != NULL)
}
else
{
- if(!IsOper(source_p))
+ if(!IsOperGeneral(source_p))
{
if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
{
me.name, source_p->name, "NAMES");
sendto_one(source_p, form_str(RPL_ENDOFNAMES),
me.name, source_p->name, "*");
- return 0;
+ return;
}
else
last_used = rb_current_time();
sendto_one(source_p, form_str(RPL_ENDOFNAMES),
me.name, source_p->name, "*");
}
-
- return 0;
}
/*
static void
names_global(struct Client *source_p)
{
- int mlen;
- int tlen;
- int cur_len;
- int dont_show = NO;
+ bool dont_show = false;
rb_dlink_node *lp, *ptr;
struct Client *target_p;
struct Channel *chptr = NULL;
struct membership *msptr;
- char buf[BUFSIZE];
- char *t;
/* first do all visible channels */
RB_DLINK_FOREACH(ptr, global_channel_list.head)
chptr = ptr->data;
channel_member_names(chptr, source_p, 0);
}
- cur_len = mlen = sprintf(buf, form_str(RPL_NAMREPLY),
- me.name, source_p->name, "*", "*");
- t = buf + mlen;
+
+ send_multiline_init(source_p, " ", form_str(RPL_NAMREPLY),
+ me.name,
+ source_p->name,
+ "*",
+ "*");
/* Second, do all clients in one big sweep */
RB_DLINK_FOREACH(ptr, global_client_list.head)
{
target_p = ptr->data;
- dont_show = NO;
+ dont_show = false;
if(!IsPerson(target_p) || IsInvisible(target_p))
continue;
if(PubChannel(chptr) || IsMember(source_p, chptr) ||
SecretChannel(chptr))
{
- dont_show = YES;
+ dont_show = true;
break;
}
}
if(dont_show)
continue;
- if((cur_len + NICKLEN + 2) > (BUFSIZE - 3))
+ if (IsCapable(source_p, CLICAP_USERHOST_IN_NAMES))
{
- sendto_one(source_p, "%s", buf);
- cur_len = mlen;
- t = buf + mlen;
+ send_multiline_item(source_p, "%s!%s@%s",
+ target_p->name,
+ target_p->username,
+ target_p->host);
+ }
+ else
+ {
+ send_multiline_item(source_p, "%s", target_p->name);
}
-
- tlen = sprintf(t, "%s ", target_p->name);
- cur_len += tlen;
- t += tlen;
}
- if(cur_len > mlen)
- sendto_one(source_p, "%s", buf);
+ send_multiline_fini(source_p, NULL);
}