Remove most of Twitter code as Twitter's API access has been removed

src/controller/mastodon/handler.py

@@ -3,11 +3,9 @@ import wx
 import logging
 from pubsub import pub
 from mysc import restart
-from wxUI.dialogs.mastodon import dialogs
 from wxUI.dialogs.mastodon import search as search_dialogs
 from wxUI.dialogs.mastodon import dialogs
 from wxUI import commonMessageDialogs
-from sessions.twitter import utils
 from . import userActions, settings
 
 log = logging.getLogger("controller.mastodon.handler")

src/controller/mastodon/messages.py

@@ -6,7 +6,7 @@ import widgetUtils
 import config
 import output
 from twitter_text import parse_tweet, config
-from controller.twitter import messages
+from controller import messages
 from sessions.mastodon import templates
 from wxUI.dialogs.mastodon import postDialogs
 
@@ -23,7 +23,7 @@ def character_count(post_text, post_cw, character_limit=500):
     parsed = parse_tweet(full_text, options=options)
     return parsed.weightedLength
 
-class post(messages.basicTweet):
+class post(messages.basicMessage):
     def __init__(self, session, title, caption, text="", *args, **kwargs):
         # take max character limit from session as this might be different for some instances.
         self.max = session.char_limit

src/controller/mastodon/settings.py

@@ -9,7 +9,7 @@ import output
 from collections import OrderedDict
 from wxUI import commonMessageDialogs
 from wxUI.dialogs.mastodon import configuration
-from extra.autocompletionUsers import scan, manage
+#from extra.autocompletionUsers import scan, manage
 from extra.ocr import OCRSpace
 from controller.settings import globalSettingsController
 from . templateEditor import EditTemplate

src/controller/mastodon/templateEditor.py

@@ -3,7 +3,7 @@ import re
 import wx
 from typing import List
 from sessions.mastodon.templates import post_variables, conversation_variables, person_variables
-from wxUI.dialogs.twitterDialogs import templateDialogs
+from wxUI.dialogs import templateDialogs
 
 class EditTemplate(object):
     def __init__(self, template: str, type: str) -> None:

src/controller/mastodon/userActions.py

@@ -6,7 +6,7 @@ from wxUI.dialogs.mastodon import userActions as userActionsDialog
 from wxUI.dialogs.mastodon import userTimeline as userTimelineDialog
 from pubsub import pub
 from mastodon import MastodonError, MastodonNotFoundError
-from extra.autocompletionUsers import completion
+#from extra.autocompletionUsers import completion
 
 log = logging.getLogger("controller.mastodon.userActions")