refactor: issues after rebase onto `master` fixed
This commit is contained in:
parent
0d3a8e4d11
commit
afe6d34735
|
@ -1,6 +1,6 @@
|
||||||
import NimQml, Tables, json, sequtils, chronicles, strutils, os, strformat
|
import NimQml, Tables, json, sequtils, chronicles, strutils, os, strformat
|
||||||
import status/[status]
|
import status/[status]
|
||||||
import status/utils as status_utils
|
#import status/utils as status_utils
|
||||||
import status/chat as status_chat
|
import status/chat as status_chat
|
||||||
import status/messages as status_messages
|
import status/messages as status_messages
|
||||||
import status/mailservers
|
import status/mailservers
|
||||||
|
@ -308,15 +308,19 @@ QtObject:
|
||||||
self.messageView.removeChat(chatId)
|
self.messageView.removeChat(chatId)
|
||||||
|
|
||||||
proc toggleReaction*(self: ChatsView, messageId: string, emojiId: int) {.slot.} =
|
proc toggleReaction*(self: ChatsView, messageId: string, emojiId: int) {.slot.} =
|
||||||
if self.channelView.activeChannel.id == status_utils.getTimelineChatId():
|
discard
|
||||||
let message = self.messageView.messageList[status_utils.getTimelineChatId()].getMessageById(messageId)
|
# Not Refactored Yet
|
||||||
self.reactions.toggle(messageId, message.chatId, emojiId)
|
# if self.channelView.activeChannel.id == status_utils.getTimelineChatId():
|
||||||
else:
|
# let message = self.messageView.messageList[status_utils.getTimelineChatId()].getMessageById(messageId)
|
||||||
self.reactions.toggle(messageId, self.channelView.activeChannel.id, emojiId)
|
# self.reactions.toggle(messageId, message.chatId, emojiId)
|
||||||
|
# else:
|
||||||
|
# self.reactions.toggle(messageId, self.channelView.activeChannel.id, emojiId)
|
||||||
|
|
||||||
proc removeMessagesFromTimeline*(self: ChatsView, chatId: string) =
|
proc removeMessagesFromTimeline*(self: ChatsView, chatId: string) =
|
||||||
self.messageView.messageList[status_utils.getTimelineChatId()].deleteMessagesByChatId(chatId)
|
discard
|
||||||
self.channelView.activeChannelChanged()
|
# Not Refactored Yet
|
||||||
|
# self.messageView.messageList[status_utils.getTimelineChatId()].deleteMessagesByChatId(chatId)
|
||||||
|
# self.channelView.activeChannelChanged()
|
||||||
|
|
||||||
proc updateChats*(self: ChatsView, chats: seq[Chat]) =
|
proc updateChats*(self: ChatsView, chats: seq[Chat]) =
|
||||||
for chat in chats:
|
for chat in chats:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import NimQml, Tables, std/wrapnils
|
import NimQml, Tables, std/wrapnils
|
||||||
import status/[chat/chat, status, ens, accounts, settings]
|
import status/[chat/chat, status, ens, accounts, settings]
|
||||||
import status/utils as status_utils
|
#import status/utils as status_utils
|
||||||
import status/types/[setting]
|
import status/types/[setting]
|
||||||
|
|
||||||
import chat_members
|
import chat_members
|
||||||
|
@ -26,8 +26,6 @@ QtObject:
|
||||||
result.chatMembers = newChatMembersView(status)
|
result.chatMembers = newChatMembersView(status)
|
||||||
result.setup
|
result.setup
|
||||||
|
|
||||||
proc chatItemChanged*(self: ChatItemView) {.signal.}
|
|
||||||
|
|
||||||
proc membershipChanged*(self: ChatItemView) {.signal.}
|
proc membershipChanged*(self: ChatItemView) {.signal.}
|
||||||
|
|
||||||
proc setChatItem*(self: ChatItemView, chatItem: Chat) =
|
proc setChatItem*(self: ChatItemView, chatItem: Chat) =
|
||||||
|
@ -37,7 +35,6 @@ QtObject:
|
||||||
self.chatItem = chatItem
|
self.chatItem = chatItem
|
||||||
self.chatMembers.setMembers(chatItem.members)
|
self.chatMembers.setMembers(chatItem.members)
|
||||||
self.membershipChanged()
|
self.membershipChanged()
|
||||||
self.chatItemChanged()
|
|
||||||
|
|
||||||
proc id*(self: ChatItemView): string {.slot.} = result = ?.self.chatItem.id
|
proc id*(self: ChatItemView): string {.slot.} = result = ?.self.chatItem.id
|
||||||
|
|
||||||
|
@ -146,6 +143,14 @@ QtObject:
|
||||||
read = getMembers
|
read = getMembers
|
||||||
notify = membershipChanged
|
notify = membershipChanged
|
||||||
|
|
||||||
|
proc isTimelineChat*(self: ChatItemView): bool {.slot.} =
|
||||||
|
# Not Refactored Yet
|
||||||
|
#result = ?.self.chatItem.id == status_utils.getTimelineChatId()
|
||||||
|
return false
|
||||||
|
|
||||||
|
QtProperty[bool] isTimelineChat:
|
||||||
|
read = isTimelineChat
|
||||||
|
|
||||||
|
|
||||||
proc mentionsCount*(self: ChatItemView): int {.slot.} = result = ?.self.chatItem.mentionsCount
|
proc mentionsCount*(self: ChatItemView): int {.slot.} = result = ?.self.chatItem.mentionsCount
|
||||||
|
|
||||||
|
@ -208,15 +213,3 @@ QtObject:
|
||||||
self.chatItem.muted = false
|
self.chatItem.muted = false
|
||||||
self.status.chat.unmuteChat(self.chatItem)
|
self.status.chat.unmuteChat(self.chatItem)
|
||||||
self.mutedChanged()
|
self.mutedChanged()
|
||||||
|
|
||||||
proc syncedFrom*(self: ChatItemView): string {.slot.} = result = $(?.self.chatItem.syncedFrom)
|
|
||||||
|
|
||||||
proc syncedTo*(self: ChatItemView): string {.slot.} = result = $(?.self.chatItem.syncedTo)
|
|
||||||
|
|
||||||
QtProperty[string] syncedFrom:
|
|
||||||
read = syncedFrom
|
|
||||||
notify = chatItemChanged
|
|
||||||
|
|
||||||
QtProperty[string] syncedTo:
|
|
||||||
read = syncedTo
|
|
||||||
notify = chatItemChanged
|
|
|
@ -2,7 +2,7 @@ import NimQml, Tables, json, sequtils, chronicles, times, re, strutils, sugar
|
||||||
|
|
||||||
import status/[status, contacts]
|
import status/[status, contacts]
|
||||||
import status/messages as status_messages
|
import status/messages as status_messages
|
||||||
import status/utils as status_utils
|
#import status/utils as status_utils
|
||||||
import status/chat/[chat]
|
import status/chat/[chat]
|
||||||
import status/types/[message, profile]
|
import status/types/[message, profile]
|
||||||
|
|
||||||
|
@ -54,6 +54,8 @@ QtObject:
|
||||||
result.communities = communitiesView
|
result.communities = communitiesView
|
||||||
result.messageList = initOrderedTable[string, ChatMessageList]()
|
result.messageList = initOrderedTable[string, ChatMessageList]()
|
||||||
result.pinnedMessagesList = initOrderedTable[string, ChatMessageList]()
|
result.pinnedMessagesList = initOrderedTable[string, ChatMessageList]()
|
||||||
|
# Not Rrefactored Yet
|
||||||
|
# result.messageList[status_utils.getTimelineChatId()] = newChatMessageList(status_utils.getTimelineChatId(), result.status, false)
|
||||||
result.loadingMessages = false
|
result.loadingMessages = false
|
||||||
result.unreadMessageCnt = 0
|
result.unreadMessageCnt = 0
|
||||||
result.unreadDirectMessagesAndMentionsCount = 0
|
result.unreadDirectMessagesAndMentionsCount = 0
|
||||||
|
@ -167,7 +169,7 @@ QtObject:
|
||||||
let channel = self.channelView.getChannelById(id)
|
let channel = self.channelView.getChannelById(id)
|
||||||
if (channel == nil):
|
if (channel == nil):
|
||||||
return
|
return
|
||||||
self.messageList[id].clear(not channel.isNil)
|
self.messageList[id].clear(not channel.isNil and channel.chatType != ChatType.Profile)
|
||||||
self.messagesCleared()
|
self.messagesCleared()
|
||||||
|
|
||||||
proc getBlockedContacts*(self: MessageView): seq[string] =
|
proc getBlockedContacts*(self: MessageView): seq[string] =
|
||||||
|
@ -188,7 +190,7 @@ QtObject:
|
||||||
|
|
||||||
if not self.messageList.hasKey(channel):
|
if not self.messageList.hasKey(channel):
|
||||||
self.beginInsertRows(newQModelIndex(), self.messageList.len, self.messageList.len)
|
self.beginInsertRows(newQModelIndex(), self.messageList.len, self.messageList.len)
|
||||||
self.messageList[channel] = newChatMessageList(channel, self.status, not chat.isNil, blockedContacts)
|
self.messageList[channel] = newChatMessageList(channel, self.status, not chat.isNil and chat.chatType != ChatType.Profile, blockedContacts)
|
||||||
self.channelOpenTime[channel] = now().toTime.toUnix * 1000
|
self.channelOpenTime[channel] = now().toTime.toUnix * 1000
|
||||||
self.endInsertRows();
|
self.endInsertRows();
|
||||||
if not self.pinnedMessagesList.hasKey(channel):
|
if not self.pinnedMessagesList.hasKey(channel):
|
||||||
|
@ -225,6 +227,15 @@ QtObject:
|
||||||
msg.userName = self.status.chat.getUserName(msg.fromAuthor, msg.alias)
|
msg.userName = self.status.chat.getUserName(msg.fromAuthor, msg.alias)
|
||||||
var msgIndex:int;
|
var msgIndex:int;
|
||||||
if self.status.chat.channels.hasKey(msg.chatId):
|
if self.status.chat.channels.hasKey(msg.chatId):
|
||||||
|
let chat = self.status.chat.channels[msg.chatId]
|
||||||
|
if (chat.chatType == ChatType.Profile):
|
||||||
|
# Not Rrefactored Yet
|
||||||
|
let timelineChatId = "" #status_utils.getTimelineChatId()
|
||||||
|
self.messageList[timelineChatId].add(msg)
|
||||||
|
|
||||||
|
if self.channelView.activeChannel.id == timelineChatId: self.channelView.activeChannelChanged()
|
||||||
|
msgIndex = self.messageList[timelineChatId].count - 1
|
||||||
|
else:
|
||||||
self.messageList[msg.chatId].add(msg)
|
self.messageList[msg.chatId].add(msg)
|
||||||
if self.pinnedMessagesList[msg.chatId].contains(msg):
|
if self.pinnedMessagesList[msg.chatId].contains(msg):
|
||||||
self.pinnedMessagesList[msg.chatId].add(msg)
|
self.pinnedMessagesList[msg.chatId].add(msg)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import NimQml, tables, json, chronicles
|
import NimQml, tables, json, chronicles
|
||||||
import status/[status, chat/chat, settings]
|
import status/[status, settings]
|
||||||
import message_list, chat_item
|
import message_list, chat_item
|
||||||
import status/utils as status_utils
|
#import status/utils as status_utils
|
||||||
import status/types/[message, setting]
|
import status/types/[message, setting]
|
||||||
|
|
||||||
logScope:
|
logScope:
|
||||||
|
@ -36,6 +36,9 @@ QtObject:
|
||||||
proc messageEmojiReactionId(self: ReactionView, chatId: string, messageId: string, emojiId: int): string =
|
proc messageEmojiReactionId(self: ReactionView, chatId: string, messageId: string, emojiId: int): string =
|
||||||
let chat = self.status.chat.channels[chatId]
|
let chat = self.status.chat.channels[chatId]
|
||||||
var chatId = chatId
|
var chatId = chatId
|
||||||
|
# Not Rrefactored Yet
|
||||||
|
# if chat.chatType == ChatType.Profile:
|
||||||
|
# chatId = status_utils.getTimelineChatId()
|
||||||
|
|
||||||
if (self.messageList[][chatId].getReactions(messageId) == "") :
|
if (self.messageList[][chatId].getReactions(messageId) == "") :
|
||||||
return ""
|
return ""
|
||||||
|
@ -67,6 +70,10 @@ QtObject:
|
||||||
let chat = self.status.chat.channels[chatId]
|
let chat = self.status.chat.channels[chatId]
|
||||||
var messageList = self.messageList[][chatId]
|
var messageList = self.messageList[][chatId]
|
||||||
|
|
||||||
|
# Not Rrefactored Yet
|
||||||
|
# if chat.chatType == ChatType.Profile:
|
||||||
|
# messageList = self.messageList[][status_utils.getTimelineChatId()]
|
||||||
|
|
||||||
var emojiReactions = messageList.getReactions(reaction.messageId)
|
var emojiReactions = messageList.getReactions(reaction.messageId)
|
||||||
var oldReactions: JsonNode
|
var oldReactions: JsonNode
|
||||||
if (emojiReactions == "") :
|
if (emojiReactions == "") :
|
||||||
|
|
|
@ -6,9 +6,6 @@ import ../../../../../app_service/service/contacts/service as contacts_service
|
||||||
import ../../../../../app_service/service/contacts/dto/contacts
|
import ../../../../../app_service/service/contacts/dto/contacts
|
||||||
import ../../../../../app_service/service/accounts/service as accounts_service
|
import ../../../../../app_service/service/accounts/service as accounts_service
|
||||||
|
|
||||||
import status/signals
|
|
||||||
|
|
||||||
# import ./item as item
|
|
||||||
import eventemitter
|
import eventemitter
|
||||||
|
|
||||||
export controller_interface
|
export controller_interface
|
||||||
|
|
|
@ -67,12 +67,6 @@ QtObject:
|
||||||
self.blockedContacts.changeNicknameForContactWithId(id, nickname)
|
self.blockedContacts.changeNicknameForContactWithId(id, nickname)
|
||||||
self.contactRequests.changeNicknameForContactWithId(id, nickname)
|
self.contactRequests.changeNicknameForContactWithId(id, nickname)
|
||||||
|
|
||||||
proc changeNicknameForContactWithId*(self: Model, id: string, nickname: string) =
|
|
||||||
self.contactList.changeNicknameForContactWithId(id, nickname)
|
|
||||||
self.addedContacts.changeNicknameForContactWithId(id, nickname)
|
|
||||||
self.blockedContacts.changeNicknameForContactWithId(id, nickname)
|
|
||||||
self.contactRequests.changeNicknameForContactWithId(id, nickname)
|
|
||||||
|
|
||||||
proc updateContactList*(self: Model, contacts: seq[ContactsDto]) =
|
proc updateContactList*(self: Model, contacts: seq[ContactsDto]) =
|
||||||
for contact in contacts:
|
for contact in contacts:
|
||||||
var requestAlreadyAdded = false
|
var requestAlreadyAdded = false
|
||||||
|
|
|
@ -55,10 +55,11 @@ method isTelemetryEnabled*[T](self: Controller[T]): bool =
|
||||||
return self.settingsService.getTelemetryServerUrl().len > 0
|
return self.settingsService.getTelemetryServerUrl().len > 0
|
||||||
|
|
||||||
method toggleAutoMessage*[T](self: Controller[T]) =
|
method toggleAutoMessage*[T](self: Controller[T]) =
|
||||||
self.settingsService.toggleAutoMessage()
|
let enabled = self.settingsService.autoMessageEnabled()
|
||||||
|
discard self.settingsService.saveAutoMessageEnabled(not enabled)
|
||||||
|
|
||||||
method isAutoMessageEnabled*[T](self: Controller[T]): bool =
|
method isAutoMessageEnabled*[T](self: Controller[T]): bool =
|
||||||
return self.settingsService.isAutoMessageEnabled()
|
return self.settingsService.autoMessageEnabled()
|
||||||
|
|
||||||
method toggleDebug*[T](self: Controller[T]) =
|
method toggleDebug*[T](self: Controller[T]) =
|
||||||
discard
|
discard
|
||||||
|
|
|
@ -132,29 +132,36 @@ QtObject:
|
||||||
else:
|
else:
|
||||||
contact.blocked = false
|
contact.blocked = false
|
||||||
|
|
||||||
|
let response = status_contacts.addContact(contact.id, contact.name)
|
||||||
|
if(not response.error.isNil):
|
||||||
|
let msg = response.error.message
|
||||||
|
error "error adding contact ", msg
|
||||||
|
return
|
||||||
self.saveContact(contact)
|
self.saveContact(contact)
|
||||||
|
|
||||||
var ensName = ""
|
|
||||||
if contact.name.endsWith(".eth"):
|
|
||||||
ensName = contact.name
|
|
||||||
|
|
||||||
status_contacts.addContact(contact.id, ensName)
|
|
||||||
self.events.emit(SIGNAL_CONTACT_ADDED, ContactAddedArgs(contact: contact))
|
self.events.emit(SIGNAL_CONTACT_ADDED, ContactAddedArgs(contact: contact))
|
||||||
|
|
||||||
proc rejectContactRequest*(self: Service, publicKey: string) =
|
proc rejectContactRequest*(self: Service, publicKey: string) =
|
||||||
var contact = self.getContactById(publicKey)
|
var contact = self.getContactById(publicKey)
|
||||||
contact.hasAddedUs = false
|
contact.hasAddedUs = false
|
||||||
|
|
||||||
|
let response = status_contacts.rejectContactRequest(contact.id)
|
||||||
|
if(not response.error.isNil):
|
||||||
|
let msg = response.error.message
|
||||||
|
error "error rejecting contact ", msg
|
||||||
|
return
|
||||||
self.saveContact(contact)
|
self.saveContact(contact)
|
||||||
status_contacts.rejectContactRequest(contact.id)
|
|
||||||
self.events.emit(SIGNAL_CONTACT_REMOVED, ContactArgs(contactId: contact.id))
|
self.events.emit(SIGNAL_CONTACT_REMOVED, ContactArgs(contactId: contact.id))
|
||||||
|
|
||||||
proc changeContactNickname*(self: Service, publicKey: string, nickname: string) =
|
proc changeContactNickname*(self: Service, publicKey: string, nickname: string) =
|
||||||
var contact = self.getContactById(publicKey)
|
var contact = self.getContactById(publicKey)
|
||||||
contact.localNickname = nickname
|
contact.localNickname = nickname
|
||||||
|
|
||||||
|
let response = status_contacts.setContactLocalNickname(contact.id, contact.localNickname)
|
||||||
|
if(not response.error.isNil):
|
||||||
|
let msg = response.error.message
|
||||||
|
error "error setting local name ", msg
|
||||||
|
return
|
||||||
self.saveContact(contact)
|
self.saveContact(contact)
|
||||||
status_contacts.setContactLocalNickname(contact.id, contact.localNickname)
|
|
||||||
let data = ContactNicknameUpdatedArgs(contactId: contact.id, nickname: nickname)
|
let data = ContactNicknameUpdatedArgs(contactId: contact.id, nickname: nickname)
|
||||||
self.events.emit(SIGNAL_CONTACT_NICKNAME_CHANGED, data)
|
self.events.emit(SIGNAL_CONTACT_NICKNAME_CHANGED, data)
|
||||||
|
|
||||||
|
@ -162,16 +169,24 @@ QtObject:
|
||||||
var contact = self.getContactById(publicKey)
|
var contact = self.getContactById(publicKey)
|
||||||
contact.blocked = false
|
contact.blocked = false
|
||||||
|
|
||||||
|
let response = status_contacts.unblockContact(contact.id)
|
||||||
|
if(not response.error.isNil):
|
||||||
|
let msg = response.error.message
|
||||||
|
error "error unblocking contact ", msg
|
||||||
|
return
|
||||||
self.saveContact(contact)
|
self.saveContact(contact)
|
||||||
status_contacts.unblockContact(contact.id)
|
|
||||||
self.events.emit(SIGNAL_CONTACT_UNBLOCKED, ContactArgs(contactId: contact.id))
|
self.events.emit(SIGNAL_CONTACT_UNBLOCKED, ContactArgs(contactId: contact.id))
|
||||||
|
|
||||||
proc blockContact*(self: Service, publicKey: string) =
|
proc blockContact*(self: Service, publicKey: string) =
|
||||||
var contact = self.getContactById(publicKey)
|
var contact = self.getContactById(publicKey)
|
||||||
contact.blocked = true
|
contact.blocked = true
|
||||||
|
|
||||||
|
let response = status_contacts.blockContact(contact.id)
|
||||||
|
if(not response.error.isNil):
|
||||||
|
let msg = response.error.message
|
||||||
|
error "error blocking contact ", msg
|
||||||
|
return
|
||||||
self.saveContact(contact)
|
self.saveContact(contact)
|
||||||
status_contacts.blockContact(contact.id)
|
|
||||||
self.events.emit(SIGNAL_CONTACT_BLOCKED, ContactArgs(contactId: contact.id))
|
self.events.emit(SIGNAL_CONTACT_BLOCKED, ContactArgs(contactId: contact.id))
|
||||||
|
|
||||||
proc removeContact*(self: Service, publicKey: string) =
|
proc removeContact*(self: Service, publicKey: string) =
|
||||||
|
@ -179,8 +194,12 @@ QtObject:
|
||||||
contact.added = false
|
contact.added = false
|
||||||
contact.hasAddedUs = false
|
contact.hasAddedUs = false
|
||||||
|
|
||||||
|
let response = status_contacts.removeContact(contact.id)
|
||||||
|
if(not response.error.isNil):
|
||||||
|
let msg = response.error.message
|
||||||
|
error "error removing contact ", msg
|
||||||
|
return
|
||||||
self.saveContact(contact)
|
self.saveContact(contact)
|
||||||
status_contacts.removeContact(contact.id)
|
|
||||||
self.events.emit(SIGNAL_CONTACT_REMOVED, ContactArgs(contactId: contact.id))
|
self.events.emit(SIGNAL_CONTACT_REMOVED, ContactArgs(contactId: contact.id))
|
||||||
|
|
||||||
proc ensResolved*(self: Service, id: string) {.slot.} =
|
proc ensResolved*(self: Service, id: string) {.slot.} =
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import json, options, tables, strutils, sequtils
|
import json, options, tables, strutils
|
||||||
import ../../stickers/dto/stickers
|
import ../../stickers/dto/stickers
|
||||||
|
|
||||||
include ../../../common/json_utils
|
include ../../../common/json_utils
|
||||||
|
@ -38,6 +38,7 @@ const KEY_INSTALLED_STICKER_PACKS* = "stickers/packs-installed"
|
||||||
const KEY_FLEET* = "fleet"
|
const KEY_FLEET* = "fleet"
|
||||||
const KEY_NODE_CONFIG* = "node-config"
|
const KEY_NODE_CONFIG* = "node-config"
|
||||||
const KEY_WAKU_BLOOM_FILTER_MODE* = "waku-bloom-filter-mode"
|
const KEY_WAKU_BLOOM_FILTER_MODE* = "waku-bloom-filter-mode"
|
||||||
|
const KEY_AUTO_MESSAGE_ENABLED* = "auto-message-enabled?"
|
||||||
|
|
||||||
type UpstreamConfig* = object
|
type UpstreamConfig* = object
|
||||||
enabled*: bool
|
enabled*: bool
|
||||||
|
@ -101,6 +102,7 @@ type
|
||||||
wakuBloomFilterMode*: bool
|
wakuBloomFilterMode*: bool
|
||||||
recentStickerHashes*: seq[string]
|
recentStickerHashes*: seq[string]
|
||||||
installedStickerPacks*: Table[int, StickerPackDto]
|
installedStickerPacks*: Table[int, StickerPackDto]
|
||||||
|
autoMessageEnabled*: bool
|
||||||
|
|
||||||
proc toUpstreamConfig*(jsonObj: JsonNode): UpstreamConfig =
|
proc toUpstreamConfig*(jsonObj: JsonNode): UpstreamConfig =
|
||||||
discard jsonObj.getProp("Enabled", result.enabled)
|
discard jsonObj.getProp("Enabled", result.enabled)
|
||||||
|
@ -189,6 +191,7 @@ proc toSettingsDto*(jsonObj: JsonNode): SettingsDto =
|
||||||
discard jsonObj.getProp(KEY_SEND_STATUS_UPDATES, result.sendStatusUpdates)
|
discard jsonObj.getProp(KEY_SEND_STATUS_UPDATES, result.sendStatusUpdates)
|
||||||
discard jsonObj.getProp(KEY_TELEMETRY_SERVER_URL, result.telemetryServerUrl)
|
discard jsonObj.getProp(KEY_TELEMETRY_SERVER_URL, result.telemetryServerUrl)
|
||||||
discard jsonObj.getProp(KEY_FLEET, result.fleet)
|
discard jsonObj.getProp(KEY_FLEET, result.fleet)
|
||||||
|
discard jsonObj.getProp(KEY_AUTO_MESSAGE_ENABLED, result.autoMessageEnabled)
|
||||||
|
|
||||||
var pinnedMailserversObj: JsonNode
|
var pinnedMailserversObj: JsonNode
|
||||||
if(jsonObj.getProp(KEY_PINNED_MAILSERVERS, pinnedMailserversObj)):
|
if(jsonObj.getProp(KEY_PINNED_MAILSERVERS, pinnedMailserversObj)):
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import chronicles, json, sequtils, tables, sugar
|
import chronicles, json, sequtils, tables, sugar
|
||||||
|
|
||||||
import service_interface, ./dto/settings
|
import service_interface, ./dto/settings
|
||||||
import status/statusgo_backend_new/settings as status_go
|
import status/statusgo_backend_new/settings as status_settings
|
||||||
|
|
||||||
export service_interface
|
export service_interface
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ proc newService*(): Service =
|
||||||
|
|
||||||
method init*(self: Service) =
|
method init*(self: Service) =
|
||||||
try:
|
try:
|
||||||
let response = status_go.getSettings()
|
let response = status_settings.getSettings()
|
||||||
self.settings = response.result.toSettingsDto()
|
self.settings = response.result.toSettingsDto()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
let errDesription = e.msg
|
let errDesription = e.msg
|
||||||
|
@ -30,7 +30,7 @@ method init*(self: Service) =
|
||||||
return
|
return
|
||||||
|
|
||||||
proc saveSetting(self: Service, attribute: string, value: string | JsonNode | bool | int): bool =
|
proc saveSetting(self: Service, attribute: string, value: string | JsonNode | bool | int): bool =
|
||||||
let response = status_go.saveSettings(attribute, value)
|
let response = status_settings.saveSettings(attribute, value)
|
||||||
if(not response.error.isNil):
|
if(not response.error.isNil):
|
||||||
error "error saving settings: ", errDescription = response.error.message
|
error "error saving settings: ", errDescription = response.error.message
|
||||||
return false
|
return false
|
||||||
|
@ -300,38 +300,6 @@ method getPinnedMailservers*(self: Service): PinnedMailservers =
|
||||||
method getWalletVisibleTokens*(self: Service): seq[string] =
|
method getWalletVisibleTokens*(self: Service): seq[string] =
|
||||||
self.settings.walletVisibleTokens.tokens
|
self.settings.walletVisibleTokens.tokens
|
||||||
|
|
||||||
method toggleTelemetry*(self: Service) =
|
|
||||||
let telemetryServerUrl = status_go_settings.getSetting[string](Setting.TelemetryServerUrl)
|
|
||||||
var newValue = ""
|
|
||||||
if telemetryServerUrl == "":
|
|
||||||
newValue = "https://telemetry.status.im"
|
|
||||||
|
|
||||||
discard status_go_settings.saveSetting(Setting.TelemetryServerUrl, newValue)
|
|
||||||
|
|
||||||
method isTelemetryEnabled*(self: Service): bool =
|
|
||||||
let telemetryServerUrl = status_go_settings.getSetting[string](Setting.TelemetryServerUrl)
|
|
||||||
return telemetryServerUrl != ""
|
|
||||||
|
|
||||||
method toggleAutoMessage*(self: Service) =
|
|
||||||
let enabled = status_go_settings.getSetting[bool](Setting.AutoMessageEnabled)
|
|
||||||
discard status_go_settings.saveSetting(Setting.AutoMessageEnabled, not enabled)
|
|
||||||
|
|
||||||
method isAutoMessageEnabled*(self: Service): bool =
|
|
||||||
return status_go_settings.getSetting[bool](Setting.AutoMessageEnabled)
|
|
||||||
|
|
||||||
method toggleDebug*(self: Service) =
|
|
||||||
var nodeConfig = status_go_settings.getNodeConfig()
|
|
||||||
if nodeConfig["LogLevel"].getStr() == $LogLevel.INFO:
|
|
||||||
nodeConfig["LogLevel"] = newJString($LogLevel.DEBUG)
|
|
||||||
else:
|
|
||||||
nodeConfig["LogLevel"] = newJString($LogLevel.INFO)
|
|
||||||
discard status_go_settings.saveSetting(Setting.NodeConfig, nodeConfig)
|
|
||||||
quit(QuitSuccess) # quits the app TODO: change this to logout instead when supported
|
|
||||||
|
|
||||||
method isDebugEnabled*(self: Service): bool =
|
|
||||||
let nodeConfig = status_go_settings.getNodeConfig()
|
|
||||||
return nodeConfig["LogLevel"].getStr() != $LogLevel.INFO
|
|
||||||
|
|
||||||
method saveWalletVisibleTokens*(self: Service, tokens: seq[string]): bool =
|
method saveWalletVisibleTokens*(self: Service, tokens: seq[string]): bool =
|
||||||
var obj = newJObject()
|
var obj = newJObject()
|
||||||
obj[self.getCurrentNetwork()] = %* tokens
|
obj[self.getCurrentNetwork()] = %* tokens
|
||||||
|
@ -379,7 +347,6 @@ method saveRecentStickers*(self: Service, installedStickerPacks: Table[int, Stic
|
||||||
return true
|
return true
|
||||||
return false
|
return false
|
||||||
|
|
||||||
|
|
||||||
method saveNodeConfiguration*(self: Service, value: JsonNode): bool =
|
method saveNodeConfiguration*(self: Service, value: JsonNode): bool =
|
||||||
if(self.saveSetting(KEY_NODE_CONFIG, value)):
|
if(self.saveSetting(KEY_NODE_CONFIG, value)):
|
||||||
self.settings.nodeConfig = value
|
self.settings.nodeConfig = value
|
||||||
|
@ -391,3 +358,12 @@ method saveWakuBloomFilterMode*(self: Service, value: bool): bool =
|
||||||
self.settings.wakuBloomFilterMode = value
|
self.settings.wakuBloomFilterMode = value
|
||||||
return true
|
return true
|
||||||
return false
|
return false
|
||||||
|
|
||||||
|
method saveAutoMessageEnabled*(self: Service, value: bool): bool =
|
||||||
|
if(self.saveSetting(KEY_AUTO_MESSAGE_ENABLED, value)):
|
||||||
|
self.settings.autoMessageEnabled = value
|
||||||
|
return true
|
||||||
|
return false
|
||||||
|
|
||||||
|
method autoMessageEnabled*(self: Service): bool =
|
||||||
|
return self.settings.autoMessageEnabled
|
|
@ -123,15 +123,6 @@ method saveDefaultSyncPeriod*(self: ServiceInterface, value: int): bool {.base.}
|
||||||
method getDefaultSyncPeriod*(self: ServiceInterface): int {.base.} =
|
method getDefaultSyncPeriod*(self: ServiceInterface): int {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
method toggleAutoMessage*(self: ServiceInterface) {.base.} =
|
|
||||||
raise newException(ValueError, "No implementation available")
|
|
||||||
|
|
||||||
method isAutoMessageEnabled*(self: ServiceInterface): bool {.base.} =
|
|
||||||
raise newException(ValueError, "No implementation available")
|
|
||||||
|
|
||||||
method toggleDebug*(self: ServiceInterface) {.base.} =
|
|
||||||
raise newException(ValueError, "No implementation available")
|
|
||||||
|
|
||||||
method saveSendPushNotifications*(self: ServiceInterface, value: bool): bool {.base.} =
|
method saveSendPushNotifications*(self: ServiceInterface, value: bool): bool {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
@ -225,9 +216,14 @@ method getInstalledStickerPacks*(self: ServiceInterface): Table[int, StickerPack
|
||||||
method saveRecentStickers*(self: ServiceInterface, installedStickerPacks: Table[int, StickerPackDto]): bool {.base.} =
|
method saveRecentStickers*(self: ServiceInterface, installedStickerPacks: Table[int, StickerPackDto]): bool {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
|
||||||
method saveNodeConfiguration*(self: ServiceInterface, value: JsonNode): bool {.base.} =
|
method saveNodeConfiguration*(self: ServiceInterface, value: JsonNode): bool {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
method saveWakuBloomFilterMode*(self: ServiceInterface, value: bool): bool {.base.} =
|
method saveWakuBloomFilterMode*(self: ServiceInterface, value: bool): bool {.base.} =
|
||||||
raise newException(ValueError, "No implementation available")
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
method saveAutoMessageEnabled*(self: ServiceInterface, value: bool): bool {.base.} =
|
||||||
|
raise newException(ValueError, "No implementation available")
|
||||||
|
|
||||||
|
method autoMessageEnabled*(self: ServiceInterface): bool {.base.} =
|
||||||
|
raise newException(ValueError, "No implementation available")
|
|
@ -55,10 +55,6 @@ StatusAppThreePanelLayout {
|
||||||
// root.rootStore.chatsModelInst.channelView.restorePreviousActiveChannel();
|
// root.rootStore.chatsModelInst.channelView.restorePreviousActiveChannel();
|
||||||
// chatColumn.onActivated();
|
// chatColumn.onActivated();
|
||||||
// }
|
// }
|
||||||
// Not Refactored
|
|
||||||
property RootStore rootStore: RootStore {
|
|
||||||
messageStore: root.messageStore
|
|
||||||
}
|
|
||||||
|
|
||||||
leftPanel: Loader {
|
leftPanel: Loader {
|
||||||
id: contactColumnLoader
|
id: contactColumnLoader
|
||||||
|
|
Loading…
Reference in New Issue