diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | poezio/bookmarks.py | 2 | ||||
| -rw-r--r-- | poezio/core/commands.py | 2 | ||||
| -rw-r--r-- | poezio/windows/bookmark_forms.py | 4 |
4 files changed, 7 insertions, 4 deletions
@@ -11,6 +11,7 @@ https://dev.louiz.org/projects/poezio/roadmap - Contacts won’t be seen playing games or music when they actually stop doing so. - /leave now toggles off the autojoin flag instead of removing the bookmark. +- Only add auotjoin on new bookmarks for synchronise_open_rooms on /join - /affiliation displays things in the info win instead of directly in the room, and additionally displays which room it refers to. - List the correct required versions for package maintainers. @@ -20,6 +21,8 @@ https://dev.louiz.org/projects/poezio/roadmap - Only send an unavailable presence on closing a room if we are joined. - Don’t display the current date for history messages received today. - Fix marquee and dice plugin to use newer Last Message Correction format. +- Bookmarks tab properly displays bookmarks method (local/remote) and allows + to switch between them again. # Forgotten additions diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py index ccda2b93..d842d2dd 100644 --- a/poezio/bookmarks.py +++ b/poezio/bookmarks.py @@ -171,7 +171,7 @@ class BookmarkList: return self.bookmarks[key] return None - def __in__(self, key) -> bool: + def __contains__(self, key) -> bool: if isinstance(key, (str, JID)): for bookmark in self.bookmarks: if bookmark.jid == key: diff --git a/poezio/core/commands.py b/poezio/core/commands.py index 176d0e73..6fc800ae 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -401,7 +401,7 @@ class CommandCore: tab.password = password tab.join() - if config.get('synchronise_open_rooms'): + if config.get('synchronise_open_rooms') and room not in self.core.bookmarks: method = 'remote' if config.get( 'use_remote_bookmarks') else 'local' self._add_bookmark('%s/%s' % (room, nick), True, password, method) diff --git a/poezio/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py index 28cab8ec..d538e6a2 100644 --- a/poezio/windows/bookmark_forms.py +++ b/poezio/windows/bookmark_forms.py @@ -269,7 +269,7 @@ class BookmarksWin(Win): self.current_horizontal_input].set_color( theme.COLOR_NORMAL_TEXT) self.current_horizontal_input += 1 - if self.current_horizontal_input > 3: + if self.current_horizontal_input > 4: self.current_horizontal_input = 0 self.lines[self.current_input][ self.current_horizontal_input].set_color( @@ -363,7 +363,7 @@ class BookmarksWin(Win): continue if i >= self.height + self.scroll_pos: break - for j in range(4): + for j in range(5): inp[j].refresh() if self.lines and self.current_input < self.height - 1: |