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

Add message to ignore patterns

master
C. McEnroe 2020-07-06 22:40:30 -04:00
parent 529028fe4a
commit cb84983dd1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
catgirl.1
View File

@ -1,4 +1,4 @@
.Dd June 12, 2020 .Dd July 6, 2020
.Dt CATGIRL 1 .Dt CATGIRL 1
.Os .Os
. .
@ -162,6 +162,7 @@ The format of the pattern is as follows:
.Ar nick Ns Op Ar !user@host .Ar nick Ns Op Ar !user@host
.Op Ar command .Op Ar command
.Op Ar channel .Op Ar channel
.Op Ar message
.Ed .Ed
. .
.It Fl j Ar join , Cm join = Ar join .It Fl j Ar join , Cm join = Ar join

11
ignore.c
View File

@ -46,10 +46,12 @@ const char *ignoreAdd(const char *pattern) {
} }
char **dest = &ignore.patterns[ignore.len++]; char **dest = &ignore.patterns[ignore.len++];
if (!ex && !sp) { if (!ex && !sp) {
asprintf(dest, "%s!*@* * *", pattern); asprintf(dest, "%s!*@* * * *", pattern);
} else if (sp < 1) { } else if (sp < 1) {
asprintf(dest, "%s * *", pattern); asprintf(dest, "%s * * *", pattern);
} else if (sp < 2) { } else if (sp < 2) {
asprintf(dest, "%s * *", pattern);
} else if (sp < 3) {
asprintf(dest, "%s *", pattern); asprintf(dest, "%s *", pattern);
} else { } else {
*dest = strdup(pattern); *dest = strdup(pattern);
@ -72,8 +74,9 @@ bool ignoreRemove(const char *pattern) {
enum Heat ignoreCheck(enum Heat heat, uint id, const struct Message *msg) { enum Heat ignoreCheck(enum Heat heat, uint id, const struct Message *msg) {
char match[512]; char match[512];
snprintf( snprintf(
match, sizeof(match), "%s!%s@%s %s %s", match, sizeof(match), "%s!%s@%s %s %s %s",
msg->nick, msg->user, msg->host, msg->cmd, idNames[id] msg->nick, msg->user, msg->host,
msg->cmd, idNames[id], (msg->params[1] ?: "")
); );
for (size_t i = 0; i < ignore.len; ++i) { for (size_t i = 0; i < ignore.len; ++i) {
if (fnmatch(ignore.patterns[i], match, FNM_CASEFOLD)) continue; if (fnmatch(ignore.patterns[i], match, FNM_CASEFOLD)) continue;