From 685c4aa01ec277d8a81c1baa3a1585e3ba8ca684 Mon Sep 17 00:00:00 2001
From: vunhat_minh <vunhat_minh@dwango.co.jp>
Date: Fri, 31 Jul 2015 15:10:39 +0900
Subject: [PATCH] Use entities/urls in open command

---
 docs/conf.py             |  4 ++--
 rainbowstream/c_image.py |  8 --------
 rainbowstream/rainbow.py | 24 ++++++------------------
 setup.py                 |  2 +-
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index ead3ddf..b5aaf71 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh'
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.8'
+version = '1.2.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.8'
+release = '1.2.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index f26cfcf..7578753 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -83,14 +83,6 @@ def image_to_display(path, start=None, length=None):
             block_print(p1, p0)
         sys.stdout.write('\n')
 
-    # Old code for display one pixel on one terminal block
-    # for y in xrange(height):
-    #     sys.stdout.write(' ' * start)
-    #     for x in xrange(width):
-    #         p = i.getpixel((x, y))
-    #         pixel_print(p)
-    #     sys.stdout.write('\n')
-
 
 """
 For direct using purpose
diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index ba91268..578754f 100644
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -651,14 +651,14 @@ def urlopen():
             return
         tid = c['tweet_dict'][int(g['stuff'])]
         tweet = t.statuses.show(id=tid)
-        link_prefix = ('http://', 'https://')
-        link_ary = [u for u in tweet['text'].split()
-                    if u.startswith(link_prefix)]
-        if not link_ary:
+        urls = tweet['entities']['urls']
+        if not urls:
             printNicely(light_magenta('No url here @.@!'))
             return
-        for link in link_ary:
-            webbrowser.open(link)
+        else:
+            for url in urls:
+                expanded_url = url['expanded_url'] 
+                webbrowser.open(expanded_url)
     except:
         debug_option()
         printNicely(red('Sorry I can\'t open url in this tweet.'))
@@ -1734,16 +1734,6 @@ def quit():
     sys.exit()
 
 
-def changelog_notify():
-    # For v1.2.8. Hardcoded here but will improve later
-    notice = light_yellow('Hey! RS just ')
-    notice += light_green('doubled ')
-    notice += light_yellow('pixels for higher image resolution. Upgrade and try')
-    notice += light_green(' -iot ')
-    notice += light_yellow('and you will like it for sure :)')
-    printNicely(notice)
-
-
 def reset():
     """
     Reset prefix of line
@@ -1753,8 +1743,6 @@ def reset():
             printNicely(red('Your ~/.rainbow_config.json is messed up:'))
             printNicely(red('>>> ' + c['USER_JSON_ERROR']))
             printNicely('')
-        if not g['using_latest']:
-            changelog_notify()
         printNicely(magenta('Need tips ? Type "h" and hit Enter key!'))
     g['reset'] = False
     try:
diff --git a/setup.py b/setup.py
index cab2f3a..9a28b1e 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
-version = '1.2.8'
+version = '1.2.9'
 
 # Require
 install_requires = [
-- 
2.25.1