Updated version to a new snapshot

doc/changelog.md

@@ -2,6 +2,9 @@
 
 ## changes in this version
 
+* TWBlue should render correctly retweets of quoted tweets. ([#365,](https://github.com/manuelcortez/TWBlue/issues/365))
+* Fixed an error that was causing TWBlue to be unable to output to screen readers at times. ([#369,](https://github.com/manuelcortez/TWBlue/issues/369))
+* Fixed autocomplete users feature. ([#367,](https://github.com/manuelcortez/TWBlue/issues/367))
 * Fixed error when displaying an URL at the end of a line, when the tweet or direct message contained multiple lines. Now the URL should be displayed correctly. ([#305,](https://github.com/manuelcortez/TWBlue/issues/305) [#272,](https://github.com/manuelcortez/TWBlue/issues/272))
 * TWBlue has been migrated completely to Python 3 (currently, the software builds with Python 3.8).
 * TWBlue should be restarted gracefully. Before, the application was alerting users of not being closed properly every time the application restarted by itself.

requirements.txt

@@ -31,7 +31,7 @@ cx_freeze
 tweepy
 twitter-text-parser
 pyenchant
-git+https://github.com/manuelcortez/libloader
+git+https://github.com/accessibleapps/libloader
-git+https://github.com/manuelcortez/platform_utils
+git+https://github.com/accessibleapps/platform_utils
-git+https://github.com/manuelcortez/accessible_output2
+git+https://github.com/accessibleapps/accessible_output2
-git+https://github.com/jmdaweb/sound_lib
+git+https://github.com/accessibleapps/sound_lib

src/application.py

@@ -9,7 +9,7 @@ if snapshot == False:
  update_url = 'https://twblue.es/updates/stable.php'
  mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/stable.json'
 else:
- version = "4"
+ version = "5"
  update_url = 'https://twblue.es/updates/snapshot.php'
  mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/snapshots.json'
 authors = ["Manuel Cortéz", "José Manuel Delicado"]

src/controller/mainController.py

@@ -253,7 +253,7 @@ class Controller(object):
 
   # Connection checker executed each minute.
   self.checker_function = RepeatingTimer(60, self.check_connection)
-  self.checker_function.start()
+#  self.checker_function.start()
   self.save_db = RepeatingTimer(300, self.save_data_in_db)
   self.save_db.start()
   log.debug("Setting updates to buffers every %d seconds..." % (60*config.app["app-settings"]["update_period"],))
@@ -1326,16 +1326,20 @@ class Controller(object):
       i.start_stream()
      else:
       i.start_stream(play_sound=False)
-    except TweepError:
+    except TweepError as err:
-     buff = self.view.search(i.name, i.account)
+     log.exception("Error %s starting buffer %s on account %s, with args %r and kwargs %r due to the following reason: %s" % (err.api_code, i.name, i.account, i.args, i.kwargs, err.reason))
-     i.remove_buffer(force=True)
+     # Determine if this error was caused by a block applied to the current user (IE permission errors).
-     commonMessageDialogs.blocked_timeline()
+     errors_allowed = [130]
-     if self.get_current_buffer() == i:
+     if (err.api_code != None and err.api_code not in errors_allowed) or (err.api_code == None and 'Not authorized' in err.reason): # A twitter error, so safely try to remove the buffer.
-      self.right()
+      buff = self.view.search(i.name, i.account)
-     self.view.delete_buffer(buff)
+      i.remove_buffer(force=True)
-     self.buffers.remove(i)
+      commonMessageDialogs.blocked_timeline()
-     del i
+      if self.get_current_buffer() == i:
-     continue
+       self.right()
+      self.view.delete_buffer(buff)
+      self.buffers.remove(i)
+      del i
+      continue
     if change_title:
      pub.sendMessage("buffer-title-changed", buffer=i)
 
@@ -1532,15 +1536,19 @@ class Controller(object):
    if i.session != None and i.session.is_logged == True:
     try:
      i.start_stream(mandatory=True)
-    except TweepError:
+    except TweepError as err:
-     buff = self.view.search(i.name, i.account)
+     log.exception("Error %s starting buffer %s on account %s, with args %r and kwargs %r due to the following reason: %s" % (err.api_code, i.name, i.account, i.args, i.kwargs, err.reason))
-     i.remove_buffer(force=True)
+     # Determine if this error was caused by a block applied to the current user (IE permission errors).
-     commonMessageDialogs.blocked_timeline()
+     errors_allowed = [130]
-     if self.get_current_buffer() == i:
+     if (err.api_code != None and err.api_code not in errors_allowed) or (err.api_code == None and 'Not authorized' in err.reason): # A twitter error, so safely try to remove the buffer.
-      self.right()
+      buff = self.view.search(i.name, i.account)
-     self.view.delete_buffer(buff)
+      i.remove_buffer(force=True)
-     self.buffers.remove(i)
+      commonMessageDialogs.blocked_timeline()
-     del i
+      if self.get_current_buffer() == i:
+       self.right()
+      self.view.delete_buffer(buff)
+      self.buffers.remove(i)
+      del i
 
  def update_buffer(self, *args, **kwargs):
   bf = self.get_current_buffer()

src/extra/autocompletionUsers/completion.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-from builtins import object
 import output
 from . import storage
 from . import wx_menu

src/extra/autocompletionUsers/manage.py

@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-# -*- coding: utf-8 -*-
-from builtins import object
-from . import storage
 import widgetUtils
-from . import wx_manage
+from . import storage, wx_manage
 from wxUI import commonMessageDialogs
 
 class autocompletionManage(object):
@@ -32,11 +27,11 @@ class autocompletionManage(object):
   if usr == False:
    return
   try:
-   data = self.session.twitter.twitter.show_user(screen_name=usr)
+   data = self.session.twitter.twitter.get_user(screen_name=usr)
   except:
    self.dialog.show_invalid_user_error()
    return
-  self.database.set_user(data["screen_name"], data["name"], 0)
+  self.database.set_user(data.screen_name, data.name, 0)
   self.update_list()
 
  def remove_user(self, ev):

src/extra/autocompletionUsers/settings.py

@@ -1,13 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-# -*- coding: utf-8 -*-
-from builtins import object
-from . import storage
 import widgetUtils
+import output
 from . import wx_settings
 from . import manage
-import output
+from . import storage
 from mysc.thread_utils import call_threaded
 
 class autocompletionSettings(object):
@@ -30,14 +26,14 @@ class autocompletionSettings(object):
   database = storage.storage(self.buffer.session.session_id)
   if self.dialog.get("followers_buffer") == True:
    buffer = self.window.search_buffer("followers", self.config["twitter"]["user_name"])
-   for i in buffer.session.db[buffer.name]["items"]:
+   for i in buffer.session.db[buffer.name]:
-    database.set_user(i["screen_name"], i["name"], 1)
+    database.set_user(i.screen_name, i.name, 1)
   else:
    database.remove_by_buffer(1)
   if self.dialog.get("friends_buffer") == True:
    buffer = self.window.search_buffer("friends", self.config["twitter"]["user_name"])
-   for i in buffer.session.db[buffer.name]["items"]:
+   for i in buffer.session.db[buffer.name]:
-    database.set_user(i["screen_name"], i["name"], 2)
+    database.set_user(i.screen_name, i.name, 2)
   else:
    database.remove_by_buffer(2)
   wx_settings.show_success_dialog()
@@ -52,12 +48,12 @@ def execute_at_startup(window, buffer, config):
  if config["mysc"]["save_followers_in_autocompletion_db"] == True and config["other_buffers"]["show_followers"] == True:
   buffer = window.search_buffer("followers", config["twitter"]["user_name"])
   for i in buffer.session.db[buffer.name]:
-   database.set_user(i["screen_name"], i["name"], 1)
+   database.set_user(i.screen_name, i.name, 1)
  else:
   database.remove_by_buffer(1)
  if config["mysc"]["save_friends_in_autocompletion_db"] == True and config["other_buffers"]["show_friends"] == True:
   buffer = window.search_buffer("friends", config["twitter"]["user_name"])
   for i in buffer.session.db[buffer.name]:
-   database.set_user(i["screen_name"], i["name"], 2)
+   database.set_user(i.screen_name, i.name, 2)
  else:
   database.remove_by_buffer(2)  

src/extra/autocompletionUsers/storage.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from builtins import object
 import os, sqlite3, paths
 
 class storage(object):

src/extra/autocompletionUsers/wx_manage.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 import wx
 import widgetUtils
 from multiplatform_widgets import widgets
 import application
+
 class autocompletionManageDialog(widgetUtils.BaseDialog):
  def __init__(self):
   super(autocompletionManageDialog, self).__init__(parent=None, id=-1, title=_(u"Manage Autocompletion database"))

src/extra/autocompletionUsers/wx_menu.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 import wx
 
 class menu(wx.Menu):

src/extra/autocompletionUsers/wx_settings.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 import wx
 import widgetUtils
 import application

src/sessions/twitter/long_tweets/tweets.py

@@ -25,7 +25,7 @@ def is_long(tweet):
   returns True if a quote is detected, False otherwise."""
  if hasattr(tweet, "quoted_status_id") and hasattr(tweet, "quoted_status"):
   return tweet.quoted_status_id
- elif hasattr(tweet, "retweeted_status")  and hasattr(tweet, "quoted_status_id") and hasattr(tweet, "quoted_status"):
+ elif hasattr(tweet, "retweeted_status")  and hasattr(tweet.retweeted_status, "quoted_status_id") and hasattr(tweet.retweeted_status, "quoted_status"):
   return tweet.retweeted_status.quoted_status_id
  return False
 

src/sessions/twitter/session.py

@@ -352,16 +352,16 @@ class Session(base.baseSession):
   return tweet
 
  def get_quoted_tweet(self, tweet):
-  """ Process a tweet and extract all information related to the quote."""
+  """ Process a tweet and extract all information related to the quote. """
   quoted_tweet = tweet
   if hasattr(tweet, "full_text"):
    value = "full_text"
   else:
    value = "text"
   setattr(quoted_tweet, value, utils.expand_urls(getattr(quoted_tweet, value), quoted_tweet.entities))
-  if hasattr(quoted_tweet, "quoted_status"):
+  if quoted_tweet.is_quote_status == True and hasattr(quoted_tweet, "quoted_status"):
    original_tweet = quoted_tweet.quoted_status
-  elif hasattr(quoted_tweet, "retweeted_status") and hasattr(quoted_tweet.retweeted_status, "quoted_status"):
+  elif hasattr(quoted_tweet, "retweeted_status") and quoted_tweet.retweeted_status.is_quote_status == True and hasattr(quoted_tweet.retweeted_status, "quoted_status"):
    original_tweet = quoted_tweet.retweeted_status.quoted_status
   else:
    return quoted_tweet
@@ -388,7 +388,7 @@ class Session(base.baseSession):
     tweet.quoted_status.twishort = True
     for i in tweet.quoted_status.entities["user_mentions"]:
      if "@%s" % (i["screen_name"]) not in tweet.quoted_status.message and i["screen_name"] != tweet.user.screen_name:
-      if hasattr(tweet["quoted_status"], "retweeted_status")  and tweet.retweeted_status.user.screen_name == i["screen_name"]:
+      if hasattr(tweet.quoted_status, "retweeted_status")  and tweet.retweeted_status.user.screen_name == i["screen_name"]:
        continue
      tweet.quoted_status.message = u"@%s %s" % (i["screen_name"], tweet.message)
    else:

updates/snapshots.json

@@ -1,4 +1,4 @@
-{"current_version": "3",
+{"current_version": "5",
 "description": "Snapshot version.",
 "date": "unknown",
 "downloads":