fix bug for favorited

diff --git a/.gitignore b/.gitignore
index fc1666b1a91a97f70282c8c9b92e36e97830bf6a..68d0a4395e9d6ff6be721765e9fc98944dbe0161 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -58,9 +58,14 @@ docs/_build/
 # Editor
 *sublime*
 .tag*
 # Editor
 *sublime*
 .tag*

+*.swp*
+*.swo*

 
 # Virtualenv
 /venv/*
 
 # History completer
 
 # Virtualenv
 /venv/*
 
 # History completer

-completer.hist
\ No newline at end of file
+completer.hist
+
+# Consumer
+rainbowstream/consumer.py

diff --git a/rainbowstream/colorset/default.json b/rainbowstream/colorset/default.json
index 9e0a6abdfacef4380cd00904caf5f657e343d182..3952c23639da05f0c55a708c98487ac949a6c935 100644 (file)
--- a/rainbowstream/colorset/default.json
+++ b/rainbowstream/colorset/default.json
@@ -51,7 +51,7 @@
         "nick"      : "grey",
         "clock"     : "grey",
         "id"        : "grey",
         "nick"      : "grey",
         "clock"     : "grey",
         "id"        : "grey",

-        "favourite" : "light_green",
+        "favorited" : "light_green",

         "rt"        : "grey",
         "link"      : "light_cyan",
         "keyword"   : "on_light_yellow"
         "rt"        : "grey",
         "link"      : "light_cyan",
         "keyword"   : "on_light_yellow"


@@ -85,4 +85,4 @@
         "days": "grey",
         "today": "on_grey"
     }
         "days": "grey",
         "today": "on_grey"
     }

-}
\ No newline at end of file
+}

diff --git a/rainbowstream/colorset/monokai.json b/rainbowstream/colorset/monokai.json
index 50eafb9da23c86f0d442a8e716b3e78c4470e3d6..7d9a7bf90942dde8a06f7d709c489b3c31f42f86 100644 (file)
--- a/rainbowstream/colorset/monokai.json
+++ b/rainbowstream/colorset/monokai.json
@@ -26,7 +26,7 @@
         "nick"      : "term_112",
         "clock"     : "term_57",
         "id"        : "term_166",
         "nick"      : "term_112",
         "clock"     : "term_57",
         "id"        : "term_166",

-        "favourite" : "term_50",
+        "favorited" : "term_50",

         "rt"        : "term_179",
         "link"      : "term_74",
         "keyword"   : "on_light_green"
         "rt"        : "term_179",
         "link"      : "term_74",
         "keyword"   : "on_light_green"


@@ -60,4 +60,4 @@
         "days": "term_57",
         "today": "on_light_blue"
     }
         "days": "term_57",
         "today": "on_light_blue"
     }

-}
\ No newline at end of file
+}

diff --git a/rainbowstream/colorset/solarized.json b/rainbowstream/colorset/solarized.json
index 5b852091997e55a2de8940b3273f170f57c3fd52..28c001dd4c356d6ecfb4e45e98606907cd7f7064 100644 (file)
--- a/rainbowstream/colorset/solarized.json
+++ b/rainbowstream/colorset/solarized.json
@@ -26,7 +26,7 @@
         "nick"      : "term_64",
         "clock"     : "term_32",
         "id"        : "term_124",
         "nick"      : "term_64",
         "clock"     : "term_32",
         "id"        : "term_124",

-        "favourite" : "term_64",
+        "favorited" : "term_64",

         "rt"        : "term_66",
         "link"      : "term_23",
         "keyword"   : "on_light_green"
         "rt"        : "term_66",
         "link"      : "term_23",
         "keyword"   : "on_light_green"


@@ -60,4 +60,4 @@
         "days": "term_64",
         "today": "on_light_green"
     }
         "days": "term_64",
         "today": "on_light_green"
     }

-}
\ No newline at end of file
+}

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index bdeafdfc77ca8ce01d308c05d94b070d39156a2a..a3d2cd15871f02a7b6f05718057bcc2cd3ffc129 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -197,7 +197,7 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     meta = color_func(c['TWEET']['clock'])(
         '[' + clock + '] ') + color_func(c['TWEET']['id'])('[id=' + str(rid) + '] ')
     if favorited:
     meta = color_func(c['TWEET']['clock'])(
         '[' + clock + '] ') + color_func(c['TWEET']['id'])('[id=' + str(rid) + '] ')
     if favorited:

-        meta = meta + color_func(c['TWEET']['favorite'])(u'\u2605')
+        meta = meta + color_func(c['TWEET']['favorited'])(u'\u2605')

     tweet = text.split()
     # Replace url
     if expanded_url:
     tweet = text.split()
     # Replace url
     if expanded_url: