From f2ad64fe8b0a64702bc4bcc55fcc5d4bc1542d2c Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 25 Jul 2023 11:18:55 -0700 Subject: [PATCH] Formatting / Linting --- .../servers/servers_functionality.go | 23 ++++++++----------- peer/cwtch_peer.go | 6 ++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/functionality/servers/servers_functionality.go b/functionality/servers/servers_functionality.go index 0e0ab55..40feeac 100644 --- a/functionality/servers/servers_functionality.go +++ b/functionality/servers/servers_functionality.go @@ -1,14 +1,13 @@ package servers - import ( "cwtch.im/cwtch/event" "cwtch.im/cwtch/model" "cwtch.im/cwtch/model/attr" "cwtch.im/cwtch/model/constants" "cwtch.im/cwtch/peer" - "cwtch.im/cwtch/settings" "cwtch.im/cwtch/protocol/connections" + "cwtch.im/cwtch/settings" "encoding/json" ) @@ -28,7 +27,7 @@ type Functionality struct { func (f *Functionality) NotifySettingsUpdate(settings settings.GlobalSettings) { -} +} func (f *Functionality) EventsToRegister() []event.Type { return []event.Type{event.ProtocolEngineCreated, event.ManifestReceived, event.FileDownloaded} @@ -42,11 +41,10 @@ func (f *Functionality) ExperimentsToRegister() []string { func (f *Functionality) OnEvent(ev event.Event, profile peer.CwtchPeer) { if profile.IsFeatureEnabled(constants.GroupsExperiment) { switch ev.EventType { - // keep the UI in sync with the current backend server updates... - // TODO: do we need a secondary heartbeat for less common updates? - case event.Heartbeat: - f.PublishServerUpdate(profile) - break; + // keep the UI in sync with the current backend server updates... + // TODO: do we need a secondary heartbeat for less common updates? + case event.Heartbeat: + f.PublishServerUpdate(profile) } } } @@ -56,7 +54,7 @@ func (f *Functionality) OnContactRequestValue(profile peer.CwtchPeer, conversati } func (f *Functionality) OnContactReceiveValue(profile peer.CwtchPeer, conversation model.Conversation, path attr.ScopedZonedPath, value string, exists bool) { - // nopt + // nopt } // FunctionalityGate returns filesharing functionality - gates now happen on function calls. @@ -77,7 +75,6 @@ type SyncStatus struct { LastMessageTime string `json:"lastMessageTime"` } - // Server encapsulates the information needed to represent a server... type Server struct { Onion string `json:"onion"` @@ -90,9 +87,9 @@ type Server struct { // PublishServerUpdate serializes the current list of group servers and publishes an event with this information func (f *Functionality) PublishServerUpdate(profile peer.CwtchPeer) { - serverListForOnion := f.GetServerInfoList(profile) - serversListBytes, _ := json.Marshal(serverListForOnion) - profile.PublishEvent(event.NewEvent(UpdateServerInfo, map[event.Field]string{"ProfileOnion": profile.GetOnion(), ServerList: string(serversListBytes)})) + serverListForOnion := f.GetServerInfoList(profile) + serversListBytes, _ := json.Marshal(serverListForOnion) + profile.PublishEvent(event.NewEvent(UpdateServerInfo, map[event.Field]string{"ProfileOnion": profile.GetOnion(), ServerList: string(serversListBytes)})) } // GetServerInfoList compiles all the information the UI might need regarding all servers.. diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go index 7a427a5..13b6b41 100644 --- a/peer/cwtch_peer.go +++ b/peer/cwtch_peer.go @@ -857,9 +857,9 @@ func (cp *cwtchPeer) doSearch(ctx context.Context, searchID string, pattern stri // in the table (e.g. deleted messages, expired messages, etc.) func (cp *cwtchPeer) SearchConversations(pattern string) string { - // TODO: For now, we simply surround the pattern with the sqlite LIKE syntax for matching any prefix, and any suffix - // At some point we would like to extend this patternt to support e.g. searching a specific conversation, or - // searching for particular types of message. + // TODO: For now, we simply surround the pattern with the sqlite LIKE syntax for matching any prefix, and any suffix + // At some point we would like to extend this patternt to support e.g. searching a specific conversation, or + // searching for particular types of message. pattern = fmt.Sprintf("%%%v%%", pattern) // we need this lock here to prevent weirdness happening when reassigning cp.cancelSearchContext