Merge pull request #241 from iron3oxide/main

style: Fix typo: Websocked -> Websocket
quexten · Jul 4, 2024 · fa4b735 · fa4b735
2 parents 4a2d3a9 + b1e6325
commit fa4b735
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/cli/agent/actions/vault.go b/cli/agent/actions/vault.go
@@ -256,7 +256,7 @@ func handleVaultStatus(request messages.IPCMessage, cfg *config.Config, vault *v
 	vaultStatus.NumberOfLogins = len(vault.GetLogins())
 	vaultStatus.NumberOfNotes = len(vault.GetNotes())
 	vaultStatus.LastSynced = vault.GetLastSynced()
-	vaultStatus.WebsockedConnected = vault.IsWebsocketConnected()
+	vaultStatus.WebsocketConnected = vault.IsWebsocketConnected()
 	vaultStatus.PinSet = cfg.HasPin()
 	vaultStatus.LoggedIn = cfg.IsLoggedIn()
 	response, err = messages.IPCMessageFromPayload(vaultStatus)

diff --git a/cli/agent/vault/vault.go b/cli/agent/vault/vault.go
@@ -20,7 +20,7 @@ type Vault struct {
 	sshKeyNoteIDs      []string
 	envCredentials     map[string]string
 	lastSynced         int64
-	websockedConnected bool
+	websocketConnected bool
 	mu                 sync.Mutex
 }
 
@@ -32,7 +32,7 @@ func NewVault(keyring *crypto.Keyring) *Vault {
 		sshKeyNoteIDs:      make([]string, 0),
 		envCredentials:     make(map[string]string),
 		lastSynced:         0,
-		websockedConnected: false,
+		websocketConnected: false,
 	}
 }
 
@@ -424,13 +424,13 @@ func (vault *Vault) GetLastSynced() int64 {
 
 func (vault *Vault) SetWebsocketConnected(connected bool) {
 	vault.lockMutex()
-	vault.websockedConnected = connected
+	vault.websocketConnected = connected
 	vault.unlockMutex()
 }
 
 func (vault *Vault) IsWebsocketConnected() bool {
 	vault.lockMutex()
 	defer vault.unlockMutex()
 
-	return vault.websockedConnected
+	return vault.websocketConnected
 }
diff --git a/cli/cmd/vault.go b/cli/cmd/vault.go
@@ -114,7 +114,7 @@ var statusCmd = &cobra.Command{
 			response["loginEntries"] = status.NumberOfLogins
 			response["noteEntries"] = status.NumberOfNotes
 			response["lastSynced"] = time.Unix(status.LastSynced, 0).String()
-			response["websocketConnected"] = status.WebsockedConnected
+			response["websocketConnected"] = status.WebsocketConnected
 			response["pinSet"] = status.PinSet
 			response["loggedIn"] = status.LoggedIn
 			responseJSON, _ := json.Marshal(response)

diff --git a/cli/ipc/messages/vault.go b/cli/ipc/messages/vault.go
@@ -27,7 +27,7 @@ type VaultStatusResponse struct {
 	NumberOfLogins     int
 	NumberOfNotes      int
 	LastSynced         int64
-	WebsockedConnected bool
+	WebsocketConnected bool
 }
 
 func init() {

diff --git a/gui/src/gui/settings.blp b/gui/src/gui/settings.blp
@@ -110,7 +110,7 @@ Adw.ApplicationWindow window {
                   icon-name: "emblem-synchronizing-symbolic";
                 }
                 Adw.ActionRow websocket_connected_row {
-                  title: "Websocked Connected";
+                  title: "Websocket Connected";
                   subtitle: "False";
                 }
                 Adw.ActionRow logins_row {