dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite handleMode

master
C. McEnroe 2020-03-22 11:18:21 -04:00
parent 1c508b78ab
commit 8da45d9183
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
handle.c
View File

@ -522,13 +522,16 @@ static void handleReplyUserModeIs(struct Message *msg) {
); );
} }
static const char *ModeNames[256] = { static const char *ChanModes[256] = {
['a'] = "protected",
['h'] = "halfop",
['i'] = "invite-only", ['i'] = "invite-only",
['k'] = "key", ['k'] = "key",
['l'] = "client limit", ['l'] = "client limit",
['m'] = "moderated", ['m'] = "moderated",
['n'] = "no external messages", ['n'] = "no external messages",
['o'] = "operator", ['o'] = "operator",
['q'] = "founder",
['s'] = "secret", ['s'] = "secret",
['t'] = "protected topic", ['t'] = "protected topic",
['v'] = "voice", ['v'] = "voice",
@ -542,76 +545,77 @@ static void handleMode(struct Message *msg) {
} }
uint id = idFor(msg->params[0]); uint id = idFor(msg->params[0]);
bool set = false; bool set = true;
uint param = 2; uint param = 2;
char buf[1024] = ""; char buf[1024] = "";
for (char *ch = msg->params[1]; *ch; ++ch) {
const char *name = ModeNames[(byte)*ch];
if (!name) name = (const char[]) { *ch, '\0' };
if (*ch == '+') {
set = true;
} else if (*ch == '-') {
set = false;
} else if (strchr(network.prefixModes, *ch)) { for (char *ch = msg->params[1]; *ch; ++ch) {
if (*ch == '+') { set = true; continue; }
if (*ch == '-') { set = false; continue; }
const char *name = ChanModes[(byte)*ch];
if (*ch == network.excepts) name = "except";
if (*ch == network.invex) name = "invite";
if (!name) name = (const char[]) { "-+"[set], *ch, '\0' };
if (strchr(network.prefixModes, *ch)) {
assert(param < ParamCap); assert(param < ParamCap);
char *nick = msg->params[param++]; char *nick = msg->params[param++];
char *mode = strchr(network.prefixModes, *ch); char prefix = network.prefixes[
char prefix = network.prefixes[mode - network.prefixModes]; strchr(network.prefixModes, *ch) - network.prefixModes
];
catf( catf(
buf, sizeof(buf), ", %s \3%02d%c%s\3", buf, sizeof(buf), ", %s \3%02d%c%s\3 \3%02d%s\3 %s",
(set ? "grants" : "revokes"), (set ? "grants" : "revokes"),
completeColor(id, nick), prefix, nick completeColor(id, nick), prefix, nick,
hash(msg->params[0]), msg->params[0],
name
); );
}
} else if (strchr(network.listModes, *ch)) { if (strchr(network.listModes, *ch)) {
assert(param < ParamCap); assert(param < ParamCap);
char *mask = msg->params[param++]; char *mask = msg->params[param++];
if (*ch == 'b') { if (*ch == 'b') {
catf( catf(
buf, sizeof(buf), ", %s %s from \3%02d%s\3", buf, sizeof(buf), ", %sbans %s from \3%02d%s\3",
(set ? "bans" : "unbans"), (set ? "" : "un"), mask,
mask,
hash(msg->params[0]), msg->params[0] hash(msg->params[0]), msg->params[0]
); );
continue; } else {
}
const char *list = (const char[]) { *ch, '\0' };
if (*ch == network.excepts) list = "except";
if (*ch == network.invex) list = "invite";
catf( catf(
buf, sizeof(buf), ", %s %s %s the \3%02d%s\3 %s list", buf, sizeof(buf), ", %s %s %s the \3%02d%s\3 %s list",
(set ? "adds" : "removes"), (set ? "adds" : "removes"), mask, (set ? "to" : "from"),
mask, hash(msg->params[0]), msg->params[0], name
(set ? "to" : "from"),
hash(msg->params[0]), msg->params[0],
list
); );
}
}
} else if (strchr(network.paramModes, *ch)) { if (strchr(network.paramModes, *ch)) {
assert(param < ParamCap); assert(param < ParamCap);
catf( catf(
buf, sizeof(buf), ", %ssets \3%02d%s\3 %s %s %s", buf, sizeof(buf), ", %ssets \3%02d%s\3 %s %s %s",
(set ? "" : "un"), hash(msg->params[0]), msg->params[0], name, (set ? "" : "un"),
hash(msg->params[0]), msg->params[0], name,
(set ? "to" : "from"), msg->params[param++] (set ? "to" : "from"), msg->params[param++]
); );
}
} else if (strchr(network.setParamModes, *ch)) { if (strchr(network.setParamModes, *ch) && set) {
if (set) {
assert(param < ParamCap); assert(param < ParamCap);
catf( catf(
buf, sizeof(buf), ", sets \3%02d%s\3 %s to %s", buf, sizeof(buf), ", sets \3%02d%s\3 %s to %s",
hash(msg->params[0]), msg->params[0], name, hash(msg->params[0]), msg->params[0],
msg->params[param++] name, msg->params[param++]
); );
} else { } else if (strchr(network.setParamModes, *ch)) {
catf( catf(
buf, sizeof(buf), ", unsets \3%02d%s\3 %s", buf, sizeof(buf), ", unsets \3%02d%s\3 %s",
hash(msg->params[0]), msg->params[0], name hash(msg->params[0]), msg->params[0], name
); );
} }
} else { if (strchr(network.channelModes, *ch)) {
catf( catf(
buf, sizeof(buf), ", %ssets \3%02d%s\3 %s", buf, sizeof(buf), ", %ssets \3%02d%s\3 %s",
(set ? "" : "un"), hash(msg->params[0]), msg->params[0], name (set ? "" : "un"), hash(msg->params[0]), msg->params[0], name
@ -619,14 +623,10 @@ static void handleMode(struct Message *msg) {
} }
} }
catf(buf, sizeof(buf), " (%s", msg->params[1]); if (!buf[0]) return;
for (uint i = 2; i < ParamCap; ++i) {
if (!msg->params[i]) break;
catf(buf, sizeof(buf), " %s", msg->params[i]);
}
uiFormat( uiFormat(
id, Cold, tagTime(msg), id, Cold, tagTime(msg),
"\3%02d%s\3\t%s)", hash(msg->user), msg->nick, &buf[2] "\3%02d%s\3\t%s", hash(msg->user), msg->nick, &buf[2]
); );
} }