Mirrors/tg
2
0
Fork 0
mirror of https://github.com/paul-nameless/tg synced 2024-11-22 03:43:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into fix-get-current-chat

Browse source
This commit is contained in:
Alexander Zveruk 2020-05-05 10:36:44 +03:00
commit 0e0d56550c
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
tg/controllers/__init__.py
View file

@ -54,15 +54,15 @@ class Controller:
if self.model.prev_chat():
self.refresh_chats()
elif keys == "J":
if self.model.jump_next_msg():
if self.model.next_msg(10):
self.refresh_msgs()
elif keys == "K":
if self.model.jump_prev_msg():
if self.model.prev_msg(10):
self.refresh_msgs()
elif keys in ("j", "^B"):
elif keys in ("j", "^P"):
if self.model.next_msg(repeat_factor):
self.refresh_msgs()
elif keys in ("k", "^C"):
elif keys in ("k", "^N"):
if self.model.prev_msg(repeat_factor):
self.refresh_msgs()
elif keys == "G":
@ -88,7 +88,7 @@ class Controller:
elif keys == "I":
# open vim or emacs to write long messages
pass
elif keys == "i":
elif keys in ("i", "a"):
# write new message
msg = self.view.get_input()
if msg:
@ -112,7 +112,7 @@ class Controller:
log.info("Pressed keys: %s", keys)
if keys == "q":
return
elif keys in ("l", "^E"):
elif keys in ("l", "^J"):
rc = self.handle_msgs()
if rc == "QUIT":
return
@ -120,19 +120,24 @@ class Controller:
self.view.msgs.resize(0.5)
self.refresh_chats()
elif keys in ("j", "^B"):
is_changed = self.model.next_chat(repeat_factor)
if is_changed:
elif keys in ("j", "^N"):
if self.model.next_chat(repeat_factor):
self.refresh_chats()
elif keys in ("k", "^C"):
is_changed = self.model.prev_chat(repeat_factor)
if is_changed:
elif keys in ("k", "^P"):
if self.model.prev_chat(repeat_factor):
self.refresh_chats()
elif keys in ("J",):
if self.model.next_chat(10):
self.refresh_chats()
elif keys in ("K",):
if self.model.prev_chat(10):
self.refresh_chats()
elif keys == "gg":
is_changed = self.model.first_chat()
if is_changed:
if self.model.first_chat():
self.refresh_chats()
def refresh_chats(self):

6
tg/models/__init__.py
View file

@ -185,12 +185,6 @@ class MsgModel:
self.current_msgs[chat_id] = 0
return True
def jump_next_msg(self, chat_id):
return self.next_msg(chat_id, step=10)
def jump_prev_msg(self, chat_id):
return self.prev_msg(chat_id, step=10)
def prev_msg(self, chat_id, step=1):
new_idx = self.current_msgs[chat_id] + step
if new_idx < len(self.msgs[chat_id]):