From 553e8d09ddad1c1049a7ca979ea0a79722888598 Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Wed, 24 Jul 2024 23:34:19 +0800
Subject: [PATCH] chore: update public default value to false
---
bin/memos/main.go | 7 ++++---
server/router/api/v1/workspace_service.go | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/memos/main.go b/bin/memos/main.go
index 1e5855bc..56cd4dd8 100644
--- a/bin/memos/main.go
+++ b/bin/memos/main.go
@@ -110,7 +110,7 @@ func init() {
rootCmd.PersistentFlags().StringVarP(&data, "data", "d", "", "data directory")
rootCmd.PersistentFlags().StringVarP(&driver, "driver", "", "", "database driver")
rootCmd.PersistentFlags().StringVarP(&dsn, "dsn", "", "", "database source name(aka. DSN)")
- rootCmd.PersistentFlags().BoolVarP(&public, "public", "", true, "")
+ rootCmd.PersistentFlags().BoolVarP(&public, "public", "", false, "")
err := viper.BindPFlag("mode", rootCmd.PersistentFlags().Lookup("mode"))
if err != nil {
@@ -145,7 +145,7 @@ func init() {
viper.SetDefault("driver", "sqlite")
viper.SetDefault("addr", "")
viper.SetDefault("port", 8081)
- viper.SetDefault("public", true)
+ viper.SetDefault("public", false)
viper.SetEnvPrefix("memos")
}
@@ -166,9 +166,10 @@ dsn: %s
addr: %s
port: %d
mode: %s
+public: %t
driver: %s
---
-`, instanceProfile.Version, instanceProfile.Data, instanceProfile.DSN, instanceProfile.Addr, instanceProfile.Port, instanceProfile.Mode, instanceProfile.Driver)
+`, instanceProfile.Version, instanceProfile.Data, instanceProfile.DSN, instanceProfile.Addr, instanceProfile.Port, instanceProfile.Mode, instanceProfile.Public, instanceProfile.Driver)
}
func printGreetings() {
diff --git a/server/router/api/v1/workspace_service.go b/server/router/api/v1/workspace_service.go
index 3796d3f4..2cbc67fb 100644
--- a/server/router/api/v1/workspace_service.go
+++ b/server/router/api/v1/workspace_service.go
@@ -23,6 +23,9 @@ func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorks
}
if owner != nil {
workspaceProfile.Owner = owner.Name
+ } else {
+ // If owner is not found, set public to true.
+ workspaceProfile.Public = true
}
return workspaceProfile, nil
}