Handle notices and actions

master
C. McEnroe 2020-02-02 17:26:20 -05:00
parent e8d0d71775
commit b535f0abdd
1 changed files with 22 additions and 5 deletions

View File

@ -193,15 +193,31 @@ static void handleJoin(struct Message *msg) {
); );
} }
static bool isAction(struct Message *msg) {
if (strncmp(msg->params[1], "\1ACTION ", 8)) return false;
msg->params[1] += 8;
size_t len = strlen(msg->params[1]);
if (msg->params[1][len - 1] == '\1') msg->params[1][len - 1] = '\0';
return true;
}
static void handlePrivmsg(struct Message *msg) { static void handlePrivmsg(struct Message *msg) {
require(msg, true, 2); require(msg, true, 2);
bool query = self.nick && !strcmp(msg->params[0], self.nick); bool query = msg->params[0][0] != '#'; // FIXME: CHANTYPES.
size_t id = idFor(query ? msg->nick : msg->params[0]); bool network = query && strchr(msg->nick, '.');
if (query) idColors[id] = hash(msg->user); bool notice = (msg->cmd[0] == 'N');
bool action = isAction(msg);
// TODO: Send services to Network?
size_t id = (network ? Network : idFor(query ? msg->nick : msg->params[0]));
if (query && !network) idColors[id] = hash(msg->user);
uiFormat( uiFormat(
id, Warm, tagTime(msg), id, Warm, tagTime(msg),
"\3%d<%s>\3 %s", "\3%d%s%s%s\3 %s",
hash(msg->user), msg->nick, msg->params[1] hash(msg->user),
(action ? "* " : notice ? "-" : "<"),
msg->nick,
(action ? "" : notice ? "-" : ">"),
msg->params[1]
); );
} }
@ -226,6 +242,7 @@ static const struct Handler {
{ "AUTHENTICATE", handleAuthenticate }, { "AUTHENTICATE", handleAuthenticate },
{ "CAP", handleCap }, { "CAP", handleCap },
{ "JOIN", handleJoin }, { "JOIN", handleJoin },
{ "NOTICE", handlePrivmsg },
{ "PING", handlePing }, { "PING", handlePing },
{ "PRIVMSG", handlePrivmsg }, { "PRIVMSG", handlePrivmsg },
}; };