fix: code review
This commit is contained in:
parent
e76e936d2b
commit
4a9f63c59a
|
@ -498,14 +498,17 @@ QtObject:
|
||||||
write = setLoadingMessages
|
write = setLoadingMessages
|
||||||
notify = loadingMessagesChanged
|
notify = loadingMessagesChanged
|
||||||
|
|
||||||
proc requestMoreTimelineMessages*(self: ChatsView, fetchRange: int) {.slot.} =
|
proc requestMoreMessages*(self: ChatsView, fetchRange: int) {.slot.} =
|
||||||
self.loadingMessages = true
|
self.loadingMessages = true
|
||||||
self.loadingMessagesChanged(true)
|
self.loadingMessagesChanged(true)
|
||||||
|
|
||||||
var allTopics: seq[string] = @[]
|
var allTopics: seq[string] = @[]
|
||||||
for contact in self.status.contacts.getContacts():
|
if(self.activeChannel.isTimelineChat):
|
||||||
for t in self.status.mailservers.getMailserverTopicsByChatId(getTimelineChatId(contact.id)).map(topic => topic.topic):
|
for contact in self.status.contacts.getContacts():
|
||||||
allTopics.add(t)
|
for t in self.status.mailservers.getMailserverTopicsByChatId(getTimelineChatId(contact.id)).map(topic => topic.topic):
|
||||||
|
allTopics.add(t)
|
||||||
|
else:
|
||||||
|
allTopics = self.status.mailservers.getMailserverTopicsByChatId(self.activeChannel.id).map(topic => topic.topic)
|
||||||
|
|
||||||
let currentOldestMessageTimestamp = self.oldestMessageTimestamp
|
let currentOldestMessageTimestamp = self.oldestMessageTimestamp
|
||||||
self.oldestMessageTimestamp = self.oldestMessageTimestamp - fetchRange
|
self.oldestMessageTimestamp = self.oldestMessageTimestamp - fetchRange
|
||||||
|
@ -514,17 +517,6 @@ QtObject:
|
||||||
self.oldestMessageTimestampChanged()
|
self.oldestMessageTimestampChanged()
|
||||||
self.messagesLoaded();
|
self.messagesLoaded();
|
||||||
|
|
||||||
proc requestMoreMessages*(self: ChatsView, fetchRange: int) {.slot.} =
|
|
||||||
self.loadingMessages = true
|
|
||||||
self.loadingMessagesChanged(true)
|
|
||||||
let topics = self.status.mailservers.getMailserverTopicsByChatId(self.activeChannel.id).map(topic => topic.topic)
|
|
||||||
let currentOldestMessageTimestamp = self.oldestMessageTimestamp
|
|
||||||
self.oldestMessageTimestamp = self.oldestMessageTimestamp - fetchRange
|
|
||||||
|
|
||||||
self.status.mailservers.requestMessages(topics, self.oldestMessageTimestamp, currentOldestMessageTimestamp, true)
|
|
||||||
self.oldestMessageTimestampChanged()
|
|
||||||
self.messagesLoaded();
|
|
||||||
|
|
||||||
proc leaveChatByIndex*(self: ChatsView, channelIndex: int) {.slot.} =
|
proc leaveChatByIndex*(self: ChatsView, channelIndex: int) {.slot.} =
|
||||||
if (self.chats.chats.len == 0): return
|
if (self.chats.chats.len == 0): return
|
||||||
let selectedChannel = self.chats.getChannel(channelIndex)
|
let selectedChannel = self.chats.getChannel(channelIndex)
|
||||||
|
|
|
@ -152,12 +152,7 @@ Item {
|
||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if(chatsModel.activeChannel.isTimelineChat){
|
chatsModel.requestMoreMessages(Constants.fetchRangeLast24Hours);
|
||||||
chatsModel.requestMoreTimelineMessages(Constants.fetchRangeLast24Hours);
|
|
||||||
} else {
|
|
||||||
chatsModel.requestMoreMessages(Constants.fetchRangeLast24Hours);
|
|
||||||
}
|
|
||||||
|
|
||||||
timer.setTimeout(function(){
|
timer.setTimeout(function(){
|
||||||
chatsModel.hideLoadingIndicator()
|
chatsModel.hideLoadingIndicator()
|
||||||
}, 3000);
|
}, 3000);
|
||||||
|
|
Loading…
Reference in New Issue