From 758dcfb3c8ae2b7dab61192ac42f9c4e7bf4523a Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Sat, 20 May 2023 22:05:14 -0700 Subject: [PATCH] update profile when hostname changes --- net/server/internal/api_setNodeConfig.go | 15 +++++++++------ net/server/internal/notify.go | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net/server/internal/api_setNodeConfig.go b/net/server/internal/api_setNodeConfig.go index ed00f190..a84ab616 100644 --- a/net/server/internal/api_setNodeConfig.go +++ b/net/server/internal/api_setNodeConfig.go @@ -27,12 +27,12 @@ func SetNodeConfig(w http.ResponseWriter, r *http.Request) { err := store.DB.Transaction(func(tx *gorm.DB) error { // upsert domain config - if res := tx.Clauses(clause.OnConflict{ - Columns: []clause.Column{{Name: "config_id"}}, - DoUpdates: clause.AssignmentColumns([]string{"str_value"}), - }).Create(&store.Config{ConfigID: CNFDomain, StrValue: config.Domain}).Error; res != nil { - return res - } + if res := tx.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "config_id"}}, + DoUpdates: clause.AssignmentColumns([]string{"str_value"}), + }).Create(&store.Config{ConfigID: CNFDomain, StrValue: config.Domain}).Error; res != nil { + return res + } // upsert account storage config if res := tx.Clauses(clause.OnConflict{ @@ -132,6 +132,9 @@ func SetNodeConfig(w http.ResponseWriter, r *http.Request) { if res := tx.Model(account).Update("account_revision", account.AccountRevision+1).Error; res != nil { return res } + if res := tx.Model(account).Update("profile_revision", account.ProfileRevision+1).Error; res != nil { + return res + } } return nil }) diff --git a/net/server/internal/notify.go b/net/server/internal/notify.go index ea2736c2..ea101f92 100644 --- a/net/server/internal/notify.go +++ b/net/server/internal/notify.go @@ -34,7 +34,7 @@ func SendNotifications() { select { case notification := <-notify: node := getStrConfigValue(CNFDomain, "") - if notification.Node == node { + if notification.Node == "" || notification.Node == node { sendLocalNotification(notification) } else { sendRemoteNotification(notification)