Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: create memo with visibility (#281)

boojack246851fdbe38
diff --git a/server/memo.go b/server/memo.go
index 779209bc6..2e9902157 100644
--- a/server/memo.go
+++ b/server/memo.go
@@ -24,8 +24,6 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
memoCreate := &api.MemoCreate{
CreatorID: userID,
- // Private is the default memo visibility.
- Visibility: api.Privite,
}
if err := json.NewDecoder(c.Request().Body).Decode(memoCreate); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo request").SetInternal(err)
@@ -34,21 +32,27 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
return echo.NewHTTPError(http.StatusBadRequest, "Memo content shouldn't be empty")
}
- userSettingMemoVisibilityKey := api.UserSettingMemoVisibilityKey
- userMemoVisibilitySetting, err := s.Store.FindUserSetting(ctx, &api.UserSettingFind{
- UserID: userID,
- Key: &userSettingMemoVisibilityKey,
- })
- if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user setting").SetInternal(err)
- }
- if userMemoVisibilitySetting != nil {
- memoVisibility := api.Privite
- err := json.Unmarshal([]byte(userMemoVisibilitySetting.Value), &memoVisibility)
+ if memoCreate.Visibility == "" {
+ userSettingMemoVisibilityKey := api.UserSettingMemoVisibilityKey
+ userMemoVisibilitySetting, err := s.Store.FindUserSetting(ctx, &api.UserSettingFind{
+ UserID: userID,
+ Key: &userSettingMemoVisibilityKey,
+ })
if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to unmarshal user setting value").SetInternal(err)
+ return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user setting").SetInternal(err)
+ }
+
+ if userMemoVisibilitySetting != nil {
+ memoVisibility := api.Privite
+ err := json.Unmarshal([]byte(userMemoVisibilitySetting.Value), &memoVisibility)
+ if err != nil {
+ return echo.NewHTTPError(http.StatusInternalServerError, "Failed to unmarshal user setting value").SetInternal(err)
+ }
+ memoCreate.Visibility = memoVisibility
+ } else {
+ // Private is the default memo visibility.
+ memoCreate.Visibility = api.Privite
}
- memoCreate.Visibility = memoVisibility
}
memo, err := s.Store.CreateMemo(ctx, memoCreate)