new trouts from rejs

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index cea3a2a6d2d3ef627735184bcfdfab3cce978a9f..86d0d2331acd6c8374219c9c740c82b40fe5e2c3 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -521,7 +521,7 @@ def getTweet(urlstring,twitapi,inclusion=False):
     else:
         tweeter_screen = "[not returned]" ; tweeter_name = "[not returned]"
         tweeter_name = tweeter_name + " RTing " + status.user.name #.encode('UTF-8', 'replace')
-    tweetText = status.text
+    tweetText = status.full_text
     if status.media:
         replacements = defaultdict( list )
         for medium in status.media:
@@ -529,7 +529,7 @@ def getTweet(urlstring,twitapi,inclusion=False):
 
         for k,v in replacements.items():
 
-            v = [re.sub(r"/tweet_video_thumb/(\w+).jpg", r"/tweet_video/\1.mp4", link) for link in v]
+            v = [re.sub(r"/tweet_video_thumb/([\w\-]+).jpg", r"/tweet_video/\1.mp4", link) for link in v]
             if len(v) > 1:
                 replacementstring = "[" +  " ; ".join(v) +"]"
             else: