diff options
| author | June McEnroe <june@causal.agency> | 2019-12-08 14:35:53 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2019-12-08 14:35:53 -0500 |
| commit | c1031563ae270b154bbacb7bbe4b4d911acb69a5 (patch) | |
| tree | 9e338b3c14473bdb8ab6f8a5445effc72e54fe6a | |
| parent | Add irc format (diff) | |
| download | litterbox-c1031563ae270b154bbacb7bbe4b4d911acb69a5.tar.gz litterbox-c1031563ae270b154bbacb7bbe4b4d911acb69a5.zip | |
Match missing final parameters in irc format
| -rw-r--r-- | unscoop.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/unscoop.c b/unscoop.c index f2eddaf..d1d27d0 100644 --- a/unscoop.c +++ b/unscoop.c @@ -118,13 +118,15 @@ static const struct Matcher IRC[] = { Join, { NULL, "$time", "$nick", "$user", "$host" }, }, { - P2_TAGS P3_ORIGIN "PART [^ ]+ :?(.+)?", - Part, { NULL, "$time", "$nick", "$user", "$host", "$message" }, + P2_TAGS P3_ORIGIN "PART [^ ]+( :?(.+))?", + Part, { NULL, "$time", "$nick", "$user", "$host", NULL, "$message" }, }, { - P2_TAGS P3_ORIGIN "KICK [^ ]+ ([^ ]+) :?(.+)?", - Kick, - { NULL, "$time", "$nick", "$user", "$host", "$target", "$message" }, + P2_TAGS P3_ORIGIN "KICK [^ ]+ ([^ ]+)( :?(.+))?", + Kick, { + NULL, "$time", "$nick", "$user", "$host", "$target", + NULL, "$message" + }, }, { P2_TAGS P3_ORIGIN "QUIT( :?(.+))?", @@ -135,8 +137,8 @@ static const struct Matcher IRC[] = { Nick, { NULL, "$time", "$nick", "$user", "$host", "$target" }, }, { - P2_TAGS P3_ORIGIN "TOPIC [^ ]+ :?(.+)", - Topic, { NULL, "$time", "$nick", "$user", "$host", "$message" }, + P2_TAGS P3_ORIGIN "TOPIC [^ ]+( :?(.+))?", + Topic, { NULL, "$time", "$nick", "$user", "$host", NULL, "$message" }, }, }; #undef P2_TAGS |