add color for mytweet

diff --git a/docs/conf.py b/docs/conf.py
index b4ab7bd22f415e7373289b43122a791c494ff1e1..3ae892963ca6333b7ab7cd2d99276a71c96d958c 100644 (file)
--- 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 = '0.8.8'
+version = '0.8.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.8'
+release = '0.8.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
index 7d280f9b4a812721a1572ef17c082d54ed2bd8f6..28592b28e3473a6729f39412c34b766b2af0f48d 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -333,6 +333,12 @@ You also can view or set a new value of every config key by ``config`` command (
     + ``#owner``: owner's username with '@'\r
     + ``#tweet``: original tweet\r
 \r
+-  ``THREAD_META_LEFT``: format for meta information of messages from partner which is display in the left of screen.\r
+\r
+-  ``THREAD_META_RIGHT``: format for meta information of messages from you which is display in the right of screen.\r
+\r
+-  ``THREAD_MIN_WIDTH``: minimum width of a message frame.\r
+\r
 -  ``MESSAGES_DISPLAY``: default messages to display on 'inbox' or 'sent' command.\r
 \r
 -  ``TREND_MAX``: default trends to display on 'trend' command.\r

diff --git a/rainbowstream/colorset/config b/rainbowstream/colorset/config
index 47deb6e1960bd2dcb48b18564e24e2b664be31d4..d85d6588d073d9c649ddf66f7571bcbd2650f892 100644 (file)
--- a/rainbowstream/colorset/config
+++ b/rainbowstream/colorset/config
@@ -24,6 +24,8 @@
     // 'thread' meta format
     "THREAD_META_LEFT" : "(#id) #clock",
     "THREAD_META_RIGHT" : "#clock (#id)",
+    // 'thread' frame's minimum width
+    "THREAD_MIN_WIDTH" : 20,
     // 'inbox','sent': default number of direct message
     "MESSAGES_DISPLAY" : 5,
     // 'trend': max trending topics

diff --git a/rainbowstream/colorset/larapaste.json b/rainbowstream/colorset/larapaste.json
index 9c7a509e4428c43790eb04b9c2144db1fb048040..a6bdb45695953e7a7175443fce473ab0f417cd65 100644 (file)
--- a/rainbowstream/colorset/larapaste.json
+++ b/rainbowstream/colorset/larapaste.json
@@ -32,6 +32,7 @@
         "rt"              : 202,
         "link"            : 154,
         "hashtag"         : 37,
+        "mytweet"         : 202,
         "keyword"         : "on_light_green"
     },
 

diff --git a/rainbowstream/colorset/monokai.json b/rainbowstream/colorset/monokai.json
index 93036bc5b1d8c8bc526f3ea6c497b14430cb9d51..d9c7bb33b3bb70b88059539859548d2cecfc1a3b 100644 (file)
--- a/rainbowstream/colorset/monokai.json
+++ b/rainbowstream/colorset/monokai.json
@@ -32,6 +32,7 @@
         "rt"              : 179,
         "link"            : 74,
         "hashtag"         : 198,
+        "mytweet"         : 179,
         "keyword"         : "on_light_green"
     },
 

diff --git a/rainbowstream/colorset/solarized.json b/rainbowstream/colorset/solarized.json
index 7cfee1e043ae9985b6421a93a2b0d35f8ea85007..e9eb1e0a33d1229024332e3789cc4b2cbe8c352b 100644 (file)
--- a/rainbowstream/colorset/solarized.json
+++ b/rainbowstream/colorset/solarized.json
@@ -32,6 +32,7 @@
         "rt"              : 66,
         "link"            : 23,
         "hashtag"         : 64,
+        "mytweet"         : 66,
         "keyword"         : "on_light_green"
     },
 

diff --git a/rainbowstream/colorset/tomorrow_night.json b/rainbowstream/colorset/tomorrow_night.json
index 32b04d14d627ad433ff7347889cda206edabaed6..3bd27dc1548dc33a0c00f190fb03ced9a5a2e368 100644 (file)
--- a/rainbowstream/colorset/tomorrow_night.json
+++ b/rainbowstream/colorset/tomorrow_night.json
@@ -32,6 +32,7 @@
         "rt"              : 145,
         "link"            : 30,
         "hashtag"         : 67,
+        "mytweet"         : 145,
         "keyword"         : "on_light_blue"
     },
 

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index 9f8a0eb9adcf5c3dda181d1d804d813a2717166b..5bde76c4c8074741ea8a948c05c93cea7134c089 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -205,6 +205,7 @@ def draw(t, keyword=None, humanize=True, fil=[], ig=[]):
         media_url = None
 
     # Filter and ignore
+    mytweet = screen_name == c['original_name']
     screen_name = '@' + screen_name
     fil = list(set((fil or []) + c['ONLY_LIST']))
     ig = list(set((ig or []) + c['IGNORE_LIST']))
@@ -249,7 +250,7 @@ def draw(t, keyword=None, humanize=True, fil=[], ig=[]):
     # Highlight link
     tweet = lmap(
         lambda x: color_func(c['TWEET']['link'])(x)
-        if x[0:4] == 'http'
+        if x.startswith('http')
         else x,
         tweet)
     # Highlight hashtag
@@ -258,6 +259,15 @@ def draw(t, keyword=None, humanize=True, fil=[], ig=[]):
         if x.startswith('#')
         else x,
         tweet)
+    # Highlight my tweet
+    if mytweet:
+        tweet = [color_func(c['TWEET']['mytweet'])(x)
+                 for x in tweet
+                 if not any([
+                     x == 'RT',
+                     x.startswith('http'),
+                     x.startswith('#')])
+                 ]
     # Highlight keyword
     tweet = ' '.join(tweet)
     if keyword:
@@ -383,6 +393,7 @@ def print_right_message(m):
     h, w = os.popen('stty size', 'r').read().split()
     w = int(w)
     frame_width = w // 3 - dg['frame_margin']
+    frame_width = max(c['THREAD_MIN_WIDTH'], frame_width)
     step = frame_width - 2 * dg['frame_margin']
     slicing = textwrap.wrap(m['text'], step)
     spaces = w - frame_width - dg['frame_margin']
@@ -446,6 +457,7 @@ def print_left_message(m):
     h, w = os.popen('stty size', 'r').read().split()
     w = int(w)
     frame_width = w // 3 - dg['frame_margin']
+    frame_width = max(c['THREAD_MIN_WIDTH'], frame_width)
     step = frame_width - 2 * dg['frame_margin']
     slicing = textwrap.wrap(m['text'], step)
     spaces = dg['frame_margin']

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 8d930847c8887e5ab7ebc2f54eaea0fb4ade1676..4b346828ef144e72934114ad587e39b7a4643c96 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -122,7 +122,7 @@ def init(args):
     name = credential['name']
     if not get_config('PREFIX'):
         set_config('PREFIX', screen_name)
-    g['original_name'] = screen_name[1:]
+    c['original_name'] = g['original_name'] = screen_name[1:]
     g['full_name'] = name
     g['decorated_name'] = lambda x: color_func(
         c['DECORATED_NAME'])('[' + x + ']: ')

diff --git a/setup.py b/setup.py
index 874893f201c5629ff5d4e0e9470b1e2331760cc0..447c9da3ef85d21615d849393c47144d7affd2ab 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
-version = '0.8.8'
+version = '0.8.9'
 
 # Require
 install_requires = [

diff --git a/theme.md b/theme.md
index e5ecbab1124b2845866bb9db36e760a7dc04c0f2..6e27d090e27758df0fd6a6a08dcf7f025db15238 100644 (file)
--- a/theme.md
+++ b/theme.md
@@ -143,6 +143,7 @@ Color reference can be found at
   * `rt`: color for `RT` word in tweet's content.
   * `link`: color for an url.
   * `hashtag`: color for a hashtag.
+  * `mytweet`: color for tweet's text from yourself.
   * `keyword`: color for highlighted keyword (in tweets search).
 * `MESSAGE`: colors of parts in message's output.
   * `partner`: color for __partner__.