Allow multiple channels in url, fix nick re

- Multiple channels have to be separated by a comma
- Fix #nick becoming a url for nick instead of #nick
This commit is contained in:
Farow 2013-08-13 07:39:34 +03:00
parent 4f77f046d0
commit 73d63ca3da
1 changed files with 2 additions and 2 deletions

View File

@ -627,7 +627,7 @@ re_email (void)
/* Rationale is that do_an_re() above will anyway look up what */ /* Rationale is that do_an_re() above will anyway look up what */
/* we find, and that WORD_NICK is the last item in the array */ /* we find, and that WORD_NICK is the last item in the array */
/* that do_an_re() runs through. */ /* that do_an_re() runs through. */
#define NICK0 "[" NICKPRE "]?[" NICKLET NICKDIG NICKSPE "]" #define NICK0 "^[" NICKPRE "]?[" NICKLET NICKDIG NICKSPE "]"
#endif #endif
#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*" #define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*"
#define NICK NICK0 NICK1 #define NICK NICK0 NICK1
@ -650,7 +650,7 @@ re_nick (void)
} }
/* CHANNEL description --- */ /* CHANNEL description --- */
#define CHANNEL "[" CHANPRE "][^ \t\a,]+" #define CHANNEL "[" CHANPRE "][^ \t\a,]+(?:,[" CHANPRE "][^ \t\a,]+)*"
static const GRegex * static const GRegex *
re_channel (void) re_channel (void)