From e4f2793aaf7669616ae52e8dfc8fbe3d7c439199 Mon Sep 17 00:00:00 2001
From: Manuel Cortez <manuel@manuelcortez.net>
Date: Wed, 21 Dec 2022 10:24:44 -0600
Subject: [PATCH] Core: Update 'tweet' menu on the menu bar for mastodon
 sessions

---
 src/controller/mainController.py   | 7 +++++--
 src/controller/mastodon/handler.py | 2 ++
 src/controller/twitter/handler.py  | 2 ++
 src/wxUI/view.py                   | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index c13d6308..b8e09a2c 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -710,6 +710,8 @@ class Controller(object):
                     else:
                         menu_item.Enable(True)
                         menu_item.SetItemLabel(handler.menus[m])
+        if hasattr(handler, "item_menu"):
+            self.view.menubar.SetMenuLabel(1, handler.item_menu)
 
     def fix_wrong_buffer(self):
         buf = self.get_best_buffer()
@@ -1080,8 +1082,9 @@ class Controller(object):
         for i in sm.removed_sessions:
             if sessions.sessions[i].logged == True:
                 self.logout_account(sessions.sessions[i].session_id)
-            self.destroy_buffer(sessions.sessions[i].settings["twitter"]["user_name"], sessions.sessions[i].settings["twitter"]["user_name"])
-            self.accounts.remove(sessions.sessions[i].settings["twitter"]["user_name"])
+            self.destroy_buffer(sessions.sessions[i].get_name(), sessions.sessions[i].get_name())
+            if sessions.sessions[i].get_name() in self.accounts:
+                self.accounts.remove(sessions.sessions[i].get_name())
             sessions.sessions.pop(i)
 
     def update_profile(self, *args, **kwargs):
diff --git a/src/controller/mastodon/handler.py b/src/controller/mastodon/handler.py
index 348a9a8f..7a64d14c 100644
--- a/src/controller/mastodon/handler.py
+++ b/src/controller/mastodon/handler.py
@@ -50,6 +50,8 @@ class Handler(object):
             filter=None,
             manage_filters=None
         )
+        # Name for the "tweet" menu in the menu bar.
+        self.item_menu = _("&Post")
 
     def create_buffers(self, session, createAccounts=True, controller=None):
         session.get_user_info()
diff --git a/src/controller/twitter/handler.py b/src/controller/twitter/handler.py
index d86f0720..f4d846a2 100644
--- a/src/controller/twitter/handler.py
+++ b/src/controller/twitter/handler.py
@@ -50,6 +50,8 @@ class Handler(object):
             filter=_("Create a &filter"),
             manage_filters=_("&Manage filters"),
         )
+        # Name for the "tweet" menu in the menu bar.
+        self.item_menu = _("&Tweet")
 
     def create_buffers(self, session, createAccounts=True, controller=None):
         session.get_user_info()
diff --git a/src/wxUI/view.py b/src/wxUI/view.py
index abd5f8e1..5d2b2f0c 100644
--- a/src/wxUI/view.py
+++ b/src/wxUI/view.py
@@ -81,7 +81,7 @@ class mainFrame(wx.Frame):
 
         # Add all to the menu Bar
         self.menubar.Append(self.menubar_application, _(u"&Application"))
-        self.menubar.Append(self.menubar_item, _(u"&Item"))
+        self.menubar.Append(self.menubar_item, _("&Tweet"))
         self.menubar.Append(self.menubar_user, _(u"&User"))
         self.menubar.Append(self.menubar_buffer, _(u"&Buffer"))
         self.menubar.Append(self.menubar_audio, _(u"&Audio"))