From 057c7915f47c552be9dd53a54f83040a375fb168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82?= <michalcieslak@status.im>
Date: Wed, 5 Oct 2022 12:53:42 +0200
Subject: [PATCH] chore: use provided pictures visibility options when creating
 settings db entry (#2867)

When initially creating settings, properties 'initialize profile_pictures_show_to'
and 'profile_pictures_visibility' are set according to the provided Setting object.
---
 multiaccounts/settings/database.go       | 8 ++++++--
 protocol/messenger_sync_settings_test.go | 1 +
 protocol/messenger_test.go               | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/multiaccounts/settings/database.go b/multiaccounts/settings/database.go
index 35af28d4e..f2f68b0f3 100644
--- a/multiaccounts/settings/database.go
+++ b/multiaccounts/settings/database.go
@@ -109,10 +109,12 @@ INSERT INTO settings (
   signing_phrase,
   wallet_root_address,
   synthetic_id,
-  current_user_status
+  current_user_status,
+  profile_pictures_show_to,
+  profile_pictures_visibility
 ) VALUES (
 ?,?,?,?,?,?,?,?,?,?,?,?,
-?,?,?,?,?,?,?,?,?,'id',?)`,
+?,?,?,?,?,?,?,?,?,'id',?,?,?)`,
 		s.Address,
 		s.Currency,
 		s.CurrentNetwork,
@@ -135,6 +137,8 @@ INSERT INTO settings (
 		s.SigningPhrase,
 		s.WalletRootAddress,
 		s.CurrentUserStatus,
+		s.ProfilePicturesShowTo,
+		s.ProfilePicturesVisibility,
 	)
 	if err != nil {
 		return err
diff --git a/protocol/messenger_sync_settings_test.go b/protocol/messenger_sync_settings_test.go
index b6a48e190..3280c86ff 100644
--- a/protocol/messenger_sync_settings_test.go
+++ b/protocol/messenger_sync_settings_test.go
@@ -141,6 +141,7 @@ func (s *MessengerSyncSettingsSuite) newMessengerWithOptions(shh types.Waku, pri
 		PublicKey:                 "0x04112233445566778899001122334455667788990011223344556677889900112233445566778899001122334455667788990011223344556677889900",
 		SigningPhrase:             "yurt joey vibe",
 		SendPushNotifications:     true,
+		ProfilePicturesShowTo:     1,
 		ProfilePicturesVisibility: 1,
 		DefaultSyncPeriod:         86400,
 		UseMailservers:            true,
diff --git a/protocol/messenger_test.go b/protocol/messenger_test.go
index 46801bf74..39492421e 100644
--- a/protocol/messenger_test.go
+++ b/protocol/messenger_test.go
@@ -131,7 +131,10 @@ func newMessengerWithKey(shh types.Waku, privateKey *ecdsa.PrivateKey, logger *z
 		WithAccount(iai.ToMultiAccount()),
 		WithDatasync(),
 		WithToplevelDatabaseMigrations(),
-		WithAppSettings(settings.Settings{}, params.NodeConfig{}),
+		WithAppSettings(settings.Settings{
+			ProfilePicturesShowTo:     1,
+			ProfilePicturesVisibility: 1,
+		}, params.NodeConfig{}),
 		WithBrowserDatabase(nil),
 	}