diff options
| author | Farow <farow_spam@lavabit.com> | 2013-08-13 07:39:34 +0300 |
|---|---|---|
| committer | Farow <farow_spam@lavabit.com> | 2013-08-13 07:39:34 +0300 |
| commit | 73d63ca3da0067bfdef7e6c5458029ceaf5dfa98 (patch) | |
| tree | 1eb1942881a5fb21906ecc76ef28dc17a353b25b /src/common | |
| parent | 4f77f046d00d81d083fa1614e7fb6099dc791a62 (diff) | |
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
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/url.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/url.c b/src/common/url.c index 856ba5a7..57d8d88b 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -627,7 +627,7 @@ re_email (void) /* 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 */ /* that do_an_re() runs through. */ -#define NICK0 "[" NICKPRE "]?[" NICKLET NICKDIG NICKSPE "]" +#define NICK0 "^[" NICKPRE "]?[" NICKLET NICKDIG NICKSPE "]" #endif #define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*" #define NICK NICK0 NICK1 @@ -650,7 +650,7 @@ re_nick (void) } /* CHANNEL description --- */ -#define CHANNEL "[" CHANPRE "][^ \t\a,]+" +#define CHANNEL "[" CHANPRE "][^ \t\a,]+(?:,[" CHANPRE "][^ \t\a,]+)*" static const GRegex * re_channel (void) |