diff pidgin-twitter.h @ 223:c3efae72f72a

tweaked the recipient pattern to allow mail addresses or some special strings such as "idolm@ster."
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 06 Sep 2008 18:37:30 +0900
parents b168502b73c3
children 1fcd0e589b9e
line wrap: on
line diff
--- a/pidgin-twitter.h	Wed Sep 03 18:39:39 2008 +0900
+++ b/pidgin-twitter.h	Sat Sep 06 18:37:30 2008 +0900
@@ -132,11 +132,11 @@
 #endif
 
 /* formats and templates */
-#define RECIPIENT_FORMAT_TWITTER "@<a href='http://twitter.com/%s'>%s</a>"
+#define RECIPIENT_FORMAT_TWITTER "%s@<a href='http://twitter.com/%s'>%s</a>"
 #define SENDER_FORMAT_TWITTER   "%s<a href='http://twitter.com/%s'>%s</a>: "
-#define RECIPIENT_FORMAT_WASSR  "@<a href='http://wassr.jp/user/%s'>%s</a>"
+#define RECIPIENT_FORMAT_WASSR  "%s@<a href='http://wassr.jp/user/%s'>%s</a>"
 #define SENDER_FORMAT_WASSR     "%s<a href='http://wassr.jp/user/%s'>%s</a>: "
-#define RECIPIENT_FORMAT_IDENTICA "@<a href='http://identi.ca/%s'>%s</a>"
+#define RECIPIENT_FORMAT_IDENTICA "%s@<a href='http://identi.ca/%s'>%s</a>"
 #define SENDER_FORMAT_IDENTICA  "%s<a href='http://identi.ca/%s'>%s</a>: "
 #define CHANNEL_FORMAT_WASSR    "%s<a href='http://wassr.jp/channel/%s'>%s</a> "
 #define CHANNEL_FORMAT_IDENTICA "%s<a href='http://identi.ca/tag/%s'>%s</a> "
@@ -147,7 +147,7 @@
 #define EMPTY                   ""
 
 /* patterns */
-#define P_RECIPIENT         "@([A-Za-z0-9_]+)"
+#define P_RECIPIENT         "(^|\\s+)@([A-Za-z0-9_]+)"
 #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)"