mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-13 10:20:28 +00:00
Code Issues Releases Wiki Activity

Inline who_flags_status

Browse Source
This commit is contained in:
Federico G. Schwindt 2013-08-05 11:05:12 +01:00
parent 74514b8c23
commit 7db8481500
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ngircd/irc-info.c
View File

@ -87,14 +87,6 @@ write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *f
flags, Client_Hops(c), Client_Info(c)); flags, Client_Hops(c), Client_Info(c));
} }
static const char *
who_flags_status(const char *client_modes)
{
if (strchr(client_modes, 'a'))
return "G"; /* away */
return "H";
}
/** /**
* Return channel user mode prefix(es). * Return channel user mode prefix(es).
* *
@ -152,7 +144,6 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
{ {
bool is_visible, is_member, is_ircop; bool is_visible, is_member, is_ircop;
CL2CHAN *cl2chan; CL2CHAN *cl2chan;
const char *client_modes;
char flags[10]; char flags[10];
CLIENT *c; CLIENT *c;
int count = 0; int count = 0;
@ -173,17 +164,21 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
for (; cl2chan ; cl2chan = Channel_NextMember(Chan, cl2chan)) { for (; cl2chan ; cl2chan = Channel_NextMember(Chan, cl2chan)) {
c = Channel_GetClient(cl2chan); c = Channel_GetClient(cl2chan);
client_modes = Client_Modes(c);
is_ircop = Client_HasMode(c, 'o'); is_ircop = Client_HasMode(c, 'o');
if (OnlyOps && !is_ircop) if (OnlyOps && !is_ircop)
continue; continue;
is_visible = Client_HasMode(c, 'i'); is_visible = Client_HasMode(c, 'i');
if (is_member || is_visible) { if (is_member || is_visible) {
strlcpy(flags, who_flags_status(client_modes), memset(flags, 0, sizeof(flags));
sizeof(flags));
if (Client_HasMode(c, 'a'))
flags[0] = 'G'; /* away */
else
flags[0] = 'H';
if (is_ircop) if (is_ircop)
strlcat(flags, "*", sizeof(flags)); flags[1] = '*';
who_flags_qualifier(Client, Channel_UserModes(Chan, c), who_flags_qualifier(Client, Channel_UserModes(Chan, c),
flags, sizeof(flags)); flags, sizeof(flags));
@ -218,7 +213,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
CL2CHAN *cl2chan; CL2CHAN *cl2chan;
CHANNEL *chan; CHANNEL *chan;
bool client_match, is_visible; bool client_match, is_visible;
char flags[4]; char flags[3];
int count = 0; int count = 0;
assert (Client != NULL); assert (Client != NULL);
@ -274,9 +269,15 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO"))
break; break;
strlcpy(flags, who_flags_status(Client_Modes(c)), sizeof(flags)); memset(flags, 0, sizeof(flags));
if (Client_HasMode(c, 'a'))
flags[0] = 'G'; /* away */
else
flags[0] = 'H';
if (Client_HasMode(c, 'o')) if (Client_HasMode(c, 'o'))
strlcat(flags, "*", sizeof(flags)); flags[1] = '*';
if (!write_whoreply(Client, c, "*", flags)) if (!write_whoreply(Client, c, "*", flags))
return DISCONNECTED; return DISCONNECTED;