From b7497791b4126aa0fe6828d1dc8acc2b9a192a90 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Mon, 21 Nov 2022 22:09:40 -0600 Subject: [PATCH] Update buffer removal code. Should be able to remove user search buffers --- src/controller/buffers/mastodon/base.py | 4 ++-- src/controller/buffers/mastodon/users.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py index 452587af..2b5d4d86 100644 --- a/src/controller/buffers/mastodon/base.py +++ b/src/controller/buffers/mastodon/base.py @@ -168,8 +168,8 @@ class BaseBuffer(base.Buffer): if self.kwargs.get("id") in self.session.settings["other_buffers"]["timelines"]: self.session.settings["other_buffers"]["timelines"].remove(self.kwargs.get("id")) self.session.settings.write() - if self.name in self.session.db: - self.session.db.pop(self.name) + if self.name in self.session.db: + self.session.db.pop(self.name) return True elif dlg == widgetUtils.NO: return False diff --git a/src/controller/buffers/mastodon/users.py b/src/controller/buffers/mastodon/users.py index 843cc375..8ba4f4f5 100644 --- a/src/controller/buffers/mastodon/users.py +++ b/src/controller/buffers/mastodon/users.py @@ -172,7 +172,7 @@ class UserBuffer(BaseBuffer): return True elif dlg == widgetUtils.NO: return False - if "-following" in self.name: + elif "-following" in self.name: if force == False: dlg = commonMessageDialogs.remove_buffer() else: @@ -186,6 +186,17 @@ class UserBuffer(BaseBuffer): return True elif dlg == widgetUtils.NO: return False + elif "-searchUser" in self.name: + if force == False: + dlg = commonMessageDialogs.remove_buffer() + else: + dlg = widgetUtils.YES + if dlg == widgetUtils.YES: + if self.name in self.session.db: + self.session.db.pop(self.name) + return True + elif dlg == widgetUtils.NO: + return False else: output.speak(_(u"This buffer is not a timeline; it can't be deleted."), True) return False \ No newline at end of file