Revert "Code fixes"

This reverts commit 5976caf736f02af9d3f4da04b5bd7ff95e9aab16.

src/Conf.defaults

@@ -12,7 +12,7 @@ reverse_timelines = boolean(default=False)
 time_to_check_streams = integer(default=30)
 announce_stream_status = boolean(default=True)
 retweet_mode = string(default="ask")
-persist_size = integer(default=0)
+persist_size = integer(default=1764)
 buffer_order = list(default=list('home','mentions','dm','sent_dm','sent_tweets','favorites','followers','friends','blocks','muted','events'))
 
 [sound]

src/app-configuration.defaults

@@ -14,8 +14,7 @@ speak_ready_msg = boolean(default=True)
 log_level = string(default="error")
 use_slow_audio_algo = boolean(default=False)
 load_keymap = string(default="default.keymap")
-use_Codeofdusk_audio_handlers=boolean(default=False)
+use_Codeofdusk_audio_handlers=boolean(default=True)
-
 [proxy]
 server = string(default="")
 port = string(default="")

src/controller/buffersController.py

@@ -435,8 +435,7 @@ class baseBufferController(bufferController):
    try:
     sound.URLPlayer.play(url, self.session.settings["sound"]["volume"])
    except:
-    log.error("Exception while executing audio method.")
+    log("Exception while executing audio method.")
-
  @_tweets_exist
  def url(self,url='',announce=True):
   if url == '':

src/controller/mainController.py

@@ -1027,19 +1027,26 @@ class Controller(object):
     url=urls_list.get_string()
    if hasattr(urls_list, "destroy"): urls_list.destroy()
   if url != None:
-   output.speak(_(u"Opening media..."), True)
+   output.speak("Opening media...",True)
    if sound.URLPlayer.is_playable(url=url,play=True,volume=buffer.session.settings["sound"]["volume"]) == False:
     return webbrowser.open_new_tab(url)
   elif utils.is_geocoded(tweet):
    return output.speak("Not implemented",True)
   else:
-   output.speak(_(u"Not actionable."), True)
+   output.speak("Not actionable.",True)
    buffer.session.sound.play("error.ogg")
 
  def url(self, *args, **kwargs):
   buffer = self.get_current_buffer()
   buffer.url()
 
+ def secondary_interact(self):
+  buffer = self.get_current_buffer()
+  if config.app['app-settings']['use_Codeofdusk_audio_handlers']:
+   return buffer.url()
+  else:
+   return buffer.audio()
+
  def audio(self, *args, **kwargs):
   self.get_current_buffer().audio()
 

src/keymaps/default.keymap

@@ -2,51 +2,3 @@
 name = Default
 desc = TWBlue's default keymap.
 author = Bill Dengler <codeofdusk@gmail.com>
-
-[keymap]
-up = control+win+up
-down = control+win+down
-left = control+win+left
-right = control+win+right
-next_account = control+win+shift+right
-previous_account = control+win+shift+left
-open_conversation = control+win+c
-show_hide = control+win+m
-post_tweet = control+win+n
-post_reply = control+win+r
-post_retweet = control+win+shift+r
-send_dm = control+win+d
-add_to_favourites = alt+win+f
-remove_from_favourites = alt+shift+win+f
-follow = control+win+s
-user_details = control+win+alt+n
-view_item = control+win+v
-exit = control+win+f4
-open_timeline = control+win+i
-remove_buffer = control+win+shift+i
-interact = control+alt+win+return
-url = control+win+return
-volume_up = control+win+alt+up
-volume_down = control+win+alt+down
-go_home = control+win+home
-go_end = control+win+end
-go_page_up = control+win+pageup
-go_page_down = control+win+pagedown
-update_profile = alt+win+p
-delete = control+win+delete
-clear_buffer = control+win+shift+delete
-repeat_item = control+win+space
-copy_to_clipboard = control+win+c
-add_to_list = control+win+a
-remove_from_list = control+win+shift+a
-toggle_buffer_mute = control+win+shift+m
-toggle_session_mute = alt+win+m
-toggle_autoread = control+win+e
-search = control+win+-
-edit_keystrokes = control+win+k
-view_user_lists = control+win+l
-get_more_items = alt+win+pageup
-reverse_geocode = control+win+g
-view_reverse_geocode = control+win+shift+g
-get_trending_topics = control+win+t
-secondary_interact = control+win+alt+return

src/sessionmanager/session.py

@@ -253,8 +253,9 @@ class Session(object):
 
   """ Gets muted users (oh really?)."""
 
-  self.db["muted_users"] = self.twitter.twitter.list_mute_ids()["ids"]
+#  self.db["muted_users"] = self.twitter.twitter.get_muted_users_ids()["ids"]
-
+  #This really needs to be fixed (#30). Return an empty list as a hacky workaround, remove this comment and the line below when fixed.
+  self.db["muted_users"] = []
  @_require_login
  def get_stream(self, name, function, *args, **kwargs):