chore: release v0.2.2

.github/workflows/build-and-push-dev-image.yml

@@ -0,0 +1,37 @@
+name: build-and-push-dev-image
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  build-and-push-dev-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: neosmemo
+          password: ${{ secrets.DOCKER_NEOSMEMO_TOKEN }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Build and Push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: neosmemo/memos:dev

.github/workflows/build-and-push-test-image.yml

@@ -0,0 +1,37 @@
+name: build-and-push-test-image
+
+on:
+  push:
+    branches:
+      - "test/*"
+
+jobs:
+  build-and-push-dev-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: neosmemo
+          password: ${{ secrets.DOCKER_NEOSMEMO_TOKEN }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Build and Push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: neosmemo/memos:test

.github/workflows/codeql.yml

@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [ main ]
   schedule:
-    - cron: "27 12 * * 0"
+    - cron: '27 12 * * 0'
 
 jobs:
   analyze:
@@ -32,39 +32,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["go", "javascript"]
+        language: [ 'go', 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+    - name: Checkout repository
+      uses: actions/checkout@v2
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-      #- run: |
-      #   make bootstrap
-      #   make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/tests.yml

@@ -1,73 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - main
-      - "release/v*.*.*"
-  pull_request:
-    branches: [main]
-
-jobs:
-  go-static-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.18
-          check-latest: true
-          cache: true
-      - name: Verify go.mod is tidy
-        run: |
-          go mod tidy
-          git diff --exit-code
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          args: -v
-          skip-cache: true
-
-  eslint-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "16"
-          cache: yarn
-          cache-dependency-path: "web/yarn.lock"
-      - run: yarn
-        working-directory: web
-      - name: Run eslint check
-        run: yarn lint
-        working-directory: web
-
-  frontend-build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "16"
-          cache: yarn
-          cache-dependency-path: "web/yarn.lock"
-      - run: yarn
-        working-directory: web
-      - name: Run frontend build
-        run: yarn build
-        working-directory: web
-
-  go-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.18
-          check-latest: true
-          cache: true
-      - name: Run all tests
-        run: go test -v ./... | tee test.log; exit ${PIPESTATUS[0]}
-      - name: Pretty print tests running time
-        run: grep --color=never -e '--- PASS:' -e '--- FAIL:' test.log | sed 's/[:()]//g' | awk '{print $2,$3,$4}' | sort -t' ' -nk3 -r | awk '{sum += $3; print $1,$2,$3,sum"s"}'

.gitignore

@@ -1,13 +1,10 @@
 # Air (hot reload) generated
 .air
 
-# temp folder
-tmp
-
 # Frontend asset
 web/dist
 
 # build folder
-build
+memos-build
 
 .DS_Store

.golangci.yaml

@@ -1,64 +0,0 @@
-linters:
-  enable:
-    - goimports
-    - revive
-    - govet
-    - staticcheck
-    - misspell
-    - gocritic
-    - sqlclosecheck
-    - rowserrcheck
-    - nilerr
-    - godot
-
-issues:
-  exclude:
-    - Rollback
-    - fmt.Printf
-    - fmt.Print
-
-linters-settings:
-  revive:
-    enable-all-rules: true
-    rules:
-      - name: file-header
-        disabled: true
-      - name: line-length-limit
-        disabled: true
-      - name: function-length
-        disabled: true
-      - name: max-public-structs
-        disabled: true
-      - name: function-result-limit
-        disabled: true
-      - name: banned-characters
-        disabled: true
-      - name: argument-limit
-        disabled: true
-      - name: cognitive-complexity
-        disabled: true
-      - name: cyclomatic
-        disabled: true
-      - name: confusing-results
-        disabled: true
-      - name: add-constant
-        disabled: true
-      - name: flag-parameter
-        disabled: true
-      - name: nested-structs
-        disabled: true
-      - name: import-shadowing
-        disabled: true
-      - name: early-return
-        disabled: true
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-  govet:
-    settings:
-      printf:
-        funcs:
-          - common.Errorf
-  forbidigo:
-    forbid:
-      - 'fmt\.Errorf(# Please use errors\.Wrap\|Wrapf\|Errorf instead)?'

.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-  "go.lintOnSave": "workspace",
-  "go.lintTool": "golangci-lint"
-}

Dockerfile

@@ -17,7 +17,9 @@ RUN apk --no-cache add gcc musl-dev
 COPY . .
 COPY --from=frontend /frontend-build/dist ./server/dist
 
-RUN go build -o memos ./bin/server/main.go
+RUN go build \
+    -o memos \
+    ./bin/server/main.go
 
 # Make workspace with above generated files.
 FROM alpine:3.16.0 AS monolithic
@@ -28,4 +30,4 @@ COPY --from=backend /backend-build/memos /usr/local/memos/
 # Directory to store the data, which can be referenced as the mounting point.
 RUN mkdir -p /var/opt/memos
 
-ENTRYPOINT ["./memos", "--mode", "prod", "--port", "5230"]
+ENTRYPOINT ["./memos"]

README.md

@@ -1,21 +1,21 @@
-<p align="center"><a href="https://usememos.com"><img height="64px" src="https://raw.githubusercontent.com/usememos/memos/main/resources/logo-full.webp" alt="✍️ memos" /></a></p>
+<h1 align="center">✍️ Memos</h1>
 
 <p align="center">An open source, self-hosted knowledge base that works with a SQLite db file.</p>
 
 <p align="center">
-  <a href="https://github.com/usememos/memos/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/usememos/memos" /></a>
+  <img alt="GitHub stars" src="https://img.shields.io/github/stars/usememos/memos" />
   <a href="https://hub.docker.com/r/neosmemo/memos"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/neosmemo/memos.svg" /></a>
   <img alt="Go report" src="https://goreportcard.com/badge/github.com/usememos/memos" />
 </p>
 
 <p align="center">
-  <a href="https://demo.usememos.com/">Live Demo</a> •
+  <a href="https://memos.onrender.com/">Live Demo</a> •
   <a href="https://t.me/+-_tNF1k70UU4ZTc9">Discuss in Telegram 👾</a>
 </p>
 
 ![demo](https://raw.githubusercontent.com/usememos/memos/main/resources/demo.webp)
 
-## Features
+## ✨ Features
 
 - 🦄 Fully open source;
 - 📜 Writing in plain textarea without any burden,
@@ -24,31 +24,23 @@
 - 🚀 Fast self-hosting with `Docker`;
 - 🤠 Pleasant UI and UX;
 
-## Deploy with Docker
-
-#### Docker Run
+## ⚓️ Deploy with Docker
 
 ```docker
-docker run -d --name memos -p 5230:5230 -v ~/.memos/:/var/opt/memos neosmemo/memos:latest
+docker run \
+  --name memos \
+  --publish 5230:5230 \
+  --volume ~/.memos/:/var/opt/memos \
+  neosmemo/memos:latest \
+  --mode prod \
+  --port 5230
 ```
 
-#### Docker Compose
+Memos should now be running at [http://localhost:5230](http://localhost:5230). If the `~/.memos/` does not have a `memos_prod.db` file, then `memos` will auto generate it.
 
-```
-version: "3.0"
-services:
-  memos:
-    image: neosmemo/memos:latest
-    container_name: memos
-    volumes:
-      - ~/.memos/:/var/opt/memos
-    ports:
-      - 5230:5230
-```
+⚠️ Please DO NOT use `dev` tag of docker image if you have no experience.
 
-Memos should be running at [http://localhost:5230](http://localhost:5230). If the `~/.memos/` does not have a `memos_prod.db` file, then memos will auto generate it.
-
-## Development
+## 🏗 Development
 
 Memos is built with a curated tech stack. It is optimized for developer experience and is very easy to start working on the code:
 
@@ -62,9 +54,8 @@ Memos is built with a curated tech stack. It is optimized for developer experien
 
 ### Prerequisites
 
-- [Go](https://golang.org/doc/install)
+- [Go](https://golang.org/doc/install) (1.16 or later)
 - [Air](https://github.com/cosmtrek/air#installation) for backend live reload
-- [Node.js](https://nodejs.org/)
 - [yarn](https://yarnpkg.com/getting-started/install)
 
 ### Steps
@@ -89,10 +80,10 @@ Memos is built with a curated tech stack. It is optimized for developer experien
 
 Memos should now be running at [http://localhost:3000](http://localhost:3000) and change either frontend or backend code would trigger live reload.
 
-### Contributing
-
-Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are greatly appreciated. 🥰
-
-## Star history
+## 🌟 Star history
 
 [![Star History Chart](https://api.star-history.com/svg?repos=usememos/memos&type=Date)](https://star-history.com/#usememos/memos&Date)
+
+---
+
+Just enjoy it.

api/cache.go

@@ -1,22 +0,0 @@
-package api
-
-// CacheNamespace is the type of a cache.
-type CacheNamespace string
-
-const (
-	// UserCache is the cache type of users.
-	UserCache CacheNamespace = "u"
-	// MemoCache is the cache type of memos.
-	MemoCache CacheNamespace = "m"
-	// ShortcutCache is the cache type of shortcuts.
-	ShortcutCache CacheNamespace = "s"
-	// ResourceCache is the cache type of resources.
-	ResourceCache CacheNamespace = "r"
-)
-
-// CacheService is the service for caches.
-type CacheService interface {
-	FindCache(namespace CacheNamespace, id int, entry interface{}) (bool, error)
-	UpsertCache(namespace CacheNamespace, id int, entry interface{}) error
-	DeleteCache(namespace CacheNamespace, id int)
-}

api/memo.go

@@ -6,8 +6,6 @@ type Visibility string
 const (
 	// Public is the PUBLIC visibility.
 	Public Visibility = "PUBLIC"
-	// Protected is the PROTECTED visibility.
-	Protected Visibility = "PROTECTED"
 	// Privite is the PRIVATE visibility.
 	Privite Visibility = "PRIVATE"
 )
@@ -16,8 +14,6 @@ func (e Visibility) String() string {
 	switch e {
 	case Public:
 		return "PUBLIC"
-	case Protected:
-		return "PROTECTED"
 	case Privite:
 		return "PRIVATE"
 	}
@@ -42,17 +38,18 @@ type Memo struct {
 type MemoCreate struct {
 	// Standard fields
 	CreatorID int
+	// Used to import memos with a clearly created ts.
+	CreatedTs *int64 `json:"createdTs"`
 
 	// Domain specific fields
-	Visibility Visibility `json:"visibility"`
-	Content    string     `json:"content"`
+	Content    string      `json:"content"`
+	Visibility *Visibility `json:"visibility"`
 }
 
 type MemoPatch struct {
 	ID int
 
 	// Standard fields
-	CreatedTs *int64     `json:"createdTs"`
 	RowStatus *RowStatus `json:"rowStatus"`
 
 	// Domain specific fields
@@ -68,9 +65,9 @@ type MemoFind struct {
 	CreatorID *int       `json:"creatorId"`
 
 	// Domain specific fields
-	Pinned         *bool
-	ContentSearch  *string
-	VisibilityList []Visibility
+	Pinned        *bool
+	ContentSearch *string
+	Visibility    *Visibility
 
 	// Pagination
 	Limit  int

api/resource.go

@@ -10,7 +10,7 @@ type Resource struct {
 
 	// Domain specific fields
 	Filename string `json:"filename"`
-	Blob     []byte `json:"-"`
+	Blob     []byte `json:"blob"`
 	Type     string `json:"type"`
 	Size     int64  `json:"size"`
 }
@@ -38,7 +38,4 @@ type ResourceFind struct {
 
 type ResourceDelete struct {
 	ID int
-
-	// Standard fields
-	CreatorID int
 }

api/user.go

@@ -1,11 +1,5 @@
 package api
 
-import (
-	"fmt"
-
-	"github.com/usememos/memos/common"
-)
-
 // Role is the type of a role.
 type Role string
 
@@ -35,12 +29,11 @@ type User struct {
 	UpdatedTs int64     `json:"updatedTs"`
 
 	// Domain specific fields
-	Email           string         `json:"email"`
-	Role            Role           `json:"role"`
-	Name            string         `json:"name"`
-	PasswordHash    string         `json:"-"`
-	OpenID          string         `json:"openId"`
-	UserSettingList []*UserSetting `json:"userSettingList"`
+	Email        string `json:"email"`
+	Role         Role   `json:"role"`
+	Name         string `json:"name"`
+	PasswordHash string `json:"-"`
+	OpenID       string `json:"openId"`
 }
 
 type UserCreate struct {
@@ -53,20 +46,6 @@ type UserCreate struct {
 	OpenID       string
 }
 
-func (create UserCreate) Validate() error {
-	if !common.ValidateEmail(create.Email) {
-		return fmt.Errorf("invalid email format")
-	}
-	if len(create.Email) < 6 {
-		return fmt.Errorf("email is too short, minimum length is 6")
-	}
-	if len(create.Password) < 6 {
-		return fmt.Errorf("password is too short, minimum length is 6")
-	}
-
-	return nil
-}
-
 type UserPatch struct {
 	ID int
 
@@ -94,7 +73,3 @@ type UserFind struct {
 	Name   *string `json:"name"`
 	OpenID *string
 }
-
-type UserDelete struct {
-	ID int
-}

api/user_setting.go

@@ -1,114 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type UserSettingKey string
-
-const (
-	// UserSettingLocaleKey is the key type for user locale.
-	UserSettingLocaleKey UserSettingKey = "locale"
-	// UserSettingMemoVisibilityKey is the key type for user preference memo default visibility.
-	UserSettingMemoVisibilityKey UserSettingKey = "memoVisibility"
-	// UserSettingEditorFontStyleKey is the key type for editor font style.
-	UserSettingEditorFontStyleKey UserSettingKey = "editorFontStyle"
-)
-
-// String returns the string format of UserSettingKey type.
-func (key UserSettingKey) String() string {
-	switch key {
-	case UserSettingLocaleKey:
-		return "locale"
-	case UserSettingMemoVisibilityKey:
-		return "memoVisibility"
-	case UserSettingEditorFontStyleKey:
-		return "editorFontFamily"
-	}
-	return ""
-}
-
-var (
-	UserSettingLocaleValue          = []string{"en", "zh"}
-	UserSettingMemoVisibilityValue  = []Visibility{Privite, Protected, Public}
-	UserSettingEditorFontStyleValue = []string{"normal", "mono"}
-)
-
-type UserSetting struct {
-	UserID int
-	Key    UserSettingKey `json:"key"`
-	// Value is a JSON string with basic value
-	Value string `json:"value"`
-}
-
-type UserSettingUpsert struct {
-	UserID int
-	Key    UserSettingKey `json:"key"`
-	Value  string         `json:"value"`
-}
-
-func (upsert UserSettingUpsert) Validate() error {
-	if upsert.Key == UserSettingLocaleKey {
-		localeValue := "en"
-		err := json.Unmarshal([]byte(upsert.Value), &localeValue)
-		if err != nil {
-			return fmt.Errorf("failed to unmarshal user setting locale value")
-		}
-
-		invalid := true
-		for _, value := range UserSettingLocaleValue {
-			if localeValue == value {
-				invalid = false
-				break
-			}
-		}
-		if invalid {
-			return fmt.Errorf("invalid user setting locale value")
-		}
-	} else if upsert.Key == UserSettingMemoVisibilityKey {
-		memoVisibilityValue := Privite
-		err := json.Unmarshal([]byte(upsert.Value), &memoVisibilityValue)
-		if err != nil {
-			return fmt.Errorf("failed to unmarshal user setting memo visibility value")
-		}
-
-		invalid := true
-		for _, value := range UserSettingMemoVisibilityValue {
-			if memoVisibilityValue == value {
-				invalid = false
-				break
-			}
-		}
-		if invalid {
-			return fmt.Errorf("invalid user setting memo visibility value")
-		}
-	} else if upsert.Key == UserSettingEditorFontStyleKey {
-		editorFontStyleValue := "normal"
-		err := json.Unmarshal([]byte(upsert.Value), &editorFontStyleValue)
-		if err != nil {
-			return fmt.Errorf("failed to unmarshal user setting editor font style")
-		}
-
-		invalid := true
-		for _, value := range UserSettingEditorFontStyleValue {
-			if editorFontStyleValue == value {
-				invalid = false
-				break
-			}
-		}
-		if invalid {
-			return fmt.Errorf("invalid user setting editor font style value")
-		}
-	} else {
-		return fmt.Errorf("invalid user setting key")
-	}
-
-	return nil
-}
-
-type UserSettingFind struct {
-	UserID int
-
-	Key *UserSettingKey `json:"key"`
-}

bin/server/cmd/root.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
+	"os"
 
 	"github.com/usememos/memos/server"
 	"github.com/usememos/memos/server/profile"
@@ -21,29 +21,31 @@ const (
 `
 )
 
-func Run(profile *profile.Profile) error {
-	ctx := context.Background()
+type Main struct {
+	profile *profile.Profile
+}
 
-	db := DB.NewDB(profile)
-	if err := db.Open(ctx); err != nil {
+func (m *Main) Run() error {
+	db := DB.NewDB(m.profile)
+	if err := db.Open(); err != nil {
 		return fmt.Errorf("cannot open db: %w", err)
 	}
 
-	s := server.NewServer(profile)
+	s := server.NewServer(m.profile)
 
-	storeInstance := store.New(db.Db, profile)
+	storeInstance := store.New(db.Db, m.profile)
 	s.Store = storeInstance
 
 	println(greetingBanner)
-	fmt.Printf("Version %s has started at :%d\n", profile.Version, profile.Port)
+	fmt.Printf("Version %s has started at :%d\n", m.profile.Version, m.profile.Port)
 
 	return s.Run()
 }
 
-func Execute() error {
-	profile, err := profile.GetProfile()
-	if err != nil {
-		return err
+func Execute() {
+	profile := profile.GetProfile()
+	m := Main{
+		profile: profile,
 	}
 
 	println("---")
@@ -54,10 +56,8 @@ func Execute() error {
 	println("version:", profile.Version)
 	println("---")
 
-	if err := Run(profile); err != nil {
+	if err := m.Run(); err != nil {
 		fmt.Printf("error: %+v\n", err)
-		return err
+		os.Exit(1)
 	}
-
-	return nil
 }

bin/server/main.go

@@ -1,15 +1,7 @@
 package main
 
-import (
-	"os"
-
-	_ "github.com/mattn/go-sqlite3"
-
-	"github.com/usememos/memos/bin/server/cmd"
-)
+import "github.com/usememos/memos/bin/server/cmd"
 
 func main() {
-	if err := cmd.Execute(); err != nil {
-		os.Exit(1)
-	}
+	cmd.Execute()
 }

common/error.go

@@ -9,7 +9,7 @@ type Code int
 
 // Application error codes.
 const (
-	// 0 ~ 99 general error.
+	// 0 ~ 99 general error
 	Ok             Code = 0
 	Internal       Code = 1
 	NotAuthorized  Code = 2
@@ -17,6 +17,11 @@ const (
 	NotFound       Code = 4
 	Conflict       Code = 5
 	NotImplemented Code = 6
+
+	// 101 ~ 199 db error
+	DbConnectionFailure    Code = 101
+	DbStatementSyntaxError Code = 102
+	DbExecutionError       Code = 103
 )
 
 // Error represents an application-specific error. Application errors can be

common/util.go

@@ -1,7 +1,6 @@
 package common
 
 import (
-	"net/mail"
 	"strings"
 
 	"github.com/google/uuid"
@@ -17,14 +16,6 @@ func HasPrefixes(src string, prefixes ...string) bool {
 	return false
 }
 
-// ValidateEmail validates the email.
-func ValidateEmail(email string) bool {
-	if _, err := mail.ParseAddress(email); err != nil {
-		return false
-	}
-	return true
-}
-
 func GenUUID() string {
 	return uuid.New().String()
 }

common/util_test.go

@@ -1,31 +0,0 @@
-package common
-
-import (
-	"testing"
-)
-
-func TestValidateEmail(t *testing.T) {
-	tests := []struct {
-		email string
-		want  bool
-	}{
-		{
-			email: "t@gmail.com",
-			want:  true,
-		},
-		{
-			email: "@qq.com",
-			want:  false,
-		},
-		{
-			email: "1@gmail",
-			want:  true,
-		},
-	}
-	for _, test := range tests {
-		result := ValidateEmail(test.email)
-		if result != test.want {
-			t.Errorf("Validate Email %s: got result %v, want %v.", test.email, result, test.want)
-		}
-	}
-}

common/version.go

@@ -7,10 +7,10 @@ import (
 
 // Version is the service current released version.
 // Semantic versioning: https://semver.org/
-var Version = "0.4.2"
+var Version = "0.2.2"
 
 // DevVersion is the service current development version.
-var DevVersion = "0.4.2"
+var DevVersion = "0.2.2"
 
 func GetCurrentVersion(mode string) string {
 	if mode == "dev" {

docker-compose.yml

@@ -1,10 +0,0 @@
-version: "3.0"
-services:
-  memos:
-    image: neosmemo/memos:latest
-    container_name: memos
-    volumes:
-      - ~/.memos/:/var/opt/memos
-    ports:
-      - 5230:5230
-    restart: unless-stopped

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/valyala/fasttemplate v1.2.1 // indirect
 	golang.org/x/crypto v0.0.0-20210920023735-84f357641f63
 	golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect
-	golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect
+	golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 )
@@ -26,13 +26,7 @@ require (
 )
 
 require (
-	github.com/VictoriaMetrics/fastcache v1.10.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.2.1
 	github.com/labstack/echo-contrib v0.12.0
 )
-
-require (
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-)

go.sum

@@ -37,16 +37,12 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs=
 github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0=
-github.com/VictoriaMetrics/fastcache v1.10.0 h1:5hDJnLsKLpnUEToub7ETuRu8RCkb40woBZAUiKonXzY=
-github.com/VictoriaMetrics/fastcache v1.10.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
-github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -55,8 +51,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/casbin/casbin/v2 v2.40.6/go.mod h1:sEL80qBYTbd+BPeL4iyvwYzFT3qwLaESq5aFKVLbLfA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -126,7 +120,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -440,9 +433,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b h1:1VkfZQv42XQlA/jchYumAnv1UPo6RgF9rJFkTgZIxO4=
 golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 h1:D1v9ucDTYBtbz5vNuBbAhIMAGhQhJ6Ym5ah3maMVNX4=
-golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

quickstart/docker-compose.yaml

@@ -1,10 +0,0 @@
-version: "3.2"
-services:
-  portainer:
-    image: neosmemo/memos:latest
-    container_name: memos
-    ports:
-      - "5230:5230"
-    volumes:
-      - ~/.memos/:/var/opt/memos
-    command: --mode=prod --port=5230

scripts/.air.toml

@@ -5,7 +5,7 @@ tmp_dir = ".air"
   bin = "./.air/memos"
   cmd = "go build -o ./.air/memos ./bin/server/main.go"
   delay = 1000
-  exclude_dir = [".air", "web", "build"]
+  exclude_dir = [".air", "web"]
   exclude_file = []
   exclude_regex = []
   exclude_unchanged = false

scripts/build.sh

@@ -1,13 +1,10 @@
-#!/bin/bash
-
-# Usage: ./scripts/build.sh
-
+# Usage: sh ./scripts/build.sh
 set -e
 
 cd "$(dirname "$0")/../"
 
-echo "Start building backend..."
+echo "Start building..."
 
-go build -o ./build/memos ./bin/server/main.go
+go build -o ./memos-build/memos ./bin/server/main.go
 
-echo "Backend built!"
+echo "Build finished"

scripts/start.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Usage: ./scripts/start.sh
-
-set -e
-
-cd "$(dirname "$0")/../"
-
-air -c ./scripts/.air.toml

server/acl.go

@@ -1,118 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net/http"
-	"strconv"
-
-	"github.com/usememos/memos/api"
-	"github.com/usememos/memos/common"
-
-	"github.com/gorilla/sessions"
-	"github.com/labstack/echo-contrib/session"
-	"github.com/labstack/echo/v4"
-)
-
-var (
-	userIDContextKey = "user-id"
-)
-
-func getUserIDContextKey() string {
-	return userIDContextKey
-}
-
-func setUserSession(ctx echo.Context, user *api.User) error {
-	sess, _ := session.Get("session", ctx)
-	sess.Options = &sessions.Options{
-		Path:     "/",
-		MaxAge:   1000 * 3600 * 24 * 30,
-		HttpOnly: true,
-	}
-	sess.Values[userIDContextKey] = user.ID
-	err := sess.Save(ctx.Request(), ctx.Response())
-	if err != nil {
-		return fmt.Errorf("failed to set session, err: %w", err)
-	}
-	return nil
-}
-
-func removeUserSession(ctx echo.Context) error {
-	sess, _ := session.Get("session", ctx)
-	sess.Options = &sessions.Options{
-		Path:     "/",
-		MaxAge:   0,
-		HttpOnly: true,
-	}
-	sess.Values[userIDContextKey] = nil
-	err := sess.Save(ctx.Request(), ctx.Response())
-	if err != nil {
-		return fmt.Errorf("failed to set session, err: %w", err)
-	}
-	return nil
-}
-
-func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		ctx := c.Request().Context()
-		path := c.Path()
-		// Skip auth.
-		if common.HasPrefixes(path, "/api/auth") {
-			return next(c)
-		}
-
-		if common.HasPrefixes(path, "/api/ping", "/api/status", "/api/user/:id") && c.Request().Method == http.MethodGet {
-			return next(c)
-		}
-
-		// If there is openId in query string and related user is found, then skip auth.
-		openID := c.QueryParam("openId")
-		if openID != "" {
-			userFind := &api.UserFind{
-				OpenID: &openID,
-			}
-			user, err := s.Store.FindUser(ctx, userFind)
-			if err != nil {
-				return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err)
-			}
-			if user != nil {
-				// Stores userID into context.
-				c.Set(getUserIDContextKey(), user.ID)
-				return next(c)
-			}
-		}
-
-		{
-			sess, _ := session.Get("session", c)
-			userIDValue := sess.Values[userIDContextKey]
-			if userIDValue != nil {
-				userID, _ := strconv.Atoi(fmt.Sprintf("%v", userIDValue))
-				userFind := &api.UserFind{
-					ID: &userID,
-				}
-				user, err := s.Store.FindUser(ctx, userFind)
-				if err != nil {
-					return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by ID: %d", userID)).SetInternal(err)
-				}
-				if user != nil {
-					if user.RowStatus == api.Archived {
-						return echo.NewHTTPError(http.StatusForbidden, fmt.Sprintf("User has been archived with email %s", user.Email))
-					}
-					c.Set(getUserIDContextKey(), userID)
-				}
-			}
-		}
-
-		if common.HasPrefixes(path, "/api/memo", "/api/tag", "/api/shortcut") && c.Request().Method == http.MethodGet {
-			if _, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
-				return next(c)
-			}
-		}
-
-		userID := c.Get(getUserIDContextKey())
-		if userID == nil {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
-
-		return next(c)
-	}
-}

server/auth.go

@@ -14,7 +14,6 @@ import (
 
 func (s *Server) registerAuthRoutes(g *echo.Group) {
 	g.POST("/auth/signin", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		signin := &api.Signin{}
 		if err := json.NewDecoder(c.Request().Body).Decode(signin); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted signin request").SetInternal(err)
@@ -23,7 +22,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		userFind := &api.UserFind{
 			Email: &signin.Email,
 		}
-		user, err := s.Store.FindUser(ctx, userFind)
+		user, err := s.Store.FindUser(userFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", signin.Email)).SetInternal(err)
 		}
@@ -61,13 +60,12 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 	})
 
 	g.POST("/auth/signup", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		// Don't allow to signup by this api if site host existed.
 		hostUserType := api.Host
 		hostUserFind := api.UserFind{
 			Role: &hostUserType,
 		}
-		hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
+		hostUser, err := s.Store.FindUser(&hostUserFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
 		}
@@ -80,15 +78,13 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted signup request").SetInternal(err)
 		}
 
-		userCreate := &api.UserCreate{
-			Email:    signup.Email,
-			Role:     api.Role(signup.Role),
-			Name:     signup.Name,
-			Password: signup.Password,
-			OpenID:   common.GenUUID(),
+		// Validate signup form.
+		// We can do stricter checks later.
+		if len(signup.Email) < 6 {
+			return echo.NewHTTPError(http.StatusBadRequest, "Email is too short, minimum length is 6.")
 		}
-		if err := userCreate.Validate(); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format.").SetInternal(err)
+		if len(signup.Password) < 6 {
+			return echo.NewHTTPError(http.StatusBadRequest, "Password is too short, minimum length is 6.")
 		}
 
 		passwordHash, err := bcrypt.GenerateFromPassword([]byte(signup.Password), bcrypt.DefaultCost)
@@ -96,9 +92,14 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate password hash").SetInternal(err)
 		}
 
-		userCreate.PasswordHash = string(passwordHash)
-
-		user, err := s.Store.CreateUser(ctx, userCreate)
+		userCreate := &api.UserCreate{
+			Email:        signup.Email,
+			Role:         api.Role(signup.Role),
+			Name:         signup.Name,
+			PasswordHash: string(passwordHash),
+			OpenID:       common.GenUUID(),
+		}
+		user, err := s.Store.CreateUser(userCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create user").SetInternal(err)
 		}

server/basic_auth.go

@@ -0,0 +1,119 @@
+package server
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/usememos/memos/api"
+	"github.com/usememos/memos/common"
+
+	"github.com/gorilla/sessions"
+	"github.com/labstack/echo-contrib/session"
+	"github.com/labstack/echo/v4"
+)
+
+var (
+	userIDContextKey = "user-id"
+)
+
+func getUserIDContextKey() string {
+	return userIDContextKey
+}
+
+func setUserSession(c echo.Context, user *api.User) error {
+	sess, _ := session.Get("session", c)
+	sess.Options = &sessions.Options{
+		Path:     "/",
+		MaxAge:   1000 * 3600 * 24 * 30,
+		HttpOnly: true,
+	}
+	sess.Values[userIDContextKey] = user.ID
+	err := sess.Save(c.Request(), c.Response())
+	if err != nil {
+		return fmt.Errorf("failed to set session, err: %w", err)
+	}
+	return nil
+}
+
+func removeUserSession(c echo.Context) error {
+	sess, _ := session.Get("session", c)
+	sess.Options = &sessions.Options{
+		Path:     "/",
+		MaxAge:   0,
+		HttpOnly: true,
+	}
+	sess.Values[userIDContextKey] = nil
+	err := sess.Save(c.Request(), c.Response())
+	if err != nil {
+		return fmt.Errorf("failed to set session, err: %w", err)
+	}
+	return nil
+}
+
+// Use session to store user.id.
+func BasicAuthMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		// Skip auth for some paths.
+		if common.HasPrefixes(c.Path(), "/api/auth", "/api/ping", "/api/status", "/api/user/:userId") {
+			return next(c)
+		}
+
+		// If there is openId in query string and related user is found, then skip auth.
+		openID := c.QueryParam("openId")
+		if openID != "" {
+			userFind := &api.UserFind{
+				OpenID: &openID,
+			}
+			user, err := s.Store.FindUser(userFind)
+			if err != nil {
+				return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err)
+			}
+			if user != nil {
+				// Stores userID into context.
+				c.Set(getUserIDContextKey(), user.ID)
+				return next(c)
+			}
+		}
+
+		if common.HasPrefixes(c.Path(), "/api/memo", "/api/tag", "/api/shortcut") && c.Request().Method == http.MethodGet {
+			if _, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
+				return next(c)
+			}
+		}
+
+		sess, err := session.Get("session", c)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Missing session").SetInternal(err)
+		}
+
+		userIDValue := sess.Values[userIDContextKey]
+		if userIDValue == nil {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Missing userID in session")
+		}
+
+		userID, err := strconv.Atoi(fmt.Sprintf("%v", userIDValue))
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to malformatted user id in the session.").SetInternal(err)
+		}
+
+		// Even if there is no error, we still need to make sure the user still exists.
+		userFind := &api.UserFind{
+			ID: &userID,
+		}
+		user, err := s.Store.FindUser(userFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by ID: %d", userID)).SetInternal(err)
+		}
+		if user == nil {
+			return echo.NewHTTPError(http.StatusUnauthorized, fmt.Sprintf("Not found user ID: %d", userID))
+		} else if user.RowStatus == api.Archived {
+			return echo.NewHTTPError(http.StatusForbidden, fmt.Sprintf("User has been archived with email %s", user.Email))
+		}
+
+		// Stores userID into context.
+		c.Set(getUserIDContextKey(), userID)
+
+		return next(c)
+	}
+}

server/memo.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
@@ -15,42 +14,20 @@ import (
 
 func (s *Server) registerMemoRoutes(g *echo.Group) {
 	g.POST("/memo", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		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)
 		}
 
-		if memoCreate.Content == "" {
-			return echo.NewHTTPError(http.StatusBadRequest, "Memo content shouldn't be empty")
+		if memoCreate.Visibility == nil || *memoCreate.Visibility == "" {
+			private := api.Privite
+			memoCreate.Visibility = &private
 		}
 
-		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 err != nil {
-				return echo.NewHTTPError(http.StatusInternalServerError, "Failed to unmarshal user setting value").SetInternal(err)
-			}
-			memoCreate.Visibility = memoVisibility
-		}
-
-		memo, err := s.Store.CreateMemo(ctx, memoCreate)
+		memo, err := s.Store.CreateMemo(memoCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create memo").SetInternal(err)
 		}
@@ -63,7 +40,6 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.PATCH("/memo/:memoId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		memoID, err := strconv.Atoi(c.Param("memoId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
@@ -76,7 +52,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch memo request").SetInternal(err)
 		}
 
-		memo, err := s.Store.PatchMemo(ctx, memoPatch)
+		memo, err := s.Store.PatchMemo(memoPatch)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch memo").SetInternal(err)
 		}
@@ -89,25 +65,24 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.GET("/memo", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		memoFind := &api.MemoFind{}
 
 		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
 			memoFind.CreatorID = &userID
-		}
-
-		currentUserID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			if memoFind.CreatorID == nil {
+		} else {
+			userID, ok := c.Get(getUserIDContextKey()).(int)
+			if !ok {
 				return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find memo")
 			}
-			memoFind.VisibilityList = []api.Visibility{api.Public}
-		} else {
-			if memoFind.CreatorID == nil {
-				memoFind.CreatorID = &currentUserID
-			} else {
-				memoFind.VisibilityList = []api.Visibility{api.Public, api.Protected}
-			}
+
+			memoFind.CreatorID = &userID
+		}
+
+		// Only can get PUBLIC memos in visitor mode
+		_, ok := c.Get(getUserIDContextKey()).(int)
+		if !ok {
+			publicVisibility := api.Public
+			memoFind.Visibility = &publicVisibility
 		}
 
 		rowStatus := api.RowStatus(c.QueryParam("rowStatus"))
@@ -124,14 +99,6 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			contentSearch := "#" + tag + " "
 			memoFind.ContentSearch = &contentSearch
 		}
-		visibilitListStr := c.QueryParam("visibility")
-		if visibilitListStr != "" {
-			visibilityList := []api.Visibility{}
-			for _, visibility := range strings.Split(visibilitListStr, ",") {
-				visibilityList = append(visibilityList, api.Visibility(visibility))
-			}
-			memoFind.VisibilityList = visibilityList
-		}
 		if limit, err := strconv.Atoi(c.QueryParam("limit")); err == nil {
 			memoFind.Limit = limit
 		}
@@ -139,7 +106,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			memoFind.Offset = offset
 		}
 
-		list, err := s.Store.FindMemoList(ctx, memoFind)
+		list, err := s.Store.FindMemoList(memoFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch memo list").SetInternal(err)
 		}
@@ -152,16 +119,12 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.POST("/memo/:memoId/organizer", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		memoID, err := strconv.Atoi(c.Param("memoId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
 		}
 
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		memoOrganizerUpsert := &api.MemoOrganizerUpsert{
 			MemoID: memoID,
 			UserID: userID,
@@ -170,12 +133,12 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo organizer request").SetInternal(err)
 		}
 
-		err = s.Store.UpsertMemoOrganizer(ctx, memoOrganizerUpsert)
+		err = s.Store.UpsertMemoOrganizer(memoOrganizerUpsert)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo organizer").SetInternal(err)
 		}
 
-		memo, err := s.Store.FindMemo(ctx, &api.MemoFind{
+		memo, err := s.Store.FindMemo(&api.MemoFind{
 			ID: &memoID,
 		})
 		if err != nil {
@@ -194,7 +157,6 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.GET("/memo/:memoId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		memoID, err := strconv.Atoi(c.Param("memoId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
@@ -203,7 +165,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 		memoFind := &api.MemoFind{
 			ID: &memoID,
 		}
-		memo, err := s.Store.FindMemo(ctx, memoFind)
+		memo, err := s.Store.FindMemo(memoFind)
 		if err != nil {
 			if common.ErrorCode(err) == common.NotFound {
 				return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Memo ID not found: %d", memoID)).SetInternal(err)
@@ -220,7 +182,6 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.DELETE("/memo/:memoId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		memoID, err := strconv.Atoi(c.Param("memoId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
@@ -229,7 +190,9 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 		memoDelete := &api.MemoDelete{
 			ID: memoID,
 		}
-		if err := s.Store.DeleteMemo(ctx, memoDelete); err != nil {
+
+		err = s.Store.DeleteMemo(memoDelete)
+		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to delete memo ID: %v", memoID)).SetInternal(err)
 		}
 
@@ -237,18 +200,14 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.GET("/memo/amount", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		normalRowStatus := api.Normal
 		memoFind := &api.MemoFind{
 			CreatorID: &userID,
 			RowStatus: &normalRowStatus,
 		}
 
-		memoList, err := s.Store.FindMemoList(ctx, memoFind)
+		memoList, err := s.Store.FindMemoList(memoFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)
 		}

server/profile/profile.go

@@ -45,7 +45,7 @@ func checkDSN(dataDir string) (string, error) {
 }
 
 // GetDevProfile will return a profile for dev or prod.
-func GetProfile() (*Profile, error) {
+func GetProfile() *Profile {
 	profile := Profile{}
 	flag.StringVar(&profile.Mode, "mode", "dev", "mode of server")
 	flag.IntVar(&profile.Port, "port", 8080, "port of server")
@@ -63,12 +63,12 @@ func GetProfile() (*Profile, error) {
 	dataDir, err := checkDSN(profile.Data)
 	if err != nil {
 		fmt.Printf("Failed to check dsn: %s, err: %+v\n", dataDir, err)
-		return nil, err
+		os.Exit(1)
 	}
 
 	profile.Data = dataDir
 	profile.DSN = fmt.Sprintf("%s/memos_%s.db", dataDir, profile.Mode)
 	profile.Version = common.GetCurrentVersion(profile.Mode)
 
-	return &profile, nil
+	return &profile
 }

server/resource.go

@@ -3,7 +3,7 @@ package server
 import (
 	"encoding/json"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"strconv"
 
@@ -14,11 +14,7 @@ import (
 
 func (s *Server) registerResourceRoutes(g *echo.Group) {
 	g.POST("/resource", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 
 		err := c.Request().ParseMultipartForm(64 << 20)
 		if err != nil {
@@ -39,7 +35,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		}
 		defer src.Close()
 
-		fileBytes, err := io.ReadAll(src)
+		fileBytes, err := ioutil.ReadAll(src)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to read file").SetInternal(err)
 		}
@@ -52,7 +48,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 			CreatorID: userID,
 		}
 
-		resource, err := s.Store.CreateResource(ctx, resourceCreate)
+		resource, err := s.Store.CreateResource(resourceCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create resource").SetInternal(err)
 		}
@@ -65,15 +61,11 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 	})
 
 	g.GET("/resource", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		resourceFind := &api.ResourceFind{
 			CreatorID: &userID,
 		}
-		list, err := s.Store.FindResourceList(ctx, resourceFind)
+		list, err := s.Store.FindResourceList(resourceFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource list").SetInternal(err)
 		}
@@ -86,21 +78,17 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 	})
 
 	g.GET("/resource/:resourceId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		resourceID, err := strconv.Atoi(c.Param("resourceId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
 		}
 
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		resourceFind := &api.ResourceFind{
 			ID:        &resourceID,
 			CreatorID: &userID,
 		}
-		resource, err := s.Store.FindResource(ctx, resourceFind)
+		resource, err := s.Store.FindResource(resourceFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource").SetInternal(err)
 		}
@@ -113,21 +101,17 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 	})
 
 	g.GET("/resource/:resourceId/blob", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		resourceID, err := strconv.Atoi(c.Param("resourceId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
 		}
 
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		resourceFind := &api.ResourceFind{
 			ID:        &resourceID,
 			CreatorID: &userID,
 		}
-		resource, err := s.Store.FindResource(ctx, resourceFind)
+		resource, err := s.Store.FindResource(resourceFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource").SetInternal(err)
 		}
@@ -142,22 +126,15 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 	})
 
 	g.DELETE("/resource/:resourceId", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
-
 		resourceID, err := strconv.Atoi(c.Param("resourceId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
 		}
 
 		resourceDelete := &api.ResourceDelete{
-			ID:        resourceID,
-			CreatorID: userID,
+			ID: resourceID,
 		}
-		if err := s.Store.DeleteResource(ctx, resourceDelete); err != nil {
+		if err := s.Store.DeleteResource(resourceDelete); err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to delete resource").SetInternal(err)
 		}
 

server/server.go

@@ -29,13 +29,9 @@ func NewServer(profile *profile.Profile) *Server {
 	e.HidePort = true
 
 	e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
-		Format: `{"time":"${time_rfc3339}",` +
-			`"method":"${method}","uri":"${uri}",` +
-			`"status":${status},"error":"${error}"}` + "\n",
+		Format: "${method} ${uri} ${status}\n",
 	}))
 
-	e.Use(middleware.CORS())
-
 	e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{
 		Skipper:      middleware.DefaultSkipper,
 		ErrorMessage: "Request timeout",
@@ -62,7 +58,7 @@ func NewServer(profile *profile.Profile) *Server {
 
 	apiGroup := e.Group("/api")
 	apiGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
-		return aclMiddleware(s, next)
+		return BasicAuthMiddleware(s, next)
 	})
 	s.registerSystemRoutes(apiGroup)
 	s.registerAuthRoutes(apiGroup)

server/shortcut.go

@@ -13,11 +13,7 @@ import (
 
 func (s *Server) registerShortcutRoutes(g *echo.Group) {
 	g.POST("/shortcut", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
+		userID := c.Get(getUserIDContextKey()).(int)
 		shortcutCreate := &api.ShortcutCreate{
 			CreatorID: userID,
 		}
@@ -25,7 +21,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post shortcut request").SetInternal(err)
 		}
 
-		shortcut, err := s.Store.CreateShortcut(ctx, shortcutCreate)
+		shortcut, err := s.Store.CreateShortcut(shortcutCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create shortcut").SetInternal(err)
 		}
@@ -38,7 +34,6 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 	})
 
 	g.PATCH("/shortcut/:shortcutId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		shortcutID, err := strconv.Atoi(c.Param("shortcutId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("shortcutId"))).SetInternal(err)
@@ -51,7 +46,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch shortcut request").SetInternal(err)
 		}
 
-		shortcut, err := s.Store.PatchShortcut(ctx, shortcutPatch)
+		shortcut, err := s.Store.PatchShortcut(shortcutPatch)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch shortcut").SetInternal(err)
 		}
@@ -64,7 +59,6 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 	})
 
 	g.GET("/shortcut", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		shortcutFind := &api.ShortcutFind{}
 
 		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
@@ -78,7 +72,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 			shortcutFind.CreatorID = &userID
 		}
 
-		list, err := s.Store.FindShortcutList(ctx, shortcutFind)
+		list, err := s.Store.FindShortcutList(shortcutFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch shortcut list").SetInternal(err)
 		}
@@ -91,7 +85,6 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 	})
 
 	g.GET("/shortcut/:shortcutId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		shortcutID, err := strconv.Atoi(c.Param("shortcutId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("shortcutId"))).SetInternal(err)
@@ -100,7 +93,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 		shortcutFind := &api.ShortcutFind{
 			ID: &shortcutID,
 		}
-		shortcut, err := s.Store.FindShortcut(ctx, shortcutFind)
+		shortcut, err := s.Store.FindShortcut(shortcutFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to fetch shortcut by ID %d", *shortcutFind.ID)).SetInternal(err)
 		}
@@ -113,7 +106,6 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 	})
 
 	g.DELETE("/shortcut/:shortcutId", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		shortcutID, err := strconv.Atoi(c.Param("shortcutId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("shortcutId"))).SetInternal(err)
@@ -122,7 +114,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 		shortcutDelete := &api.ShortcutDelete{
 			ID: shortcutID,
 		}
-		if err := s.Store.DeleteShortcut(ctx, shortcutDelete); err != nil {
+		if err := s.Store.DeleteShortcut(shortcutDelete); err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to delete shortcut").SetInternal(err)
 		}
 

server/system.go

@@ -21,12 +21,11 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 	})
 
 	g.GET("/status", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		hostUserType := api.Host
 		hostUserFind := api.UserFind{
 			Role: &hostUserType,
 		}
-		hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
+		hostUser, err := s.Store.FindUser(&hostUserFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
 		}
@@ -37,7 +36,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 		}
 
 		systemStatus := api.SystemStatus{
-			Host:    hostUser,
+			Host:   hostUser,
 			Profile: s.Profile,
 		}
 

server/tag.go

@@ -14,7 +14,6 @@ import (
 
 func (s *Server) registerTagRoutes(g *echo.Group) {
 	g.GET("/tag", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		contentSearch := "#"
 		normalRowStatus := api.Normal
 		memoFind := api.MemoFind{
@@ -24,30 +23,30 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 
 		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
 			memoFind.CreatorID = &userID
-		}
-
-		currentUserID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			if memoFind.CreatorID == nil {
-				return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find memo")
-			}
-			memoFind.VisibilityList = []api.Visibility{api.Public}
 		} else {
-			if memoFind.CreatorID == nil {
-				memoFind.CreatorID = &currentUserID
-			} else {
-				memoFind.VisibilityList = []api.Visibility{api.Public, api.Protected}
+			userID, ok := c.Get(getUserIDContextKey()).(int)
+			if !ok {
+				return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find tag")
 			}
+
+			memoFind.CreatorID = &userID
 		}
 
-		memoList, err := s.Store.FindMemoList(ctx, &memoFind)
+		// Only can get PUBLIC memos in visitor mode
+		_, ok := c.Get(getUserIDContextKey()).(int)
+		if !ok {
+			publicVisibility := api.Public
+			memoFind.Visibility = &publicVisibility
+		}
+
+		memoList, err := s.Store.FindMemoList(&memoFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)
 		}
 
 		tagMapSet := make(map[string]bool)
 
-		r := regexp.MustCompile(`#([^\s#]+?) `)
+		r, err := regexp.Compile("#(.+?) ")
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to compile regexp").SetInternal(err)
 		}

server/user.go

@@ -15,39 +15,18 @@ import (
 
 func (s *Server) registerUserRoutes(g *echo.Group) {
 	g.POST("/user", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing auth session")
-		}
-		currentUser, err := s.Store.FindUser(ctx, &api.UserFind{
-			ID: &userID,
-		})
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by id").SetInternal(err)
-		}
-		if currentUser.Role != api.Host {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Only Host user can create member.")
-		}
-
-		userCreate := &api.UserCreate{
-			OpenID: common.GenUUID(),
-		}
+		userCreate := &api.UserCreate{}
 		if err := json.NewDecoder(c.Request().Body).Decode(userCreate); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post user request").SetInternal(err)
 		}
 
-		if err := userCreate.Validate(); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format.").SetInternal(err)
-		}
-
 		passwordHash, err := bcrypt.GenerateFromPassword([]byte(userCreate.Password), bcrypt.DefaultCost)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate password hash").SetInternal(err)
 		}
 
 		userCreate.PasswordHash = string(passwordHash)
-		user, err := s.Store.CreateUser(ctx, userCreate)
+		user, err := s.Store.CreateUser(userCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create user").SetInternal(err)
 		}
@@ -60,17 +39,11 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 	})
 
 	g.GET("/user", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userList, err := s.Store.FindUserList(ctx, &api.UserFind{})
+		userList, err := s.Store.FindUserList(&api.UserFind{})
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch user list").SetInternal(err)
 		}
 
-		for _, user := range userList {
-			// data desensitize
-			user.OpenID = ""
-		}
-
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(userList)); err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode user list response").SetInternal(err)
@@ -78,73 +51,13 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		return nil
 	})
 
-	// GET /api/user/me is used to check if the user is logged in.
-	g.GET("/user/me", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing auth session")
-		}
-
-		userFind := &api.UserFind{
-			ID: &userID,
-		}
-		user, err := s.Store.FindUser(ctx, userFind)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user").SetInternal(err)
-		}
-
-		userSettingList, err := s.Store.FindUserSettingList(ctx, &api.UserSettingFind{
-			UserID: userID,
-		})
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find userSettingList").SetInternal(err)
-		}
-		user.UserSettingList = userSettingList
-
-		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
-		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode user response").SetInternal(err)
-		}
-		return nil
-	})
-
-	g.POST("/user/setting", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing auth session")
-		}
-
-		userSettingUpsert := &api.UserSettingUpsert{}
-		if err := json.NewDecoder(c.Request().Body).Decode(userSettingUpsert); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post user setting upsert request").SetInternal(err)
-		}
-		if err := userSettingUpsert.Validate(); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user setting format").SetInternal(err)
-		}
-
-		userSettingUpsert.UserID = userID
-		userSetting, err := s.Store.UpsertUserSetting(ctx, userSettingUpsert)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert user setting").SetInternal(err)
-		}
-
-		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
-		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(userSetting)); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode user setting response").SetInternal(err)
-		}
-		return nil
-	})
-
 	g.GET("/user/:id", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		id, err := strconv.Atoi(c.Param("id"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted user id").SetInternal(err)
 		}
 
-		user, err := s.Store.FindUser(ctx, &api.UserFind{
+		user, err := s.Store.FindUser(&api.UserFind{
 			ID: &id,
 		})
 		if err != nil {
@@ -163,28 +76,31 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		return nil
 	})
 
-	g.PATCH("/user/:id", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		userID, err := strconv.Atoi(c.Param("id"))
-		if err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("id"))).SetInternal(err)
-		}
-		currentUserID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
-		currentUser, err := s.Store.FindUser(ctx, &api.UserFind{
-			ID: &currentUserID,
-		})
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user").SetInternal(err)
-		}
-		if currentUser == nil {
-			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Current session user not found with ID: %d", currentUserID)).SetInternal(err)
-		} else if currentUser.Role != api.Host && currentUserID != userID {
-			return echo.NewHTTPError(http.StatusForbidden, "Access forbidden for current session user").SetInternal(err)
+	// GET /api/user/me is used to check if the user is logged in.
+	g.GET("/user/me", func(c echo.Context) error {
+		userSessionID := c.Get(getUserIDContextKey())
+		if userSessionID == nil {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Missing auth session")
 		}
 
+		userID := userSessionID.(int)
+		userFind := &api.UserFind{
+			ID: &userID,
+		}
+		user, err := s.Store.FindUser(userFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch user").SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode user response").SetInternal(err)
+		}
+		return nil
+	})
+
+	g.PATCH("/user/me", func(c echo.Context) error {
+		userID := c.Get(getUserIDContextKey()).(int)
 		userPatch := &api.UserPatch{
 			ID: userID,
 		}
@@ -192,10 +108,6 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch user request").SetInternal(err)
 		}
 
-		if userPatch.Email != nil && !common.ValidateEmail(*userPatch.Email) {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid email format")
-		}
-
 		if userPatch.Password != nil && *userPatch.Password != "" {
 			passwordHash, err := bcrypt.GenerateFromPassword([]byte(*userPatch.Password), bcrypt.DefaultCost)
 			if err != nil {
@@ -211,7 +123,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 			userPatch.OpenID = &openID
 		}
 
-		user, err := s.Store.PatchUser(ctx, userPatch)
+		user, err := s.Store.PatchUser(userPatch)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch user").SetInternal(err)
 		}
@@ -223,13 +135,9 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		return nil
 	})
 
-	g.DELETE("/user/:id", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		currentUserID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
-		}
-		currentUser, err := s.Store.FindUser(ctx, &api.UserFind{
+	g.PATCH("/user/:userId", func(c echo.Context) error {
+		currentUserID := c.Get(getUserIDContextKey()).(int)
+		currentUser, err := s.Store.FindUser(&api.UserFind{
 			ID: &currentUserID,
 		})
 		if err != nil {
@@ -241,18 +149,37 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusForbidden, "Access forbidden for current session user").SetInternal(err)
 		}
 
-		userID, err := strconv.Atoi(c.Param("id"))
+		userID, err := strconv.Atoi(c.Param("userId"))
 		if err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("id"))).SetInternal(err)
+			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("userId"))).SetInternal(err)
 		}
 
-		userDelete := &api.UserDelete{
+		userPatch := &api.UserPatch{
 			ID: userID,
 		}
-		if err := s.Store.DeleteUser(ctx, userDelete); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to delete user").SetInternal(err)
+		if err := json.NewDecoder(c.Request().Body).Decode(userPatch); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch user request").SetInternal(err)
 		}
 
-		return c.JSON(http.StatusOK, true)
+		if userPatch.Password != nil && *userPatch.Password != "" {
+			passwordHash, err := bcrypt.GenerateFromPassword([]byte(*userPatch.Password), bcrypt.DefaultCost)
+			if err != nil {
+				return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate password hash").SetInternal(err)
+			}
+
+			passwordHashStr := string(passwordHash)
+			userPatch.PasswordHash = &passwordHashStr
+		}
+
+		user, err := s.Store.PatchUser(userPatch)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch user").SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode user response").SetInternal(err)
+		}
+		return nil
 	})
 }

server/webhook.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"fmt"
-	"html"
 	"net/http"
 	"strconv"
 
@@ -17,18 +16,17 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) {
 	})
 
 	g.GET("/r/:resourceId/:filename", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		resourceID, err := strconv.Atoi(c.Param("resourceId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
 		}
 
-		filename := html.UnescapeString(c.Param("filename"))
+		filename := c.Param("filename")
 		resourceFind := &api.ResourceFind{
 			ID:       &resourceID,
 			Filename: &filename,
 		}
-		resource, err := s.Store.FindResource(ctx, resourceFind)
+		resource, err := s.Store.FindResource(resourceFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to fetch resource ID: %v", resourceID)).SetInternal(err)
 		}

store/cache.go

@@ -1,72 +0,0 @@
-package store
-
-import (
-	"bytes"
-	"encoding/binary"
-	"encoding/gob"
-	"fmt"
-
-	"github.com/VictoriaMetrics/fastcache"
-	"github.com/usememos/memos/api"
-)
-
-var (
-	// 64 MiB.
-	cacheSize                  = 1024 * 1024 * 64
-	_         api.CacheService = (*CacheService)(nil)
-)
-
-// CacheService implements a cache.
-type CacheService struct {
-	cache *fastcache.Cache
-}
-
-// NewCacheService creates a cache service.
-func NewCacheService() *CacheService {
-	return &CacheService{
-		cache: fastcache.New(cacheSize),
-	}
-}
-
-// FindCache finds the value in cache.
-func (s *CacheService) FindCache(namespace api.CacheNamespace, id int, entry interface{}) (bool, error) {
-	buf1 := []byte{0, 0, 0, 0, 0, 0, 0, 0}
-	binary.LittleEndian.PutUint64(buf1, uint64(id))
-
-	buf2, has := s.cache.HasGet(nil, append([]byte(namespace), buf1...))
-	if has {
-		dec := gob.NewDecoder(bytes.NewReader(buf2))
-		if err := dec.Decode(entry); err != nil {
-			return false, fmt.Errorf("failed to decode entry for cache namespace: %s, error: %w", namespace, err)
-		}
-		return true, nil
-	}
-
-	return false, nil
-}
-
-// UpsertCache upserts the value to cache.
-func (s *CacheService) UpsertCache(namespace api.CacheNamespace, id int, entry interface{}) error {
-	buf1 := []byte{0, 0, 0, 0, 0, 0, 0, 0}
-	binary.LittleEndian.PutUint64(buf1, uint64(id))
-
-	var buf2 bytes.Buffer
-	enc := gob.NewEncoder(&buf2)
-	if err := enc.Encode(entry); err != nil {
-		return fmt.Errorf("failed to encode entry for cache namespace: %s, error: %w", namespace, err)
-	}
-	s.cache.Set(append([]byte(namespace), buf1...), buf2.Bytes())
-
-	return nil
-}
-
-// DeleteCache deletes the cache.
-func (s *CacheService) DeleteCache(namespace api.CacheNamespace, id int) {
-	buf1 := []byte{0, 0, 0, 0, 0, 0, 0, 0}
-	binary.LittleEndian.PutUint64(buf1, uint64(id))
-
-	_, has := s.cache.HasGet(nil, append([]byte(namespace), buf1...))
-	if has {
-		s.cache.Del(append([]byte(namespace), buf1...))
-	}
-}

store/db/db.go

@@ -1,12 +1,12 @@
 package db
 
 import (
-	"context"
 	"database/sql"
 	"embed"
 	"errors"
 	"fmt"
 	"io/fs"
+	"io/ioutil"
 	"os"
 	"regexp"
 	"sort"
@@ -14,6 +14,8 @@ import (
 
 	"github.com/usememos/memos/common"
 	"github.com/usememos/memos/server/profile"
+
+	_ "github.com/mattn/go-sqlite3"
 )
 
 //go:embed migration
@@ -36,7 +38,7 @@ func NewDB(profile *profile.Profile) *DB {
 	return db
 }
 
-func (db *DB) Open(ctx context.Context) (err error) {
+func (db *DB) Open() (err error) {
 	// Ensure a DSN is set before attempting to open the database.
 	if db.profile.DSN == "" {
 		return fmt.Errorf("dsn required")
@@ -51,32 +53,32 @@ func (db *DB) Open(ctx context.Context) (err error) {
 	db.Db = sqlDB
 	// If mode is dev, we should migrate and seed the database.
 	if db.profile.Mode == "dev" {
-		if err := db.applyLatestSchema(ctx); err != nil {
+		if err := db.applyLatestSchema(); err != nil {
 			return fmt.Errorf("failed to apply latest schema: %w", err)
 		}
-		if err := db.seed(ctx); err != nil {
+		if err := db.seed(); err != nil {
 			return fmt.Errorf("failed to seed: %w", err)
 		}
 	} else {
 		// If db file not exists, we should migrate the database.
 		if _, err := os.Stat(db.profile.DSN); errors.Is(err, os.ErrNotExist) {
-			err := db.applyLatestSchema(ctx)
+			err := db.applyLatestSchema()
 			if err != nil {
 				return fmt.Errorf("failed to apply latest schema: %w", err)
 			}
 		} else {
-			err := db.createMigrationHistoryTable(ctx)
+			err := db.createMigrationHistoryTable()
 			if err != nil {
 				return fmt.Errorf("failed to create migration_history table: %w", err)
 			}
 
 			currentVersion := common.GetCurrentVersion(db.profile.Mode)
-			migrationHistory, err := db.FindMigrationHistory(ctx, &MigrationHistoryFind{})
+			migrationHistory, err := findMigrationHistory(db.Db, &MigrationHistoryFind{})
 			if err != nil {
 				return err
 			}
 			if migrationHistory == nil {
-				migrationHistory, err = db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{
+				migrationHistory, err = upsertMigrationHistory(db.Db, &MigrationHistoryUpsert{
 					Version: currentVersion,
 				})
 				if err != nil {
@@ -88,12 +90,12 @@ func (db *DB) Open(ctx context.Context) (err error) {
 				minorVersionList := getMinorVersionList()
 
 				// backup the raw database file before migration
-				rawBytes, err := os.ReadFile(db.profile.DSN)
+				rawBytes, err := ioutil.ReadFile(db.profile.DSN)
 				if err != nil {
 					return fmt.Errorf("failed to read raw database file, err: %w", err)
 				}
 				backupDBFilePath := fmt.Sprintf("%s/memos_%s_%d_backup.db", db.profile.Data, db.profile.Version, time.Now().Unix())
-				if err := os.WriteFile(backupDBFilePath, rawBytes, 0644); err != nil {
+				if err := ioutil.WriteFile(backupDBFilePath, rawBytes, 0644); err != nil {
 					return fmt.Errorf("failed to write raw database file, err: %w", err)
 				}
 
@@ -103,7 +105,7 @@ func (db *DB) Open(ctx context.Context) (err error) {
 					normalizedVersion := minorVersion + ".0"
 					if common.IsVersionGreaterThan(normalizedVersion, migrationHistory.Version) && common.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
 						println("applying migration for", normalizedVersion)
-						if err := db.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {
+						if err := db.applyMigrationForMinorVersion(minorVersion); err != nil {
 							return fmt.Errorf("failed to apply minor version migration: %w", err)
 						}
 					}
@@ -125,21 +127,21 @@ const (
 	latestSchemaFileName = "LATEST__SCHEMA.sql"
 )
 
-func (db *DB) applyLatestSchema(ctx context.Context) error {
-	latestSchemaPath := fmt.Sprintf("%s/%s/%s", "migration", db.profile.Mode, latestSchemaFileName)
+func (db *DB) applyLatestSchema() error {
+	latestSchemaPath := fmt.Sprintf("%s/%s", "migration", latestSchemaFileName)
 	buf, err := migrationFS.ReadFile(latestSchemaPath)
 	if err != nil {
 		return fmt.Errorf("failed to read latest schema %q, error %w", latestSchemaPath, err)
 	}
 	stmt := string(buf)
-	if err := db.execute(ctx, stmt); err != nil {
+	if err := db.execute(stmt); err != nil {
 		return fmt.Errorf("migrate error: statement:%s err=%w", stmt, err)
 	}
 	return nil
 }
 
-func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion string) error {
-	filenames, err := fs.Glob(migrationFS, fmt.Sprintf("%s/%s/*.sql", "migration/prod", minorVersion))
+func (db *DB) applyMigrationForMinorVersion(minorVersion string) error {
+	filenames, err := fs.Glob(migrationFS, fmt.Sprintf("%s/%s/*.sql", "migration", minorVersion))
 	if err != nil {
 		return err
 	}
@@ -155,28 +157,22 @@ func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion st
 		}
 		stmt := string(buf)
 		migrationStmt += stmt
-		if err := db.execute(ctx, stmt); err != nil {
+		if err := db.execute(stmt); err != nil {
 			return fmt.Errorf("migrate error: statement:%s err=%w", stmt, err)
 		}
 	}
 
-	tx, err := db.Db.Begin()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
 	// upsert the newest version to migration_history
-	if _, err = upsertMigrationHistory(ctx, tx, &MigrationHistoryUpsert{
+	if _, err = upsertMigrationHistory(db.Db, &MigrationHistoryUpsert{
 		Version: minorVersion + ".0",
 	}); err != nil {
 		return err
 	}
 
-	return tx.Commit()
+	return nil
 }
 
-func (db *DB) seed(ctx context.Context) error {
+func (db *DB) seed() error {
 	filenames, err := fs.Glob(seedFS, fmt.Sprintf("%s/*.sql", "seed"))
 	if err != nil {
 		return err
@@ -191,22 +187,22 @@ func (db *DB) seed(ctx context.Context) error {
 			return fmt.Errorf("failed to read seed file, filename=%s err=%w", filename, err)
 		}
 		stmt := string(buf)
-		if err := db.execute(ctx, stmt); err != nil {
+		if err := db.execute(stmt); err != nil {
 			return fmt.Errorf("seed error: statement:%s err=%w", stmt, err)
 		}
 	}
 	return nil
 }
 
-// execute runs a single SQL statement within a transaction.
-func (db *DB) execute(ctx context.Context, stmt string) error {
+// excecute runs a single SQL statement within a transaction.
+func (db *DB) execute(stmt string) error {
 	tx, err := db.Db.Begin()
 	if err != nil {
 		return err
 	}
 	defer tx.Rollback()
 
-	if _, err := tx.ExecContext(ctx, stmt); err != nil {
+	if _, err := tx.Exec(stmt); err != nil {
 		return err
 	}
 
@@ -214,7 +210,7 @@ func (db *DB) execute(ctx context.Context, stmt string) error {
 }
 
 // minorDirRegexp is a regular expression for minor version directory.
-var minorDirRegexp = regexp.MustCompile(`^migration/prod/[0-9]+\.[0-9]+$`)
+var minorDirRegexp = regexp.MustCompile(`^migration/[0-9]+\.[0-9]+$`)
 
 func getMinorVersionList() []string {
 	minorVersionList := []string{}
@@ -238,14 +234,8 @@ func getMinorVersionList() []string {
 }
 
 // createMigrationHistoryTable creates the migration_history table if it doesn't exist.
-func (db *DB) createMigrationHistoryTable(ctx context.Context) error {
-	tx, err := db.Db.Begin()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	if err := createTable(ctx, tx, `
+func (db *DB) createMigrationHistoryTable() error {
+	if err := createTable(db.Db, `
 	CREATE TABLE IF NOT EXISTS migration_history (
 		version TEXT NOT NULL PRIMARY KEY,
 		created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now'))
@@ -254,5 +244,5 @@ func (db *DB) createMigrationHistoryTable(ctx context.Context) error {
 		return err
 	}
 
-	return tx.Commit()
+	return nil
 }

store/db/migration/0.2/00__user_role.sql

@@ -4,7 +4,8 @@ PRAGMA foreign_keys = off;
 
 DROP TABLE IF EXISTS _user_old;
 
-ALTER TABLE user RENAME TO _user_old;
+ALTER TABLE 
+  user RENAME TO _user_old;
 
 CREATE TABLE user (
   id INTEGER PRIMARY KEY AUTOINCREMENT, 

store/db/migration/LATEST__SCHEMA.sql

@@ -3,7 +3,6 @@ DROP TABLE IF EXISTS `memo_organizer`;
 DROP TABLE IF EXISTS `memo`;
 DROP TABLE IF EXISTS `shortcut`;
 DROP TABLE IF EXISTS `resource`;
-DROP TABLE IF EXISTS `user_setting`;
 DROP TABLE IF EXISTS `user`;
 
 -- user
@@ -45,7 +44,7 @@ CREATE TABLE memo (
   updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
   row_status TEXT NOT NULL CHECK (row_status IN ('NORMAL', 'ARCHIVED')) DEFAULT 'NORMAL',
   content TEXT NOT NULL DEFAULT '',
-  visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PROTECTED', 'PRIVATE')) DEFAULT 'PRIVATE',
+  visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PRIVATE')) DEFAULT 'PRIVATE',
   FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
 );
 
@@ -140,13 +139,3 @@ SET
 WHERE
   rowid = old.rowid;
 END;
-
--- user_setting
-CREATE TABLE user_setting (
-  user_id INTEGER NOT NULL,
-  key TEXT NOT NULL,
-  value TEXT NOT NULL,
-  FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-CREATE UNIQUE INDEX user_setting_key_user_id_index ON user_setting(key, user_id);

store/db/migration/prod/0.3/00__memo_visibility_protected.sql

@@ -1,37 +0,0 @@
--- change memo visibility field from "PRIVATE"/"PUBLIC" to "PRIVATE"/"PROTECTED"/"PUBLIC".
-
-PRAGMA foreign_keys = off;
-
-DROP TABLE IF EXISTS _memo_old;
-
-ALTER TABLE memo RENAME TO _memo_old;
-
-CREATE TABLE memo (
-  id INTEGER PRIMARY KEY AUTOINCREMENT, 
-  creator_id INTEGER NOT NULL, 
-  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')), 
-  updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')), 
-  row_status TEXT NOT NULL CHECK (row_status IN ('NORMAL', 'ARCHIVED')) DEFAULT 'NORMAL', 
-  content TEXT NOT NULL DEFAULT '', 
-  visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PROTECTED', 'PRIVATE')) DEFAULT 'PRIVATE', 
-  FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-INSERT INTO memo (
-  id, creator_id, created_ts, updated_ts, 
-  row_status, content, visibility
-) 
-SELECT 
-  id, 
-  creator_id, 
-  created_ts, 
-  updated_ts, 
-  row_status, 
-  content, 
-  visibility
-FROM 
-  _memo_old;
-
-DROP TABLE IF EXISTS _memo_old;
-
-PRAGMA foreign_keys = on;

store/db/migration/prod/0.4/00__user_setting.sql

@@ -1,9 +0,0 @@
--- user_setting
-CREATE TABLE user_setting (
-  user_id INTEGER NOT NULL,
-  key TEXT NOT NULL,
-  value TEXT NOT NULL,
-  FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-CREATE UNIQUE INDEX user_setting_key_user_id_index ON user_setting(key, user_id);

store/db/migration/prod/LATEST__SCHEMA.sql

@@ -1,152 +0,0 @@
--- drop all tables
-DROP TABLE IF EXISTS `memo_organizer`;
-DROP TABLE IF EXISTS `memo`;
-DROP TABLE IF EXISTS `shortcut`;
-DROP TABLE IF EXISTS `resource`;
-DROP TABLE IF EXISTS `user_setting`;
-DROP TABLE IF EXISTS `user`;
-
--- user
-CREATE TABLE user (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  -- allowed row status are 'NORMAL', 'ARCHIVED'.
-  row_status TEXT NOT NULL CHECK (row_status IN ('NORMAL', 'ARCHIVED')) DEFAULT 'NORMAL',
-  email TEXT NOT NULL UNIQUE,
-  role TEXT NOT NULL CHECK (role IN ('HOST', 'USER')) DEFAULT 'USER',
-  name TEXT NOT NULL,
-  password_hash TEXT NOT NULL,
-  open_id TEXT NOT NULL UNIQUE
-);
-
-INSERT INTO
-  sqlite_sequence (name, seq)
-VALUES
-  ('user', 100);
-
-CREATE TRIGGER IF NOT EXISTS `trigger_update_user_modification_time`
-AFTER
-UPDATE
-  ON `user` FOR EACH ROW BEGIN
-UPDATE
-  `user`
-SET
-  updated_ts = (strftime('%s', 'now'))
-WHERE
-  rowid = old.rowid;
-END;
-
--- memo
-CREATE TABLE memo (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  creator_id INTEGER NOT NULL,
-  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  row_status TEXT NOT NULL CHECK (row_status IN ('NORMAL', 'ARCHIVED')) DEFAULT 'NORMAL',
-  content TEXT NOT NULL DEFAULT '',
-  visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PROTECTED', 'PRIVATE')) DEFAULT 'PRIVATE',
-  FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-INSERT INTO
-  sqlite_sequence (name, seq)
-VALUES
-  ('memo', 1000);
-
-CREATE TRIGGER IF NOT EXISTS `trigger_update_memo_modification_time`
-AFTER
-UPDATE
-  ON `memo` FOR EACH ROW BEGIN
-UPDATE
-  `memo`
-SET
-  updated_ts = (strftime('%s', 'now'))
-WHERE
-  rowid = old.rowid;
-END;
-
--- memo_organizer
-CREATE TABLE memo_organizer (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  memo_id INTEGER NOT NULL,
-  user_id INTEGER NOT NULL,
-  pinned INTEGER NOT NULL CHECK (pinned IN (0, 1)) DEFAULT 0,
-  FOREIGN KEY(memo_id) REFERENCES memo(id) ON DELETE CASCADE,
-  FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE,
-  UNIQUE(memo_id, user_id)
-);
-
-INSERT INTO
-  sqlite_sequence (name, seq)
-VALUES
-  ('memo_organizer', 1000);
-
--- shortcut
-CREATE TABLE shortcut (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  creator_id INTEGER NOT NULL,
-  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  row_status TEXT NOT NULL CHECK (row_status IN ('NORMAL', 'ARCHIVED')) DEFAULT 'NORMAL',
-  title TEXT NOT NULL DEFAULT '',
-  payload TEXT NOT NULL DEFAULT '{}',
-  FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-INSERT INTO
-  sqlite_sequence (name, seq)
-VALUES
-  ('shortcut', 10000);
-
-CREATE TRIGGER IF NOT EXISTS `trigger_update_shortcut_modification_time`
-AFTER
-UPDATE
-  ON `shortcut` FOR EACH ROW BEGIN
-UPDATE
-  `shortcut`
-SET
-  updated_ts = (strftime('%s', 'now'))
-WHERE
-  rowid = old.rowid;
-END;
-
--- resource
-CREATE TABLE resource (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  creator_id INTEGER NOT NULL,
-  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  updated_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
-  filename TEXT NOT NULL DEFAULT '',
-  blob BLOB NOT NULL,
-  type TEXT NOT NULL DEFAULT '',
-  size INTEGER NOT NULL DEFAULT 0,
-  FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-INSERT INTO
-  sqlite_sequence (name, seq)
-VALUES
-  ('resource', 10000);
-
-CREATE TRIGGER IF NOT EXISTS `trigger_update_resource_modification_time`
-AFTER
-UPDATE
-  ON `resource` FOR EACH ROW BEGIN
-UPDATE
-  `resource`
-SET
-  updated_ts = (strftime('%s', 'now'))
-WHERE
-  rowid = old.rowid;
-END;
-
--- user_setting
-CREATE TABLE user_setting (
-  user_id INTEGER NOT NULL,
-  key TEXT NOT NULL,
-  value TEXT NOT NULL,
-  FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
-);
-
-CREATE UNIQUE INDEX user_setting_key_user_id_index ON user_setting(key, user_id);

store/db/migration_history.go

@@ -1,7 +1,6 @@
 package db
 
 import (
-	"context"
 	"database/sql"
 	"strings"
 )
@@ -19,62 +18,23 @@ type MigrationHistoryFind struct {
 	Version *string
 }
 
-func (db *DB) FindMigrationHistory(ctx context.Context, find *MigrationHistoryFind) (*MigrationHistory, error) {
-	tx, err := db.Db.Begin()
-	if err != nil {
-		return nil, err
-	}
-	defer tx.Rollback()
-
-	list, err := findMigrationHistoryList(ctx, tx, find)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(list) == 0 {
-		return nil, nil
-	}
-
-	migrationHistory := list[0]
-	return migrationHistory, nil
-}
-
-func (db *DB) UpsertMigrationHistory(ctx context.Context, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {
-	tx, err := db.Db.Begin()
-	if err != nil {
-		return nil, err
-	}
-	defer tx.Rollback()
-
-	migrationHistory, err := upsertMigrationHistory(ctx, tx, upsert)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-
-	return migrationHistory, nil
-}
-
-func findMigrationHistoryList(ctx context.Context, tx *sql.Tx, find *MigrationHistoryFind) ([]*MigrationHistory, error) {
+func findMigrationHistoryList(db *sql.DB, find *MigrationHistoryFind) ([]*MigrationHistory, error) {
 	where, args := []string{"1 = 1"}, []interface{}{}
 
 	if v := find.Version; v != nil {
 		where, args = append(where, "version = ?"), append(args, *v)
 	}
 
-	query := `
+	rows, err := db.Query(`
 		SELECT 
 			version,
 			created_ts
 		FROM
 			migration_history
-		WHERE ` + strings.Join(where, " AND ") + `
-		ORDER BY version DESC
-	`
-	rows, err := tx.QueryContext(ctx, query, args...)
+		WHERE `+strings.Join(where, " AND ")+`
+		ORDER BY created_ts DESC`,
+		args...,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -93,15 +53,24 @@ func findMigrationHistoryList(ctx context.Context, tx *sql.Tx, find *MigrationHi
 		migrationHistoryList = append(migrationHistoryList, &migrationHistory)
 	}
 
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
 	return migrationHistoryList, nil
 }
 
-func upsertMigrationHistory(ctx context.Context, tx *sql.Tx, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {
-	query := `
+func findMigrationHistory(db *sql.DB, find *MigrationHistoryFind) (*MigrationHistory, error) {
+	list, err := findMigrationHistoryList(db, find)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(list) == 0 {
+		return nil, nil
+	} else {
+		return list[0], nil
+	}
+}
+
+func upsertMigrationHistory(db *sql.DB, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {
+	row, err := db.Query(`
 		INSERT INTO migration_history (
 			version
 		)
@@ -110,8 +79,9 @@ func upsertMigrationHistory(ctx context.Context, tx *sql.Tx, upsert *MigrationHi
 		SET
 			version=EXCLUDED.version
 		RETURNING version, created_ts
-	`
-	row, err := tx.QueryContext(ctx, query, upsert.Version)
+	`,
+		upsert.Version,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -126,9 +96,5 @@ func upsertMigrationHistory(ctx context.Context, tx *sql.Tx, upsert *MigrationHi
 		return nil, err
 	}
 
-	if err := row.Err(); err != nil {
-		return nil, err
-	}
-
 	return &migrationHistory, nil
 }

store/db/seed/10001__user.sql

@@ -37,25 +37,3 @@ VALUES
     -- raw password: secret
     '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
   );
-
-INSERT INTO 
-  user (
-    `id`, 
-    `row_status`, 
-    `email`,
-    `role`,
-    `name`, 
-    `open_id`,
-    `password_hash`
-  )
-VALUES
-  (
-    103, 
-    'ARCHIVED', 
-    'bob@usememos.com',
-    'USER',
-    'Bob',
-    'bob_open_id',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  );

store/db/seed/10002__memo.sql

@@ -16,8 +16,7 @@ INSERT INTO
   memo (
     `id`,
     `content`, 
-    `creator_id`,
-    `visibility`
+    `creator_id`
   )
 VALUES
   (
@@ -27,8 +26,7 @@ VALUES
 - [x] Clean the room;
 - [x] Read *📖 The Little Prince*;
 (👆 click to toggle status)', 
-    101,
-    'PROTECTED'
+    101
   );
 
 INSERT INTO 
@@ -50,8 +48,7 @@ INSERT INTO
   memo (
     `id`,
     `content`, 
-    `creator_id`,
-    `visibility`
+    `creator_id`
   )
 VALUES
   (
@@ -62,8 +59,7 @@ VALUES
 - [ ] Watch *👦 The Boys*;
 (👆 click to toggle status)
 ', 
-    102,
-    'PROTECTED'
+    102
   );
 
 INSERT INTO 

store/db/seed/10004__shortcut.sql

@@ -1,12 +1,10 @@
 INSERT INTO 
   shortcut (
     `title`, 
-    `creator_id`,
-    `payload`
+    `creator_id`
   )
 VALUES
   (
-    'inbox', 
-    101,
-    '[{"type":"TYPE","value":{"operator":"IS","value":"NOT_TAGGED"},"relation":"AND"}]'
+    'All my memos', 
+    101
   );

store/db/table.go

@@ -1,7 +1,6 @@
 package db
 
 import (
-	"context"
 	"database/sql"
 	"strings"
 )
@@ -12,20 +11,20 @@ type Table struct {
 }
 
 //lint:ignore U1000 Ignore unused function temporarily for debugging
-//nolint:all
-func findTable(ctx context.Context, tx *sql.Tx, tableName string) (*Table, error) {
+func findTable(db *sql.DB, tableName string) (*Table, error) {
 	where, args := []string{"1 = 1"}, []interface{}{}
 
 	where, args = append(where, "type = ?"), append(args, "table")
 	where, args = append(where, "name = ?"), append(args, tableName)
 
-	query := `
+	rows, err := db.Query(`
 		SELECT
 			tbl_name,
 			sql
 		FROM sqlite_schema
-		WHERE ` + strings.Join(where, " AND ")
-	rows, err := tx.QueryContext(ctx, query, args...)
+		WHERE `+strings.Join(where, " AND "),
+		args...,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -55,11 +54,13 @@ func findTable(ctx context.Context, tx *sql.Tx, tableName string) (*Table, error
 	}
 }
 
-func createTable(ctx context.Context, tx *sql.Tx, stmt string) error {
-	_, err := tx.ExecContext(ctx, stmt)
+func createTable(db *sql.DB, sql string) error {
+	result, err := db.Exec(sql)
 	if err != nil {
 		return err
 	}
 
-	return nil
+	_, err = result.RowsAffected()
+
+	return err
 }

store/memo.go

@@ -1,7 +1,6 @@
 package store
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"strings"
@@ -44,93 +43,43 @@ func (raw *memoRaw) toMemo() *api.Memo {
 	}
 }
 
-func (s *Store) composeMemo(ctx context.Context, raw *memoRaw) (*api.Memo, error) {
-	memo := raw.toMemo()
-
-	memoOrganizer, err := s.FindMemoOrganizer(ctx, &api.MemoOrganizerFind{
-		MemoID: memo.ID,
-		UserID: memo.CreatorID,
-	})
-	if err != nil && common.ErrorCode(err) != common.NotFound {
-		return nil, err
-	} else if memoOrganizer != nil {
-		memo.Pinned = memoOrganizer.Pinned
-	}
-
-	return memo, nil
-}
-
-func (s *Store) CreateMemo(ctx context.Context, create *api.MemoCreate) (*api.Memo, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	memoRaw, err := createMemoRaw(ctx, tx, create)
+func (s *Store) CreateMemo(create *api.MemoCreate) (*api.Memo, error) {
+	memoRaw, err := createMemoRaw(s.db, create)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
-	memo, err := s.composeMemo(ctx, memoRaw)
+	memo, err := s.composeMemo(memoRaw)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := s.cache.UpsertCache(api.MemoCache, memo.ID, memo); err != nil {
-		return nil, err
-	}
-
 	return memo, nil
 }
 
-func (s *Store) PatchMemo(ctx context.Context, patch *api.MemoPatch) (*api.Memo, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	memoRaw, err := patchMemoRaw(ctx, tx, patch)
+func (s *Store) PatchMemo(patch *api.MemoPatch) (*api.Memo, error) {
+	memoRaw, err := patchMemoRaw(s.db, patch)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
-	memo, err := s.composeMemo(ctx, memoRaw)
+	memo, err := s.composeMemo(memoRaw)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := s.cache.UpsertCache(api.MemoCache, memo.ID, memo); err != nil {
-		return nil, err
-	}
-
 	return memo, nil
 }
 
-func (s *Store) FindMemoList(ctx context.Context, find *api.MemoFind) ([]*api.Memo, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	memoRawList, err := findMemoRawList(ctx, tx, find)
+func (s *Store) FindMemoList(find *api.MemoFind) ([]*api.Memo, error) {
+	memoRawList, err := findMemoRawList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
 
 	list := []*api.Memo{}
 	for _, raw := range memoRawList {
-		memo, err := s.composeMemo(ctx, raw)
+		memo, err := s.composeMemo(raw)
 		if err != nil {
 			return nil, err
 		}
@@ -141,25 +90,8 @@ func (s *Store) FindMemoList(ctx context.Context, find *api.MemoFind) ([]*api.Me
 	return list, nil
 }
 
-func (s *Store) FindMemo(ctx context.Context, find *api.MemoFind) (*api.Memo, error) {
-	if find.ID != nil {
-		memo := &api.Memo{}
-		has, err := s.cache.FindCache(api.MemoCache, *find.ID, memo)
-		if err != nil {
-			return nil, err
-		}
-		if has {
-			return memo, nil
-		}
-	}
-
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	list, err := findMemoRawList(ctx, tx, find)
+func (s *Store) FindMemo(find *api.MemoFind) (*api.Memo, error) {
+	list, err := findMemoRawList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -168,52 +100,52 @@ func (s *Store) FindMemo(ctx context.Context, find *api.MemoFind) (*api.Memo, er
 		return nil, &common.Error{Code: common.NotFound, Err: fmt.Errorf("not found")}
 	}
 
-	memo, err := s.composeMemo(ctx, list[0])
+	memo, err := s.composeMemo(list[0])
 	if err != nil {
 		return nil, err
 	}
 
-	if err := s.cache.UpsertCache(api.MemoCache, memo.ID, memo); err != nil {
-		return nil, err
-	}
-
 	return memo, nil
 }
 
-func (s *Store) DeleteMemo(ctx context.Context, delete *api.MemoDelete) error {
-	tx, err := s.db.BeginTx(ctx, nil)
+func (s *Store) DeleteMemo(delete *api.MemoDelete) error {
+	err := deleteMemo(s.db, delete)
 	if err != nil {
 		return FormatError(err)
 	}
-	defer tx.Rollback()
-
-	if err := deleteMemo(ctx, tx, delete); err != nil {
-		return FormatError(err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		return FormatError(err)
-	}
-
-	s.cache.DeleteCache(api.MemoCache, delete.ID)
 
 	return nil
 }
 
-func createMemoRaw(ctx context.Context, tx *sql.Tx, create *api.MemoCreate) (*memoRaw, error) {
-	set := []string{"creator_id", "content", "visibility"}
-	args := []interface{}{create.CreatorID, create.Content, create.Visibility}
-	placeholder := []string{"?", "?", "?"}
+func createMemoRaw(db *sql.DB, create *api.MemoCreate) (*memoRaw, error) {
+	set := []string{"creator_id", "content"}
+	placeholder := []string{"?", "?"}
+	args := []interface{}{create.CreatorID, create.Content}
+
+	if v := create.Visibility; v != nil {
+		set, placeholder, args = append(set, "visibility"), append(placeholder, "?"), append(args, *v)
+	}
+	if v := create.CreatedTs; v != nil {
+		set, placeholder, args = append(set, "created_ts"), append(placeholder, "?"), append(args, *v)
+	}
 
 	query := `
-		INSERT INTO memo (
-			` + strings.Join(set, ", ") + `
-		)
-		VALUES (` + strings.Join(placeholder, ",") + `)
-		RETURNING id, creator_id, created_ts, updated_ts, row_status, content, visibility
-	`
+	INSERT INTO memo (
+		` + strings.Join(set, ", ") + `
+	)
+	VALUES (` + strings.Join(placeholder, ",") + `)
+	RETURNING id, creator_id, created_ts, updated_ts, row_status, content, visibility`
+	row, err := db.Query(query,
+		args...,
+	)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer row.Close()
+
+	row.Next()
 	var memoRaw memoRaw
-	if err := tx.QueryRowContext(ctx, query, args...).Scan(
+	if err := row.Scan(
 		&memoRaw.ID,
 		&memoRaw.CreatorID,
 		&memoRaw.CreatedTs,
@@ -228,32 +160,36 @@ func createMemoRaw(ctx context.Context, tx *sql.Tx, create *api.MemoCreate) (*me
 	return &memoRaw, nil
 }
 
-func patchMemoRaw(ctx context.Context, tx *sql.Tx, patch *api.MemoPatch) (*memoRaw, error) {
+func patchMemoRaw(db *sql.DB, patch *api.MemoPatch) (*memoRaw, error) {
 	set, args := []string{}, []interface{}{}
 
-	if v := patch.CreatedTs; v != nil {
-		set, args = append(set, "created_ts = ?"), append(args, *v)
+	if v := patch.Content; v != nil {
+		set, args = append(set, "content = ?"), append(args, *v)
 	}
 	if v := patch.RowStatus; v != nil {
 		set, args = append(set, "row_status = ?"), append(args, *v)
 	}
-	if v := patch.Content; v != nil {
-		set, args = append(set, "content = ?"), append(args, *v)
-	}
 	if v := patch.Visibility; v != nil {
 		set, args = append(set, "visibility = ?"), append(args, *v)
 	}
 
 	args = append(args, patch.ID)
 
-	query := `
+	row, err := db.Query(`
 		UPDATE memo
-		SET ` + strings.Join(set, ", ") + `
+		SET `+strings.Join(set, ", ")+`
 		WHERE id = ?
 		RETURNING id, creator_id, created_ts, updated_ts, row_status, content, visibility
-	`
+	`, args...)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer row.Close()
+
+	row.Next()
+
 	var memoRaw memoRaw
-	if err := tx.QueryRowContext(ctx, query, args...).Scan(
+	if err := row.Scan(
 		&memoRaw.ID,
 		&memoRaw.CreatorID,
 		&memoRaw.CreatedTs,
@@ -268,7 +204,7 @@ func patchMemoRaw(ctx context.Context, tx *sql.Tx, patch *api.MemoPatch) (*memoR
 	return &memoRaw, nil
 }
 
-func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*memoRaw, error) {
+func findMemoRawList(db *sql.DB, find *api.MemoFind) ([]*memoRaw, error) {
 	where, args := []string{"1 = 1"}, []interface{}{}
 
 	if v := find.ID; v != nil {
@@ -286,13 +222,8 @@ func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*me
 	if v := find.ContentSearch; v != nil {
 		where, args = append(where, "content LIKE ?"), append(args, "%"+*v+"%")
 	}
-	if v := find.VisibilityList; len(v) != 0 {
-		list := []string{}
-		for _, visibility := range v {
-			list = append(list, fmt.Sprintf("$%d", len(args)+1))
-			args = append(args, visibility)
-		}
-		where = append(where, fmt.Sprintf("visibility in (%s)", strings.Join(list, ",")))
+	if v := find.Visibility; v != nil {
+		where, args = append(where, "visibility = ?"), append(args, *v)
 	}
 
 	pagination := ""
@@ -303,7 +234,7 @@ func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*me
 		}
 	}
 
-	query := `
+	rows, err := db.Query(`
 		SELECT
 			id,
 			creator_id,
@@ -313,10 +244,10 @@ func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*me
 			content,
 			visibility
 		FROM memo
-		WHERE ` + strings.Join(where, " AND ") + `
-		ORDER BY created_ts DESC
-	` + pagination
-	rows, err := tx.QueryContext(ctx, query, args...)
+		WHERE `+strings.Join(where, " AND ")+`
+		ORDER BY created_ts DESC`+pagination,
+		args...,
+	)
 	if err != nil {
 		return nil, FormatError(err)
 	}
@@ -347,14 +278,32 @@ func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*me
 	return memoRawList, nil
 }
 
-func deleteMemo(ctx context.Context, tx *sql.Tx, delete *api.MemoDelete) error {
-	_, err := tx.ExecContext(ctx, `
-		PRAGMA foreign_keys = ON;
-		DELETE FROM memo WHERE id = ?
-	`, delete.ID)
+func deleteMemo(db *sql.DB, delete *api.MemoDelete) error {
+	result, err := db.Exec(`DELETE FROM memo WHERE id = ?`, delete.ID)
 	if err != nil {
 		return FormatError(err)
 	}
 
+	rows, _ := result.RowsAffected()
+	if rows == 0 {
+		return &common.Error{Code: common.NotFound, Err: fmt.Errorf("memo ID not found: %d", delete.ID)}
+	}
+
 	return nil
 }
+
+func (s *Store) composeMemo(raw *memoRaw) (*api.Memo, error) {
+	memo := raw.toMemo()
+
+	memoOrganizer, err := s.FindMemoOrganizer(&api.MemoOrganizerFind{
+		MemoID: memo.ID,
+		UserID: memo.CreatorID,
+	})
+	if err != nil && common.ErrorCode(err) != common.NotFound {
+		return nil, err
+	} else if memoOrganizer != nil {
+		memo.Pinned = memoOrganizer.Pinned
+	}
+
+	return memo, nil
+}

store/memo_organizer.go

@@ -1,7 +1,6 @@
 package store
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 
@@ -30,14 +29,8 @@ func (raw *memoOrganizerRaw) toMemoOrganizer() *api.MemoOrganizer {
 	}
 }
 
-func (s *Store) FindMemoOrganizer(ctx context.Context, find *api.MemoOrganizerFind) (*api.MemoOrganizer, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	memoOrganizerRaw, err := findMemoOrganizer(ctx, tx, find)
+func (s *Store) FindMemoOrganizer(find *api.MemoOrganizerFind) (*api.MemoOrganizer, error) {
+	memoOrganizerRaw, err := findMemoOrganizer(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -47,26 +40,17 @@ func (s *Store) FindMemoOrganizer(ctx context.Context, find *api.MemoOrganizerFi
 	return memoOrganizer, nil
 }
 
-func (s *Store) UpsertMemoOrganizer(ctx context.Context, upsert *api.MemoOrganizerUpsert) error {
-	tx, err := s.db.BeginTx(ctx, nil)
+func (s *Store) UpsertMemoOrganizer(upsert *api.MemoOrganizerUpsert) error {
+	err := upsertMemoOrganizer(s.db, upsert)
 	if err != nil {
-		return FormatError(err)
-	}
-	defer tx.Rollback()
-
-	if err := upsertMemoOrganizer(ctx, tx, upsert); err != nil {
 		return err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return FormatError(err)
-	}
-
 	return nil
 }
 
-func findMemoOrganizer(ctx context.Context, tx *sql.Tx, find *api.MemoOrganizerFind) (*memoOrganizerRaw, error) {
-	query := `
+func findMemoOrganizer(db *sql.DB, find *api.MemoOrganizerFind) (*memoOrganizerRaw, error) {
+	row, err := db.Query(`
 		SELECT
 			id,
 			memo_id,
@@ -74,8 +58,7 @@ func findMemoOrganizer(ctx context.Context, tx *sql.Tx, find *api.MemoOrganizerF
 			pinned
 		FROM memo_organizer
 		WHERE memo_id = ? AND user_id = ?
-	`
-	row, err := tx.QueryContext(ctx, query, find.MemoID, find.UserID)
+	`, find.MemoID, find.UserID)
 	if err != nil {
 		return nil, FormatError(err)
 	}
@@ -95,15 +78,11 @@ func findMemoOrganizer(ctx context.Context, tx *sql.Tx, find *api.MemoOrganizerF
 		return nil, FormatError(err)
 	}
 
-	if err := row.Err(); err != nil {
-		return nil, err
-	}
-
 	return &memoOrganizerRaw, nil
 }
 
-func upsertMemoOrganizer(ctx context.Context, tx *sql.Tx, upsert *api.MemoOrganizerUpsert) error {
-	query := `
+func upsertMemoOrganizer(db *sql.DB, upsert *api.MemoOrganizerUpsert) error {
+	row, err := db.Query(`
 		INSERT INTO memo_organizer (
 			memo_id,
 			user_id,
@@ -114,9 +93,20 @@ func upsertMemoOrganizer(ctx context.Context, tx *sql.Tx, upsert *api.MemoOrgani
 		SET
 			pinned = EXCLUDED.pinned
 		RETURNING id, memo_id, user_id, pinned
-	`
+	`,
+		upsert.MemoID,
+		upsert.UserID,
+		upsert.Pinned,
+	)
+	if err != nil {
+		return FormatError(err)
+	}
+
+	defer row.Close()
+
+	row.Next()
 	var memoOrganizer api.MemoOrganizer
-	if err := tx.QueryRowContext(ctx, query, upsert.MemoID, upsert.UserID, upsert.Pinned).Scan(
+	if err := row.Scan(
 		&memoOrganizer.ID,
 		&memoOrganizer.MemoID,
 		&memoOrganizer.UserID,

store/resource.go

@@ -1,7 +1,6 @@
 package store
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"strings"
@@ -44,39 +43,19 @@ func (raw *resourceRaw) toResource() *api.Resource {
 	}
 }
 
-func (s *Store) CreateResource(ctx context.Context, create *api.ResourceCreate) (*api.Resource, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	resourceRaw, err := createResource(ctx, tx, create)
+func (s *Store) CreateResource(create *api.ResourceCreate) (*api.Resource, error) {
+	resourceRaw, err := createResource(s.db, create)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
 	resource := resourceRaw.toResource()
 
-	if err := s.cache.UpsertCache(api.ResourceCache, resource.ID, resource); err != nil {
-		return nil, err
-	}
-
 	return resource, nil
 }
 
-func (s *Store) FindResourceList(ctx context.Context, find *api.ResourceFind) ([]*api.Resource, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	resourceRawList, err := findResourceList(ctx, tx, find)
+func (s *Store) FindResourceList(find *api.ResourceFind) ([]*api.Resource, error) {
+	resourceRawList, err := findResourceList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -89,25 +68,8 @@ func (s *Store) FindResourceList(ctx context.Context, find *api.ResourceFind) ([
 	return resourceList, nil
 }
 
-func (s *Store) FindResource(ctx context.Context, find *api.ResourceFind) (*api.Resource, error) {
-	if find.ID != nil {
-		resource := &api.Resource{}
-		has, err := s.cache.FindCache(api.ResourceCache, *find.ID, resource)
-		if err != nil {
-			return nil, err
-		}
-		if has {
-			return resource, nil
-		}
-	}
-
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	list, err := findResourceList(ctx, tx, find)
+func (s *Store) FindResource(find *api.ResourceFind) (*api.Resource, error) {
+	list, err := findResourceList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -118,36 +80,20 @@ func (s *Store) FindResource(ctx context.Context, find *api.ResourceFind) (*api.
 
 	resource := list[0].toResource()
 
-	if err := s.cache.UpsertCache(api.ResourceCache, resource.ID, resource); err != nil {
-		return nil, err
-	}
-
 	return resource, nil
 }
 
-func (s *Store) DeleteResource(ctx context.Context, delete *api.ResourceDelete) error {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return FormatError(err)
-	}
-	defer tx.Rollback()
-
-	err = deleteResource(ctx, tx, delete)
+func (s *Store) DeleteResource(delete *api.ResourceDelete) error {
+	err := deleteResource(s.db, delete)
 	if err != nil {
 		return err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return FormatError(err)
-	}
-
-	s.cache.DeleteCache(api.ResourceCache, delete.ID)
-
 	return nil
 }
 
-func createResource(ctx context.Context, tx *sql.Tx, create *api.ResourceCreate) (*resourceRaw, error) {
-	query := `
+func createResource(db *sql.DB, create *api.ResourceCreate) (*resourceRaw, error) {
+	row, err := db.Query(`
 		INSERT INTO resource (
 			filename,
 			blob,
@@ -156,16 +102,27 @@ func createResource(ctx context.Context, tx *sql.Tx, create *api.ResourceCreate)
 			creator_id
 		)
 		VALUES (?, ?, ?, ?, ?)
-		RETURNING id, filename, blob, type, size, creator_id, created_ts, updated_ts
-	`
+		RETURNING id, filename, blob, type, size, created_ts, updated_ts
+	`,
+		create.Filename,
+		create.Blob,
+		create.Type,
+		create.Size,
+		create.CreatorID,
+	)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer row.Close()
+
+	row.Next()
 	var resourceRaw resourceRaw
-	if err := tx.QueryRowContext(ctx, query, create.Filename, create.Blob, create.Type, create.Size, create.CreatorID).Scan(
+	if err := row.Scan(
 		&resourceRaw.ID,
 		&resourceRaw.Filename,
 		&resourceRaw.Blob,
 		&resourceRaw.Type,
 		&resourceRaw.Size,
-		&resourceRaw.CreatorID,
 		&resourceRaw.CreatedTs,
 		&resourceRaw.UpdatedTs,
 	); err != nil {
@@ -175,7 +132,7 @@ func createResource(ctx context.Context, tx *sql.Tx, create *api.ResourceCreate)
 	return &resourceRaw, nil
 }
 
-func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) ([]*resourceRaw, error) {
+func findResourceList(db *sql.DB, find *api.ResourceFind) ([]*resourceRaw, error) {
 	where, args := []string{"1 = 1"}, []interface{}{}
 
 	if v := find.ID; v != nil {
@@ -188,21 +145,20 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 		where, args = append(where, "filename = ?"), append(args, *v)
 	}
 
-	query := `
+	rows, err := db.Query(`
 		SELECT
 			id,
 			filename,
 			blob,
 			type,
 			size,
-			creator_id,
 			created_ts,
 			updated_ts
 		FROM resource
-		WHERE ` + strings.Join(where, " AND ") + `
-		ORDER BY created_ts DESC
-	`
-	rows, err := tx.QueryContext(ctx, query, args...)
+		WHERE `+strings.Join(where, " AND ")+`
+		ORDER BY created_ts DESC`,
+		args...,
+	)
 	if err != nil {
 		return nil, FormatError(err)
 	}
@@ -217,7 +173,6 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 			&resourceRaw.Blob,
 			&resourceRaw.Type,
 			&resourceRaw.Size,
-			&resourceRaw.CreatorID,
 			&resourceRaw.CreatedTs,
 			&resourceRaw.UpdatedTs,
 		); err != nil {
@@ -234,14 +189,16 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 	return resourceRawList, nil
 }
 
-func deleteResource(ctx context.Context, tx *sql.Tx, delete *api.ResourceDelete) error {
-	_, err := tx.ExecContext(ctx, `
-		PRAGMA foreign_keys = ON;
-		DELETE FROM resource WHERE id = ? AND creator_id = ?
-	`, delete.ID, delete.CreatorID)
+func deleteResource(db *sql.DB, delete *api.ResourceDelete) error {
+	result, err := db.Exec(`DELETE FROM resource WHERE id = ?`, delete.ID)
 	if err != nil {
 		return FormatError(err)
 	}
 
+	rows, _ := result.RowsAffected()
+	if rows == 0 {
+		return &common.Error{Code: common.NotFound, Err: fmt.Errorf("resource ID not found: %d", delete.ID)}
+	}
+
 	return nil
 }

store/shortcut.go

@@ -1,7 +1,6 @@
 package store
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"strings"
@@ -40,64 +39,30 @@ func (raw *shortcutRaw) toShortcut() *api.Shortcut {
 	}
 }
 
-func (s *Store) CreateShortcut(ctx context.Context, create *api.ShortcutCreate) (*api.Shortcut, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	shortcutRaw, err := createShortcut(ctx, tx, create)
+func (s *Store) CreateShortcut(create *api.ShortcutCreate) (*api.Shortcut, error) {
+	shortcutRaw, err := createShortcut(s.db, create)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
 	shortcut := shortcutRaw.toShortcut()
 
-	if err := s.cache.UpsertCache(api.ShortcutCache, shortcut.ID, shortcut); err != nil {
-		return nil, err
-	}
-
 	return shortcut, nil
 }
 
-func (s *Store) PatchShortcut(ctx context.Context, patch *api.ShortcutPatch) (*api.Shortcut, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	shortcutRaw, err := patchShortcut(ctx, tx, patch)
+func (s *Store) PatchShortcut(patch *api.ShortcutPatch) (*api.Shortcut, error) {
+	shortcutRaw, err := patchShortcut(s.db, patch)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
 	shortcut := shortcutRaw.toShortcut()
 
-	if err := s.cache.UpsertCache(api.ShortcutCache, shortcut.ID, shortcut); err != nil {
-		return nil, err
-	}
-
 	return shortcut, nil
 }
 
-func (s *Store) FindShortcutList(ctx context.Context, find *api.ShortcutFind) ([]*api.Shortcut, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	shortcutRawList, err := findShortcutList(ctx, tx, find)
+func (s *Store) FindShortcutList(find *api.ShortcutFind) ([]*api.Shortcut, error) {
+	shortcutRawList, err := findShortcutList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -110,25 +75,8 @@ func (s *Store) FindShortcutList(ctx context.Context, find *api.ShortcutFind) ([
 	return list, nil
 }
 
-func (s *Store) FindShortcut(ctx context.Context, find *api.ShortcutFind) (*api.Shortcut, error) {
-	if find.ID != nil {
-		shortcut := &api.Shortcut{}
-		has, err := s.cache.FindCache(api.ShortcutCache, *find.ID, shortcut)
-		if err != nil {
-			return nil, err
-		}
-		if has {
-			return shortcut, nil
-		}
-	}
-
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	list, err := findShortcutList(ctx, tx, find)
+func (s *Store) FindShortcut(find *api.ShortcutFind) (*api.Shortcut, error) {
+	list, err := findShortcutList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -139,36 +87,20 @@ func (s *Store) FindShortcut(ctx context.Context, find *api.ShortcutFind) (*api.
 
 	shortcut := list[0].toShortcut()
 
-	if err := s.cache.UpsertCache(api.ShortcutCache, shortcut.ID, shortcut); err != nil {
-		return nil, err
-	}
-
 	return shortcut, nil
 }
 
-func (s *Store) DeleteShortcut(ctx context.Context, delete *api.ShortcutDelete) error {
-	tx, err := s.db.BeginTx(ctx, nil)
+func (s *Store) DeleteShortcut(delete *api.ShortcutDelete) error {
+	err := deleteShortcut(s.db, delete)
 	if err != nil {
 		return FormatError(err)
 	}
-	defer tx.Rollback()
-
-	err = deleteShortcut(ctx, tx, delete)
-	if err != nil {
-		return FormatError(err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		return FormatError(err)
-	}
-
-	s.cache.DeleteCache(api.ShortcutCache, delete.ID)
 
 	return nil
 }
 
-func createShortcut(ctx context.Context, tx *sql.Tx, create *api.ShortcutCreate) (*shortcutRaw, error) {
-	query := `
+func createShortcut(db *sql.DB, create *api.ShortcutCreate) (*shortcutRaw, error) {
+	row, err := db.Query(`
 		INSERT INTO shortcut (
 			title, 
 			payload, 
@@ -176,9 +108,19 @@ func createShortcut(ctx context.Context, tx *sql.Tx, create *api.ShortcutCreate)
 		)
 		VALUES (?, ?, ?)
 		RETURNING id, title, payload, creator_id, created_ts, updated_ts, row_status
-	`
+	`,
+		create.Title,
+		create.Payload,
+		create.CreatorID,
+	)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer row.Close()
+
+	row.Next()
 	var shortcutRaw shortcutRaw
-	if err := tx.QueryRowContext(ctx, query, create.Title, create.Payload, create.CreatorID).Scan(
+	if err := row.Scan(
 		&shortcutRaw.ID,
 		&shortcutRaw.Title,
 		&shortcutRaw.Payload,
@@ -193,7 +135,7 @@ func createShortcut(ctx context.Context, tx *sql.Tx, create *api.ShortcutCreate)
 	return &shortcutRaw, nil
 }
 
-func patchShortcut(ctx context.Context, tx *sql.Tx, patch *api.ShortcutPatch) (*shortcutRaw, error) {
+func patchShortcut(db *sql.DB, patch *api.ShortcutPatch) (*shortcutRaw, error) {
 	set, args := []string{}, []interface{}{}
 
 	if v := patch.Title; v != nil {
@@ -208,14 +150,23 @@ func patchShortcut(ctx context.Context, tx *sql.Tx, patch *api.ShortcutPatch) (*
 
 	args = append(args, patch.ID)
 
-	query := `
+	row, err := db.Query(`
 		UPDATE shortcut
-		SET ` + strings.Join(set, ", ") + `
+		SET `+strings.Join(set, ", ")+`
 		WHERE id = ?
 		RETURNING id, title, payload, created_ts, updated_ts, row_status
-	`
+	`, args...)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer row.Close()
+
+	if !row.Next() {
+		return nil, &common.Error{Code: common.NotFound, Err: fmt.Errorf("not found")}
+	}
+
 	var shortcutRaw shortcutRaw
-	if err := tx.QueryRowContext(ctx, query, args...).Scan(
+	if err := row.Scan(
 		&shortcutRaw.ID,
 		&shortcutRaw.Title,
 		&shortcutRaw.Payload,
@@ -229,7 +180,7 @@ func patchShortcut(ctx context.Context, tx *sql.Tx, patch *api.ShortcutPatch) (*
 	return &shortcutRaw, nil
 }
 
-func findShortcutList(ctx context.Context, tx *sql.Tx, find *api.ShortcutFind) ([]*shortcutRaw, error) {
+func findShortcutList(db *sql.DB, find *api.ShortcutFind) ([]*shortcutRaw, error) {
 	where, args := []string{"1 = 1"}, []interface{}{}
 
 	if v := find.ID; v != nil {
@@ -242,7 +193,7 @@ func findShortcutList(ctx context.Context, tx *sql.Tx, find *api.ShortcutFind) (
 		where, args = append(where, "title = ?"), append(args, *v)
 	}
 
-	rows, err := tx.QueryContext(ctx, `
+	rows, err := db.Query(`
 		SELECT
 			id,
 			title,
@@ -286,14 +237,16 @@ func findShortcutList(ctx context.Context, tx *sql.Tx, find *api.ShortcutFind) (
 	return shortcutRawList, nil
 }
 
-func deleteShortcut(ctx context.Context, tx *sql.Tx, delete *api.ShortcutDelete) error {
-	_, err := tx.ExecContext(ctx, `
-		PRAGMA foreign_keys = ON;
-		DELETE FROM shortcut WHERE id = ?
-	`, delete.ID)
+func deleteShortcut(db *sql.DB, delete *api.ShortcutDelete) error {
+	result, err := db.Exec(`DELETE FROM shortcut WHERE id = ?`, delete.ID)
 	if err != nil {
 		return FormatError(err)
 	}
 
+	rows, _ := result.RowsAffected()
+	if rows == 0 {
+		return &common.Error{Code: common.NotFound, Err: fmt.Errorf("shortcut ID not found: %d", delete.ID)}
+	}
+
 	return nil
 }

store/store.go

@@ -3,24 +3,19 @@ package store
 import (
 	"database/sql"
 
-	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/server/profile"
 )
 
-// Store provides database access to all raw objects.
+// Store provides database access to all raw objects
 type Store struct {
 	db      *sql.DB
 	profile *profile.Profile
-	cache   api.CacheService
 }
 
-// New creates a new instance of Store.
+// New creates a new instance of Store
 func New(db *sql.DB, profile *profile.Profile) *Store {
-	cacheService := NewCacheService()
-
 	return &Store{
 		db:      db,
 		profile: profile,
-		cache:   cacheService,
 	}
 }

store/user.go

@@ -1,7 +1,6 @@
 package store
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"strings"
@@ -44,64 +43,30 @@ func (raw *userRaw) toUser() *api.User {
 	}
 }
 
-func (s *Store) CreateUser(ctx context.Context, create *api.UserCreate) (*api.User, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	userRaw, err := createUser(ctx, tx, create)
+func (s *Store) CreateUser(create *api.UserCreate) (*api.User, error) {
+	userRaw, err := createUser(s.db, create)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
 	user := userRaw.toUser()
 
-	if err := s.cache.UpsertCache(api.UserCache, user.ID, user); err != nil {
-		return nil, err
-	}
-
 	return user, nil
 }
 
-func (s *Store) PatchUser(ctx context.Context, patch *api.UserPatch) (*api.User, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	userRaw, err := patchUser(ctx, tx, patch)
+func (s *Store) PatchUser(patch *api.UserPatch) (*api.User, error) {
+	userRaw, err := patchUser(s.db, patch)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
-	}
-
 	user := userRaw.toUser()
 
-	if err := s.cache.UpsertCache(api.UserCache, user.ID, user); err != nil {
-		return nil, err
-	}
-
 	return user, nil
 }
 
-func (s *Store) FindUserList(ctx context.Context, find *api.UserFind) ([]*api.User, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	userRawList, err := findUserList(ctx, tx, find)
+func (s *Store) FindUserList(find *api.UserFind) ([]*api.User, error) {
+	userRawList, err := findUserList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -114,25 +79,8 @@ func (s *Store) FindUserList(ctx context.Context, find *api.UserFind) ([]*api.Us
 	return list, nil
 }
 
-func (s *Store) FindUser(ctx context.Context, find *api.UserFind) (*api.User, error) {
-	if find.ID != nil {
-		user := &api.User{}
-		has, err := s.cache.FindCache(api.UserCache, *find.ID, user)
-		if err != nil {
-			return nil, err
-		}
-		if has {
-			return user, nil
-		}
-	}
-
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	list, err := findUserList(ctx, tx, find)
+func (s *Store) FindUser(find *api.UserFind) (*api.User, error) {
+	list, err := findUserList(s.db, find)
 	if err != nil {
 		return nil, err
 	}
@@ -145,36 +93,11 @@ func (s *Store) FindUser(ctx context.Context, find *api.UserFind) (*api.User, er
 
 	user := list[0].toUser()
 
-	if err := s.cache.UpsertCache(api.UserCache, user.ID, user); err != nil {
-		return nil, err
-	}
-
 	return user, nil
 }
 
-func (s *Store) DeleteUser(ctx context.Context, delete *api.UserDelete) error {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return FormatError(err)
-	}
-	defer tx.Rollback()
-
-	err = deleteUser(ctx, tx, delete)
-	if err != nil {
-		return FormatError(err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		return FormatError(err)
-	}
-
-	s.cache.DeleteCache(api.UserCache, delete.ID)
-
-	return nil
-}
-
-func createUser(ctx context.Context, tx *sql.Tx, create *api.UserCreate) (*userRaw, error) {
-	query := `
+func createUser(db *sql.DB, create *api.UserCreate) (*userRaw, error) {
+	row, err := db.Query(`
 		INSERT INTO user (
 			email,
 			role,
@@ -184,15 +107,21 @@ func createUser(ctx context.Context, tx *sql.Tx, create *api.UserCreate) (*userR
 		)
 		VALUES (?, ?, ?, ?, ?)
 		RETURNING id, email, role, name, password_hash, open_id, created_ts, updated_ts, row_status
-	`
-	var userRaw userRaw
-	if err := tx.QueryRowContext(ctx, query,
+	`,
 		create.Email,
 		create.Role,
 		create.Name,
 		create.PasswordHash,
 		create.OpenID,
-	).Scan(
+	)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer row.Close()
+
+	row.Next()
+	var userRaw userRaw
+	if err := row.Scan(
 		&userRaw.ID,
 		&userRaw.Email,
 		&userRaw.Role,
@@ -209,7 +138,7 @@ func createUser(ctx context.Context, tx *sql.Tx, create *api.UserCreate) (*userR
 	return &userRaw, nil
 }
 
-func patchUser(ctx context.Context, tx *sql.Tx, patch *api.UserPatch) (*userRaw, error) {
+func patchUser(db *sql.DB, patch *api.UserPatch) (*userRaw, error) {
 	set, args := []string{}, []interface{}{}
 
 	if v := patch.RowStatus; v != nil {
@@ -230,13 +159,12 @@ func patchUser(ctx context.Context, tx *sql.Tx, patch *api.UserPatch) (*userRaw,
 
 	args = append(args, patch.ID)
 
-	query := `
+	row, err := db.Query(`
 		UPDATE user
-		SET ` + strings.Join(set, ", ") + `
+		SET `+strings.Join(set, ", ")+`
 		WHERE id = ?
 		RETURNING id, email, role, name, password_hash, open_id, created_ts, updated_ts, row_status
-	`
-	row, err := tx.QueryContext(ctx, query, args...)
+	`, args...)
 	if err != nil {
 		return nil, FormatError(err)
 	}
@@ -258,17 +186,13 @@ func patchUser(ctx context.Context, tx *sql.Tx, patch *api.UserPatch) (*userRaw,
 			return nil, FormatError(err)
 		}
 
-		if err := row.Err(); err != nil {
-			return nil, err
-		}
-
 		return &userRaw, nil
 	}
 
 	return nil, &common.Error{Code: common.NotFound, Err: fmt.Errorf("user ID not found: %d", patch.ID)}
 }
 
-func findUserList(ctx context.Context, tx *sql.Tx, find *api.UserFind) ([]*userRaw, error) {
+func findUserList(db *sql.DB, find *api.UserFind) ([]*userRaw, error) {
 	where, args := []string{"1 = 1"}, []interface{}{}
 
 	if v := find.ID; v != nil {
@@ -287,7 +211,7 @@ func findUserList(ctx context.Context, tx *sql.Tx, find *api.UserFind) ([]*userR
 		where, args = append(where, "open_id = ?"), append(args, *v)
 	}
 
-	query := `
+	rows, err := db.Query(`
 		SELECT 
 			id,
 			email,
@@ -299,10 +223,10 @@ func findUserList(ctx context.Context, tx *sql.Tx, find *api.UserFind) ([]*userR
 			updated_ts,
 			row_status
 		FROM user
-		WHERE ` + strings.Join(where, " AND ") + `
-		ORDER BY created_ts DESC, row_status DESC
-	`
-	rows, err := tx.QueryContext(ctx, query, args...)
+		WHERE `+strings.Join(where, " AND ")+`
+		ORDER BY created_ts DESC`,
+		args...,
+	)
 	if err != nil {
 		return nil, FormatError(err)
 	}
@@ -322,6 +246,7 @@ func findUserList(ctx context.Context, tx *sql.Tx, find *api.UserFind) ([]*userR
 			&userRaw.UpdatedTs,
 			&userRaw.RowStatus,
 		); err != nil {
+			fmt.Println(err)
 			return nil, FormatError(err)
 		}
 
@@ -334,14 +259,3 @@ func findUserList(ctx context.Context, tx *sql.Tx, find *api.UserFind) ([]*userR
 
 	return userRawList, nil
 }
-
-func deleteUser(ctx context.Context, tx *sql.Tx, delete *api.UserDelete) error {
-	if _, err := tx.ExecContext(ctx, `
-		PRAGMA foreign_keys = ON;
-		DELETE FROM user WHERE id = ?
-	`, delete.ID); err != nil {
-		return FormatError(err)
-	}
-
-	return nil
-}

store/user_setting.go

@@ -1,151 +0,0 @@
-package store
-
-import (
-	"context"
-	"database/sql"
-	"strings"
-
-	"github.com/usememos/memos/api"
-)
-
-type userSettingRaw struct {
-	UserID int
-	Key    api.UserSettingKey
-	Value  string
-}
-
-func (raw *userSettingRaw) toUserSetting() *api.UserSetting {
-	return &api.UserSetting{
-		UserID: raw.UserID,
-		Key:    raw.Key,
-		Value:  raw.Value,
-	}
-}
-
-func (s *Store) UpsertUserSetting(ctx context.Context, upsert *api.UserSettingUpsert) (*api.UserSetting, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	userSettingRaw, err := upsertUserSetting(ctx, tx, upsert)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-
-	userSetting := userSettingRaw.toUserSetting()
-
-	return userSetting, nil
-}
-
-func (s *Store) FindUserSettingList(ctx context.Context, find *api.UserSettingFind) ([]*api.UserSetting, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	userSettingRawList, err := findUserSettingList(ctx, tx, find)
-	if err != nil {
-		return nil, err
-	}
-
-	list := []*api.UserSetting{}
-	for _, raw := range userSettingRawList {
-		list = append(list, raw.toUserSetting())
-	}
-
-	return list, nil
-}
-
-func (s *Store) FindUserSetting(ctx context.Context, find *api.UserSettingFind) (*api.UserSetting, error) {
-	tx, err := s.db.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer tx.Rollback()
-
-	list, err := findUserSettingList(ctx, tx, find)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(list) == 0 {
-		return nil, nil
-	}
-
-	userSetting := list[0].toUserSetting()
-
-	return userSetting, nil
-}
-
-func upsertUserSetting(ctx context.Context, tx *sql.Tx, upsert *api.UserSettingUpsert) (*userSettingRaw, error) {
-	query := `
-		INSERT INTO user_setting (
-			user_id, key, value
-		)
-		VALUES (?, ?, ?)
-		ON CONFLICT(user_id, key) DO UPDATE 
-		SET
-			value = EXCLUDED.value
-		RETURNING user_id, key, value
-	`
-	var userSettingRaw userSettingRaw
-	if err := tx.QueryRowContext(ctx, query, upsert.UserID, upsert.Key, upsert.Value).Scan(
-		&userSettingRaw.UserID,
-		&userSettingRaw.Key,
-		&userSettingRaw.Value,
-	); err != nil {
-		return nil, FormatError(err)
-	}
-
-	return &userSettingRaw, nil
-}
-
-func findUserSettingList(ctx context.Context, tx *sql.Tx, find *api.UserSettingFind) ([]*userSettingRaw, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
-
-	if v := find.Key; v != nil {
-		where, args = append(where, "key = ?"), append(args, v.String())
-	}
-
-	where, args = append(where, "user_id = ?"), append(args, find.UserID)
-
-	query := `
-		SELECT
-			user_id,
-		  key,
-			value
-		FROM user_setting
-		WHERE ` + strings.Join(where, " AND ")
-	rows, err := tx.QueryContext(ctx, query, args...)
-	if err != nil {
-		return nil, FormatError(err)
-	}
-	defer rows.Close()
-
-	userSettingRawList := make([]*userSettingRaw, 0)
-	for rows.Next() {
-		var userSettingRaw userSettingRaw
-		if err := rows.Scan(
-			&userSettingRaw.UserID,
-			&userSettingRaw.Key,
-			&userSettingRaw.Value,
-		); err != nil {
-			return nil, FormatError(err)
-		}
-
-		userSettingRawList = append(userSettingRawList, &userSettingRaw)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, FormatError(err)
-	}
-
-	return userSettingRawList, nil
-}

web/index.html

@@ -2,21 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/logo.webp" type="image/*" />
+    <link rel="icon" href="/favicon.svg" sizes="64x64" type="image/*" />
     <meta name="theme-color" content="#f6f5f4" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
-    <link rel="manifest" href="/manifest.json" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
     <title>Memos</title>
+    <script src="https://kit.fontawesome.com/41e3aaa6af.js" crossorigin="anonymous"></script>
   </head>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
-    <script>
-      window.addEventListener("load", () => {
-        if ("serviceWorker" in navigator) {
-          navigator.serviceWorker.register("/sw.js");
-        }
-      });
-    </script>
   </body>
 </html>

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memos",
-  "version": "0.4.2",
+  "version": "0.2.2",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
@@ -15,7 +15,6 @@
     "qs": "^6.11.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "react-feather": "^2.0.10",
     "react-redux": "^8.0.1"
   },
   "devDependencies": {

web/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><text x="0.1em" y=".9em" font-size="90">✍️</text></svg>

web/public/manifest.json

@@ -1,17 +0,0 @@
-{
-  "short_name": "Memos",
-  "name": "Memos",
-  "icons": [
-    {
-      "src": "/logo.webp",
-      "type": "image/*",
-      "sizes": "200x200"
-    }
-  ],
-  "start_url": "/",
-  "background_color": "#f6f5f4",
-  "display": "standalone",
-  "scope": "/",
-  "theme_color": "#f6f5f4",
-  "description": "usememos/memos"
-}

web/public/sw.js

@@ -1,10 +0,0 @@
-self.addEventListener("install", (event) => {
-    event.waitUntil((async () => {})());
-  });
-  
-  self.addEventListener("activate", (event) => {
-    event.waitUntil((async () => {})());
-  });
-  
-  self.addEventListener("fetch", (event) => {});
-  

web/src/App.tsx

@@ -1,41 +1,10 @@
-import { useEffect, useState } from "react";
-import useI18n from "./hooks/useI18n";
 import { appRouterSwitch } from "./routers";
-import { globalService, locationService } from "./services";
 import { useAppSelector } from "./store";
-import * as storage from "./helpers/storage";
 
 function App() {
-  const { setLocale } = useI18n();
-  const user = useAppSelector((state) => state.user.user);
-  const global = useAppSelector((state) => state.global);
   const pathname = useAppSelector((state) => state.location.pathname);
-  const [isLoading, setLoading] = useState(true);
 
-  useEffect(() => {
-    locationService.updateStateWithLocation();
-    window.onpopstate = () => {
-      locationService.updateStateWithLocation();
-    };
-    globalService.initialState().then(() => {
-      setLoading(false);
-    });
-  }, []);
-
-  useEffect(() => {
-    if (user?.setting.locale) {
-      globalService.setLocale(user.setting.locale);
-    }
-  }, [user?.setting.locale]);
-
-  useEffect(() => {
-    setLocale(global.locale);
-    storage.set({
-      locale: global.locale,
-    });
-  }, [global.locale]);
-
-  return <>{isLoading ? null : appRouterSwitch(pathname)}</>;
+  return <>{appRouterSwitch(pathname)}</>;
 }
 
 export default App;

web/src/components/AboutSiteDialog.tsx

@@ -1,16 +1,13 @@
 import { useEffect, useState } from "react";
 import * as api from "../helpers/api";
-import useI18n from "../hooks/useI18n";
 import Only from "./common/OnlyWhen";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import GitHubBadge from "./GitHubBadge";
 import "../less/about-site-dialog.less";
 
 interface Props extends DialogProps {}
 
 const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
-  const { t } = useI18n();
   const [profile, setProfile] = useState<Profile>();
 
   useEffect(() => {
@@ -37,22 +34,22 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
     <>
       <div className="dialog-header-container">
         <p className="title-text">
-          <span className="icon-text">🤠</span>
-          {t("common.about")}
+          <span className="icon-text">🤠</span>About <b>Memos</b>
         </p>
         <button className="btn close-btn" onClick={handleCloseBtnClick}>
-          <Icon.X />
+          <i className="fa-solid fa-xmark fa-lg"></i>
         </button>
       </div>
       <div className="dialog-content-container">
-        <img className="logo-img" src="/logo-full.webp" alt="" />
-        <p>{t("slogan")}</p>
+        <p>
+          Memos is an <i>open source</i>, <i>self-hosted</i> knowledge base that works with a SQLite db file.
+        </p>
         <br />
         <div className="addtion-info-container">
           <GitHubBadge />
           <Only when={profile !== undefined}>
             <>
-              {t("common.version")}:
+              version:
               <span className="pre-text">
                 {profile?.version}-{profile?.mode}
               </span>
@@ -66,7 +63,7 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
 };
 
 export default function showAboutSiteDialog(): void {
-  generateDialog(
+  showDialog(
     {
       className: "about-site-dialog",
     },

web/src/components/ArchivedMemo.tsx

@@ -1,12 +1,11 @@
-import { IMAGE_URL_REG } from "../helpers/marked";
+import { IMAGE_URL_REG } from "../helpers/consts";
 import * as utils from "../helpers/utils";
-import useI18n from "../hooks/useI18n";
 import useToggle from "../hooks/useToggle";
 import { memoService } from "../services";
-import { formatMemoContent } from "../helpers/marked";
 import Only from "./common/OnlyWhen";
 import Image from "./Image";
 import toastHelper from "./Toast";
+import { formatMemoContent } from "./Memo";
 import "../less/memo.less";
 
 interface Props {
@@ -20,7 +19,6 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
     createdAtStr: utils.getDateTimeString(propsMemo.createdTs),
     archivedAtStr: utils.getDateTimeString(propsMemo.updatedTs ?? Date.now()),
   };
-  const { t } = useI18n();
   const [showConfirmDeleteBtn, toggleConfirmDeleteBtn] = useToggle(false);
   const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));
 
@@ -30,8 +28,7 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
         await memoService.deleteMemoById(memo.id);
         await memoService.fetchAllMemos();
       } catch (error: any) {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
+        toastHelper.error(error.message);
       }
     } else {
       toggleConfirmDeleteBtn();
@@ -47,8 +44,7 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
       await memoService.fetchAllMemos();
       toastHelper.info("Restored successfully");
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error.message);
     }
   };
 
@@ -64,11 +60,10 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
         <span className="time-text">Archived at {memo.archivedAtStr}</span>
         <div className="btns-container">
           <span className="btn restore-btn" onClick={handleRestoreMemoClick}>
-            {t("common.restore")}
+            Restore
           </span>
           <span className={`btn delete-btn ${showConfirmDeleteBtn ? "final-confirm" : ""}`} onClick={handleDeleteMemoClick}>
-            {t("common.delete")}
-            {showConfirmDeleteBtn ? "!" : ""}
+            {showConfirmDeleteBtn ? "Delete!" : "Delete"}
           </span>
         </div>
       </div>

web/src/components/ArchivedMemoDialog.tsx

@@ -2,8 +2,7 @@ import { useEffect, useState } from "react";
 import useLoading from "../hooks/useLoading";
 import { memoService } from "../services";
 import { useAppSelector } from "../store";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import toastHelper from "./Toast";
 import ArchivedMemo from "./ArchivedMemo";
 import "../less/archived-memo-dialog.less";
@@ -23,8 +22,7 @@ const ArchivedMemoDialog: React.FC<Props> = (props: Props) => {
         setArchivedMemos(result);
       })
       .catch((error) => {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
+        toastHelper.error("Failed to fetch archived memos: ", error);
       })
       .finally(() => {
         loadingState.setFinish();
@@ -39,7 +37,7 @@ const ArchivedMemoDialog: React.FC<Props> = (props: Props) => {
           Archived Memos
         </p>
         <button className="btn close-btn" onClick={destroy}>
-          <Icon.X className="icon-img" />
+          <i className="fa-solid fa-xmark fa-lg icon-img"></i>
         </button>
       </div>
       <div className="dialog-content-container">
@@ -49,7 +47,7 @@ const ArchivedMemoDialog: React.FC<Props> = (props: Props) => {
           </div>
         ) : archivedMemos.length === 0 ? (
           <div className="tip-text-container">
-            <p className="tip-text">No archived memos.</p>
+            <p className="tip-text">Here is No Zettels.</p>
           </div>
         ) : (
           <div className="archived-memos-container">
@@ -63,10 +61,11 @@ const ArchivedMemoDialog: React.FC<Props> = (props: Props) => {
   );
 };
 
-export default function showArchivedMemoDialog(): void {
-  generateDialog(
+export default function showArchivedMemo(): void {
+  showDialog(
     {
       className: "archived-memo-dialog",
+      useAppContext: true,
     },
     ArchivedMemoDialog,
     {}

web/src/components/BetaBadge.tsx

@@ -1,13 +0,0 @@
-import "../less/beta-badge.less";
-
-interface Props {
-  className?: string;
-}
-
-const BetaBadge: React.FC<Props> = (props: Props) => {
-  const { className } = props;
-
-  return <span className={`beta-badge ${className ?? ""}`}>beta</span>;
-};
-
-export default BetaBadge;

web/src/components/ChangeMemoCreatedTsDialog.tsx

@@ -1,99 +0,0 @@
-import { useEffect, useState } from "react";
-import dayjs from "dayjs";
-import useI18n from "../hooks/useI18n";
-import { memoService } from "../services";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
-import toastHelper from "./Toast";
-import "../less/change-memo-created-ts-dialog.less";
-
-interface Props extends DialogProps {
-  memoId: MemoId;
-}
-
-const ChangeMemoCreatedTsDialog: React.FC<Props> = (props: Props) => {
-  const { t } = useI18n();
-  const { destroy, memoId } = props;
-  const [createdAt, setCreatedAt] = useState("");
-  const maxDatetimeValue = dayjs().format("YYYY-MM-DDTHH:mm");
-
-  useEffect(() => {
-    const memo = memoService.getMemoById(memoId);
-    if (memo) {
-      const datetime = dayjs(memo.createdTs).format("YYYY-MM-DDTHH:mm");
-      setCreatedAt(datetime);
-    } else {
-      toastHelper.error("Memo not found.");
-      destroy();
-    }
-  }, []);
-
-  const handleCloseBtnClick = () => {
-    destroy();
-  };
-
-  const handleDatetimeInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const datetime = e.target.value as string;
-    setCreatedAt(datetime);
-  };
-
-  const handleSaveBtnClick = async () => {
-    const nowTs = dayjs().unix();
-    const createdTs = dayjs(createdAt).unix();
-
-    if (createdTs > nowTs) {
-      toastHelper.error("Invalid created datetime.");
-      return;
-    }
-
-    try {
-      await memoService.patchMemo({
-        id: memoId,
-        createdTs,
-      });
-      toastHelper.info("Memo created datetime changed.");
-      handleCloseBtnClick();
-    } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
-    }
-  };
-
-  return (
-    <>
-      <div className="dialog-header-container">
-        <p className="title-text">Change memo created time</p>
-        <button className="btn close-btn" onClick={handleCloseBtnClick}>
-          <Icon.X />
-        </button>
-      </div>
-      <div className="dialog-content-container">
-        <label className="form-label input-form-label">
-          <input type="datetime-local" value={createdAt} max={maxDatetimeValue} onChange={handleDatetimeInputChange} />
-        </label>
-        <div className="btns-container">
-          <span className="btn cancel-btn" onClick={handleCloseBtnClick}>
-            {t("common.cancel")}
-          </span>
-          <span className="btn confirm-btn" onClick={handleSaveBtnClick}>
-            {t("common.save")}
-          </span>
-        </div>
-      </div>
-    </>
-  );
-};
-
-function showChangeMemoCreatedTsDialog(memoId: MemoId) {
-  generateDialog(
-    {
-      className: "change-memo-created-ts-dialog",
-    },
-    ChangeMemoCreatedTsDialog,
-    {
-      memoId,
-    }
-  );
-}
-
-export default showChangeMemoCreatedTsDialog;

web/src/components/ChangePasswordDialog.tsx

@@ -1,9 +1,7 @@
 import { useEffect, useState } from "react";
 import { validate, ValidatorConfig } from "../helpers/validator";
-import useI18n from "../hooks/useI18n";
 import { userService } from "../services";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import toastHelper from "./Toast";
 import "../less/change-password-dialog.less";
 
@@ -17,7 +15,6 @@ const validateConfig: ValidatorConfig = {
 interface Props extends DialogProps {}
 
 const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
-  const { t } = useI18n();
   const [newPassword, setNewPassword] = useState("");
   const [newPasswordAgain, setNewPasswordAgain] = useState("");
 
@@ -58,16 +55,13 @@ const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
     }
 
     try {
-      const user = userService.getState().user as User;
       await userService.patchUser({
-        id: user.id,
         password: newPassword,
       });
       toastHelper.info("Password changed.");
       handleCloseBtnClick();
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error);
     }
   };
 
@@ -76,7 +70,7 @@ const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
       <div className="dialog-header-container">
         <p className="title-text">Change Password</p>
         <button className="btn close-btn" onClick={handleCloseBtnClick}>
-          <Icon.X />
+          <i className="fa-solid fa-xmark fa-lg"></i>
         </button>
       </div>
       <div className="dialog-content-container">
@@ -88,10 +82,10 @@ const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
         </label>
         <div className="btns-container">
           <span className="btn cancel-btn" onClick={handleCloseBtnClick}>
-            {t("common.cancel")}
+            Cancel
           </span>
           <span className="btn confirm-btn" onClick={handleSaveBtnClick}>
-            {t("common.save")}
+            Save
           </span>
         </div>
       </div>
@@ -100,7 +94,7 @@ const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
 };
 
 function showChangePasswordDialog() {
-  generateDialog(
+  showDialog(
     {
       className: "change-password-dialog",
     },

web/src/components/ConfirmResetOpenIdDialog.tsx

@@ -0,0 +1,73 @@
+import { useEffect } from "react";
+import { userService } from "../services";
+import useLoading from "../hooks/useLoading";
+import { showDialog } from "./Dialog";
+import toastHelper from "./Toast";
+import "../less/confirm-reset-openid-dialog.less";
+
+interface Props extends DialogProps {}
+
+const ConfirmResetOpenIdDialog: React.FC<Props> = ({ destroy }: Props) => {
+  const resetBtnClickLoadingState = useLoading(false);
+
+  useEffect(() => {
+    // do nth
+  }, []);
+
+  const handleCloseBtnClick = () => {
+    destroy();
+  };
+
+  const handleConfirmBtnClick = async () => {
+    if (resetBtnClickLoadingState.isLoading) {
+      return;
+    }
+
+    resetBtnClickLoadingState.setLoading();
+    try {
+      await userService.patchUser({
+        resetOpenId: true,
+      });
+    } catch (error) {
+      toastHelper.error("Request reset open API failed.");
+      return;
+    }
+    toastHelper.success("Reset open API succeeded.");
+    handleCloseBtnClick();
+  };
+
+  return (
+    <>
+      <div className="dialog-header-container">
+        <p className="title-text">Reset Open API</p>
+        <button className="btn close-btn" onClick={handleCloseBtnClick}>
+          <i className="fa-solid fa-xmark fa-lg"></i>
+        </button>
+      </div>
+      <div className="dialog-content-container">
+        <p className="warn-text">
+          ❗️The existing API will be invalidated and a new one will be generated, are you sure you want to reset?
+        </p>
+        <div className="btns-container">
+          <span className="btn cancel-btn" onClick={handleCloseBtnClick}>
+            Cancel
+          </span>
+          <span className={`btn confirm-btn ${resetBtnClickLoadingState.isLoading ? "loading" : ""}`} onClick={handleConfirmBtnClick}>
+            Reset!
+          </span>
+        </div>
+      </div>
+    </>
+  );
+};
+
+function showConfirmResetOpenIdDialog() {
+  showDialog(
+    {
+      className: "confirm-reset-openid-dialog",
+    },
+    ConfirmResetOpenIdDialog
+  );
+}
+
+export default showConfirmResetOpenIdDialog;

web/src/components/CreateShortcutDialog.tsx

@@ -1,9 +1,8 @@
-import { useCallback, useEffect, useState } from "react";
+import { memo, useCallback, useEffect, useState } from "react";
 import { memoService, shortcutService } from "../services";
 import { checkShouldShowMemoWithFilters, filterConsts, getDefaultFilter, relationConsts } from "../helpers/filter";
 import useLoading from "../hooks/useLoading";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import toastHelper from "./Toast";
 import Selector from "./common/Selector";
 import "../less/create-shortcut-dialog.less";
@@ -61,8 +60,7 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {
         });
       }
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error.message);
     }
     destroy();
   };
@@ -102,7 +100,7 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {
           {shortcutId ? "Edit Shortcut" : "Create Shortcut"}
         </p>
         <button className="btn close-btn" onClick={destroy}>
-          <Icon.X />
+          <i className="fa-solid fa-xmark fa-lg"></i>
         </button>
       </div>
       <div className="dialog-content-container">
@@ -152,66 +150,129 @@ interface MemoFilterInputerProps {
   handleFilterRemove: (index: number) => void;
 }
 
-const MemoFilterInputer: React.FC<MemoFilterInputerProps> = (props: MemoFilterInputerProps) => {
+const FilterInputer: React.FC<MemoFilterInputerProps> = (props: MemoFilterInputerProps) => {
   const { index, filter, handleFilterChange, handleFilterRemove } = props;
-  const [value, setValue] = useState<string>(filter.value.value);
-
   const tags = Array.from(memoService.getState().tags);
   const { type } = filter;
-  const dataSource =
-    type === "TYPE"
-      ? filterConsts["TYPE"].values
-      : tags.sort().map((t) => {
-          return { text: t, value: t };
-        });
+  const [inputElements, setInputElements] = useState<JSX.Element>(<></>);
 
   useEffect(() => {
-    setValue(filter.value.value);
-  }, [type]);
-
-  const handleRelationChange = (value: string) => {
-    if (["AND", "OR"].includes(value)) {
-      handleFilterChange(index, {
-        ...filter,
-        relation: value as MemoFilterRalation,
-      });
+    let operatorElement = <></>;
+    if (Object.keys(filterConsts).includes(type)) {
+      operatorElement = (
+        <Selector
+          className="operator-selector"
+          dataSource={Object.values(filterConsts[type as FilterType].operators)}
+          value={filter.value.operator}
+          handleValueChanged={handleOperatorChange}
+        />
+      );
     }
-  };
 
-  const handleTypeChange = (value: string) => {
-    if (filter.type !== value) {
-      const ops = Object.values(filterConsts[value as FilterType].operators);
+    let valueElement = <></>;
+    switch (type) {
+      case "TYPE": {
+        valueElement = (
+          <Selector
+            className="value-selector"
+            dataSource={filterConsts["TYPE"].values}
+            value={filter.value.value}
+            handleValueChanged={handleValueChange}
+          />
+        );
+        break;
+      }
+      case "TAG": {
+        valueElement = (
+          <Selector
+            className="value-selector"
+            dataSource={tags.sort().map((t) => {
+              return { text: t, value: t };
+            })}
+            value={filter.value.value}
+            handleValueChanged={handleValueChange}
+          />
+        );
+        break;
+      }
+      case "TEXT": {
+        valueElement = (
+          <input
+            type="text"
+            className="value-inputer"
+            value={filter.value.value}
+            onChange={(event) => {
+              handleValueChange(event.target.value);
+              event.target.focus();
+            }}
+          />
+        );
+        break;
+      }
+    }
+
+    setInputElements(
+      <>
+        {operatorElement}
+        {valueElement}
+      </>
+    );
+  }, [type, filter]);
+
+  const handleRelationChange = useCallback(
+    (value: string) => {
+      if (["AND", "OR"].includes(value)) {
+        handleFilterChange(index, {
+          ...filter,
+          relation: value as MemoFilterRalation,
+        });
+      }
+    },
+    [filter]
+  );
+
+  const handleTypeChange = useCallback(
+    (value: string) => {
+      if (filter.type !== value) {
+        const ops = Object.values(filterConsts[value as FilterType].operators);
+        handleFilterChange(index, {
+          ...filter,
+          type: value as FilterType,
+          value: {
+            operator: ops[0].value,
+            value: "",
+          },
+        });
+      }
+    },
+    [filter]
+  );
+
+  const handleOperatorChange = useCallback(
+    (value: string) => {
       handleFilterChange(index, {
         ...filter,
-        type: value as FilterType,
         value: {
-          operator: ops[0].value,
-          value: "",
+          ...filter.value,
+          operator: value,
         },
       });
-    }
-  };
+    },
+    [filter]
+  );
 
-  const handleOperatorChange = (value: string) => {
-    handleFilterChange(index, {
-      ...filter,
-      value: {
-        ...filter.value,
-        operator: value,
-      },
-    });
-  };
-
-  const handleValueChange = (value: string) => {
-    setValue(value);
-    handleFilterChange(index, {
-      ...filter,
-      value: {
-        ...filter.value,
-        value,
-      },
-    });
-  };
+  const handleValueChange = useCallback(
+    (value: string) => {
+      handleFilterChange(index, {
+        ...filter,
+        value: {
+          ...filter.value,
+          value,
+        },
+      });
+    },
+    [filter]
+  );
 
   const handleRemoveBtnClick = () => {
     handleFilterRemove(index);
@@ -233,31 +294,17 @@ const MemoFilterInputer: React.FC<MemoFilterInputerProps> = (props: MemoFilterIn
         value={filter.type}
         handleValueChanged={handleTypeChange}
       />
-      <Selector
-        className="operator-selector"
-        dataSource={Object.values(filterConsts[type as FilterType].operators)}
-        value={filter.value.operator}
-        handleValueChanged={handleOperatorChange}
-      />
-      {type === "TEXT" ? (
-        <input
-          type="text"
-          className="value-inputer"
-          value={value}
-          onChange={(event) => {
-            handleValueChange(event.target.value);
-          }}
-        />
-      ) : (
-        <Selector className="value-selector" dataSource={dataSource} value={value} handleValueChanged={handleValueChange} />
-      )}
-      <Icon.X className="remove-btn" onClick={handleRemoveBtnClick} />
+
+      {inputElements}
+      <i className="fa-solid fa-xmark remove-btn" onClick={handleRemoveBtnClick}></i>
     </div>
   );
 };
 
+const MemoFilterInputer: React.FC<MemoFilterInputerProps> = memo(FilterInputer);
+
 export default function showCreateShortcutDialog(shortcutId?: ShortcutId): void {
-  generateDialog(
+  showDialog(
     {
       className: "create-shortcut-dialog",
     },

web/src/components/DailyMemo.tsx

@@ -1,5 +1,7 @@
+import { IMAGE_URL_REG } from "../helpers/consts";
 import * as utils from "../helpers/utils";
-import { formatMemoContent } from "../helpers/marked";
+import Only from "./common/OnlyWhen";
+import { formatMemoContent } from "./Memo";
 import "../less/daily-memo.less";
 
 interface DailyMemo extends Memo {
@@ -18,6 +20,7 @@ const DailyMemo: React.FC<Props> = (props: Props) => {
     createdAtStr: utils.getDateTimeString(propsMemo.createdTs),
     timeStr: utils.getTimeString(propsMemo.createdTs),
   };
+  const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));
 
   return (
     <div className="daily-memo-wrapper">
@@ -25,14 +28,14 @@ const DailyMemo: React.FC<Props> = (props: Props) => {
         <span className="normal-text">{memo.timeStr}</span>
       </div>
       <div className="memo-content-container">
-        <div
-          className="memo-content-text"
-          dangerouslySetInnerHTML={{
-            __html: formatMemoContent(memo.content, {
-              inlineImage: true,
-            }),
-          }}
-        ></div>
+        <div className="memo-content-text" dangerouslySetInnerHTML={{ __html: formatMemoContent(memo.content) }}></div>
+        <Only when={imageUrls.length > 0}>
+          <div className="images-container">
+            {imageUrls.map((imgUrl, idx) => (
+              <img key={idx} src={imgUrl} decoding="async" />
+            ))}
+          </div>
+        </Only>
       </div>
       <div className="split-line"></div>
     </div>

web/src/components/DailyReviewDialog.tsx

@@ -1,12 +1,10 @@
 import { useRef, useState } from "react";
 import { useAppSelector } from "../store";
 import toImage from "../labs/html2image";
-import useI18n from "../hooks/useI18n";
 import useToggle from "../hooks/useToggle";
 import { DAILY_TIMESTAMP } from "../helpers/consts";
 import * as utils from "../helpers/utils";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import DatePicker from "./common/DatePicker";
 import showPreviewImageDialog from "./PreviewImageDialog";
 import DailyMemo from "./DailyMemo";
@@ -20,7 +18,6 @@ const monthChineseStrArray = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "
 const weekdayChineseStrArray = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 
 const DailyReviewDialog: React.FC<Props> = (props: Props) => {
-  const { t } = useI18n();
   const memos = useAppSelector((state) => state.memo.memos);
   const [currentDateStamp, setCurrentDateStamp] = useState(utils.getDateStampByDate(utils.getDateString(props.currentDateStamp)));
   const [showDatePicker, toggleShowDatePicker] = useToggle(false);
@@ -63,21 +60,20 @@ const DailyReviewDialog: React.FC<Props> = (props: Props) => {
     <>
       <div className="dialog-header-container">
         <p className="title-text" onClick={() => toggleShowDatePicker()}>
-          <span className="icon-text">📅</span> {t("sidebar.daily-review")}
+          <span className="icon-text">📅</span> Daily Review
         </p>
         <div className="btns-container">
           <button className="btn-text" onClick={() => setCurrentDateStamp(currentDateStamp - DAILY_TIMESTAMP)}>
-            <Icon.ChevronLeft className="icon-img" />
+            <i className="fa-solid fa-chevron-left icon-img"></i>
           </button>
           <button className="btn-text" onClick={() => setCurrentDateStamp(currentDateStamp + DAILY_TIMESTAMP)}>
-            <Icon.ChevronRight className="icon-img" />
+            <i className="fa-solid fa-chevron-right icon-img"></i>
           </button>
-          <button className="btn-text share" onClick={handleShareBtnClick}>
-            <Icon.Share className="icon-img" />
+          <button className="btn-text" onClick={handleShareBtnClick}>
+            <i className="fa-solid fa-share-nodes icon-img"></i>
           </button>
-          <span className="split-line">/</span>
           <button className="btn-text" onClick={() => props.destroy()}>
-            <Icon.X className="icon-img" />
+            <i className="fa-solid fa-xmark fa-lg icon-img"></i>
           </button>
         </div>
         <DatePicker
@@ -112,9 +108,10 @@ const DailyReviewDialog: React.FC<Props> = (props: Props) => {
 };
 
 export default function showDailyReviewDialog(datestamp: DateStamp = Date.now()): void {
-  generateDialog(
+  showDialog(
     {
       className: "daily-review-dialog",
+      useAppContext: true,
     },
     DailyReviewDialog,
     { currentDateStamp: datestamp }

web/src/components/Dialog.tsx

@@ -1,12 +1,12 @@
-import { useEffect } from "react";
 import { createRoot } from "react-dom/client";
+import { ANIMATION_DURATION } from "../helpers/consts";
 import { Provider } from "react-redux";
-import { ANIMATION_DURATION } from "../../helpers/consts";
-import store from "../../store";
-import "../../less/base-dialog.less";
+import store from "../store";
+import "../less/dialog.less";
 
 interface DialogConfig {
   className: string;
+  useAppContext?: boolean;
   clickSpaceDestroy?: boolean;
 }
 
@@ -17,20 +17,6 @@ interface Props extends DialogConfig, DialogProps {
 const BaseDialog: React.FC<Props> = (props: Props) => {
   const { children, className, clickSpaceDestroy, destroy } = props;
 
-  useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.code === "Escape") {
-        destroy();
-      }
-    };
-
-    document.body.addEventListener("keydown", handleKeyDown);
-
-    return () => {
-      document.body.removeEventListener("keydown", handleKeyDown);
-    };
-  }, []);
-
   const handleSpaceClicked = () => {
     if (clickSpaceDestroy) {
       destroy();
@@ -46,7 +32,7 @@ const BaseDialog: React.FC<Props> = (props: Props) => {
   );
 };
 
-export function generateDialog<T extends DialogProps>(
+export function showDialog<T extends DialogProps>(
   config: DialogConfig,
   DialogComponent: React.FC<T>,
   props?: Omit<T, "destroy">
@@ -75,14 +61,16 @@ export function generateDialog<T extends DialogProps>(
     destroy: cbs.destroy,
   } as T;
 
-  const Fragment = (
-    <Provider store={store}>
-      <BaseDialog destroy={cbs.destroy} clickSpaceDestroy={true} {...config}>
-        <DialogComponent {...dialogProps} />
-      </BaseDialog>
-    </Provider>
+  let Fragment = (
+    <BaseDialog destroy={cbs.destroy} clickSpaceDestroy={true} {...config}>
+      <DialogComponent {...dialogProps} />
+    </BaseDialog>
   );
 
+  if (config.useAppContext) {
+    Fragment = <Provider store={store}>{Fragment}</Provider>;
+  }
+
   dialog.render(Fragment);
 
   return cbs;

web/src/components/Dialog/CommonDialog.tsx

@@ -1,85 +0,0 @@
-import Icon from "../Icon";
-import { generateDialog } from "./BaseDialog";
-import "../../less/common-dialog.less";
-
-type DialogStyle = "info" | "warning";
-
-interface Props extends DialogProps {
-  title: string;
-  content: string;
-  style?: DialogStyle;
-  closeBtnText?: string;
-  confirmBtnText?: string;
-  onClose?: () => void;
-  onConfirm?: () => void;
-}
-
-const defaultProps = {
-  title: "",
-  content: "",
-  style: "info",
-  closeBtnText: "Close",
-  confirmBtnText: "Confirm",
-  onClose: () => null,
-  onConfirm: () => null,
-};
-
-const CommonDialog: React.FC<Props> = (props: Props) => {
-  const { title, content, destroy, closeBtnText, confirmBtnText, onClose, onConfirm, style } = {
-    ...defaultProps,
-    ...props,
-  };
-
-  const handleCloseBtnClick = () => {
-    onClose();
-    destroy();
-  };
-
-  const handleConfirmBtnClick = async () => {
-    onConfirm();
-    destroy();
-  };
-
-  return (
-    <>
-      <div className="dialog-header-container">
-        <p className="title-text">{title}</p>
-        <button className="btn close-btn" onClick={handleCloseBtnClick}>
-          <Icon.X />
-        </button>
-      </div>
-      <div className="dialog-content-container">
-        <p className="content-text">{content}</p>
-        <div className="btns-container">
-          <span className="btn cancel-btn" onClick={handleCloseBtnClick}>
-            {closeBtnText}
-          </span>
-          <span className={`btn confirm-btn ${style}`} onClick={handleConfirmBtnClick}>
-            {confirmBtnText}
-          </span>
-        </div>
-      </div>
-    </>
-  );
-};
-
-interface CommonDialogProps {
-  title: string;
-  content: string;
-  className?: string;
-  style?: DialogStyle;
-  closeBtnText?: string;
-  confirmBtnText?: string;
-  onClose?: () => void;
-  onConfirm?: () => void;
-}
-
-export const showCommonDialog = (props: CommonDialogProps) => {
-  generateDialog(
-    {
-      className: `common-dialog ${props?.className ?? ""}`,
-    },
-    CommonDialog,
-    props
-  );
-};

web/src/components/Dialog/index.ts

@@ -1 +0,0 @@
-export { generateDialog } from "./BaseDialog";

web/src/components/Editor/Editor.tsx

@@ -1,5 +1,4 @@
 import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef } from "react";
-import useI18n from "../../hooks/useI18n";
 import useRefresh from "../../hooks/useRefresh";
 import Only from "../common/OnlyWhen";
 import "../../less/editor.less";
@@ -10,7 +9,6 @@ export interface EditorRefActions {
   insertText: (text: string) => void;
   setContent: (text: string) => void;
   getContent: () => string;
-  getCursorPosition: () => number;
 }
 
 interface EditorProps {
@@ -19,8 +17,10 @@ interface EditorProps {
   placeholder: string;
   fullscreen: boolean;
   showConfirmBtn: boolean;
+  showCancelBtn: boolean;
   tools?: ReactNode;
   onConfirmBtnClick: (content: string) => void;
+  onCancelBtnClick: () => void;
   onContentChange: (content: string) => void;
 }
 
@@ -32,10 +32,11 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
     placeholder,
     fullscreen,
     showConfirmBtn,
+    showCancelBtn,
     onConfirmBtnClick: handleConfirmBtnClickCallback,
+    onCancelBtnClick: handleCancelBtnClickCallback,
     onContentChange: handleContentChangeCallback,
   } = props;
-  const { t } = useI18n();
   const editorRef = useRef<HTMLTextAreaElement>(null);
   const refresh = useRefresh();
 
@@ -65,17 +66,14 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
         }
 
         const prevValue = editorRef.current.value;
-        const cursorPosition = editorRef.current.selectionStart;
-        editorRef.current.value = prevValue.slice(0, cursorPosition) + rawText + prevValue.slice(cursorPosition);
-        editorRef.current.focus();
-        editorRef.current.selectionEnd = cursorPosition + rawText.length;
+        editorRef.current.value =
+          prevValue.slice(0, editorRef.current.selectionStart) + rawText + prevValue.slice(editorRef.current.selectionStart);
         handleContentChangeCallback(editorRef.current.value);
         refresh();
       },
       setContent: (text: string) => {
         if (editorRef.current) {
           editorRef.current.value = text;
-          editorRef.current.focus();
           handleContentChangeCallback(editorRef.current.value);
           refresh();
         }
@@ -83,9 +81,6 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
       getContent: (): string => {
         return editorRef.current?.value ?? "";
       },
-      getCursorPosition: (): number => {
-        return editorRef.current?.selectionStart ?? 0;
-      },
     }),
     []
   );
@@ -114,6 +109,10 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
     editorRef.current.value = "";
   }, []);
 
+  const handleCommonCancelBtnClick = useCallback(() => {
+    handleCancelBtnClickCallback();
+  }, []);
+
   return (
     <div className={"common-editor-wrapper " + className}>
       <textarea
@@ -129,9 +128,14 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
           <Only when={props.tools !== undefined}>{props.tools}</Only>
         </div>
         <div className="btns-container">
+          <Only when={showCancelBtn}>
+            <button className="action-btn cancel-btn" onClick={handleCommonCancelBtnClick}>
+              Cancel editting
+            </button>
+          </Only>
           <Only when={showConfirmBtn}>
             <button className="action-btn confirm-btn" disabled={editorRef.current?.value === ""} onClick={handleCommonConfirmBtnClick}>
-              {t("editor.save")} <span className="icon-text">✍️</span>
+              Save <span className="icon-text">✍️</span>
             </button>
           </Only>
         </div>

web/src/components/GitHubBadge.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useState } from "react";
 import * as api from "../helpers/api";
-import Icon from "./Icon";
 import "../less/github-badge.less";
 
 interface Props {}
@@ -17,10 +16,13 @@ const GitHubBadge: React.FC<Props> = () => {
   return (
     <a className="github-badge-container" href="https://github.com/usememos/memos">
       <div className="github-icon">
-        <Icon.GitHub className="icon-img" />
+        <i className="fa-brands fa-github fa-lg icon-img"></i>
         Star
       </div>
-      <div className="count-text">{starCount || ""}</div>
+      <div className="count-text">
+        {starCount || ""}
+        <span className="icon-text">🌟</span>
+      </div>
     </a>
   );
 };

web/src/components/Icon.ts

@@ -1,3 +0,0 @@
-import * as Icon from "react-feather";
-
-export default Icon;

web/src/components/Memo.tsx

@@ -1,13 +1,10 @@
 import { memo, useEffect, useRef, useState } from "react";
-import { indexOf } from "lodash-es";
+import { escape, indexOf } from "lodash-es";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
-import "dayjs/locale/zh";
-import useI18n from "../hooks/useI18n";
-import { UNKNOWN_ID } from "../helpers/consts";
-import { DONE_BLOCK_REG, formatMemoContent, IMAGE_URL_REG, TODO_BLOCK_REG } from "../helpers/marked";
+import { IMAGE_URL_REG, LINK_URL_REG, MEMO_LINK_REG, TAG_REG, UNKNOWN_ID } from "../helpers/consts";
+import { DONE_BLOCK_REG, parseMarkedToHtml, TODO_BLOCK_REG } from "../helpers/marked";
 import { editorStateService, locationService, memoService, userService } from "../services";
-import Icon from "./Icon";
 import Only from "./common/OnlyWhen";
 import toastHelper from "./Toast";
 import Image from "./Image";
@@ -29,49 +26,42 @@ interface State {
   expandButtonStatus: ExpandButtonStatus;
 }
 
-export const getFormatedMemoCreatedAtStr = (createdTs: number, locale = "en"): string => {
+export const getFormatedMemoCreatedAtStr = (createdTs: number): string => {
   if (Date.now() - createdTs < 1000 * 60 * 60 * 24) {
-    return dayjs(createdTs).locale(locale).fromNow();
+    return dayjs(createdTs).fromNow();
   } else {
-    return dayjs(createdTs).locale(locale).format("YYYY/MM/DD HH:mm:ss");
+    return dayjs(createdTs).format("YYYY/MM/DD HH:mm:ss");
   }
 };
 
 const Memo: React.FC<Props> = (props: Props) => {
   const memo = props.memo;
-  const { t, locale } = useI18n();
   const [state, setState] = useState<State>({
     expandButtonStatus: -1,
   });
-  const [createdAtStr, setCreatedAtStr] = useState<string>(getFormatedMemoCreatedAtStr(memo.createdTs, locale));
+  const [createdAtStr, setCreatedAtStr] = useState<string>(getFormatedMemoCreatedAtStr(memo.createdTs));
   const memoContainerRef = useRef<HTMLDivElement>(null);
-  const memoContentContainerRef = useRef<HTMLDivElement>(null);
   const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));
   const isVisitorMode = userService.isVisitorMode();
 
   useEffect(() => {
-    if (!memoContentContainerRef) {
+    if (!memoContainerRef) {
       return;
     }
 
-    if (Number(memoContentContainerRef.current?.clientHeight) > MAX_MEMO_CONTAINER_HEIGHT) {
+    if (Number(memoContainerRef.current?.clientHeight) > MAX_MEMO_CONTAINER_HEIGHT) {
       setState({
         ...state,
         expandButtonStatus: 0,
       });
     }
 
-    let intervalFlag = -1;
     if (Date.now() - memo.createdTs < 1000 * 60 * 60 * 24) {
-      intervalFlag = setInterval(() => {
-        setCreatedAtStr(getFormatedMemoCreatedAtStr(memo.createdTs, locale));
+      setInterval(() => {
+        setCreatedAtStr(dayjs(memo.createdTs).fromNow());
       }, 1000 * 1);
     }
-
-    return () => {
-      clearInterval(intervalFlag);
-    };
-  }, [locale]);
+  }, []);
 
   const handleShowMemoStoryDialog = () => {
     showMemoCardDialog(memo);
@@ -104,8 +94,7 @@ const Memo: React.FC<Props> = (props: Props) => {
         rowStatus: "ARCHIVED",
       });
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error.message);
     }
 
     if (editorStateService.getState().editMemoId === memo.id) {
@@ -127,7 +116,7 @@ const Memo: React.FC<Props> = (props: Props) => {
       if (memoTemp) {
         showMemoCardDialog(memoTemp);
       } else {
-        toastHelper.error("Memo Not Found");
+        toastHelper.error("MEMO Not Found");
         targetEl.classList.remove("memo-link-text");
       }
     } else if (targetEl.className === "tag-span") {
@@ -144,7 +133,7 @@ const Memo: React.FC<Props> = (props: Props) => {
       }
 
       const status = targetEl.dataset?.value;
-      const todoElementList = [...(memoContentContainerRef.current?.querySelectorAll(`span.todo-block[data-value=${status}]`) ?? [])];
+      const todoElementList = [...(memoContainerRef.current?.querySelectorAll(`span.todo-block[data-value=${status}]`) ?? [])];
       for (const element of todoElementList) {
         if (element === targetEl) {
           const index = indexOf(todoElementList, element);
@@ -173,60 +162,58 @@ const Memo: React.FC<Props> = (props: Props) => {
   };
 
   const handleExpandBtnClick = () => {
-    const expandButtonStatus = Boolean(!state.expandButtonStatus);
-    if (!expandButtonStatus) {
-      memoContainerRef.current?.scrollIntoView();
-    }
-
     setState({
-      expandButtonStatus: Number(expandButtonStatus) as ExpandButtonStatus,
+      expandButtonStatus: Number(Boolean(!state.expandButtonStatus)) as ExpandButtonStatus,
     });
   };
 
   return (
-    <div className={`memo-wrapper ${"memos-" + memo.id} ${memo.pinned ? "pinned" : ""}`} ref={memoContainerRef}>
+    <div className={`memo-wrapper ${"memos-" + memo.id} ${memo.pinned ? "pinned" : ""}`}>
       <div className="memo-top-wrapper">
         <div className="status-text-container" onClick={handleShowMemoStoryDialog}>
           <span className="time-text">{createdAtStr}</span>
-          <Only when={memo.visibility !== "PRIVATE" && !isVisitorMode}>
-            <span className={`status-text ${memo.visibility.toLocaleLowerCase()}`}>{memo.visibility}</span>
+          <Only when={memo.pinned}>
+            <span className="status-text">PINNED</span>
+          </Only>
+          <Only when={memo.visibility === "PUBLIC" && !isVisitorMode}>
+            <span className="status-text">PUBLIC</span>
           </Only>
         </div>
         <div className={`btns-container ${userService.isVisitorMode() ? "!hidden" : ""}`}>
           <span className="btn more-action-btn">
-            <Icon.MoreHorizontal className="icon-img" />
+            <i className="fa-solid fa-ellipsis icon-img"></i>
           </span>
           <div className="more-action-btns-wrapper">
             <div className="more-action-btns-container">
               <div className="btns-container">
                 <div className="btn" onClick={handleTogglePinMemoBtnClick}>
-                  <Icon.Flag className={`icon-img ${memo.pinned ? "" : "opacity-20"}`} />
-                  <span className="tip-text">{memo.pinned ? t("common.unpin") : t("common.pin")}</span>
+                  <i className={`fa-solid fa-thumbtack icon-img ${memo.pinned ? "" : "opacity-20"}`}></i>
+                  <span className="tip-text">{memo.pinned ? "Unpin" : "Pin"}</span>
                 </div>
                 <div className="btn" onClick={handleEditMemoClick}>
-                  <Icon.Edit3 className="icon-img" />
-                  <span className="tip-text">{t("common.edit")}</span>
+                  <i className="fa-solid fa-pen-to-square icon-img"></i>
+                  <span className="tip-text">Edit</span>
                 </div>
                 <div className="btn" onClick={handleGenMemoImageBtnClick}>
-                  <Icon.Share className="icon-img" />
-                  <span className="tip-text">{t("common.share")}</span>
+                  <i className="fa-solid fa-share-nodes icon-img"></i>
+                  <span className="tip-text">Share</span>
                 </div>
               </div>
               <span className="btn" onClick={handleMarkMemoClick}>
-                {t("common.mark")}
+                Mark
               </span>
               <span className="btn" onClick={handleShowMemoStoryDialog}>
-                {t("memo.view-story")}
+                View Story
               </span>
               <span className="btn archive-btn" onClick={handleArchiveMemoClick}>
-                {t("common.archive")}
+                Archive
               </span>
             </div>
           </div>
         </div>
       </div>
       <div
-        ref={memoContentContainerRef}
+        ref={memoContainerRef}
         className={`memo-content-text ${state.expandButtonStatus === 0 ? "expanded" : ""}`}
         onClick={handleMemoContentClick}
         dangerouslySetInnerHTML={{ __html: formatMemoContent(memo.content) }}
@@ -235,7 +222,7 @@ const Memo: React.FC<Props> = (props: Props) => {
         <div className="expand-btn-container">
           <span className={`btn ${state.expandButtonStatus === 0 ? "expand-btn" : "fold-btn"}`} onClick={handleExpandBtnClick}>
             {state.expandButtonStatus === 0 ? "Expand" : "Fold"}
-            <Icon.ChevronRight className="icon-img" />
+            <i className="fa-solid fa-chevron-right icon-img"></i>
           </span>
         </div>
       )}
@@ -250,4 +237,15 @@ const Memo: React.FC<Props> = (props: Props) => {
   );
 };
 
+export function formatMemoContent(content: string) {
+  const tempElement = document.createElement("div");
+  tempElement.innerHTML = parseMarkedToHtml(escape(content));
+
+  return tempElement.innerHTML
+    .replace(IMAGE_URL_REG, "")
+    .replace(MEMO_LINK_REG, "<span class='memo-link-text' data-value='$2'>$1</span>")
+    .replace(LINK_URL_REG, "<a class='link' target='_blank' rel='noreferrer' href='$2'>$1</a>")
+    .replace(TAG_REG, "<span class='tag-span'>#$1</span> ");
+}
+
 export default memo(Memo);

web/src/components/MemoCardDialog.tsx

@@ -1,16 +1,13 @@
 import { useState, useEffect, useCallback } from "react";
 import { editorStateService, memoService, userService } from "../services";
-import { useAppSelector } from "../store";
-import { UNKNOWN_ID, VISIBILITY_SELECTOR_ITEMS } from "../helpers/consts";
+import { IMAGE_URL_REG, MEMO_LINK_REG, UNKNOWN_ID } from "../helpers/consts";
 import * as utils from "../helpers/utils";
-import { formatMemoContent, IMAGE_URL_REG, MEMO_LINK_REG, parseHtmlToRawText } from "../helpers/marked";
+import { parseHtmlToRawText } from "../helpers/marked";
 import Only from "./common/OnlyWhen";
 import toastHelper from "./Toast";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import Image from "./Image";
-import Icon from "./Icon";
-import Selector from "./common/Selector";
-import showChangeMemoCreatedTsDialog from "./ChangeMemoCreatedTsDialog";
+import { formatMemoContent } from "./Memo";
 import "../less/memo-card-dialog.less";
 
 interface LinkedMemo extends Memo {
@@ -23,7 +20,6 @@ interface Props extends DialogProps {
 }
 
 const MemoCardDialog: React.FC<Props> = (props: Props) => {
-  const memos = useAppSelector((state) => state.memo.memos);
   const [memo, setMemo] = useState<Memo>({
     ...props.memo,
   });
@@ -72,12 +68,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
     };
 
     fetchLinkedMemos();
-    setMemo(memoService.getMemoById(memo.id) as Memo);
-  }, [memos, memo.id]);
-
-  const handleMemoCreatedAtClick = () => {
-    showChangeMemoCreatedTsDialog(memo.id);
-  };
+  }, [memo.id]);
 
   const handleMemoContentClick = useCallback(async (e: React.MouseEvent) => {
     const targetEl = e.target as HTMLElement;
@@ -95,7 +86,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
         setLinkedMemos([]);
         setMemo(nextMemo);
       } else {
-        toastHelper.error("Memo Not Found");
+        toastHelper.error("MEMO Not Found");
         targetEl.classList.remove("memo-link-text");
       }
     }
@@ -107,16 +98,25 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
     setMemo(memo);
   }, []);
 
-  const handleEditMemoBtnClick = () => {
+  const handleEditMemoBtnClick = useCallback(() => {
     props.destroy();
     editorStateService.setEditMemoWithId(memo.id);
+  }, [memo.id]);
+
+  const handlePinClick = async () => {
+    if (memo.pinned) {
+      await memoService.unpinMemo(memo.id);
+    } else {
+      await memoService.pinMemo(memo.id);
+    }
+    setMemo({
+      ...memo,
+      pinned: !memo.pinned,
+    });
   };
 
-  const handleVisibilitySelectorChange = async (visibility: Visibility) => {
-    if (memo.visibility === visibility) {
-      return;
-    }
-
+  const handleVisibilityClick = async () => {
+    const visibility = memo.visibility === "PRIVATE" ? "PUBLIC" : "PRIVATE";
     await memoService.patchMemo({
       id: memo.id,
       visibility: visibility,
@@ -129,35 +129,25 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
 
   return (
     <>
-      <Only when={!userService.isVisitorMode()}>
-        <div className="card-header-container">
-          <div className="visibility-selector-container">
-            <Icon.Eye className="icon-img" />
-            <Selector
-              className="visibility-selector"
-              dataSource={VISIBILITY_SELECTOR_ITEMS}
-              value={memo.visibility}
-              handleValueChanged={(value) => handleVisibilitySelectorChange(value as Visibility)}
-            />
-          </div>
-        </div>
-      </Only>
       <div className="memo-card-container">
         <div className="header-container">
-          <p className="time-text" onClick={handleMemoCreatedAtClick}>
-            {utils.getDateTimeString(memo.createdTs)}
-          </p>
+          <p className="time-text">{utils.getDateTimeString(memo.createdTs)}</p>
           <div className="btns-container">
             <Only when={!userService.isVisitorMode()}>
               <>
-                <button className="btn edit-btn" onClick={handleEditMemoBtnClick}>
-                  <Icon.Edit3 className="icon-img" />
+                <button className="btn" onClick={handlePinClick}>
+                  <i className={`fa-solid fa-thumbtack icon-img ${memo.pinned ? "" : "opacity-20"}`}></i>
+                </button>
+                <button className="btn" onClick={handleVisibilityClick}>
+                  <i className={`fa-solid fa-eye icon-img ${memo.visibility === "PUBLIC" ? "" : "opacity-20"}`}></i>
+                </button>
+                <button className="btn edit-btn" onClick={handleEditMemoBtnClick}>
+                  <i className="fa-solid fa-pen-to-square icon-img"></i>
                 </button>
-                <span className="split-line">/</span>
               </>
             </Only>
             <button className="btn close-btn" onClick={props.destroy}>
-              <Icon.X className="icon-img" />
+              <i className="fa-solid fa-xmark fa-lg icon-img"></i>
             </button>
           </div>
         </div>
@@ -228,7 +218,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
 };
 
 export default function showMemoCardDialog(memo: Memo): void {
-  generateDialog(
+  showDialog(
     {
       className: "memo-card-dialog",
     },

web/src/components/MemoEditor.tsx

@@ -1,10 +1,8 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { UNKNOWN_ID } from "../helpers/consts";
 import { editorStateService, locationService, memoService, resourceService } from "../services";
-import useI18n from "../hooks/useI18n";
 import { useAppSelector } from "../store";
 import * as storage from "../helpers/storage";
-import Icon from "./Icon";
 import toastHelper from "./Toast";
 import Editor, { EditorRefActions } from "./Editor/Editor";
 import "../less/memo-editor.less";
@@ -17,8 +15,6 @@ interface State {
 }
 
 const MemoEditor: React.FC<Props> = () => {
-  const { t, locale } = useI18n();
-  const user = useAppSelector((state) => state.user.user);
   const editorState = useAppSelector((state) => state.editor);
   const tags = useAppSelector((state) => state.memo.tags);
   const [state, setState] = useState<State>({
@@ -28,7 +24,6 @@ const MemoEditor: React.FC<Props> = () => {
   const editorRef = useRef<EditorRefActions>(null);
   const prevGlobalStateRef = useRef(editorState);
   const tagSeletorRef = useRef<HTMLDivElement>(null);
-  const editorFontStyle = user?.setting.editorFontStyle || "normal";
 
   useEffect(() => {
     if (editorState.markMemoId && editorState.markMemoId !== UNKNOWN_ID) {
@@ -112,17 +107,16 @@ const MemoEditor: React.FC<Props> = () => {
       const { type } = file;
 
       if (!type.startsWith("image")) {
-        toastHelper.error("Only image file supported.");
         return;
       }
 
       try {
         const image = await resourceService.upload(file);
         const url = `/h/r/${image.id}/${image.filename}`;
+
         return url;
       } catch (error: any) {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
+        toastHelper.error(error);
       } finally {
         setState({
           ...state,
@@ -158,8 +152,7 @@ const MemoEditor: React.FC<Props> = () => {
         locationService.clearQuery();
       }
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error.message);
     }
 
     setState({
@@ -169,7 +162,7 @@ const MemoEditor: React.FC<Props> = () => {
     setEditorContentCache("");
   };
 
-  const handleCancelEditingBtnClick = useCallback(() => {
+  const handleCancelBtnClick = useCallback(() => {
     editorStateService.clearEditMemo();
     editorRef.current?.setContent("");
     setEditorContentCache("");
@@ -179,57 +172,23 @@ const MemoEditor: React.FC<Props> = () => {
     setEditorContentCache(content);
   }, []);
 
-  const handleCheckBoxBtnClick = () => {
-    if (!editorRef.current) {
-      return;
-    }
-
-    const cursorPosition = editorRef.current.getCursorPosition();
-    const prevValue = editorRef.current.getContent().slice(0, cursorPosition);
-    if (prevValue === "" || prevValue.endsWith("\n")) {
-      editorRef.current?.insertText("- [ ] ");
-    } else {
-      editorRef.current?.insertText("\n- [ ] ");
-    }
-  };
-
-  const handleCodeBlockBtnClick = () => {
-    if (!editorRef.current) {
-      return;
-    }
-
-    const cursorPosition = editorRef.current.getCursorPosition();
-    const prevValue = editorRef.current.getContent().slice(0, cursorPosition);
-    if (prevValue === "" || prevValue.endsWith("\n")) {
-      editorRef.current?.insertText("```\n\n```");
-    } else {
-      editorRef.current?.insertText("\n```\n\n```");
-    }
-  };
-
   const handleUploadFileBtnClick = useCallback(() => {
     const inputEl = document.createElement("input");
-    inputEl.style.position = "fixed";
-    inputEl.style.top = "-100vh";
-    inputEl.style.left = "-100vw";
-    document.body.appendChild(inputEl);
     inputEl.type = "file";
-    inputEl.multiple = true;
-    inputEl.accept = "image/*";
+    inputEl.multiple = false;
+    inputEl.accept = "image/png, image/gif, image/jpeg";
     inputEl.onchange = async () => {
       if (!inputEl.files || inputEl.files.length === 0) {
         return;
       }
 
-      for (const file of inputEl.files) {
-        const url = await handleUploadFile(file);
-        if (url) {
-          editorRef.current?.insertText(`![](${url})`);
-        }
+      const file = inputEl.files[0];
+      const url = await handleUploadFile(file);
+      if (url) {
+        editorRef.current?.insertText(`![](${url})`);
       }
     };
     inputEl.click();
-    document.body.removeChild(inputEl);
   }, []);
 
   const handleFullscreenBtnClick = () => {
@@ -250,60 +209,41 @@ const MemoEditor: React.FC<Props> = () => {
 
   const editorConfig = useMemo(
     () => ({
-      className: `memo-editor ${editorFontStyle}`,
+      className: "memo-editor",
       initialContent: getEditorContentCache(),
-      placeholder: t("editor.placeholder"),
+      placeholder: "Any thoughts...",
       fullscreen: state.fullscreen,
       showConfirmBtn: true,
+      showCancelBtn: isEditing,
       onConfirmBtnClick: handleSaveBtnClick,
+      onCancelBtnClick: handleCancelBtnClick,
       onContentChange: handleContentChange,
     }),
-    [isEditing, state.fullscreen, locale, editorFontStyle]
+    [isEditing, state.fullscreen]
   );
 
   return (
     <div className={`memo-editor-container ${isEditing ? "edit-ing" : ""} ${state.fullscreen ? "fullscreen" : ""}`}>
-      <div className={`tip-container ${isEditing ? "" : "!hidden"}`}>
-        <span className="tip-text">{t("editor.editing")}</span>
-        <button className="cancel-btn" onClick={handleCancelEditingBtnClick}>
-          {t("common.cancel")}
-        </button>
-      </div>
+      <p className={"tip-text " + (isEditing ? "" : "hidden")}>Editting...</p>
       <Editor
         ref={editorRef}
         {...editorConfig}
         tools={
           <>
             <div className="action-btn tag-action">
-              <Icon.Hash className="icon-img" />
+              <i className="fa-solid fa-hashtag icon-img"></i>
               <div ref={tagSeletorRef} className="tag-list" onClick={handleTagSeletorClick}>
-                {tags.length > 0 ? (
-                  tags.map((tag) => {
-                    return (
-                      <span className="item-container" key={tag}>
-                        {tag}
-                      </span>
-                    );
-                  })
-                ) : (
-                  <p className="tip-text" onClick={(e) => e.stopPropagation()}>
-                    {t("common.null")}
-                  </p>
-                )}
+                {tags.map((t) => {
+                  return <span key={t}>{t}</span>;
+                })}
               </div>
             </div>
             <button className="action-btn">
-              <Icon.CheckSquare className="icon-img" onClick={handleCheckBoxBtnClick} />
-            </button>
-            <button className="action-btn">
-              <Icon.Code className="icon-img" onClick={handleCodeBlockBtnClick} />
-            </button>
-            <button className="action-btn">
-              <Icon.Image className="icon-img" onClick={handleUploadFileBtnClick} />
+              <i className="fa-solid fa-image icon-img" onClick={handleUploadFileBtnClick}></i>
               <span className={`tip-text ${state.isUploadingResource ? "!block" : ""}`}>Uploading</span>
             </button>
             <button className="action-btn" onClick={handleFullscreenBtnClick}>
-              {state.fullscreen ? <Icon.Minimize className="icon-img" /> : <Icon.Maximize className="icon-img" />}
+              <i className={`fa-solid fa-${state.fullscreen ? "compress" : "expand"} icon-img`}></i>
             </button>
           </>
         }

web/src/components/MemoList.tsx

@@ -1,21 +1,19 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { memoService, shortcutService } from "../services";
-import useI18n from "../hooks/useI18n";
 import { useAppSelector } from "../store";
-import { IMAGE_URL_REG, LINK_URL_REG, MEMO_LINK_REG, TAG_REG } from "../helpers/marked";
+import { IMAGE_URL_REG, LINK_URL_REG, MEMO_LINK_REG, TAG_REG } from "../helpers/consts";
 import * as utils from "../helpers/utils";
 import { checkShouldShowMemoWithFilters } from "../helpers/filter";
 import toastHelper from "./Toast";
-import Only from "./common/OnlyWhen";
 import Memo from "./Memo";
 import "../less/memo-list.less";
 
 interface Props {}
 
 const MemoList: React.FC<Props> = () => {
-  const { t } = useI18n();
   const query = useAppSelector((state) => state.location.query);
-  const { memos, isFetching } = useAppSelector((state) => state.memo);
+  const memos = useAppSelector((state) => state.memo.memos);
+  const [isFetching, setFetchStatus] = useState(true);
   const wrapperElement = useRef<HTMLDivElement>(null);
 
   const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId } = query ?? {};
@@ -84,35 +82,28 @@ const MemoList: React.FC<Props> = () => {
     memoService
       .fetchAllMemos()
       .then(() => {
-        // do nth
+        setFetchStatus(false);
+        memoService.updateTagsState();
       })
-      .catch((error) => {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
+      .catch(() => {
+        toastHelper.error("😭 Fetching failed, please try again later.");
       });
   }, []);
 
   useEffect(() => {
-    wrapperElement.current?.scrollTo({
-      top: 0,
-    });
+    wrapperElement.current?.scrollTo({ top: 0 });
   }, [query]);
 
   return (
     <div className={`memo-list-container ${isFetching ? "" : "completed"}`} ref={wrapperElement}>
-      <Only when={isFetching}>
-        <div className="status-text-container fetching-tip">
-          <p className="status-text">{t("memo-list.fetching-data")}</p>
-        </div>
-      </Only>
       {sortedMemos.map((memo) => (
-        <Memo key={`${memo.id}-${memo.createdTs}-${memo.updatedTs}`} memo={memo} />
+        <Memo key={`${memo.id}-${memo.updatedTs}`} memo={memo} />
       ))}
-      <Only when={!isFetching}>
-        <div className="status-text-container">
-          <p className="status-text">{sortedMemos.length === 0 ? "no memos 🌃" : showMemoFilter ? "" : "all memos are ready 🎉"}</p>
-        </div>
-      </Only>
+      <div className="status-text-container">
+        <p className="status-text">
+          {isFetching ? "Fetching data..." : sortedMemos.length === 0 ? "No memos 🌃" : showMemoFilter ? "" : "All memos are ready 🎉"}
+        </p>
+      </div>
     </div>
   );
 };

web/src/components/MemosHeader.tsx

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
 import { memoService, shortcutService } from "../services";
 import { useAppSelector } from "../store";
-import Icon from "./Icon";
 import SearchBar from "./SearchBar";
 import { toggleSiderbar } from "./Sidebar";
 import "../less/memos-header.less";
@@ -29,7 +28,7 @@ const MemosHeader: React.FC<Props> = () => {
 
   const handleTitleTextClick = useCallback(() => {
     const now = Date.now();
-    if (now - prevRequestTimestamp > 1 * 1000) {
+    if (now - prevRequestTimestamp > 10 * 1000) {
       prevRequestTimestamp = now;
       memoService.fetchAllMemos().catch(() => {
         // do nth
@@ -41,7 +40,7 @@ const MemosHeader: React.FC<Props> = () => {
     <div className="section-header-container memos-header-container">
       <div className="title-container">
         <div className="action-btn" onClick={toggleSiderbar}>
-          <Icon.Menu className="icon-img" />
+          <i className="fa-solid fa-bars icon-img"></i>
         </div>
         <span className="title-text" onClick={handleTitleTextClick}>
           {titleText}

web/src/components/MenuBtnsPopup.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useRef } from "react";
 import * as api from "../helpers/api";
 import { locationService, userService } from "../services";
-import useI18n from "../hooks/useI18n";
 import toastHelper from "./Toast";
 import Only from "./common/OnlyWhen";
 import showAboutSiteDialog from "./AboutSiteDialog";
@@ -14,7 +13,6 @@ interface Props {
 
 const MenuBtnsPopup: React.FC<Props> = (props: Props) => {
   const { shownStatus, setShownStatus } = props;
-  const { t } = useI18n();
   const popupElRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -42,8 +40,7 @@ const MenuBtnsPopup: React.FC<Props> = (props: Props) => {
         toastHelper.info(JSON.stringify(profile, null, 4));
       })
       .catch((error) => {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
+        toastHelper.error("Failed to ping\n" + JSON.stringify(error, null, 4));
       });
   };
 
@@ -52,28 +49,24 @@ const MenuBtnsPopup: React.FC<Props> = (props: Props) => {
   };
 
   const handleSignOutBtnClick = async () => {
-    userService
-      .doSignOut()
-      .then(() => {
-        locationService.replaceHistory("/auth");
-        window.location.reload();
-      })
-      .catch(() => {
-        // do nth
-      });
+    userService.doSignOut().catch(() => {
+      // do nth
+    });
+    locationService.replaceHistory("/signin");
+    window.location.reload();
   };
 
   return (
     <div className={`menu-btns-popup ${shownStatus ? "" : "hidden"}`} ref={popupElRef}>
       <button className="btn action-btn" onClick={handleAboutBtnClick}>
-        <span className="icon">🤠</span> {t("common.about")}
+        <span className="icon">🤠</span> About
       </button>
       <button className="btn action-btn" onClick={handlePingBtnClick}>
         <span className="icon">🎯</span> Ping
       </button>
       <Only when={!userService.isVisitorMode()}>
         <button className="btn action-btn" onClick={handleSignOutBtnClick}>
-          <span className="icon">👋</span> {t("common.sign-out")}
+          <span className="icon">👋</span> Sign out
         </button>
       </Only>
     </div>

web/src/components/PreviewImageDialog.tsx

@@ -1,6 +1,5 @@
+import { showDialog } from "./Dialog";
 import * as utils from "../helpers/utils";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
 import "../less/preview-image-dialog.less";
 
 interface Props extends DialogProps {
@@ -19,29 +18,25 @@ const PreviewImageDialog: React.FC<Props> = ({ destroy, imgUrl }: Props) => {
     a.click();
   };
 
-  const handleImgContainerClick = () => {
-    destroy();
-  };
-
   return (
     <>
       <div className="btns-container">
         <button className="btn" onClick={handleCloseBtnClick}>
-          <Icon.X className="icon-img" />
+          <i className="fa-solid fa-xmark fa-lg icon-img"></i>
         </button>
         <button className="btn" onClick={handleDownloadBtnClick}>
-          <Icon.Download className="icon-img" />
+          <i className="fa-solid fa-download icon-img"></i>
         </button>
       </div>
-      <div className="img-container" onClick={handleImgContainerClick}>
-        <img onClick={(e) => e.stopPropagation()} src={imgUrl} />
+      <div className="img-container">
+        <img src={imgUrl} />
       </div>
     </>
   );
 };
 
 export default function showPreviewImageDialog(imgUrl: string): void {
-  generateDialog(
+  showDialog(
     {
       className: "preview-image-dialog",
     },

web/src/components/ResourcesDialog.tsx

@@ -1,180 +0,0 @@
-import { useEffect, useState } from "react";
-import * as utils from "../helpers/utils";
-import useI18n from "../hooks/useI18n";
-import useLoading from "../hooks/useLoading";
-import { resourceService } from "../services";
-import Dropdown from "./common/Dropdown";
-import { generateDialog } from "./Dialog";
-import { showCommonDialog } from "./Dialog/CommonDialog";
-import showPreviewImageDialog from "./PreviewImageDialog";
-import Icon from "./Icon";
-import toastHelper from "./Toast";
-import "../less/resources-dialog.less";
-
-interface Props extends DialogProps {}
-
-interface State {
-  resources: Resource[];
-  isUploadingResource: boolean;
-}
-
-const ResourcesDialog: React.FC<Props> = (props: Props) => {
-  const { destroy } = props;
-  const { t } = useI18n();
-  const loadingState = useLoading();
-  const [state, setState] = useState<State>({
-    resources: [],
-    isUploadingResource: false,
-  });
-
-  useEffect(() => {
-    fetchResources()
-      .catch((error) => {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
-      })
-      .finally(() => {
-        loadingState.setFinish();
-      });
-  }, []);
-
-  const fetchResources = async () => {
-    const data = await resourceService.getResourceList();
-    setState({
-      ...state,
-      resources: data,
-    });
-  };
-
-  const handleUploadFileBtnClick = async () => {
-    if (state.isUploadingResource) {
-      return;
-    }
-
-    const inputEl = document.createElement("input");
-    inputEl.style.position = "fixed";
-    inputEl.style.top = "-100vh";
-    inputEl.style.left = "-100vw";
-    document.body.appendChild(inputEl);
-    inputEl.type = "file";
-    inputEl.multiple = true;
-    inputEl.accept = "image/*";
-    inputEl.onchange = async () => {
-      if (!inputEl.files || inputEl.files.length === 0) {
-        return;
-      }
-
-      setState({
-        ...state,
-        isUploadingResource: true,
-      });
-
-      for (const file of inputEl.files) {
-        await resourceService.upload(file);
-        try {
-          await resourceService.upload(file);
-        } catch (error: any) {
-          console.error(error);
-          toastHelper.error(error.response.data.message);
-        } finally {
-          setState({
-            ...state,
-            isUploadingResource: false,
-          });
-        }
-      }
-
-      await fetchResources();
-    };
-    inputEl.click();
-    document.body.removeChild(inputEl);
-  };
-
-  const handlPreviewBtnClick = (resource: Resource) => {
-    showPreviewImageDialog(`${window.location.origin}/h/r/${resource.id}/${resource.filename}`);
-  };
-
-  const handleCopyResourceLinkBtnClick = (resource: Resource) => {
-    utils.copyTextToClipboard(`${window.location.origin}/h/r/${resource.id}/${resource.filename}`);
-    toastHelper.success("Succeed to copy resource link to clipboard");
-  };
-
-  const handleDeleteResourceBtnClick = (resource: Resource) => {
-    showCommonDialog({
-      title: `Delete Resource`,
-      content: `Are you sure to delete this resource? THIS ACTION IS IRREVERSIABLE.❗️`,
-      style: "warning",
-      onConfirm: async () => {
-        await resourceService.deleteResourceById(resource.id);
-        await fetchResources();
-      },
-    });
-  };
-
-  return (
-    <>
-      <div className="dialog-header-container">
-        <p className="title-text">
-          <span className="icon-text">🌄</span>
-          {t("sidebar.resources")}
-        </p>
-        <button className="btn close-btn" onClick={destroy}>
-          <Icon.X className="icon-img" />
-        </button>
-      </div>
-      <div className="dialog-content-container">
-        <div className="tip-text-container">(👨‍💻WIP) View your static resources in memos. e.g. images</div>
-        <div className="upload-resource-container" onClick={() => handleUploadFileBtnClick()}>
-          <div className="upload-resource-btn">
-            <Icon.File className="icon-img" />
-            <span>Upload</span>
-          </div>
-        </div>
-        {loadingState.isLoading ? (
-          <div className="loading-text-container">
-            <p className="tip-text">fetching data...</p>
-          </div>
-        ) : (
-          <div className="resource-table-container">
-            <div className="fields-container">
-              <span className="field-text">ID</span>
-              <span className="field-text name-text">NAME</span>
-              <span className="field-text">TYPE</span>
-              <span></span>
-            </div>
-            {state.resources.length === 0 ? (
-              <p className="tip-text">No resource.</p>
-            ) : (
-              state.resources.map((resource) => (
-                <div key={resource.id} className="resource-container">
-                  <span className="field-text">{resource.id}</span>
-                  <span className="field-text name-text">{resource.filename}</span>
-                  <span className="field-text">{resource.type}</span>
-                  <div className="buttons-container">
-                    <Dropdown className="actions-dropdown">
-                      <button onClick={() => handlPreviewBtnClick(resource)}>Preview</button>
-                      <button onClick={() => handleCopyResourceLinkBtnClick(resource)}>Copy Link</button>
-                      <button className="delete-btn" onClick={() => handleDeleteResourceBtnClick(resource)}>
-                        Delete
-                      </button>
-                    </Dropdown>
-                  </div>
-                </div>
-              ))
-            )}
-          </div>
-        )}
-      </div>
-    </>
-  );
-};
-
-export default function showResourcesDialog() {
-  generateDialog(
-    {
-      className: "resources-dialog",
-    },
-    ResourcesDialog,
-    {}
-  );
-}

web/src/components/SearchBar.tsx

@@ -1,7 +1,6 @@
 import { locationService } from "../services";
 import { useAppSelector } from "../store";
 import { memoSpecialTypes } from "../helpers/filter";
-import Icon from "./Icon";
 import "../less/search-bar.less";
 
 interface Props {}
@@ -25,7 +24,7 @@ const SearchBar: React.FC<Props> = () => {
   return (
     <div className="search-bar-container">
       <div className="search-bar-inputer">
-        <Icon.Search className="icon-img" />
+        <i className="fa-solid fa-magnifying-glass fa-sm icon-img"></i>
         <input className="text-input" type="text" placeholder="" onChange={handleTextQueryInput} />
       </div>
       <div className="quickly-action-wrapper">

web/src/components/SettingDialog.tsx

@@ -1,8 +1,6 @@
 import { useState } from "react";
 import { useAppSelector } from "../store";
-import useI18n from "../hooks/useI18n";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
+import { showDialog } from "./Dialog";
 import MyAccountSection from "./Settings/MyAccountSection";
 import PreferencesSection from "./Settings/PreferencesSection";
 import MemberSection from "./Settings/MemberSection";
@@ -18,7 +16,6 @@ interface State {
 
 const SettingDialog: React.FC<Props> = (props: Props) => {
   const { destroy } = props;
-  const { t } = useI18n();
   const user = useAppSelector((state) => state.user.user);
   const [state, setState] = useState<State>({
     selectedSection: "my-account",
@@ -33,33 +30,33 @@ const SettingDialog: React.FC<Props> = (props: Props) => {
   return (
     <div className="dialog-content-container">
       <button className="btn close-btn" onClick={destroy}>
-        <Icon.X className="icon-img" />
+        <i className="fa-solid fa-xmark fa-lg icon-img"></i>
       </button>
       <div className="section-selector-container">
-        <span className="section-title">{t("common.basic")}</span>
+        <span className="section-title">Basic</span>
         <div className="section-items-container">
           <span
             onClick={() => handleSectionSelectorItemClick("my-account")}
             className={`section-item ${state.selectedSection === "my-account" ? "selected" : ""}`}
           >
-            <span className="icon-text">🤠</span> {t("setting.my-account")}
+            <span className="icon-text">🤠</span> My account
           </span>
           <span
             onClick={() => handleSectionSelectorItemClick("preferences")}
             className={`section-item ${state.selectedSection === "preferences" ? "selected" : ""}`}
           >
-            <span className="icon-text">🏟</span> {t("setting.preference")}
+            <span className="icon-text">🏟</span> Preferences
           </span>
         </div>
         {user?.role === "HOST" ? (
           <>
-            <span className="section-title">{t("common.admin")}</span>
+            <span className="section-title">Admin</span>
             <div className="section-items-container">
               <span
                 onClick={() => handleSectionSelectorItemClick("member")}
                 className={`section-item ${state.selectedSection === "member" ? "selected" : ""}`}
               >
-                <span className="icon-text">👤</span> {t("setting.member")}
+                <span className="icon-text">👤</span> Member
               </span>
             </div>
           </>
@@ -79,9 +76,10 @@ const SettingDialog: React.FC<Props> = (props: Props) => {
 };
 
 export default function showSettingDialog(): void {
-  generateDialog(
+  showDialog(
     {
       className: "setting-dialog",
+      useAppContext: true,
     },
     SettingDialog,
     {}

web/src/components/Settings/MemberSection.tsx

@@ -1,12 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { isEmpty } from "lodash-es";
-import useI18n from "../../hooks/useI18n";
-import { userService } from "../../services";
-import { useAppSelector } from "../../store";
 import * as api from "../../helpers/api";
 import toastHelper from "../Toast";
-import Dropdown from "../common/Dropdown";
-import { showCommonDialog } from "../Dialog/CommonDialog";
 import "../../less/settings/member-section.less";
 
 interface Props {}
@@ -17,8 +12,6 @@ interface State {
 }
 
 const PreferencesSection: React.FC<Props> = () => {
-  const { t } = useI18n();
-  const currentUser = useAppSelector((state) => state.user.user);
   const [state, setState] = useState<State>({
     createUserEmail: "",
     createUserPassword: "",
@@ -64,8 +57,7 @@ const PreferencesSection: React.FC<Props> = () => {
     try {
       await api.createUser(userCreate);
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error.message);
     }
     await fetchUserList();
     setState({
@@ -74,87 +66,35 @@ const PreferencesSection: React.FC<Props> = () => {
     });
   };
 
-  const handleArchiveUserClick = (user: User) => {
-    showCommonDialog({
-      title: `Archive Member`,
-      content: `❗️Are you sure to archive ${user.name}?`,
-      style: "warning",
-      onConfirm: async () => {
-        await userService.patchUser({
-          id: user.id,
-          rowStatus: "ARCHIVED",
-        });
-        fetchUserList();
-      },
-    });
-  };
-
-  const handleRestoreUserClick = async (user: User) => {
-    await userService.patchUser({
-      id: user.id,
-      rowStatus: "NORMAL",
-    });
-    fetchUserList();
-  };
-
-  const handleDeleteUserClick = (user: User) => {
-    showCommonDialog({
-      title: `Delete Member`,
-      content: `Are you sure to delete ${user.name}? THIS ACTION IS IRREVERSIABLE.❗️`,
-      style: "warning",
-      onConfirm: async () => {
-        await userService.deleteUser({
-          id: user.id,
-        });
-        fetchUserList();
-      },
-    });
-  };
-
   return (
     <div className="section-container member-section-container">
-      <p className="title-text">{t("setting.member-section.create-a-member")}</p>
+      <p className="title-text">Create a member</p>
       <div className="create-member-container">
         <div className="input-form-container">
-          <span className="field-text">{t("common.email")}</span>
-          <input type="email" placeholder={t("common.email")} value={state.createUserEmail} onChange={handleEmailInputChange} />
+          <span className="field-text">Email</span>
+          <input type="email" placeholder="Email" value={state.createUserEmail} onChange={handleEmailInputChange} />
         </div>
         <div className="input-form-container">
-          <span className="field-text">{t("common.password")}</span>
-          <input type="text" placeholder={t("common.password")} value={state.createUserPassword} onChange={handlePasswordInputChange} />
+          <span className="field-text">Password</span>
+          <input type="text" placeholder="Password" value={state.createUserPassword} onChange={handlePasswordInputChange} />
         </div>
         <div className="btns-container">
-          <button onClick={handleCreateUserBtnClick}>{t("common.create")}</button>
+          <button onClick={handleCreateUserBtnClick}>Create</button>
         </div>
       </div>
       <p className="title-text">Member list</p>
       <div className="member-container field-container">
         <span className="field-text">ID</span>
         <span className="field-text">EMAIL</span>
-        <span></span>
       </div>
       {userList.map((user) => (
-        <div key={user.id} className={`member-container ${user.rowStatus === "ARCHIVED" ? "archived" : ""}`}>
+        <div key={user.id} className="member-container">
           <span className="field-text id-text">{user.id}</span>
           <span className="field-text email-text">{user.email}</span>
-          <div className="buttons-container">
-            {currentUser?.id === user.id ? (
-              <span className="tip-text">Yourself</span>
-            ) : (
-              <Dropdown className="actions-dropdown">
-                {user.rowStatus === "NORMAL" ? (
-                  <button onClick={() => handleArchiveUserClick(user)}>{t("common.archive")}</button>
-                ) : (
-                  <>
-                    <button onClick={() => handleRestoreUserClick(user)}>{t("common.restore")}</button>
-                    <button className="delete" onClick={() => handleDeleteUserClick(user)}>
-                      {t("common.delete")}
-                    </button>
-                  </>
-                )}
-              </Dropdown>
-            )}
-          </div>
+          {/* TODO */}
+          {/* <div className="buttons-container">
+            <span>delete</span>
+          </div> */}
         </div>
       ))}
     </div>

web/src/components/Settings/MyAccountSection.tsx

@@ -1,11 +1,10 @@
 import { useState } from "react";
-import useI18n from "../../hooks/useI18n";
 import { useAppSelector } from "../../store";
 import { userService } from "../../services";
 import { validate, ValidatorConfig } from "../../helpers/validator";
 import toastHelper from "../Toast";
-import { showCommonDialog } from "../Dialog/CommonDialog";
 import showChangePasswordDialog from "../ChangePasswordDialog";
+import showConfirmResetOpenIdDialog from "../ConfirmResetOpenIdDialog";
 import "../../less/settings/my-account-section.less";
 
 const validateConfig: ValidatorConfig = {
@@ -18,7 +17,6 @@ const validateConfig: ValidatorConfig = {
 interface Props {}
 
 const MyAccountSection: React.FC<Props> = () => {
-  const { t } = useI18n();
   const user = useAppSelector((state) => state.user.user as User);
   const [username, setUsername] = useState<string>(user.name);
   const openAPIRoute = `${window.location.origin}/api/memo?openId=${user.openId}`;
@@ -41,13 +39,11 @@ const MyAccountSection: React.FC<Props> = () => {
 
     try {
       await userService.patchUser({
-        id: user.id,
         name: username,
       });
       toastHelper.info("Username changed");
     } catch (error: any) {
-      console.error(error);
-      toastHelper.error(error.response.data.message);
+      toastHelper.error(error.message);
     }
   };
 
@@ -56,11 +52,7 @@ const MyAccountSection: React.FC<Props> = () => {
   };
 
   const handleResetOpenIdBtnClick = async () => {
-    showCommonDialog({
-      title: "Reset Open API",
-      content: "❗️The existing API will be invalidated and a new one will be generated, are you sure you want to reset?",
-      style: "warning",
-    });
+    showConfirmResetOpenIdDialog();
   };
 
   const handlePreventDefault = (e: React.MouseEvent) => {
@@ -71,17 +63,17 @@ const MyAccountSection: React.FC<Props> = () => {
   return (
     <>
       <div className="section-container account-section-container">
-        <p className="title-text">{t("setting.account-section.title")}</p>
+        <p className="title-text">Account Information</p>
         <label className="form-label">
-          <span className="normal-text">{t("common.email")}:</span>
+          <span className="normal-text">Email:</span>
           <span className="normal-text">{user.email}</span>
         </label>
         <label className="form-label input-form-label username-label">
-          <span className="normal-text">{t("common.username")}:</span>
+          <span className="normal-text">Username:</span>
           <input type="text" value={username} onChange={handleUsernameChanged} />
           <div className={`btns-container ${username === user.name ? "!hidden" : ""}`} onClick={handlePreventDefault}>
             <span className="btn confirm-btn" onClick={handleConfirmEditUsernameBtnClick}>
-              {t("common.save")}
+              Save
             </span>
             <span
               className="btn cancel-btn"
@@ -89,14 +81,14 @@ const MyAccountSection: React.FC<Props> = () => {
                 setUsername(user.name);
               }}
             >
-              {t("common.cancel")}
+              Cancel
             </span>
           </div>
         </label>
         <label className="form-label password-label">
-          <span className="normal-text">{t("common.password")}:</span>
+          <span className="normal-text">Password:</span>
           <span className="btn" onClick={handleChangePasswordBtnClick}>
-            {t("common.change")}
+            Change it
           </span>
         </label>
       </div>
@@ -104,9 +96,10 @@ const MyAccountSection: React.FC<Props> = () => {
         <p className="title-text">Open API</p>
         <p className="value-text">{openAPIRoute}</p>
         <span className="reset-btn" onClick={handleResetOpenIdBtnClick}>
-          {t("common.reset")} API
+          Reset API
         </span>
         <div className="usage-guide-container">
+          <p className="title-text">Usage guide:</p>
           <pre>{`POST ${openAPIRoute}\nContent-type: application/json\n{\n  "content": "Hello #memos from ${window.location.origin}"\n}`}</pre>
         </div>
       </div>

web/src/components/Settings/PreferencesSection.tsx

@@ -1,81 +1,80 @@
-import { globalService, userService } from "../../services";
-import { useAppSelector } from "../../store";
-import { VISIBILITY_SELECTOR_ITEMS } from "../../helpers/consts";
-import useI18n from "../../hooks/useI18n";
-import Selector from "../common/Selector";
-import BetaBadge from "../BetaBadge";
+import { memoService } from "../../services";
+import * as utils from "../../helpers/utils";
+import toastHelper from "../Toast";
 import "../../less/settings/preferences-section.less";
 
 interface Props {}
 
-const localeSelectorItems = [
-  {
-    text: "English",
-    value: "en",
-  },
-  {
-    text: "中文",
-    value: "zh",
-  },
-];
-
-const editorFontStyleSelectorItems = [
-  {
-    text: "Normal",
-    value: "normal",
-  },
-  {
-    text: "Mono",
-    value: "mono",
-  },
-];
-
 const PreferencesSection: React.FC<Props> = () => {
-  const { t } = useI18n();
-  const { setting } = useAppSelector((state) => state.user.user as User);
+  const handleExportBtnClick = async () => {
+    const formatedMemos = memoService.getState().memos.map((m) => {
+      return {
+        content: m.content,
+        createdTs: m.createdTs,
+      };
+    });
 
-  const handleLocaleChanged = async (value: string) => {
-    await userService.upsertUserSetting("locale", value);
-    globalService.setLocale(value as Locale);
+    const jsonStr = JSON.stringify(formatedMemos);
+    const element = document.createElement("a");
+    element.setAttribute("href", "data:text/json;charset=utf-8," + encodeURIComponent(jsonStr));
+    element.setAttribute("download", `memos-${utils.getDateTimeString(Date.now())}.json`);
+    element.style.display = "none";
+    document.body.appendChild(element);
+    element.click();
+    document.body.removeChild(element);
   };
 
-  const handleDefaultMemoVisibilityChanged = async (value: string) => {
-    await userService.upsertUserSetting("memoVisibility", value);
-  };
+  const handleImportBtnClick = async () => {
+    const fileInputEl = document.createElement("input");
+    fileInputEl.type = "file";
+    fileInputEl.accept = "application/JSON";
+    fileInputEl.onchange = () => {
+      if (fileInputEl.files?.length && fileInputEl.files.length > 0) {
+        const reader = new FileReader();
+        reader.readAsText(fileInputEl.files[0]);
+        reader.onload = async (event) => {
+          const memoList = JSON.parse(event.target?.result as string) as Memo[];
+          if (!Array.isArray(memoList)) {
+            toastHelper.error("Unexpected data type.");
+          }
 
-  const handleEditorFontStyleChanged = async (value: string) => {
-    await userService.upsertUserSetting("editorFontStyle", value);
+          let succeedAmount = 0;
+
+          for (const memo of memoList) {
+            const content = memo.content || "";
+            const createdTs = (memo as any).createdAt || memo.createdTs || Date.now();
+
+            try {
+              const memoCreate = {
+                content,
+                createdTs: Math.floor(utils.getTimeStampByDate(createdTs) / 1000),
+              };
+              await memoService.createMemo(memoCreate);
+              succeedAmount++;
+            } catch (error) {
+              // do nth
+            }
+          }
+
+          await memoService.fetchAllMemos();
+          toastHelper.success(`${succeedAmount} memos successfully imported.`);
+        };
+      }
+    };
+    fileInputEl.click();
   };
 
   return (
     <div className="section-container preferences-section-container">
-      <p className="title-text">{t("common.basic")}</p>
-      <label className="form-label selector">
-        <span className="normal-text">
-          {t("common.language")}
-          <BetaBadge className="ml-2" />
-        </span>
-        <Selector className="ml-2 w-32" value={setting.locale} dataSource={localeSelectorItems} handleValueChanged={handleLocaleChanged} />
-      </label>
-      <p className="title-text">{t("setting.preference")}</p>
-      <label className="form-label selector">
-        <span className="normal-text">{t("setting.preference-section.default-memo-visibility")}</span>
-        <Selector
-          className="ml-2 w-32"
-          value={setting.memoVisibility}
-          dataSource={VISIBILITY_SELECTOR_ITEMS}
-          handleValueChanged={handleDefaultMemoVisibilityChanged}
-        />
-      </label>
-      <label className="form-label selector">
-        <span className="normal-text">{t("setting.preference-section.editor-font-style")}</span>
-        <Selector
-          className="ml-2 w-32"
-          value={setting.editorFontStyle}
-          dataSource={editorFontStyleSelectorItems}
-          handleValueChanged={handleEditorFontStyleChanged}
-        />
-      </label>
+      <p className="title-text">Others</p>
+      <div className="btns-container">
+        <button className="btn" onClick={handleExportBtnClick}>
+          Export data as JSON
+        </button>
+        <button className="btn" onClick={handleImportBtnClick}>
+          Import from JSON
+        </button>
+      </div>
     </div>
   );
 };

web/src/components/ShareMemoImageDialog.tsx

@@ -1,14 +1,12 @@
 import { useEffect, useRef, useState } from "react";
 import { userService } from "../services";
 import toImage from "../labs/html2image";
-import { ANIMATION_DURATION } from "../helpers/consts";
-import useI18n from "../hooks/useI18n";
+import { ANIMATION_DURATION, IMAGE_URL_REG } from "../helpers/consts";
 import * as utils from "../helpers/utils";
-import { formatMemoContent, IMAGE_URL_REG } from "../helpers/marked";
+import { showDialog } from "./Dialog";
 import Only from "./common/OnlyWhen";
-import Icon from "./Icon";
-import { generateDialog } from "./Dialog";
 import toastHelper from "./Toast";
+import { formatMemoContent } from "./Memo";
 import "../less/share-memo-image-dialog.less";
 
 interface Props extends DialogProps {
@@ -17,7 +15,6 @@ interface Props extends DialogProps {
 
 const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
   const { memo: propsMemo, destroy } = props;
-  const { t } = useI18n();
   const { user: userinfo } = userService.getState();
   const memo = {
     ...propsMemo,
@@ -56,10 +53,10 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
     destroy();
   };
 
-  const handleImageOnLoad = (event: React.SyntheticEvent<HTMLImageElement>) => {
-    if (event.type === "error") {
-      toastHelper.error("Image load failed");
-      (event.target as HTMLImageElement).remove();
+  const handleImageOnLoad = (ev: React.SyntheticEvent<HTMLImageElement>) => {
+    if (ev.type === "error") {
+      toastHelper.error("😟 Image load failed");
+      (ev.target as HTMLImageElement).remove();
     }
     setImgAmount(imgAmount - 1);
   };
@@ -75,11 +72,10 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
     <>
       <div className="dialog-header-container">
         <p className="title-text">
-          <span className="icon-text">🌄</span>
-          {t("common.share")} Memo
+          <span className="icon-text">🌄</span>Share Memo
         </p>
         <button className="btn close-btn" onClick={handleCloseBtnClick}>
-          <Icon.X className="icon-img" />
+          <i className="fa-solid fa-xmark fa-lg icon-img"></i>
         </button>
       </div>
       <div className="dialog-content-container">
@@ -111,7 +107,7 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
 };
 
 export default function showShareMemoImageDialog(memo: Memo): void {
-  generateDialog(
+  showDialog(
     {
       className: "share-memo-image-dialog",
     },

web/src/components/ShortcutList.tsx

@@ -1,11 +1,9 @@
 import { useEffect } from "react";
 import { locationService, shortcutService } from "../services";
 import { useAppSelector } from "../store";
-import useI18n from "../hooks/useI18n";
 import * as utils from "../helpers/utils";
 import useToggle from "../hooks/useToggle";
 import useLoading from "../hooks/useLoading";
-import Icon from "./Icon";
 import toastHelper from "./Toast";
 import showCreateShortcutDialog from "./CreateShortcutDialog";
 import "../less/shortcut-list.less";
@@ -41,7 +39,7 @@ const ShortcutList: React.FC<Props> = () => {
       <p className="title-text">
         <span className="normal-text">Shortcuts</span>
         <button className="btn" onClick={() => showCreateShortcutDialog()}>
-          <Icon.Plus className="icon-img" />
+          <i className="fa-solid fa-plus icon-img fa-xs"></i>
         </button>
       </p>
       <div className="shortcuts-container">
@@ -60,7 +58,6 @@ interface ShortcutContainerProps {
 
 const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutContainerProps) => {
   const { shortcut, isActive } = props;
-  const { t } = useI18n();
   const [showConfirmDeleteBtn, toggleConfirmDeleteBtn] = useToggle(false);
 
   const handleShortcutClick = () => {
@@ -78,8 +75,7 @@ const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutCont
       try {
         await shortcutService.deleteShortcutById(shortcut.id);
       } catch (error: any) {
-        console.error(error);
-        toastHelper.error(error.response.data.message);
+        toastHelper.error(error.message);
       }
     } else {
       toggleConfirmDeleteBtn();
@@ -117,23 +113,22 @@ const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutCont
         </div>
         <div className="btns-container">
           <span className="action-btn toggle-btn">
-            <Icon.MoreHorizontal className="icon-img" />
+            <i className="fa-solid fa-ellipsis fa-sm icon-img"></i>
           </span>
           <div className="action-btns-wrapper">
             <div className="action-btns-container">
               <span className="btn" onClick={handlePinShortcutBtnClick}>
-                {shortcut.rowStatus === "ARCHIVED" ? t("common.unpin") : t("common.pin")}
+                {shortcut.rowStatus === "ARCHIVED" ? "Unpin" : "Pin"}
               </span>
               <span className="btn" onClick={handleEditShortcutBtnClick}>
-                {t("common.edit")}
+                Edit
               </span>
               <span
                 className={`btn delete-btn ${showConfirmDeleteBtn ? "final-confirm" : ""}`}
                 onClick={handleDeleteMemoClick}
                 onMouseLeave={handleDeleteBtnMouseLeave}
               >
-                {t("common.delete")}
-                {showConfirmDeleteBtn ? "!" : ""}
+                {showConfirmDeleteBtn ? "Delete!" : "Delete"}
               </span>
             </div>
           </div>