Handle KICK

See I knew the color cache in complete would be useful in at least one
place!
weechat-hashes
C. McEnroe 2020-02-08 00:58:17 -05:00
parent f14175ebed
commit b5707af4b8
3 changed files with 27 additions and 1 deletions

3
chat.h
View File

@ -151,12 +151,13 @@ char *editTail(void);
const char *complete(size_t id, const char *prefix); const char *complete(size_t id, const char *prefix);
void completeAccept(void); void completeAccept(void);
void completeReject(void); void completeReject(void);
size_t completeID(const char *str);
void completeAdd(size_t id, const char *str, enum Color color); void completeAdd(size_t id, const char *str, enum Color color);
void completeTouch(size_t id, const char *str, enum Color color); void completeTouch(size_t id, const char *str, enum Color color);
void completeReplace(size_t id, const char *old, const char *new); void completeReplace(size_t id, const char *old, const char *new);
void completeRemove(size_t id, const char *str); void completeRemove(size_t id, const char *str);
void completeClear(size_t id); void completeClear(size_t id);
size_t completeID(const char *str);
enum Color completeColor(size_t id, const char *str);
FILE *configOpen(const char *path, const char *mode); FILE *configOpen(const char *path, const char *mode);
int getopt_config( int getopt_config(

View File

@ -90,6 +90,11 @@ void completeTouch(size_t id, const char *str, enum Color color) {
prepend(node ? detach(node) : alloc(id, str, color)); prepend(node ? detach(node) : alloc(id, str, color));
} }
enum Color completeColor(size_t id, const char *str) {
struct Node *node = find(id, str);
return (node ? node->color : Default);
}
static struct Node *match; static struct Node *match;
const char *complete(size_t id, const char *prefix) { const char *complete(size_t id, const char *prefix) {

View File

@ -226,6 +226,25 @@ static void handlePart(struct Message *msg) {
); );
} }
static void handleKick(struct Message *msg) {
require(msg, true, 2);
size_t id = idFor(msg->params[0]);
bool kicked = self.nick && !strcmp(msg->params[1], self.nick);
completeTouch(id, msg->nick, hash(msg->user));
uiFormat(
id, (kicked ? Hot : Cold), tagTime(msg),
"%s\3%02d%s\17\tkicks \3%02d%s\3 out of \3%02d%s\3%s%s",
(kicked ? "\26" : ""),
hash(msg->user), msg->nick,
completeColor(id, msg->params[1]), msg->params[1],
hash(msg->params[0]), msg->params[0],
(msg->params[2] ? ": " : ""),
(msg->params[2] ? msg->params[2] : "")
);
completeRemove(id, msg->params[1]);
if (kicked) completeClear(id);
}
static void handleNick(struct Message *msg) { static void handleNick(struct Message *msg) {
require(msg, true, 1); require(msg, true, 1);
if (self.nick && !strcmp(msg->nick, self.nick)) { if (self.nick && !strcmp(msg->nick, self.nick)) {
@ -413,6 +432,7 @@ static const struct Handler {
{ "CAP", handleCap }, { "CAP", handleCap },
{ "ERROR", handleError }, { "ERROR", handleError },
{ "JOIN", handleJoin }, { "JOIN", handleJoin },
{ "KICK", handleKick },
{ "NICK", handleNick }, { "NICK", handleNick },
{ "NOTICE", handlePrivmsg }, { "NOTICE", handlePrivmsg },
{ "PART", handlePart }, { "PART", handlePart },