Mercurial > pidgin-twitter
diff pidgin-twitter.h @ 226:8da85ae0aa2c
tweaked user pattern and channel pattern so that they can be matched regardless of surrounding anchor markups.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 13 Sep 2008 01:20:13 +0900 |
parents | 1ef5aa4883a1 |
children | 29c741b1b921 |
line wrap: on
line diff
--- a/pidgin-twitter.h Tue Sep 09 18:53:36 2008 +0900 +++ b/pidgin-twitter.h Sat Sep 13 01:20:13 2008 +0900 @@ -31,8 +31,6 @@ COMMAND, PSEUDO, USER, - USER_FIRST_LINE, - USER_FORMATTED, CHANNEL_WASSR, IMAGE_TWITTER, IMAGE_WASSR, @@ -151,10 +149,8 @@ #define P_SENDER "^(\\r?\\n?)\\s*([-A-Za-z0-9_]+)(?:\\s*\\(.+\\))?: " #define P_COMMAND "^(?:\\s*)([dDfFgGlLmMnNtTwW]{1}\\s+[A-Za-z0-9_]+)(?:\\s*\\Z)" #define P_PSEUDO "^\\s*(?:[\"#$%&'()*+,\\-./:;<=>?\\[\\\\\\]_`{|}~]|[^\\s\\x21-\\x7E])*([dDfFgGlLmMnNtTwW]{1})(?:\\Z|\\s+|[^\\x21-\\x7E]+\\Z)" -#define P_USER "^\\(.+?\\)\\s*([-A-Za-z0-9_]+):" -#define P_USER_FIRST_LINE "^\\(.+?\\)\\s*.+:\\s*([-A-Za-z0-9_]+):" -#define P_USER_FORMATTED "^.*?<a .+?>([-A-Za-z0-9_]+)</a>:" -#define P_CHANNEL "^(.*?<a .+?>[A-Za-z0-9_]+</a>: \\r?\\n?#)([A-Za-z0-9_]+) " +#define P_USER "^.*?(?:<a .+?>)?([-A-Za-z0-9_]+)(?:</a>)?:" +#define P_CHANNEL "^(.*?(?:<a .+?>)?[-A-Za-z0-9_]+(?:</a>)?: \\r?\\n?#)([A-Za-z0-9_]+) " #define P_IMAGE_TWITTER "<a href=\"/account/profile_image/.+?\"><img .+? id=\"profile-image\".*src=\"(http://.+)\" .+?/>" #define P_IMAGE_WASSR "<div class=\"image\"><a href=\".+\"><img src=\"(.+)\" width=\".+?\" /></a></div>" #define P_IMAGE_IDENTICA "<img src=\"(http://.+.identi.ca/.+)\" class=\"avatar profile\" width=\"96\" height=\"96\" alt=\"[A-Za-z0-0_]+\"/>"