X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Futil.py;h=292a7e5b408687f88f1f134500032302f011b810;hp=8a33711ceb7efc98a954a48e4337e02b848bd474;hb=04610460050d47adec2e7b9c8a354b6ee99a6317;hpb=8d2c1db679b49c431980bb3241f5066663175f5b

diff --git a/rainbowstream/util.py b/rainbowstream/util.py
index 8a33711..292a7e5 100644
--- a/rainbowstream/util.py
+++ b/rainbowstream/util.py
@@ -21,24 +21,33 @@ def detail_twitter_error(twitterException):
         printNicely(yellow(info))
 
 
-def format_prefix(listname = '', keyword = ''):
+def format_prefix(listname='', keyword=''):
     """
     Format the custom prefix
     """
     formattedPrefix = c['PREFIX']
     owner = '@' + c['original_name']
     place = ''
+    # Public stream
     if keyword:
-        place = '/public'
-        keyword = '#' + keyword
-
-    if listname:
+        formattedPrefix = ''.join(formattedPrefix.split('#owner'))
+        formattedPrefix = ''.join(formattedPrefix.split('#place'))
+        formattedPrefix = ''.join(formattedPrefix.split('#me'))
+    # List stream
+    elif listname:
+        formattedPrefix = ''.join(formattedPrefix.split('#keyword'))
+        formattedPrefix = ''.join(formattedPrefix.split('#me'))
         owner, place = listname.split('/')
-        place = "/" + place
-
-    formattedPrefix = formattedPrefix.replace("#owner", owner)
-    formattedPrefix = formattedPrefix.replace("#place", place)
-    formattedPrefix = formattedPrefix.replace("#keyword", keyword)
-    formattedPrefix = formattedPrefix.replace("#me", '@' + c['original_name'])
+        place = '/' + place
+    # Personal stream
+    else:
+        formattedPrefix = ''.join(formattedPrefix.split('#keyword'))
+        formattedPrefix = ''.join(formattedPrefix.split('#owner'))
+        formattedPrefix = ''.join(formattedPrefix.split('#place'))
+
+    formattedPrefix = formattedPrefix.replace('#owner', owner)
+    formattedPrefix = formattedPrefix.replace('#place', place)
+    formattedPrefix = formattedPrefix.replace('#keyword', keyword)
+    formattedPrefix = formattedPrefix.replace('#me', '@' + c['original_name'])
 
     return formattedPrefix