parent
b688a5a305
commit
b164b088f5
|
@ -113,4 +113,7 @@ method getRenderedText*[T](self: Controller[T], parsedTextArray: seq[ParsedText]
|
||||||
return self.messageService.getRenderedText(parsedTextArray)
|
return self.messageService.getRenderedText(parsedTextArray)
|
||||||
|
|
||||||
method decodeContentHash*[T](self: Controller[T], hash: string): string =
|
method decodeContentHash*[T](self: Controller[T], hash: string): string =
|
||||||
return eth_utils.decodeContentHash(hash)
|
return eth_utils.decodeContentHash(hash)
|
||||||
|
|
||||||
|
method switchTo*[T](self: Controller[T], sectionId, chatId, messageId: string) =
|
||||||
|
self.messageService.switchTo(sectionId, chatId, messageId)
|
|
@ -42,10 +42,13 @@ method dismissActivityCenterNotifications*(self: AccessInterface, notificationId
|
||||||
method getRenderedText*(self: AccessInterface, parsedTextArray: seq[ParsedText]): string {.base.} =
|
method getRenderedText*(self: AccessInterface, parsedTextArray: seq[ParsedText]): string {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
|
||||||
method decodeContentHash*(self: AccessInterface, hash: string): string {.base.} =
|
method decodeContentHash*(self: AccessInterface, hash: string): string {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
method switchTo*(self: AccessInterface, sectionId, chatId, messageId: string) {.base.} =
|
||||||
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
|
||||||
type
|
type
|
||||||
## Abstract class (concept) which must be implemented by object/s used in this
|
## Abstract class (concept) which must be implemented by object/s used in this
|
||||||
## module.
|
## module.
|
||||||
|
|
|
@ -66,6 +66,9 @@ method acceptActivityCenterNotifications*(self: AccessInterface, notificationIds
|
||||||
method dismissActivityCenterNotifications*(self: AccessInterface, notificationIds: seq[string]): string {.base.} =
|
method dismissActivityCenterNotifications*(self: AccessInterface, notificationIds: seq[string]): string {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
method switchTo*(self: AccessInterface, sectionId, chatId, messageId: string) {.base.} =
|
||||||
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
type
|
type
|
||||||
## Abstract class (concept) which must be implemented by object/s used in this
|
## Abstract class (concept) which must be implemented by object/s used in this
|
||||||
## module.
|
## module.
|
||||||
|
|
|
@ -181,3 +181,6 @@ method dismissActivityCenterNotificationsDone*[T](self: Module[T], notificationI
|
||||||
|
|
||||||
method dismissActivityCenterNotifications*[T](self: Module[T], notificationIds: seq[string]): string =
|
method dismissActivityCenterNotifications*[T](self: Module[T], notificationIds: seq[string]): string =
|
||||||
self.controller.dismissActivityCenterNotifications(notificationIds)
|
self.controller.dismissActivityCenterNotifications(notificationIds)
|
||||||
|
|
||||||
|
method switchTo*[T](self: Module[T], sectionId, chatId, messageId: string) =
|
||||||
|
self.controller.switchTo(sectionId, chatId, messageId)
|
|
@ -126,3 +126,6 @@ QtObject:
|
||||||
# self.communities.joinedCommunityList.decrementMentions(communityId, activityCenterNotification.chatId)
|
# self.communities.joinedCommunityList.decrementMentions(communityId, activityCenterNotification.chatId)
|
||||||
self.model.addActivityNotificationItemToList(activityCenterNotification)
|
self.model.addActivityNotificationItemToList(activityCenterNotification)
|
||||||
self.activityNotificationsChanged()
|
self.activityNotificationsChanged()
|
||||||
|
|
||||||
|
proc switchTo*(self: View, sectionId: string, chatId: string, messageId: string) {.slot.} =
|
||||||
|
self.delegate.switchTo(sectionId, chatId, messageId)
|
||||||
|
|
|
@ -124,12 +124,11 @@ Item {
|
||||||
messageImage: model.message.messageImage
|
messageImage: model.message.messageImage
|
||||||
messageTimestamp: model.timestamp
|
messageTimestamp: model.timestamp
|
||||||
linkUrls: model.links
|
linkUrls: model.links
|
||||||
//timestamp: model.message.timestamp
|
|
||||||
messageOutgoingStatus: model.message.outgoingStatus
|
messageOutgoingStatus: model.message.outgoingStatus
|
||||||
messageContentType: model.message.contentType
|
messageContentType: model.message.contentType
|
||||||
//pinnedMessage: model.message.pinned
|
pinnedMessage: model.message.pinned
|
||||||
//messagePinnedBy: model.message.pinnedBy
|
messagePinnedBy: model.message.pinnedBy
|
||||||
//reactionsModel: model.message.reactions
|
reactionsModel: model.message.reactions
|
||||||
activityCenterMessage: true
|
activityCenterMessage: true
|
||||||
read: model.read
|
read: model.read
|
||||||
onImageClicked: Global.openImagePopup(image, root.messageContextMenu)
|
onImageClicked: Global.openImagePopup(image, root.messageContextMenu)
|
||||||
|
@ -140,18 +139,11 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
activityCenter.close()
|
activityCenter.close()
|
||||||
|
var sectionId = "chat"
|
||||||
// if (model.message.communityId) {
|
if (model.message.communityId) {
|
||||||
// root.chatSectionModule..communities.setActiveCommunity(model.message.communityId)
|
sectionId = model.message.communityId
|
||||||
// }
|
}
|
||||||
|
root.store.activityCenterModuleInst.switchTo(sectionId, model.chatId, model.id)
|
||||||
// root.chatSectionModule.setActiveChannel(model.chatId);
|
|
||||||
|
|
||||||
// To position to appropriate message check how it's done in AppSearch module,
|
|
||||||
// similar may be done here, corresponding module for activity center just need to
|
|
||||||
// use the mechanism done there, send the signal form message service and
|
|
||||||
// and the rest is already handled.
|
|
||||||
// positionAtMessage(model.id);
|
|
||||||
}
|
}
|
||||||
prevMessageIndex: root.previousNotificationIndex
|
prevMessageIndex: root.previousNotificationIndex
|
||||||
prevMsgTimestamp: root.previousNotificationTimestamp
|
prevMsgTimestamp: root.previousNotificationTimestamp
|
||||||
|
|
Loading…
Reference in New Issue