Changeset 635 for confluence

Timestamp:

08/07/09 12:14:31 (12 months ago)

Author:

confluence

Message:

bugfix: anchors formatted as tags

Files:

• confluence/feedfilters/twitterfilter.py (modified) (2 diffs)

confluence/feedfilters/twitterfilter.py

@@ -19 +19 @@
 linkurls = re.compile(r"(https?://[^ ]*)")
 linknames = re.compile(r"@([a-zA-Z0-9_]+)")
-hashtags = re.compile(r"#([a-zA-Z0-9_]+)")
+hashtags = re.compile(r"(^| )#([a-zA-Z0-9_]+)")
 statusidpattern = re.compile(r"http://twitter.com/.*/statuses/([0-9]*)")
 
@@ -43 +43 @@
     text = linkurls.sub(r"<a href='\1'>\1</a>", text)
     text = linknames.sub(r"<a href='http://twitter.com/\1'>@\1</a>", text)
-    text = hashtags.sub(r"<a href='http://search.twitter.com/search?q=%23\1'>#\1</a>", text)
+    text = hashtags.sub(r"\1<a href='http://search.twitter.com/search?q=%23\1'>#\2</a>", text)
     text += " <a href='http://twitter.com/home?status=@%s%%20&in_reply_to_status_id=%s&in_reply_to=%s'>Reply</a>" % (username, statusid, username)
     description.data = text