chore: upgrade version to 0.10.3 (#1060)

fix: handle empty condition in rss

.dockerignore

@@ -1,2 +1 @@
 web/node_modules
-web/yarn.lock

.github/FUNDING.yml

@@ -1 +1 @@
-ko_fi: stevenlgtm
+github: usememos

.github/workflows/backend-tests.yml

@@ -0,0 +1,41 @@
+name: Backend Test
+
+on:
+  pull_request:
+    branches:
+      - main
+      - "release/*.*.*"
+
+jobs:
+  go-static-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+          check-latest: true
+          cache: true
+      - name: Verify go.mod is tidy
+        run: |
+          go mod tidy -go=1.19
+          git diff --exit-code
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          args: -v
+          skip-cache: true
+
+  go-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+          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"}'

.github/workflows/frontend-tests.yml

@@ -0,0 +1,38 @@
+name: Frontend Test
+
+on:
+  pull_request:
+    branches:
+      - main
+      - "release/*.*.*"
+
+jobs:
+  eslint-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+          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: "18"
+          cache: yarn
+          cache-dependency-path: "web/yarn.lock"
+      - run: yarn
+        working-directory: web
+      - name: Run frontend build
+        run: yarn build
+        working-directory: web

.github/workflows/issue-translator.yml

@@ -0,0 +1,18 @@
+name: 'issue-translator'
+on: 
+  issue_comment: 
+    types: [created]
+  issues: 
+    types: [opened]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: usthe/issues-translate-action@v2.7
+        with:
+          IS_MODIFY_TITLE: false
+          # not require, default false, . Decide whether to modify the issue title
+          # if true, the robot account @Issues-translate-bot must have modification permissions, invite @Issues-translate-bot to your project or use your custom bot.
+          CUSTOM_BOT_NOTE: Issue is not in English. It has been translated automatically.
+          # not require. Customize the translation robot prefix message.

.github/workflows/tests.yml

@@ -1,88 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - main
-      - "release/v*.*.*"
-  pull_request:
-    branches: [main]
-
-jobs:
-  eslint-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-          cache: yarn
-          cache-dependency-path: "web/yarn.lock"
-      - run: yarn
-        working-directory: web
-      - name: Run eslint check
-        run: yarn lint
-        working-directory: web
-
-  jest-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-          cache: yarn
-          cache-dependency-path: "web/yarn.lock"
-      - run: yarn
-        working-directory: web
-      - name: Run jest
-        run: yarn test
-        working-directory: web
-
-  frontend-build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-          cache: yarn
-          cache-dependency-path: "web/yarn.lock"
-      - run: yarn
-        working-directory: web
-      - name: Run frontend build
-        run: yarn build
-        working-directory: web
-
-  go-static-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-          check-latest: true
-          cache: true
-      - name: Verify go.mod is tidy
-        run: |
-          go mod tidy -go=1.19
-          git diff --exit-code
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          args: -v
-          skip-cache: true
-
-  go-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-          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"}'

.github/workflows/uffizzi-preview.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   cache-compose-file:
     name: Cache Compose File
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     outputs:
       compose-file-cache-key: ${{ env.HASH }}
@@ -70,6 +71,7 @@ jobs:
 
   deploy-uffizzi-preview:
     name: Use Remote Workflow to Preview on Uffizzi
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     needs:
       - cache-compose-file
     uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2

.gitignore

@@ -15,7 +15,4 @@ build
 # Jetbrains
 .idea
 
-# vscode
-.vscode
-
 bin/air

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "golang.go"
+  ]
+}

.vscode/project.code-workspace

@@ -0,0 +1,12 @@
+{
+  "folders": [
+    {
+      "name": "server",
+      "path": "../"
+    },
+    {
+      "name": "web",
+      "path": "../web"
+    },
+  ],
+}

CODEOWNERS

@@ -1,2 +1,2 @@
 # These owners will be the default owners for everything in the repo.
-* @boojack @lqwakeup
+* @boojack

Dockerfile

@@ -4,15 +4,13 @@ WORKDIR /frontend-build
 
 COPY ./web/ .
 
-RUN yarn
-RUN yarn build
+RUN yarn && yarn build
 
 # Build backend exec file.
 FROM golang:1.19.3-alpine3.16 AS backend
 WORKDIR /backend-build
 
-RUN apk update
-RUN apk --no-cache add gcc musl-dev
+RUN apk update && apk add --no-cache gcc musl-dev
 
 COPY . .
 COPY --from=frontend /frontend-build/dist ./server/dist

README.md

@@ -1,7 +1,5 @@
 <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>
 
-<p align="center">An open-source, self-hosted memo hub with knowledge management and socialization.</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>
   <a href="https://hub.docker.com/r/neosmemo/memos"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/neosmemo/memos.svg" /></a>
@@ -13,7 +11,9 @@
   Discuss in <a href="https://t.me/+-_tNF1k70UU4ZTc9">Telegram</a> / <b><a href="https://discord.gg/tfPJa4UmAv">Discord 🏂</a></b>
 </p>
 
-![demo](./resources/demo.webp)
+![demo](./resources/demo.webp#gh-light-mode-only)
+
+![demo-dark](./resources/demo-dark.webp#gh-dark-mode-only)
 
 ## Features
 
@@ -31,13 +31,13 @@
 docker run -d --name memos -p 5230:5230 -v ~/.memos/:/var/opt/memos neosmemo/memos:latest
 ```
 
-If the `~/.memos/` does not have a `memos_prod.db` file, then memos will auto generate it. Memos will be running at [http://localhost:5230](http://localhost:5230).
+> `~/.memos/` will be used as the data directory in your machine. And `/var/opt/memos` is the directory of the volume in docker and should not be modified.
 
 ### Docker Compose
 
-Example Compose YAML file: [`docker-compose.yaml`](./docker-compose.yaml).
+Example docker compose YAML file: [`docker-compose.yaml`](./docker-compose.yaml).
 
-If you want to upgrade the version of memos, use the following command.
+You can upgrade memos with the following command.
 
 ```sh
 docker-compose down && docker image rm neosmemo/memos:latest && docker-compose up -d
@@ -54,7 +54,7 @@ Contributions are what make the open source community such an amazing place to l
 
 See more in [development guide](./docs/development.md).
 
-## Products made by Community
+### Products made by Community
 
 - [Moe Memos](https://memos.moe/) - Third party client for iOS and Android
 - [lmm214/memos-bber](https://github.com/lmm214/memos-bber) - Chrome extension
@@ -63,6 +63,10 @@ See more in [development guide](./docs/development.md).
 - [eallion/memos.top](https://github.com/eallion/memos.top) - A static page rendered with the Memos API
 - [eindex/logseq-memos-sync](https://github.com/EINDEX/logseq-memos-sync) - A Logseq plugin
 
+### User stories
+
+- [Memos - A Twitter Like Notes App You can Self Host](https://noted.lol/memos/)
+
 ### Join the community to build memos together!
 
 <a href="https://github.com/usememos/memos/graphs/contributors">
@@ -71,7 +75,7 @@ See more in [development guide](./docs/development.md).
 
 ## License
 
-This project is open source and available under the [MIT License](https://github.com/usememos/memos/blob/main/LICENSE).
+[MIT License](https://github.com/usememos/memos/blob/main/LICENSE).
 
 ## Star history
 

api/activity.go

@@ -0,0 +1,137 @@
+package api
+
+import "github.com/usememos/memos/server/profile"
+
+// ActivityType is the type for an activity.
+type ActivityType string
+
+const (
+	// User related.
+
+	// ActivityUserCreate is the type for creating users.
+	ActivityUserCreate ActivityType = "user.create"
+	// ActivityUserUpdate is the type for updating users.
+	ActivityUserUpdate ActivityType = "user.update"
+	// ActivityUserDelete is the type for deleting users.
+	ActivityUserDelete ActivityType = "user.delete"
+	// ActivityUserAuthSignIn is the type for user signin.
+	ActivityUserAuthSignIn ActivityType = "user.auth.signin"
+	// ActivityUserAuthSignUp is the type for user signup.
+	ActivityUserAuthSignUp ActivityType = "user.auth.signup"
+	// ActivityUserSettingUpdate is the type for updating user settings.
+	ActivityUserSettingUpdate ActivityType = "user.setting.update"
+
+	// Memo related.
+
+	// ActivityMemoCreate is the type for creating memos.
+	ActivityMemoCreate ActivityType = "memo.create"
+	// ActivityMemoUpdate is the type for updating memos.
+	ActivityMemoUpdate ActivityType = "memo.update"
+	// ActivityMemoDelete is the type for deleting memos.
+	ActivityMemoDelete ActivityType = "memo.delete"
+
+	// Shortcut related.
+
+	// ActivityShortcutCreate is the type for creating shortcuts.
+	ActivityShortcutCreate ActivityType = "shortcut.create"
+	// ActivityShortcutUpdate is the type for updating shortcuts.
+	ActivityShortcutUpdate ActivityType = "shortcut.update"
+	// ActivityShortcutDelete is the type for deleting shortcuts.
+	ActivityShortcutDelete ActivityType = "shortcut.delete"
+
+	// Resource related.
+
+	// ActivityResourceCreate is the type for creating resources.
+	ActivityResourceCreate ActivityType = "resource.create"
+	// ActivityResourceDelete is the type for deleting resources.
+	ActivityResourceDelete ActivityType = "resource.delete"
+
+	// Tag related.
+
+	// ActivityTagCreate is the type for creating tags.
+	ActivityTagCreate ActivityType = "tag.create"
+	// ActivityTagDelete is the type for deleting tags.
+	ActivityTagDelete ActivityType = "tag.delete"
+
+	// Server related.
+
+	// ActivityServerStart is the type for starting server.
+	ActivityServerStart ActivityType = "server.start"
+)
+
+// ActivityLevel is the level of activities.
+type ActivityLevel string
+
+const (
+	// ActivityInfo is the INFO level of activities.
+	ActivityInfo ActivityLevel = "INFO"
+	// ActivityWarn is the WARN level of activities.
+	ActivityWarn ActivityLevel = "WARN"
+	// ActivityError is the ERROR level of activities.
+	ActivityError ActivityLevel = "ERROR"
+)
+
+type ActivityUserCreatePayload struct {
+	UserID   int    `json:"userId"`
+	Username string `json:"username"`
+	Role     Role   `json:"role"`
+}
+
+type ActivityUserAuthSignInPayload struct {
+	UserID int    `json:"userId"`
+	IP     string `json:"ip"`
+}
+
+type ActivityUserAuthSignUpPayload struct {
+	Username string `json:"username"`
+	IP       string `json:"ip"`
+}
+
+type ActivityMemoCreatePayload struct {
+	Content    string `json:"content"`
+	Visibility string `json:"visibility"`
+}
+
+type ActivityShortcutCreatePayload struct {
+	Title   string `json:"title"`
+	Payload string `json:"payload"`
+}
+
+type ActivityResourceCreatePayload struct {
+	Filename string `json:"filename"`
+	Type     string `json:"type"`
+	Size     int64  `json:"size"`
+}
+
+type ActivityTagCreatePayload struct {
+	TagName string `json:"tagName"`
+}
+
+type ActivityServerStartPayload struct {
+	ServerID string           `json:"serverId"`
+	Profile  *profile.Profile `json:"profile"`
+}
+
+type Activity struct {
+	ID int `json:"id"`
+
+	// Standard fields
+	CreatorID int   `json:"creatorId"`
+	CreatedTs int64 `json:"createdTs"`
+
+	// Domain specific fields
+	Type    ActivityType  `json:"type"`
+	Level   ActivityLevel `json:"level"`
+	Payload string        `json:"payload"`
+}
+
+// ActivityCreate is the API message for creating an activity.
+type ActivityCreate struct {
+	// Standard fields
+	CreatorID int
+
+	// Domain specific fields
+	Type    ActivityType `json:"type"`
+	Level   ActivityLevel
+	Payload string `json:"payload"`
+}

api/api.go

@@ -1,5 +1,8 @@
 package api
 
+// UnknownID is the ID for unknowns.
+const UnknownID = -1
+
 // RowStatus is the status for a row.
 type RowStatus string
 

api/auth.go

@@ -1,11 +1,11 @@
 package api
 
-type Signin struct {
+type SignIn struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
 }
 
-type Signup struct {
+type SignUp struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
 	Role     Role   `json:"role"`

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

@@ -46,7 +46,7 @@ type Memo struct {
 
 type MemoCreate struct {
 	// Standard fields
-	CreatorID int
+	CreatorID int `json:"-"`
 
 	// Domain specific fields
 	Visibility Visibility `json:"visibility"`
@@ -73,11 +73,11 @@ type MemoPatch struct {
 }
 
 type MemoFind struct {
-	ID *int `json:"id"`
+	ID *int
 
 	// Standard fields
-	RowStatus *RowStatus `json:"rowStatus"`
-	CreatorID *int       `json:"creatorId"`
+	RowStatus *RowStatus
+	CreatorID *int
 
 	// Domain specific fields
 	Pinned         *bool

api/memo_organizer.go

@@ -9,17 +9,17 @@ type MemoOrganizer struct {
 	Pinned bool
 }
 
+type MemoOrganizerUpsert struct {
+	MemoID int  `json:"-"`
+	UserID int  `json:"-"`
+	Pinned bool `json:"pinned"`
+}
+
 type MemoOrganizerFind struct {
 	MemoID int
 	UserID int
 }
 
-type MemoOrganizerUpsert struct {
-	MemoID int
-	UserID int
-	Pinned bool `json:"pinned"`
-}
-
 type MemoOrganizerDelete struct {
 	MemoID *int
 	UserID *int

api/memo_resource.go

@@ -8,7 +8,7 @@ type MemoResource struct {
 }
 
 type MemoResourceUpsert struct {
-	MemoID     int
+	MemoID     int `json:"-"`
 	ResourceID int
 	UpdatedTs  *int64
 }

api/resource.go

@@ -9,10 +9,11 @@ type Resource struct {
 	UpdatedTs int64 `json:"updatedTs"`
 
 	// Domain specific fields
-	Filename string `json:"filename"`
-	Blob     []byte `json:"-"`
-	Type     string `json:"type"`
-	Size     int64  `json:"size"`
+	Filename     string `json:"filename"`
+	Blob         []byte `json:"-"`
+	ExternalLink string `json:"externalLink"`
+	Type         string `json:"type"`
+	Size         int64  `json:"size"`
 
 	// Related fields
 	LinkedMemoAmount int `json:"linkedMemoAmount"`
@@ -20,13 +21,14 @@ type Resource struct {
 
 type ResourceCreate struct {
 	// Standard fields
-	CreatorID int
+	CreatorID int `json:"-"`
 
 	// Domain specific fields
-	Filename string `json:"filename"`
-	Blob     []byte `json:"blob"`
-	Type     string `json:"type"`
-	Size     int64  `json:"size"`
+	Filename     string `json:"filename"`
+	Blob         []byte `json:"-"`
+	ExternalLink string `json:"externalLink"`
+	Type         string `json:"type"`
+	Size         int64  `json:"-"`
 }
 
 type ResourceFind struct {
@@ -38,6 +40,7 @@ type ResourceFind struct {
 	// Domain specific fields
 	Filename *string `json:"filename"`
 	MemoID   *int
+	GetBlob  bool
 }
 
 type ResourcePatch struct {

api/shortcut.go

@@ -16,7 +16,7 @@ type Shortcut struct {
 
 type ShortcutCreate struct {
 	// Standard fields
-	CreatorID int
+	CreatorID int `json:"-"`
 
 	// Domain specific fields
 	Title   string `json:"title"`

api/system_setting.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	"golang.org/x/exp/slices"
@@ -10,6 +11,10 @@ import (
 type SystemSettingName string
 
 const (
+	// SystemSettingServerID is the key type of server id.
+	SystemSettingServerID SystemSettingName = "serverId"
+	// SystemSettingSecretSessionName is the key type of secret session name.
+	SystemSettingSecretSessionName SystemSettingName = "secretSessionName"
 	// SystemSettingAllowSignUpName is the key type of allow signup setting.
 	SystemSettingAllowSignUpName SystemSettingName = "allowSignUp"
 	// SystemSettingAdditionalStyleName is the key type of additional style.
@@ -38,6 +43,10 @@ type CustomizedProfile struct {
 
 func (key SystemSettingName) String() string {
 	switch key {
+	case SystemSettingServerID:
+		return "serverId"
+	case SystemSettingSecretSessionName:
+		return "secretSessionName"
 	case SystemSettingAllowSignUpName:
 		return "allowSignUp"
 	case SystemSettingAdditionalStyleName:
@@ -56,7 +65,7 @@ var (
 
 type SystemSetting struct {
 	Name SystemSettingName
-	// Value is a JSON string with basic value
+	// Value is a JSON string with basic value.
 	Value       string
 	Description string
 }
@@ -68,7 +77,9 @@ type SystemSettingUpsert struct {
 }
 
 func (upsert SystemSettingUpsert) Validate() error {
-	if upsert.Name == SystemSettingAllowSignUpName {
+	if upsert.Name == SystemSettingServerID {
+		return errors.New("update server id is not allowed")
+	} else if upsert.Name == SystemSettingAllowSignUpName {
 		value := false
 		err := json.Unmarshal([]byte(upsert.Value), &value)
 		if err != nil {

api/tag.go

@@ -7,7 +7,7 @@ type Tag struct {
 
 type TagUpsert struct {
 	Name      string
-	CreatorID int
+	CreatorID int `json:"-"`
 }
 
 type TagFind struct {

api/user.go

@@ -2,6 +2,8 @@ package api
 
 import (
 	"fmt"
+
+	"github.com/usememos/memos/common"
 )
 
 // Role is the type of a role.
@@ -61,9 +63,23 @@ func (create UserCreate) Validate() error {
 	if len(create.Username) < 4 {
 		return fmt.Errorf("username is too short, minimum length is 4")
 	}
+	if len(create.Username) > 32 {
+		return fmt.Errorf("username is too long, maximum length is 32")
+	}
 	if len(create.Password) < 4 {
 		return fmt.Errorf("password is too short, minimum length is 4")
 	}
+	if len(create.Nickname) > 64 {
+		return fmt.Errorf("nickname is too long, maximum length is 64")
+	}
+	if create.Email != "" {
+		if len(create.Email) > 256 {
+			return fmt.Errorf("email is too long, maximum length is 256")
+		}
+		if !common.ValidateEmail(create.Email) {
+			return fmt.Errorf("invalid email format")
+		}
+	}
 
 	return nil
 }
@@ -85,6 +101,31 @@ type UserPatch struct {
 	OpenID       *string
 }
 
+func (patch UserPatch) Validate() error {
+	if patch.Username != nil && len(*patch.Username) < 4 {
+		return fmt.Errorf("username is too short, minimum length is 4")
+	}
+	if patch.Username != nil && len(*patch.Username) > 32 {
+		return fmt.Errorf("username is too long, maximum length is 32")
+	}
+	if patch.Password != nil && len(*patch.Password) < 4 {
+		return fmt.Errorf("password is too short, minimum length is 4")
+	}
+	if patch.Nickname != nil && len(*patch.Nickname) > 64 {
+		return fmt.Errorf("nickname is too long, maximum length is 64")
+	}
+	if patch.Email != nil {
+		if len(*patch.Email) > 256 {
+			return fmt.Errorf("email is too long, maximum length is 256")
+		}
+		if !common.ValidateEmail(*patch.Email) {
+			return fmt.Errorf("invalid email format")
+		}
+	}
+
+	return nil
+}
+
 type UserFind struct {
 	ID *int `json:"id"`
 

api/user_setting.go

@@ -36,7 +36,7 @@ func (key UserSettingKey) String() string {
 }
 
 var (
-	UserSettingLocaleValue                 = []string{"en", "zh", "vi", "fr", "nl", "sv", "de", "es"}
+	UserSettingLocaleValue                 = []string{"en", "zh", "vi", "fr", "nl", "sv", "de", "es", "uk", "ru", "it", "hant"}
 	UserSettingAppearanceValue             = []string{"system", "light", "dark"}
 	UserSettingMemoVisibilityValue         = []Visibility{Private, Protected, Public}
 	UserSettingMemoDisplayTsOptionKeyValue = []string{"created_ts", "updated_ts"}
@@ -50,7 +50,7 @@ type UserSetting struct {
 }
 
 type UserSettingUpsert struct {
-	UserID int
+	UserID int            `json:"-"`
 	Key    UserSettingKey `json:"key"`
 	Value  string         `json:"value"`
 }

bin/server/main.go

@@ -1,19 +1,18 @@
 package main
 
 import (
+	"net/http"
 	"os"
+	"os/signal"
+	"syscall"
 
 	_ "github.com/mattn/go-sqlite3"
 
 	"context"
 	"fmt"
 
-	metric "github.com/usememos/memos/plugin/metrics"
 	"github.com/usememos/memos/server"
 	"github.com/usememos/memos/server/profile"
-	"github.com/usememos/memos/store"
-
-	DB "github.com/usememos/memos/store/db"
 )
 
 const (
@@ -27,38 +26,12 @@ const (
 `
 )
 
-func run(profile *profile.Profile) error {
-	ctx := context.Background()
-
-	db := DB.NewDB(profile)
-	if err := db.Open(ctx); err != nil {
-		return fmt.Errorf("cannot open db: %w", err)
-	}
-
-	serverInstance := server.NewServer(profile)
-	storeInstance := store.New(db.Db, profile)
-	serverInstance.Store = storeInstance
-
-	metricCollector := server.NewMetricCollector(profile, storeInstance)
-	// Disable metrics collector.
-	metricCollector.Enabled = false
-	serverInstance.Collector = &metricCollector
-
-	println(greetingBanner)
-	fmt.Printf("Version %s has started at :%d\n", profile.Version, profile.Port)
-	metricCollector.Collect(ctx, &metric.Metric{
-		Name: "service started",
-	})
-
-	return serverInstance.Run()
-}
-
-func execute() error {
+func main() {
 	profile, err := profile.GetProfile()
 	if err != nil {
-		return err
+		fmt.Printf("failed to get profile, error: %+v\n", err)
+		return
 	}
-
 	println("---")
 	println("profile")
 	println("mode:", profile.Mode)
@@ -67,16 +40,35 @@ func execute() error {
 	println("version:", profile.Version)
 	println("---")
 
-	if err := run(profile); err != nil {
-		fmt.Printf("error: %+v\n", err)
-		return err
+	ctx, cancel := context.WithCancel(context.Background())
+	s, err := server.NewServer(ctx, profile)
+	if err != nil {
+		cancel()
+		fmt.Printf("failed to create server, error: %+v\n", err)
+		return
 	}
 
-	return nil
-}
+	c := make(chan os.Signal, 1)
+	// Trigger graceful shutdown on SIGINT or SIGTERM.
+	// The default signal sent by the `kill` command is SIGTERM,
+	// which is taken as the graceful shutdown signal for many systems, eg., Kubernetes, Gunicorn.
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	go func() {
+		sig := <-c
+		fmt.Printf("%s received.\n", sig.String())
+		s.Shutdown(ctx)
+		cancel()
+	}()
 
-func main() {
-	if err := execute(); err != nil {
-		os.Exit(1)
+	println(greetingBanner)
+	fmt.Printf("Version %s has started at :%d\n", profile.Version, profile.Port)
+	if err := s.Start(ctx); err != nil {
+		if err != http.ErrServerClosed {
+			fmt.Printf("failed to start server, error: %+v\n", err)
+			cancel()
+		}
 	}
+
+	// Wait for CTRL-C.
+	<-ctx.Done()
 }

common/log/logger.go

@@ -0,0 +1,67 @@
+// Package log implements a simple logging package.
+package log
+
+import (
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+var (
+	// `gl` is the global logger.
+	// Other packages should use public methods such as Info/Error to do the logging.
+	// For other types of logging, e.g. logging to a separate file, they should use their own loggers.
+	gl     *zap.Logger
+	gLevel zap.AtomicLevel
+)
+
+// Initializes the global console logger.
+func init() {
+	gLevel = zap.NewAtomicLevelAt(zap.InfoLevel)
+	gl, _ = zap.Config{
+		Level:       gLevel,
+		Development: true,
+		// Use "console" to print readable stacktrace.
+		Encoding:         "console",
+		EncoderConfig:    zap.NewDevelopmentEncoderConfig(),
+		OutputPaths:      []string{"stderr"},
+		ErrorOutputPaths: []string{"stderr"},
+	}.Build(
+		// Skip one caller stack to locate the correct caller.
+		zap.AddCallerSkip(1),
+	)
+}
+
+// SetLevel wraps the zap Level's SetLevel method.
+func SetLevel(level zapcore.Level) {
+	gLevel.SetLevel(level)
+}
+
+// EnabledLevel wraps the zap Level's Enabled method.
+func EnabledLevel(level zapcore.Level) bool {
+	return gLevel.Enabled(level)
+}
+
+// Debug wraps the zap Logger's Debug method.
+func Debug(msg string, fields ...zap.Field) {
+	gl.Debug(msg, fields...)
+}
+
+// Info wraps the zap Logger's Info method.
+func Info(msg string, fields ...zap.Field) {
+	gl.Info(msg, fields...)
+}
+
+// Warn wraps the zap Logger's Warn method.
+func Warn(msg string, fields ...zap.Field) {
+	gl.Warn(msg, fields...)
+}
+
+// Error wraps the zap Logger's Error method.
+func Error(msg string, fields ...zap.Field) {
+	gl.Error(msg, fields...)
+}
+
+// Sync wraps the zap Logger's Sync method.
+func Sync() {
+	_ = gl.Sync()
+}

docs/development.md

@@ -37,4 +37,4 @@ Memos is built with a curated tech stack. It is optimized for developer experien
    cd web && yarn && yarn dev
    ```
 
-Memos should now be running at [http://localhost:3000](http://localhost:3000) and change either frontend or backend code would trigger live reload.
+Memos should now be running at [http://localhost:3001](http://localhost:3001) and change either frontend or backend code would trigger live reload.

go.mod

@@ -7,8 +7,8 @@ require github.com/mattn/go-sqlite3 v1.14.9
 require github.com/google/uuid v1.3.0
 
 require (
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
-	golang.org/x/net v0.0.0-20220728030405-41545e8bf201
+	golang.org/x/crypto v0.1.0
+	golang.org/x/net v0.1.0
 )
 
 require github.com/labstack/echo/v4 v4.9.0
@@ -16,10 +16,8 @@ require github.com/labstack/echo/v4 v4.9.0
 require (
 	github.com/VictoriaMetrics/fastcache v1.10.0
 	github.com/gorilla/feeds v1.1.1
-	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.2.1
 	github.com/labstack/echo-contrib v0.13.0
-	github.com/stretchr/testify v1.8.1
 )
 
 require (
@@ -29,6 +27,7 @@ require (
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/labstack/gommon v0.3.1 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
@@ -38,14 +37,20 @@ require (
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.1 // indirect
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.4.0 // indirect
 	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require (
+	github.com/pkg/errors v0.9.1
 	github.com/segmentio/analytics-go v3.1.0+incompatible
-	golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
+	github.com/stretchr/testify v1.8.0
+	go.uber.org/zap v1.24.0
+	golang.org/x/exp v0.0.0-20230111222715-75897c7a292a
+	golang.org/x/mod v0.6.0
 )

go.sum

@@ -2,6 +2,7 @@ github.com/VictoriaMetrics/fastcache v1.10.0 h1:5hDJnLsKLpnUEToub7ETuRu8RCkb40wo
 github.com/VictoriaMetrics/fastcache v1.10.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8=
 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/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -45,6 +46,8 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
@@ -55,33 +58,41 @@ github.com/segmentio/backo-go v1.0.1 h1:68RQccglxZeyURy93ASB/2kc9QudzgIDexJ927N+
 github.com/segmentio/backo-go v1.0.1/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=
 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 h1:5oN1Pz/eDhCpbMbLstvIPa0b/BEQo6g6nwV3pLjfM6w=
-golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/net v0.0.0-20220728030405-41545e8bf201 h1:bvOltf3SADAfG05iRml8lAB3qjoEX5RCyN4K6G5v3N0=
-golang.org/x/net v0.0.0-20220728030405-41545e8bf201/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/exp v0.0.0-20230111222715-75897c7a292a h1:/YWeLOBWYV5WAQORVPkZF3Pq9IppkcT72GKnWjNf5W8=
+golang.org/x/exp v0.0.0-20230111222715-75897c7a292a/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
+golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
 golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

plugin/metrics/collector.go

@@ -1,6 +1,14 @@
 package metric
 
+// Metric is the API message for metric.
+type Metric struct {
+	ID     string
+	Name   string
+	Labels map[string]string
+}
+
 // Collector is the interface definition for metric collector.
 type Collector interface {
+	Identify(id string) error
 	Collect(metric *Metric) error
 }

plugin/metrics/metric.go

@@ -1,7 +0,0 @@
-package metric
-
-// Metric is the API message for metric.
-type Metric struct {
-	Name   string
-	Labels map[string]string
-}

plugin/metrics/segment/collector.go

@@ -3,15 +3,10 @@ package segment
 import (
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/segmentio/analytics-go"
 	metric "github.com/usememos/memos/plugin/metrics"
 )
 
-var (
-	sessionUUID = uuid.NewString()
-)
-
 // collector is the metrics collector https://segment.com/.
 type collector struct {
 	client analytics.Client
@@ -26,6 +21,14 @@ func NewCollector(key string) metric.Collector {
 	}
 }
 
+// Identify will identify the server caller.
+func (c *collector) Identify(id string) error {
+	return c.client.Enqueue(analytics.Identify{
+		UserId:    id,
+		Timestamp: time.Now().UTC(),
+	})
+}
+
 // Collect will exec all the segment collector.
 func (c *collector) Collect(metric *metric.Metric) error {
 	properties := analytics.NewProperties()
@@ -34,9 +37,9 @@ func (c *collector) Collect(metric *metric.Metric) error {
 	}
 
 	return c.client.Enqueue(analytics.Track{
-		Event:       string(metric.Name),
-		AnonymousId: sessionUUID,
-		Properties:  properties,
-		Timestamp:   time.Now().UTC(),
+		UserId:     metric.ID,
+		Timestamp:  time.Now().UTC(),
+		Event:      metric.Name,
+		Properties: properties,
 	})
 }

scripts/.air.toml

@@ -11,3 +11,5 @@ tmp_dir = ".air"
   exclude_unchanged = false
   follow_symlink = false
   full_bin = ""
+  send_interrupt = true
+  kill_delay = 2000

server/acl.go

@@ -15,6 +15,7 @@ import (
 
 var (
 	userIDContextKey = "user-id"
+	sessionName      = "memos_session"
 )
 
 func getUserIDContextKey() string {
@@ -22,12 +23,12 @@ func getUserIDContextKey() string {
 }
 
 func setUserSession(ctx echo.Context, user *api.User) error {
-	sess, _ := session.Get("memos_session", ctx)
+	sess, _ := session.Get(sessionName, ctx)
 	sess.Options = &sessions.Options{
 		Path:     "/",
 		MaxAge:   3600 * 24 * 30,
 		HttpOnly: true,
-		Secure:   true,
+		SameSite: http.SameSiteStrictMode,
 	}
 	sess.Values[userIDContextKey] = user.ID
 	err := sess.Save(ctx.Request(), ctx.Response())
@@ -38,7 +39,7 @@ func setUserSession(ctx echo.Context, user *api.User) error {
 }
 
 func removeUserSession(ctx echo.Context) error {
-	sess, _ := session.Get("memos_session", ctx)
+	sess, _ := session.Get(sessionName, ctx)
 	sess.Options = &sessions.Options{
 		Path:     "/",
 		MaxAge:   0,
@@ -57,61 +58,33 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
 		ctx := c.Request().Context()
 		path := c.Path()
 
-		// Skip auth.
-		if common.HasPrefixes(path, "/api/auth") {
+		if s.DefaultAuthSkipper(c) {
 			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 && common.ErrorCode(err) != common.NotFound {
-					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(sessionName, 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 && common.ErrorCode(err) != common.NotFound {
+				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 username %s", user.Username))
 				}
+				c.Set(getUserIDContextKey(), userID)
 			}
 		}
 
-		{
-			sess, _ := session.Get("memos_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 && common.ErrorCode(err) != common.NotFound {
-					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 username %s", user.Username))
-					}
-					c.Set(getUserIDContextKey(), userID)
-				}
-			}
-		}
-
-		if common.HasPrefixes(path, "/api/ping", "/api/status", "/api/user/:id", "/api/memo/all", "/api/memo/:memoId", "/api/memo/amount") && c.Request().Method == http.MethodGet {
+		if common.HasPrefixes(path, "/api/ping", "/api/status", "/api/user/:id", "/api/memo") && c.Request().Method == http.MethodGet {
 			return next(c)
 		}
 
-		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")

server/auth.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/pkg/errors"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
 	metric "github.com/usememos/memos/plugin/metrics"
@@ -16,7 +17,7 @@ import (
 func (s *Server) registerAuthRoutes(g *echo.Group) {
 	g.POST("/auth/signin", func(c echo.Context) error {
 		ctx := c.Request().Context()
-		signin := &api.Signin{}
+		signin := &api.SignIn{}
 		if err := json.NewDecoder(c.Request().Body).Decode(signin); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted signin request").SetInternal(err)
 		}
@@ -43,9 +44,9 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		if err = setUserSession(c, user); err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to set signin session").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "user signed in",
-		})
+		if err := s.createUserAuthSignInActivity(c, user); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {
@@ -54,23 +55,9 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		return nil
 	})
 
-	g.POST("/auth/logout", func(c echo.Context) error {
-		ctx := c.Request().Context()
-		err := removeUserSession(c)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to set logout session").SetInternal(err)
-		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "user logout",
-		})
-
-		c.Response().WriteHeader(http.StatusOK)
-		return nil
-	})
-
 	g.POST("/auth/signup", func(c echo.Context) error {
 		ctx := c.Request().Context()
-		signup := &api.Signup{}
+		signup := &api.SignUp{}
 		if err := json.NewDecoder(c.Request().Body).Decode(signup); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted signup request").SetInternal(err)
 		}
@@ -84,7 +71,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
 		}
 		if signup.Role == api.Host && hostUser != nil {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Site Host existed, please contact the site host to signin account firstly.").SetInternal(err)
+			return echo.NewHTTPError(http.StatusUnauthorized, "Site Host existed, please contact the site host to signin account firstly").SetInternal(err)
 		}
 
 		systemSettingAllowSignUpName := api.SystemSettingAllowSignUpName
@@ -103,7 +90,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			}
 		}
 		if !allowSignUpSettingValue && hostUser != nil {
-			return echo.NewHTTPError(http.StatusUnauthorized, "Site Host existed, please contact the site host to signin account firstly.").SetInternal(err)
+			return echo.NewHTTPError(http.StatusUnauthorized, "Site Host existed, please contact the site host to signin account firstly").SetInternal(err)
 		}
 
 		userCreate := &api.UserCreate{
@@ -114,7 +101,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			OpenID:   common.GenUUID(),
 		}
 		if err := userCreate.Validate(); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format.").SetInternal(err)
+			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format").SetInternal(err)
 		}
 
 		passwordHash, err := bcrypt.GenerateFromPassword([]byte(signup.Password), bcrypt.DefaultCost)
@@ -128,9 +115,9 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create user").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "user signed up",
-		})
+		if err := s.createUserAuthSignUpActivity(c, user); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		err = setUserSession(c, user)
 		if err != nil {
@@ -143,4 +130,63 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		}
 		return nil
 	})
+
+	g.POST("/auth/signout", func(c echo.Context) error {
+		err := removeUserSession(c)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to set sign out session").SetInternal(err)
+		}
+
+		return c.JSON(http.StatusOK, true)
+	})
+}
+
+func (s *Server) createUserAuthSignInActivity(c echo.Context, user *api.User) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityUserAuthSignInPayload{
+		UserID: user.ID,
+		IP:     echo.ExtractIPFromRealIPHeader()(c.Request()),
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: user.ID,
+		Type:      api.ActivityUserAuthSignIn,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Collect(ctx, &metric.Metric{
+		Name: string(activity.Type),
+	})
+	return err
+}
+
+func (s *Server) createUserAuthSignUpActivity(c echo.Context, user *api.User) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityUserAuthSignUpPayload{
+		Username: user.Username,
+		IP:       echo.ExtractIPFromRealIPHeader()(c.Request()),
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: user.ID,
+		Type:      api.ActivityUserAuthSignUp,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Collect(ctx, &metric.Metric{
+		Name: string(activity.Type),
+	})
+	return err
 }

server/common.go

@@ -1,11 +1,57 @@
 package server
 
-func composeResponse(data interface{}) interface{} {
-	type R struct {
-		Data interface{} `json:"data"`
-	}
+import (
+	"net/http"
 
-	return R{
+	"github.com/labstack/echo/v4"
+	"github.com/usememos/memos/api"
+	"github.com/usememos/memos/common"
+)
+
+type response struct {
+	Data interface{} `json:"data"`
+}
+
+func composeResponse(data interface{}) response {
+	return response{
 		Data: data,
 	}
 }
+
+func DefaultGetRequestSkipper(c echo.Context) bool {
+	return c.Request().Method == http.MethodGet
+}
+
+func DefaultAPIRequestSkipper(c echo.Context) bool {
+	path := c.Path()
+	return common.HasPrefixes(path, "/api")
+}
+
+func (server *Server) DefaultAuthSkipper(c echo.Context) bool {
+	ctx := c.Request().Context()
+	path := c.Path()
+
+	// Skip auth.
+	if common.HasPrefixes(path, "/api/auth") {
+		return true
+	}
+
+	// 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 := server.Store.FindUser(ctx, userFind)
+		if err != nil && common.ErrorCode(err) != common.NotFound {
+			return false
+		}
+		if user != nil {
+			// Stores userID into context.
+			c.Set(getUserIDContextKey(), user.ID)
+			return true
+		}
+	}
+
+	return false
+}

server/embed_frontend.go

@@ -25,18 +25,19 @@ func embedFrontend(e *echo.Echo) {
 	// Use echo static middleware to serve the built dist folder
 	// refer: https://github.com/labstack/echo/blob/master/middleware/static.go
 	e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
+		Skipper:    DefaultAPIRequestSkipper,
 		HTML5:      true,
 		Filesystem: getFileSystem("dist"),
 	}))
 
-	g := e.Group("assets")
-	g.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
+	assetsGroup := e.Group("assets")
+	assetsGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			c.Response().Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable")
 			return next(c)
 		}
 	})
-	g.Use(middleware.StaticWithConfig(middleware.StaticConfig{
+	assetsGroup.Use(middleware.StaticWithConfig(middleware.StaticConfig{
 		HTML5:      true,
 		Filesystem: getFileSystem("dist/assets"),
 	}))

server/http_getter.go

@@ -8,12 +8,10 @@ import (
 
 	"github.com/labstack/echo/v4"
 	getter "github.com/usememos/memos/plugin/http_getter"
-	metric "github.com/usememos/memos/plugin/metrics"
 )
 
-func (s *Server) registerGetterPublicRoutes(g *echo.Group) {
+func registerGetterPublicRoutes(g *echo.Group) {
 	g.GET("/get/httpmeta", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		urlStr := c.QueryParam("url")
 		if urlStr == "" {
 			return echo.NewHTTPError(http.StatusBadRequest, "Missing website url")
@@ -26,12 +24,6 @@ func (s *Server) registerGetterPublicRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusNotAcceptable, fmt.Sprintf("Failed to get website meta with url: %s", urlStr)).SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "getter used",
-			Labels: map[string]string{
-				"type": "httpmeta",
-			},
-		})
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(htmlMeta)); err != nil {
@@ -41,7 +33,6 @@ func (s *Server) registerGetterPublicRoutes(g *echo.Group) {
 	})
 
 	g.GET("/get/image", func(c echo.Context) error {
-		ctx := c.Request().Context()
 		urlStr := c.QueryParam("url")
 		if urlStr == "" {
 			return echo.NewHTTPError(http.StatusBadRequest, "Missing image url")
@@ -54,12 +45,6 @@ func (s *Server) registerGetterPublicRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Failed to get image url: %s", urlStr)).SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "getter used",
-			Labels: map[string]string{
-				"type": "image",
-			},
-		})
 
 		c.Response().Writer.WriteHeader(http.StatusOK)
 		c.Response().Writer.Header().Set("Content-Type", image.Mediatype)

server/memo.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
 	metric "github.com/usememos/memos/plugin/metrics"
@@ -24,15 +25,10 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
 		}
 
-		memoCreate := &api.MemoCreate{
-			CreatorID: userID,
-		}
+		memoCreate := &api.MemoCreate{}
 		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 == "" {
 			userSettingMemoVisibilityKey := api.UserSettingMemoVisibilityKey
@@ -57,13 +53,14 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			}
 		}
 
+		memoCreate.CreatorID = userID
 		memo, err := s.Store.CreateMemo(ctx, memoCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create memo").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "memo created",
-		})
+		if err := s.createMemoCreateActivity(c, memo); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		for _, resourceID := range memoCreate.ResourceIDList {
 			if _, err := s.Store.UpsertMemoResource(ctx, &api.MemoResourceUpsert{
@@ -98,13 +95,15 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
 		}
 
-		memoFind := &api.MemoFind{
-			ID:        &memoID,
-			CreatorID: &userID,
-		}
-		if _, err := s.Store.FindMemo(ctx, memoFind); err != nil {
+		memo, err := s.Store.FindMemo(ctx, &api.MemoFind{
+			ID: &memoID,
+		})
+		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo").SetInternal(err)
 		}
+		if memo.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+		}
 
 		currentTs := time.Now().Unix()
 		memoPatch := &api.MemoPatch{
@@ -115,7 +114,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(ctx, memoPatch)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch memo").SetInternal(err)
 		}
@@ -173,7 +172,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 		}
 		tag := c.QueryParam("tag")
 		if tag != "" {
-			contentSearch := "#" + tag + " "
+			contentSearch := "#" + tag
 			memoFind.ContentSearch = &contentSearch
 		}
 		visibilityListStr := c.QueryParam("visibility")
@@ -229,6 +228,148 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 		return nil
 	})
 
+	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)
+		}
+
+		memoFind := &api.MemoFind{
+			ID: &memoID,
+		}
+		memo, err := s.Store.FindMemo(ctx, 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)
+			}
+
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find memo by ID: %v", memoID)).SetInternal(err)
+		}
+
+		userID, ok := c.Get(getUserIDContextKey()).(int)
+		if memo.Visibility == api.Private {
+			if !ok || memo.CreatorID != userID {
+				return echo.NewHTTPError(http.StatusForbidden, "this memo is private only")
+			}
+		} else if memo.Visibility == api.Protected {
+			if !ok {
+				return echo.NewHTTPError(http.StatusForbidden, "this memo is protected, missing user in session")
+			}
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode memo response").SetInternal(err)
+		}
+		return nil
+	})
+
+	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")
+		}
+		memoOrganizerUpsert := &api.MemoOrganizerUpsert{}
+		if err := json.NewDecoder(c.Request().Body).Decode(memoOrganizerUpsert); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo organizer request").SetInternal(err)
+		}
+		memoOrganizerUpsert.MemoID = memoID
+		memoOrganizerUpsert.UserID = userID
+
+		err = s.Store.UpsertMemoOrganizer(ctx, memoOrganizerUpsert)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo organizer").SetInternal(err)
+		}
+
+		memo, err := s.Store.FindMemo(ctx, &api.MemoFind{
+			ID: &memoID,
+		})
+		if err != nil {
+			if common.ErrorCode(err) == common.NotFound {
+				return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Memo ID not found: %d", memoID)).SetInternal(err)
+			}
+
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find memo by ID: %v", memoID)).SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode memo response").SetInternal(err)
+		}
+		return nil
+	})
+
+	g.POST("/memo/:memoId/resource", 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")
+		}
+		memoResourceUpsert := &api.MemoResourceUpsert{}
+		if err := json.NewDecoder(c.Request().Body).Decode(memoResourceUpsert); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo resource request").SetInternal(err)
+		}
+		resourceFind := &api.ResourceFind{
+			ID: &memoResourceUpsert.ResourceID,
+		}
+		resource, err := s.Store.FindResource(ctx, resourceFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource").SetInternal(err)
+		}
+		if resource == nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Resource not found").SetInternal(err)
+		} else if resource.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized to bind this resource").SetInternal(err)
+		}
+
+		memoResourceUpsert.MemoID = memoID
+		currentTs := time.Now().Unix()
+		memoResourceUpsert.UpdatedTs = &currentTs
+		if _, err := s.Store.UpsertMemoResource(ctx, memoResourceUpsert); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo resource").SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resource)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode resource response").SetInternal(err)
+		}
+		return nil
+	})
+
+	g.GET("/memo/:memoId/resource", 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)
+		}
+
+		resourceFind := &api.ResourceFind{
+			MemoID: &memoID,
+		}
+		resourceList, err := s.Store.FindResourceList(ctx, resourceFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource list").SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resourceList)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode resource list response").SetInternal(err)
+		}
+		return nil
+	})
+
 	g.GET("/memo/amount", func(c echo.Context) error {
 		ctx := c.Request().Context()
 		normalRowStatus := api.Normal
@@ -352,183 +493,26 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 		return nil
 	})
 
-	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)
-		}
-
-		memoFind := &api.MemoFind{
-			ID: &memoID,
-		}
-		memo, err := s.Store.FindMemo(ctx, 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)
-			}
-
-			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find memo by ID: %v", memoID)).SetInternal(err)
-		}
-
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if memo.Visibility == api.Private {
-			if !ok || memo.CreatorID != userID {
-				return echo.NewHTTPError(http.StatusForbidden, "this memo is private only")
-			}
-		} else if memo.Visibility == api.Protected {
-			if !ok {
-				return echo.NewHTTPError(http.StatusForbidden, "this memo is protected, missing user in session")
-			}
-		}
-
-		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
-		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode memo response").SetInternal(err)
-		}
-		return nil
-	})
-
-	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")
-		}
-		memoOrganizerUpsert := &api.MemoOrganizerUpsert{
-			MemoID: memoID,
-			UserID: userID,
-		}
-		if err := json.NewDecoder(c.Request().Body).Decode(memoOrganizerUpsert); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo organizer request").SetInternal(err)
-		}
-
-		err = s.Store.UpsertMemoOrganizer(ctx, memoOrganizerUpsert)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo organizer").SetInternal(err)
-		}
-
-		memo, err := s.Store.FindMemo(ctx, &api.MemoFind{
-			ID: &memoID,
-		})
-		if err != nil {
-			if common.ErrorCode(err) == common.NotFound {
-				return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Memo ID not found: %d", memoID)).SetInternal(err)
-			}
-
-			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find memo by ID: %v", memoID)).SetInternal(err)
-		}
-
-		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
-		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode memo response").SetInternal(err)
-		}
-		return nil
-	})
-
-	g.POST("/memo/:memoId/resource", 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)
-		}
-
-		currentTs := time.Now().Unix()
-		memoResourceUpsert := &api.MemoResourceUpsert{
-			MemoID:    memoID,
-			UpdatedTs: &currentTs,
-		}
-		if err := json.NewDecoder(c.Request().Body).Decode(memoResourceUpsert); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo resource request").SetInternal(err)
-		}
-
-		if _, err := s.Store.UpsertMemoResource(ctx, memoResourceUpsert); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo resource").SetInternal(err)
-		}
-
-		resourceFind := &api.ResourceFind{
-			ID: &memoResourceUpsert.ResourceID,
-		}
-		resource, err := s.Store.FindResource(ctx, resourceFind)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource").SetInternal(err)
-		}
-
-		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
-		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resource)); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode resource response").SetInternal(err)
-		}
-		return nil
-	})
-
-	g.GET("/memo/:memoId/resource", 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)
-		}
-
-		resourceFind := &api.ResourceFind{
-			MemoID: &memoID,
-		}
-		resourceList, err := s.Store.FindResourceList(ctx, resourceFind)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource list").SetInternal(err)
-		}
-
-		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
-		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resourceList)); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode resource list response").SetInternal(err)
-		}
-		return nil
-	})
-
-	g.DELETE("/memo/:memoId/resource/:resourceId", 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("Memo ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
-		}
-		resourceID, err := strconv.Atoi(c.Param("resourceId"))
-		if err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Resource ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
-		}
-
-		memoResourceDelete := &api.MemoResourceDelete{
-			MemoID:     &memoID,
-			ResourceID: &resourceID,
-		}
-		if err := s.Store.DeleteMemoResource(ctx, memoResourceDelete); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource list").SetInternal(err)
-		}
-
-		return c.JSON(http.StatusOK, true)
-	})
-
 	g.DELETE("/memo/:memoId", 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")
 		}
-
 		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)
 		}
 
-		memoFind := &api.MemoFind{
-			ID:        &memoID,
-			CreatorID: &userID,
-		}
-		if _, err := s.Store.FindMemo(ctx, memoFind); err != nil {
+		memo, err := s.Store.FindMemo(ctx, &api.MemoFind{
+			ID: &memoID,
+		})
+		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo").SetInternal(err)
 		}
+		if memo.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+		}
 
 		memoDelete := &api.MemoDelete{
 			ID: memoID,
@@ -542,4 +526,65 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 
 		return c.JSON(http.StatusOK, true)
 	})
+
+	g.DELETE("/memo/:memoId/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")
+		}
+		memoID, err := strconv.Atoi(c.Param("memoId"))
+		if err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Memo ID is not a number: %s", c.Param("memoId"))).SetInternal(err)
+		}
+		resourceID, err := strconv.Atoi(c.Param("resourceId"))
+		if err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Resource ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
+		}
+
+		memo, err := s.Store.FindMemo(ctx, &api.MemoFind{
+			ID: &memoID,
+		})
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo").SetInternal(err)
+		}
+		if memo.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+		}
+
+		memoResourceDelete := &api.MemoResourceDelete{
+			MemoID:     &memoID,
+			ResourceID: &resourceID,
+		}
+		if err := s.Store.DeleteMemoResource(ctx, memoResourceDelete); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource list").SetInternal(err)
+		}
+
+		return c.JSON(http.StatusOK, true)
+	})
+}
+
+func (s *Server) createMemoCreateActivity(c echo.Context, memo *api.Memo) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityMemoCreatePayload{
+		Content:    memo.Content,
+		Visibility: memo.Visibility.String(),
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: memo.CreatorID,
+		Type:      api.ActivityMemoCreate,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Collect(ctx, &metric.Metric{
+		Name: string(activity.Type),
+	})
+	return err
 }

server/metric_collector.go

@@ -8,29 +8,39 @@ import (
 	"github.com/usememos/memos/plugin/metrics/segment"
 	"github.com/usememos/memos/server/profile"
 	"github.com/usememos/memos/server/version"
-	"github.com/usememos/memos/store"
 )
 
 // MetricCollector is the metric collector.
 type MetricCollector struct {
-	Collector metric.Collector
+	collector metric.Collector
+	ID        string
 	Enabled   bool
 	Profile   *profile.Profile
-	Store     *store.Store
 }
 
 const (
-	segmentMetricWriteKey = "fTn5BumOkj352n3TGw9tu0ARH2dOkcoQ"
+	segmentMetricWriteKey = "NbPruMMmfqfD2AMCw3pkxZTsszVS3hKq"
 )
 
-func NewMetricCollector(profile *profile.Profile, store *store.Store) MetricCollector {
+func (s *Server) registerMetricCollector() {
 	c := segment.NewCollector(segmentMetricWriteKey)
+	mc := &MetricCollector{
+		collector: c,
+		ID:        s.ID,
+		Enabled:   false,
+		Profile:   s.Profile,
+	}
+	s.Collector = mc
+}
 
-	return MetricCollector{
-		Collector: c,
-		Enabled:   true,
-		Profile:   profile,
-		Store:     store,
+func (mc *MetricCollector) Identify(_ context.Context) {
+	if !mc.Enabled {
+		return
+	}
+
+	err := mc.collector.Identify(mc.ID)
+	if err != nil {
+		fmt.Printf("Failed to request segment, error: %+v\n", err)
 	}
 }
 
@@ -39,16 +49,13 @@ func (mc *MetricCollector) Collect(_ context.Context, metric *metric.Metric) {
 		return
 	}
 
-	if mc.Profile.Mode == "dev" {
-		return
-	}
-
 	if metric.Labels == nil {
 		metric.Labels = map[string]string{}
 	}
+	metric.Labels["mode"] = mc.Profile.Mode
 	metric.Labels["version"] = version.GetCurrentVersion(mc.Profile.Mode)
-
-	err := mc.Collector.Collect(metric)
+	metric.ID = mc.ID
+	err := mc.collector.Collect(metric)
 	if err != nil {
 		fmt.Printf("Failed to request segment, error: %+v\n", err)
 	}

server/profile/profile.go

@@ -48,7 +48,7 @@ func checkDSN(dataDir string) (string, error) {
 func GetProfile() (*Profile, error) {
 	profile := Profile{}
 	flag.StringVar(&profile.Mode, "mode", "dev", "mode of server")
-	flag.IntVar(&profile.Port, "port", 8080, "port of server")
+	flag.IntVar(&profile.Port, "port", 8081, "port of server")
 	flag.StringVar(&profile.Data, "data", "", "data directory")
 	flag.Parse()
 

server/resource.go

@@ -1,14 +1,17 @@
 package server
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
 	metric "github.com/usememos/memos/plugin/metrics"
@@ -18,7 +21,7 @@ import (
 
 const (
 	// The max file size is 32MB.
-	maxFileSize = (32 * 8) << 20
+	maxFileSize = 32 << 20
 )
 
 func (s *Server) registerResourceRoutes(g *echo.Group) {
@@ -29,6 +32,34 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
 		}
 
+		resourceCreate := &api.ResourceCreate{}
+		if err := json.NewDecoder(c.Request().Body).Decode(resourceCreate); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post resource request").SetInternal(err)
+		}
+
+		resourceCreate.CreatorID = userID
+		resource, err := s.Store.CreateResource(ctx, resourceCreate)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create resource").SetInternal(err)
+		}
+		if err := s.createResourceCreateActivity(c, resource); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
+		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resource)); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode resource response").SetInternal(err)
+		}
+		return nil
+	})
+
+	g.POST("/resource/blob", 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")
+		}
+
 		if err := c.Request().ParseMultipartForm(maxFileSize); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Upload file overload max size").SetInternal(err)
 		}
@@ -56,20 +87,19 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		}
 
 		resourceCreate := &api.ResourceCreate{
+			CreatorID: userID,
 			Filename:  filename,
 			Type:      filetype,
 			Size:      size,
 			Blob:      fileBytes,
-			CreatorID: userID,
 		}
-
 		resource, err := s.Store.CreateResource(ctx, resourceCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create resource").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "resource created",
-		})
+		if err := s.createResourceCreateActivity(c, resource); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resource)); err != nil {
@@ -123,6 +153,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		resourceFind := &api.ResourceFind{
 			ID:        &resourceID,
 			CreatorID: &userID,
+			GetBlob:   true,
 		}
 		resource, err := s.Store.FindResource(ctx, resourceFind)
 		if err != nil {
@@ -150,6 +181,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		resourceFind := &api.ResourceFind{
 			ID:        &resourceID,
 			CreatorID: &userID,
+			GetBlob:   true,
 		}
 		resource, err := s.Store.FindResource(ctx, resourceFind)
 		if err != nil {
@@ -158,6 +190,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 
 		c.Response().Writer.WriteHeader(http.StatusOK)
 		c.Response().Writer.Header().Set("Content-Type", resource.Type)
+		c.Response().Writer.Header().Set(echo.HeaderContentSecurityPolicy, "default-src 'self'")
 		if _, err := c.Response().Writer.Write(resource.Blob); err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write resource blob").SetInternal(err)
 		}
@@ -177,23 +210,26 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		}
 
 		resourceFind := &api.ResourceFind{
-			ID:        &resourceID,
-			CreatorID: &userID,
+			ID: &resourceID,
 		}
-		if _, err := s.Store.FindResource(ctx, resourceFind); err != nil {
+		resource, err := s.Store.FindResource(ctx, resourceFind)
+		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find resource").SetInternal(err)
 		}
+		if resource.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+		}
 
 		currentTs := time.Now().Unix()
 		resourcePatch := &api.ResourcePatch{
-			ID:        resourceID,
 			UpdatedTs: &currentTs,
 		}
 		if err := json.NewDecoder(c.Request().Body).Decode(resourcePatch); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch resource request").SetInternal(err)
 		}
 
-		resource, err := s.Store.PatchResource(ctx, resourcePatch)
+		resourcePatch.ID = resourceID
+		resource, err = s.Store.PatchResource(ctx, resourcePatch)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch resource").SetInternal(err)
 		}
@@ -224,8 +260,8 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find resource").SetInternal(err)
 		}
-		if resource == nil {
-			return echo.NewHTTPError(http.StatusNotFound, "Not find resource").SetInternal(err)
+		if resource.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
 		}
 
 		resourceDelete := &api.ResourceDelete{
@@ -256,19 +292,49 @@ func (s *Server) registerResourcePublicRoutes(g *echo.Group) {
 		resourceFind := &api.ResourceFind{
 			ID:       &resourceID,
 			Filename: &filename,
+			GetBlob:  true,
 		}
 		resource, err := s.Store.FindResource(ctx, resourceFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to fetch resource ID: %v", resourceID)).SetInternal(err)
 		}
 
-		c.Response().Writer.Header().Set("Content-Type", resource.Type)
-		c.Response().Writer.WriteHeader(http.StatusOK)
+		resourceType := strings.ToLower(resource.Type)
+		if strings.HasPrefix(resourceType, "text") || (strings.HasPrefix(resourceType, "application") && resourceType != "application/pdf") {
+			resourceType = echo.MIMETextPlain
+		}
 		c.Response().Writer.Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable")
 		c.Response().Writer.Header().Set(echo.HeaderContentSecurityPolicy, "default-src 'self'")
-		if _, err := c.Response().Writer.Write(resource.Blob); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write response").SetInternal(err)
+		if strings.HasPrefix(resourceType, "video") || strings.HasPrefix(resourceType, "audio") {
+			http.ServeContent(c.Response(), c.Request(), resource.Filename, time.Unix(resource.UpdatedTs, 0), bytes.NewReader(resource.Blob))
+			return nil
 		}
-		return nil
+		return c.Stream(http.StatusOK, resourceType, bytes.NewReader(resource.Blob))
 	})
 }
+
+func (s *Server) createResourceCreateActivity(c echo.Context, resource *api.Resource) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityResourceCreatePayload{
+		Filename: resource.Filename,
+		Type:     resource.Type,
+		Size:     resource.Size,
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: resource.CreatorID,
+		Type:      api.ActivityResourceCreate,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Collect(ctx, &metric.Metric{
+		Name: string(activity.Type),
+	})
+	return err
+}

server/rss.go

@@ -1,8 +1,11 @@
 package server
 
 import (
+	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/gorilla/feeds"
@@ -10,10 +13,87 @@ import (
 	"github.com/usememos/memos/api"
 )
 
+func generateRSSFromMemoList(memoList []*api.Memo, baseURL string, profile *api.CustomizedProfile) (string, error) {
+	feed := &feeds.Feed{
+		Title:       profile.Name,
+		Link:        &feeds.Link{Href: baseURL},
+		Description: profile.Description,
+		Created:     time.Now(),
+	}
+
+	feed.Items = make([]*feeds.Item, len(memoList))
+	for i, memo := range memoList {
+		var useTitle = strings.HasPrefix(memo.Content, "# ")
+
+		var title string
+		if useTitle {
+			title = strings.Split(memo.Content, "\n")[0][2:]
+		} else {
+			title = memo.Creator.Username + "-memos-" + strconv.Itoa(memo.ID)
+		}
+
+		var description string
+		if useTitle {
+			var firstLineEnd = strings.Index(memo.Content, "\n")
+			description = memo.Content[firstLineEnd+1:]
+		} else {
+			description = memo.Content
+		}
+
+		feed.Items[i] = &feeds.Item{
+			Title:       title,
+			Link:        &feeds.Link{Href: baseURL + "/m/" + strconv.Itoa(memo.ID)},
+			Description: description,
+			Created:     time.Unix(memo.CreatedTs, 0),
+		}
+	}
+
+	rss, err := feed.ToRss()
+	if err != nil {
+		return "", err
+	}
+	return rss, nil
+}
+
 func (s *Server) registerRSSRoutes(g *echo.Group) {
+	g.GET("/explore/rss.xml", func(c echo.Context) error {
+		ctx := c.Request().Context()
+
+		systemCustomizedProfile, err := getSystemCustomizedProfile(ctx, s)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to get system customized profile").SetInternal(err)
+		}
+
+		normalStatus := api.Normal
+		memoFind := api.MemoFind{
+			RowStatus: &normalStatus,
+			VisibilityList: []api.Visibility{
+				api.Public,
+			},
+		}
+		memoList, err := s.Store.FindMemoList(ctx, &memoFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)
+		}
+
+		baseURL := c.Scheme() + "://" + c.Request().Host
+		rss, err := generateRSSFromMemoList(memoList, baseURL, &systemCustomizedProfile)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate rss").SetInternal(err)
+		}
+
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationXMLCharsetUTF8)
+		return c.String(http.StatusOK, rss)
+	})
+
 	g.GET("/u/:id/rss.xml", func(c echo.Context) error {
 		ctx := c.Request().Context()
 
+		systemCustomizedProfile, err := getSystemCustomizedProfile(ctx, s)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to get system customized profile").SetInternal(err)
+		}
+
 		id, err := strconv.Atoi(c.Param("id"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "User id is not a number").SetInternal(err)
@@ -32,41 +112,66 @@ func (s *Server) registerRSSRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)
 		}
 
-		userFind := api.UserFind{
-			ID: &id,
-		}
-		user, err := s.Store.FindUser(ctx, &userFind)
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user").SetInternal(err)
-		}
-
 		baseURL := c.Scheme() + "://" + c.Request().Host
 
-		feed := &feeds.Feed{
-			Title:       "Memos",
-			Link:        &feeds.Link{Href: baseURL},
-			Description: "Memos",
-			Author:      &feeds.Author{Name: user.Username},
-			Created:     time.Now(),
-		}
-
-		feed.Items = make([]*feeds.Item, len(memoList))
-		for i, memo := range memoList {
-			feed.Items[i] = &feeds.Item{
-				Title:       user.Username + "-memos-" + strconv.Itoa(memo.ID),
-				Link:        &feeds.Link{Href: baseURL + "/m/" + strconv.Itoa(memo.ID)},
-				Description: memo.Content,
-				Created:     time.Unix(memo.CreatedTs, 0),
-			}
-		}
-
-		rss, err := feed.ToRss()
+		rss, err := generateRSSFromMemoList(memoList, baseURL, &systemCustomizedProfile)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate rss").SetInternal(err)
 		}
-
-		rssPrefix := `<?xml version="1.0" encoding="UTF-8"?>`
-
-		return c.XMLBlob(http.StatusOK, []byte(rss[len(rssPrefix):]))
+		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationXMLCharsetUTF8)
+		return c.String(http.StatusOK, rss)
 	})
 }
+
+func getSystemCustomizedProfile(ctx context.Context, s *Server) (api.CustomizedProfile, error) {
+	systemStatus := api.SystemStatus{
+		CustomizedProfile: api.CustomizedProfile{
+			Name:        "memos",
+			LogoURL:     "",
+			Description: "",
+			Locale:      "en",
+			Appearance:  "system",
+			ExternalURL: "",
+		},
+	}
+
+	systemSettingList, err := s.Store.FindSystemSettingList(ctx, &api.SystemSettingFind{})
+	if err != nil {
+		return api.CustomizedProfile{}, err
+	}
+	for _, systemSetting := range systemSettingList {
+		if systemSetting.Name == api.SystemSettingServerID || systemSetting.Name == api.SystemSettingSecretSessionName {
+			continue
+		}
+
+		var value interface{}
+		err := json.Unmarshal([]byte(systemSetting.Value), &value)
+		if err != nil {
+			return api.CustomizedProfile{}, err
+		}
+
+		if systemSetting.Name == api.SystemSettingCustomizedProfileName {
+			valueMap := value.(map[string]interface{})
+			systemStatus.CustomizedProfile = api.CustomizedProfile{}
+			if v := valueMap["name"]; v != nil {
+				systemStatus.CustomizedProfile.Name = v.(string)
+			}
+			if v := valueMap["logoUrl"]; v != nil {
+				systemStatus.CustomizedProfile.LogoURL = v.(string)
+			}
+			if v := valueMap["description"]; v != nil {
+				systemStatus.CustomizedProfile.Description = v.(string)
+			}
+			if v := valueMap["locale"]; v != nil {
+				systemStatus.CustomizedProfile.Locale = v.(string)
+			}
+			if v := valueMap["appearance"]; v != nil {
+				systemStatus.CustomizedProfile.Appearance = v.(string)
+			}
+			if v := valueMap["externalUrl"]; v != nil {
+				systemStatus.CustomizedProfile.ExternalURL = v.(string)
+			}
+		}
+	}
+	return systemStatus.CustomizedProfile, nil
+}

server/server.go

@@ -1,13 +1,19 @@
 package server
 
 import (
+	"context"
+	"database/sql"
+	"encoding/json"
 	"fmt"
 	"time"
 
+	"github.com/pkg/errors"
+	"github.com/usememos/memos/api"
+	metric "github.com/usememos/memos/plugin/metrics"
 	"github.com/usememos/memos/server/profile"
 	"github.com/usememos/memos/store"
+	"github.com/usememos/memos/store/db"
 
-	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
 	"github.com/labstack/echo-contrib/session"
 	"github.com/labstack/echo/v4"
@@ -15,58 +21,88 @@ import (
 )
 
 type Server struct {
-	e *echo.Echo
+	e  *echo.Echo
+	db *sql.DB
 
+	ID        string
+	Profile   *profile.Profile
+	Store     *store.Store
 	Collector *MetricCollector
-
-	Profile *profile.Profile
-
-	Store *store.Store
 }
 
-func NewServer(profile *profile.Profile) *Server {
+func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) {
 	e := echo.New()
 	e.Debug = true
 	e.HideBanner = true
 	e.HidePort = true
 
+	db := db.NewDB(profile)
+	if err := db.Open(ctx); err != nil {
+		return nil, errors.Wrap(err, "cannot open db")
+	}
+
+	s := &Server{
+		e:       e,
+		db:      db.DBInstance,
+		Profile: profile,
+	}
+	storeInstance := store.New(db.DBInstance, profile)
+	s.Store = storeInstance
+
 	e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
 		Format: `{"time":"${time_rfc3339}",` +
 			`"method":"${method}","uri":"${uri}",` +
 			`"status":${status},"error":"${error}"}` + "\n",
 	}))
 
+	e.Use(middleware.Gzip())
+
+	e.Use(middleware.CSRFWithConfig(middleware.CSRFConfig{
+		Skipper:     s.DefaultAuthSkipper,
+		TokenLookup: "cookie:_csrf",
+	}))
+
 	e.Use(middleware.CORS())
 
+	e.Use(middleware.SecureWithConfig(middleware.SecureConfig{
+		Skipper:            DefaultGetRequestSkipper,
+		XSSProtection:      "1; mode=block",
+		ContentTypeNosniff: "nosniff",
+		XFrameOptions:      "SAMEORIGIN",
+		HSTSPreloadEnabled: false,
+	}))
+
 	e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{
-		Skipper:      middleware.DefaultSkipper,
 		ErrorMessage: "Request timeout",
 		Timeout:      30 * time.Second,
 	}))
 
+	serverID, err := s.getSystemServerID(ctx)
+	if err != nil {
+		return nil, err
+	}
+	s.ID = serverID
+
+	secretSessionName := "usememos"
+	if profile.Mode == "prod" {
+		secretSessionName, err = s.getSystemSecretSessionName(ctx)
+		if err != nil {
+			return nil, err
+		}
+	}
+	e.Use(session.Middleware(sessions.NewCookieStore([]byte(secretSessionName))))
+
 	embedFrontend(e)
 
-	// In dev mode, set the const secret key to make signin session persistence.
-	secret := []byte("usememos")
-	if profile.Mode == "prod" {
-		secret = securecookie.GenerateRandomKey(16)
-	}
-	e.Use(session.Middleware(sessions.NewCookieStore(secret)))
-
-	s := &Server{
-		e:       e,
-		Profile: profile,
-	}
+	// Register MetricCollector to server.
+	s.registerMetricCollector()
 
 	rootGroup := e.Group("")
 	s.registerRSSRoutes(rootGroup)
 
-	webhookGroup := e.Group("/h")
-	s.registerResourcePublicRoutes(webhookGroup)
-
 	publicGroup := e.Group("/o")
 	s.registerResourcePublicRoutes(publicGroup)
-	s.registerGetterPublicRoutes(publicGroup)
+	registerGetterPublicRoutes(publicGroup)
 
 	apiGroup := e.Group("/api")
 	apiGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
@@ -80,9 +116,54 @@ func NewServer(profile *profile.Profile) *Server {
 	s.registerResourceRoutes(apiGroup)
 	s.registerTagRoutes(apiGroup)
 
-	return s
+	return s, nil
 }
 
-func (server *Server) Run() error {
-	return server.e.Start(fmt.Sprintf(":%d", server.Profile.Port))
+func (s *Server) Start(ctx context.Context) error {
+	if err := s.createServerStartActivity(ctx); err != nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Identify(ctx)
+	return s.e.Start(fmt.Sprintf(":%d", s.Profile.Port))
+}
+
+func (s *Server) Shutdown(ctx context.Context) {
+	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+
+	// Shutdown echo server
+	if err := s.e.Shutdown(ctx); err != nil {
+		fmt.Printf("failed to shutdown server, error: %v\n", err)
+	}
+
+	// Close database connection
+	if err := s.db.Close(); err != nil {
+		fmt.Printf("failed to close database, error: %v\n", err)
+	}
+
+	fmt.Printf("memos stopped properly\n")
+}
+
+func (s *Server) createServerStartActivity(ctx context.Context) error {
+	payload := api.ActivityServerStartPayload{
+		ServerID: s.ID,
+		Profile:  s.Profile,
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: api.UnknownID,
+		Type:      api.ActivityServerStart,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Collect(ctx, &metric.Metric{
+		Name: string(activity.Type),
+	})
+	return err
 }

server/shortcut.go

@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
-	metric "github.com/usememos/memos/plugin/metrics"
 
 	"github.com/labstack/echo/v4"
 )
@@ -21,20 +21,19 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 		if !ok {
 			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
 		}
-		shortcutCreate := &api.ShortcutCreate{
-			CreatorID: userID,
-		}
+		shortcutCreate := &api.ShortcutCreate{}
 		if err := json.NewDecoder(c.Request().Body).Decode(shortcutCreate); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post shortcut request").SetInternal(err)
 		}
 
+		shortcutCreate.CreatorID = userID
 		shortcut, err := s.Store.CreateShortcut(ctx, shortcutCreate)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create shortcut").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "shortcut created",
-		})
+		if err := s.createShortcutCreateActivity(c, shortcut); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil {
@@ -45,21 +44,36 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 
 	g.PATCH("/shortcut/:shortcutId", 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")
+		}
 		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)
 		}
 
+		shortcutFind := &api.ShortcutFind{
+			ID: &shortcutID,
+		}
+		shortcut, err := s.Store.FindShortcut(ctx, shortcutFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find shortcut").SetInternal(err)
+		}
+		if shortcut.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+		}
+
 		currentTs := time.Now().Unix()
 		shortcutPatch := &api.ShortcutPatch{
-			ID:        shortcutID,
 			UpdatedTs: &currentTs,
 		}
 		if err := json.NewDecoder(c.Request().Body).Decode(shortcutPatch); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch shortcut request").SetInternal(err)
 		}
 
-		shortcut, err := s.Store.PatchShortcut(ctx, shortcutPatch)
+		shortcutPatch.ID = shortcutID
+		shortcut, err = s.Store.PatchShortcut(ctx, shortcutPatch)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to patch shortcut").SetInternal(err)
 		}
@@ -73,19 +87,14 @@ 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 {
-			shortcutFind.CreatorID = &userID
-		} else {
-			userID, ok := c.Get(getUserIDContextKey()).(int)
-			if !ok {
-				return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find shortcut")
-			}
-
-			shortcutFind.CreatorID = &userID
+		userID, ok := c.Get(getUserIDContextKey()).(int)
+		if !ok {
+			return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find shortcut")
 		}
 
+		shortcutFind := &api.ShortcutFind{
+			CreatorID: &userID,
+		}
 		list, err := s.Store.FindShortcutList(ctx, shortcutFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch shortcut list").SetInternal(err)
@@ -122,11 +131,26 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 
 	g.DELETE("/shortcut/:shortcutId", 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")
+		}
 		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)
 		}
 
+		shortcutFind := &api.ShortcutFind{
+			ID: &shortcutID,
+		}
+		shortcut, err := s.Store.FindShortcut(ctx, shortcutFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find shortcut").SetInternal(err)
+		}
+		if shortcut.CreatorID != userID {
+			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+		}
+
 		shortcutDelete := &api.ShortcutDelete{
 			ID: &shortcutID,
 		}
@@ -140,3 +164,25 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 		return c.JSON(http.StatusOK, true)
 	})
 }
+
+func (s *Server) createShortcutCreateActivity(c echo.Context, shortcut *api.Shortcut) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityShortcutCreatePayload{
+		Title:   shortcut.Title,
+		Payload: shortcut.Payload,
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: shortcut.CreatorID,
+		Type:      api.ActivityShortcutCreate,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	return err
+}

server/system.go

@@ -1,13 +1,14 @@
 package server
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"os"
 
+	"github.com/google/uuid"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
-	metric "github.com/usememos/memos/plugin/metrics"
 
 	"github.com/labstack/echo/v4"
 )
@@ -37,6 +38,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 		if hostUser != nil {
 			// data desensitize
 			hostUser.OpenID = ""
+			hostUser.Email = ""
 		}
 
 		systemStatus := api.SystemStatus{
@@ -61,6 +63,10 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find system setting list").SetInternal(err)
 		}
 		for _, systemSetting := range systemSettingList {
+			if systemSetting.Name == api.SystemSettingServerID || systemSetting.Name == api.SystemSettingSecretSessionName {
+				continue
+			}
+
 			var value interface{}
 			err := json.Unmarshal([]byte(systemSetting.Value), &value)
 			if err != nil {
@@ -75,13 +81,24 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 				systemStatus.AdditionalScript = value.(string)
 			} else if systemSetting.Name == api.SystemSettingCustomizedProfileName {
 				valueMap := value.(map[string]interface{})
-				systemStatus.CustomizedProfile = api.CustomizedProfile{
-					Name:        valueMap["name"].(string),
-					LogoURL:     valueMap["logoUrl"].(string),
-					Description: valueMap["description"].(string),
-					Locale:      valueMap["locale"].(string),
-					Appearance:  valueMap["appearance"].(string),
-					ExternalURL: valueMap["externalUrl"].(string),
+				systemStatus.CustomizedProfile = api.CustomizedProfile{}
+				if v := valueMap["name"]; v != nil {
+					systemStatus.CustomizedProfile.Name = v.(string)
+				}
+				if v := valueMap["logoUrl"]; v != nil {
+					systemStatus.CustomizedProfile.LogoURL = v.(string)
+				}
+				if v := valueMap["description"]; v != nil {
+					systemStatus.CustomizedProfile.Description = v.(string)
+				}
+				if v := valueMap["locale"]; v != nil {
+					systemStatus.CustomizedProfile.Locale = v.(string)
+				}
+				if v := valueMap["appearance"]; v != nil {
+					systemStatus.CustomizedProfile.Appearance = v.(string)
+				}
+				if v := valueMap["externalUrl"]; v != nil {
+					systemStatus.CustomizedProfile.ExternalURL = v.(string)
 				}
 			}
 		}
@@ -124,9 +141,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user").SetInternal(err)
 		}
-		if user == nil {
-			return echo.NewHTTPError(http.StatusNotFound, "Current signin user not found")
-		} else if user.Role != api.Host {
+		if user == nil || user.Role != api.Host {
 			return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
 		}
 
@@ -142,10 +157,6 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert system setting").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name:   "systemSetting updated",
-			Labels: map[string]string{"field": string(systemSettingUpsert.Name)},
-		})
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(systemSetting)); err != nil {
@@ -190,3 +201,43 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 		return nil
 	})
 }
+
+func (s *Server) getSystemServerID(ctx context.Context) (string, error) {
+	serverIDKey := api.SystemSettingServerID
+	serverIDValue, err := s.Store.FindSystemSetting(ctx, &api.SystemSettingFind{
+		Name: &serverIDKey,
+	})
+	if err != nil && common.ErrorCode(err) != common.NotFound {
+		return "", err
+	}
+	if serverIDValue == nil || serverIDValue.Value == "" {
+		serverIDValue, err = s.Store.UpsertSystemSetting(ctx, &api.SystemSettingUpsert{
+			Name:  serverIDKey,
+			Value: uuid.NewString(),
+		})
+		if err != nil {
+			return "", err
+		}
+	}
+	return serverIDValue.Value, nil
+}
+
+func (s *Server) getSystemSecretSessionName(ctx context.Context) (string, error) {
+	secretSessionNameKey := api.SystemSettingSecretSessionName
+	secretSessionNameValue, err := s.Store.FindSystemSetting(ctx, &api.SystemSettingFind{
+		Name: &secretSessionNameKey,
+	})
+	if err != nil && common.ErrorCode(err) != common.NotFound {
+		return "", err
+	}
+	if secretSessionNameValue == nil || secretSessionNameValue.Value == "" {
+		secretSessionNameValue, err = s.Store.UpsertSystemSetting(ctx, &api.SystemSettingUpsert{
+			Name:  secretSessionNameKey,
+			Value: uuid.NewString(),
+		})
+		if err != nil {
+			return "", err
+		}
+	}
+	return secretSessionNameValue.Value, nil
+}

server/tag.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
 	"regexp"
 	"sort"
-	"strconv"
 
+	"github.com/pkg/errors"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
-	metric "github.com/usememos/memos/plugin/metrics"
+	"golang.org/x/exp/slices"
 
 	"github.com/labstack/echo/v4"
 )
@@ -23,9 +24,7 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
 		}
 
-		tagUpsert := &api.TagUpsert{
-			CreatorID: userID,
-		}
+		tagUpsert := &api.TagUpsert{}
 		if err := json.NewDecoder(c.Request().Body).Decode(tagUpsert); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post tag request").SetInternal(err)
 		}
@@ -33,13 +32,14 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusBadRequest, "Tag name shouldn't be empty")
 		}
 
+		tagUpsert.CreatorID = userID
 		tag, err := s.Store.UpsertTag(ctx, tagUpsert)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert tag").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "tag created",
-		})
+		if err := s.createTagCreateActivity(c, tag); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(tag.Name)); err != nil {
@@ -50,19 +50,14 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 
 	g.GET("/tag", func(c echo.Context) error {
 		ctx := c.Request().Context()
-		tagFind := &api.TagFind{}
-		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
-			tagFind.CreatorID = userID
+		userID, ok := c.Get(getUserIDContextKey()).(int)
+		if !ok {
+			return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find tag")
 		}
 
-		if tagFind.CreatorID == 0 {
-			currentUserID, ok := c.Get(getUserIDContextKey()).(int)
-			if !ok {
-				return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find tag")
-			}
-			tagFind.CreatorID = currentUserID
+		tagFind := &api.TagFind{
+			CreatorID: userID,
 		}
-
 		tagList, err := s.Store.FindTagList(ctx, tagFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find tag list").SetInternal(err)
@@ -82,40 +77,41 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 
 	g.GET("/tag/suggestion", func(c echo.Context) error {
 		ctx := c.Request().Context()
+		userID, ok := c.Get(getUserIDContextKey()).(int)
+		if !ok {
+			return echo.NewHTTPError(http.StatusBadRequest, "Missing user session")
+		}
 		contentSearch := "#"
 		normalRowStatus := api.Normal
 		memoFind := api.MemoFind{
+			CreatorID:     &userID,
 			ContentSearch: &contentSearch,
 			RowStatus:     &normalRowStatus,
 		}
 
-		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}
-			}
-		}
-
 		memoList, err := s.Store.FindMemoList(ctx, &memoFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)
 		}
 
+		tagFind := &api.TagFind{
+			CreatorID: userID,
+		}
+		existTagList, err := s.Store.FindTagList(ctx, tagFind)
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find tag list").SetInternal(err)
+		}
+		tagNameList := []string{}
+		for _, tag := range existTagList {
+			tagNameList = append(tagNameList, tag.Name)
+		}
+
 		tagMapSet := make(map[string]bool)
 		for _, memo := range memoList {
 			for _, tag := range findTagListFromMemoContent(memo.Content) {
-				tagMapSet[tag] = true
+				if !slices.Contains(tagNameList, tag) {
+					tagMapSet[tag] = true
+				}
 			}
 		}
 		tagList := []string{}
@@ -138,8 +134,10 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
 		}
 
-		tagName := c.Param("tagName")
-		if tagName == "" {
+		tagName, err := url.QueryUnescape(c.Param("tagName"))
+		if err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Invalid tag name").SetInternal(err)
+		} else if tagName == "" {
 			return echo.NewHTTPError(http.StatusBadRequest, "Tag name cannot be empty")
 		}
 
@@ -175,3 +173,24 @@ func findTagListFromMemoContent(memoContent string) []string {
 	sort.Strings(tagList)
 	return tagList
 }
+
+func (s *Server) createTagCreateActivity(c echo.Context, tag *api.Tag) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityTagCreatePayload{
+		TagName: tag.Name,
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: tag.CreatorID,
+		Type:      api.ActivityTagCreate,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	return err
+}

server/user.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/common"
 	metric "github.com/usememos/memos/plugin/metrics"
@@ -29,18 +30,20 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 			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.")
+			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 userCreate.Role == api.Host {
+			return echo.NewHTTPError(http.StatusForbidden, "Could not create host user")
+		}
+		userCreate.OpenID = common.GenUUID()
 
 		if err := userCreate.Validate(); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format.").SetInternal(err)
+			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format").SetInternal(err)
 		}
 
 		passwordHash, err := bcrypt.GenerateFromPassword([]byte(userCreate.Password), bcrypt.DefaultCost)
@@ -53,9 +56,9 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create user").SetInternal(err)
 		}
-		s.Collector.Collect(ctx, &metric.Metric{
-			Name: "user created",
-		})
+		if err := s.createUserCreateActivity(c, user); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err)
+		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 		if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {
@@ -74,6 +77,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		for _, user := range userList {
 			// data desensitize
 			user.OpenID = ""
+			user.Email = ""
 		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
@@ -159,6 +163,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		if user != nil {
 			// data desensitize
 			user.OpenID = ""
+			user.Email = ""
 		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
@@ -192,15 +197,14 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 
 		currentTs := time.Now().Unix()
 		userPatch := &api.UserPatch{
-			ID:        userID,
 			UpdatedTs: &currentTs,
 		}
 		if err := json.NewDecoder(c.Request().Body).Decode(userPatch); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted patch user request").SetInternal(err)
 		}
-
-		if userPatch.Email != nil && *userPatch.Email != "" && !common.ValidateEmail(*userPatch.Email) {
-			return echo.NewHTTPError(http.StatusBadRequest, "Invalid email format")
+		userPatch.ID = userID
+		if err := userPatch.Validate(); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Invalid user patch format").SetInternal(err)
 		}
 
 		if userPatch.Password != nil && *userPatch.Password != "" {
@@ -274,3 +278,29 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
 		return c.JSON(http.StatusOK, true)
 	})
 }
+
+func (s *Server) createUserCreateActivity(c echo.Context, user *api.User) error {
+	ctx := c.Request().Context()
+	payload := api.ActivityUserCreatePayload{
+		UserID:   user.ID,
+		Username: user.Username,
+		Role:     user.Role,
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal activity payload")
+	}
+	activity, err := s.Store.CreateActivity(ctx, &api.ActivityCreate{
+		CreatorID: user.ID,
+		Type:      api.ActivityUserCreate,
+		Level:     api.ActivityInfo,
+		Payload:   string(payloadStr),
+	})
+	if err != nil || activity == nil {
+		return errors.Wrap(err, "failed to create activity")
+	}
+	s.Collector.Collect(ctx, &metric.Metric{
+		Name: string(activity.Type),
+	})
+	return err
+}

server/version/version.go

@@ -1,16 +1,18 @@
 package version
 
 import (
-	"strconv"
+	"fmt"
 	"strings"
+
+	"golang.org/x/mod/semver"
 )
 
 // Version is the service current released version.
 // Semantic versioning: https://semver.org/
-var Version = "0.9.0"
+var Version = "0.10.3"
 
 // DevVersion is the service current development version.
-var DevVersion = "0.9.0"
+var DevVersion = "0.10.3"
 
 func GetCurrentVersion(mode string) string {
 	if mode == "dev" {
@@ -29,39 +31,31 @@ func GetMinorVersion(version string) string {
 
 func GetSchemaVersion(version string) string {
 	minorVersion := GetMinorVersion(version)
-
 	return minorVersion + ".0"
 }
 
-// convSemanticVersionToInt converts version string to int.
-func convSemanticVersionToInt(version string) int {
-	versionList := strings.Split(version, ".")
-
-	if len(versionList) < 3 {
-		return 0
-	}
-	major, err := strconv.Atoi(versionList[0])
-	if err != nil {
-		return 0
-	}
-	minor, err := strconv.Atoi(versionList[1])
-	if err != nil {
-		return 0
-	}
-	patch, err := strconv.Atoi(versionList[2])
-	if err != nil {
-		return 0
-	}
-
-	return major*10000 + minor*100 + patch
-}
-
 // IsVersionGreaterThanOrEqualTo returns true if version is greater than or equal to target.
 func IsVersionGreaterOrEqualThan(version, target string) bool {
-	return convSemanticVersionToInt(version) >= convSemanticVersionToInt(target)
+	return semver.Compare(fmt.Sprintf("v%s", version), fmt.Sprintf("v%s", target)) > -1
 }
 
 // IsVersionGreaterThan returns true if version is greater than target.
 func IsVersionGreaterThan(version, target string) bool {
-	return convSemanticVersionToInt(version) > convSemanticVersionToInt(target)
+	return semver.Compare(fmt.Sprintf("v%s", version), fmt.Sprintf("v%s", target)) > 0
+}
+
+type SortVersion []string
+
+func (s SortVersion) Len() int {
+	return len(s)
+}
+
+func (s SortVersion) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s SortVersion) Less(i, j int) bool {
+	v1 := fmt.Sprintf("v%s", s[i])
+	v2 := fmt.Sprintf("v%s", s[j])
+	return semver.Compare(v1, v2) == -1
 }

server/version/version_test.go

@@ -0,0 +1,93 @@
+package version
+
+import (
+	"sort"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsVersionGreaterOrEqualThan(t *testing.T) {
+	tests := []struct {
+		version string
+		target  string
+		want    bool
+	}{
+		{
+			version: "0.9.1",
+			target:  "0.9.1",
+			want:    true,
+		},
+		{
+			version: "0.10.0",
+			target:  "0.9.1",
+			want:    true,
+		},
+		{
+			version: "0.9.0",
+			target:  "0.9.1",
+			want:    false,
+		},
+	}
+	for _, test := range tests {
+		result := IsVersionGreaterOrEqualThan(test.version, test.target)
+		if result != test.want {
+			t.Errorf("got result %v, want %v.", result, test.want)
+		}
+	}
+}
+
+func TestIsVersionGreaterThan(t *testing.T) {
+	tests := []struct {
+		version string
+		target  string
+		want    bool
+	}{
+		{
+			version: "0.9.1",
+			target:  "0.9.1",
+			want:    false,
+		},
+		{
+			version: "0.10.0",
+			target:  "0.8.0",
+			want:    true,
+		},
+		{
+			version: "0.8.0",
+			target:  "0.10.0",
+			want:    false,
+		},
+		{
+			version: "0.9.0",
+			target:  "0.9.1",
+			want:    false,
+		},
+	}
+	for _, test := range tests {
+		result := IsVersionGreaterThan(test.version, test.target)
+		if result != test.want {
+			t.Errorf("got result %v, want %v.", result, test.want)
+		}
+	}
+}
+
+func TestSortVersion(t *testing.T) {
+	tests := []struct {
+		versionList []string
+		want        []string
+	}{
+		{
+			versionList: []string{"0.9.1", "0.10.0", "0.8.0"},
+			want:        []string{"0.8.0", "0.9.1", "0.10.0"},
+		},
+		{
+			versionList: []string{"1.9.1", "0.9.1", "0.10.0", "0.8.0"},
+			want:        []string{"0.8.0", "0.9.1", "0.10.0", "1.9.1"},
+		},
+	}
+	for _, test := range tests {
+		sort.Sort(SortVersion(test.versionList))
+		assert.Equal(t, test.versionList, test.want)
+	}
+}

store/activity.go

@@ -0,0 +1,89 @@
+package store
+
+import (
+	"context"
+	"database/sql"
+
+	"github.com/usememos/memos/api"
+)
+
+// activityRaw is the store model for an Activity.
+// Fields have exactly the same meanings as Activity.
+type activityRaw struct {
+	ID int
+
+	// Standard fields
+	CreatorID int
+	CreatedTs int64
+
+	// Domain specific fields
+	Type    api.ActivityType
+	Level   api.ActivityLevel
+	Payload string
+}
+
+// toActivity creates an instance of Activity based on the ActivityRaw.
+func (raw *activityRaw) toActivity() *api.Activity {
+	return &api.Activity{
+		ID: raw.ID,
+
+		CreatorID: raw.CreatorID,
+		CreatedTs: raw.CreatedTs,
+
+		Type:    raw.Type,
+		Level:   raw.Level,
+		Payload: raw.Payload,
+	}
+}
+
+// CreateActivity creates an instance of Activity.
+func (s *Store) CreateActivity(ctx context.Context, create *api.ActivityCreate) (*api.Activity, error) {
+	if s.profile.Mode != "dev" {
+		return nil, nil
+	}
+
+	tx, err := s.db.BeginTx(ctx, nil)
+	if err != nil {
+		return nil, FormatError(err)
+	}
+	defer tx.Rollback()
+
+	activityRaw, err := createActivity(ctx, tx, create)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := tx.Commit(); err != nil {
+		return nil, FormatError(err)
+	}
+
+	activity := activityRaw.toActivity()
+	return activity, nil
+}
+
+// createActivity creates a new activity.
+func createActivity(ctx context.Context, tx *sql.Tx, create *api.ActivityCreate) (*activityRaw, error) {
+	query := `
+		INSERT INTO activity (
+			creator_id, 
+			type, 
+			level, 
+			payload
+		)
+		VALUES (?, ?, ?, ?)
+		RETURNING id, type, level, payload, creator_id, created_ts
+	`
+	var activityRaw activityRaw
+	if err := tx.QueryRowContext(ctx, query, create.CreatorID, create.Type, create.Level, create.Payload).Scan(
+		&activityRaw.ID,
+		&activityRaw.Type,
+		&activityRaw.Level,
+		&activityRaw.Payload,
+		&activityRaw.CreatedTs,
+		&activityRaw.CreatedTs,
+	); err != nil {
+		return nil, FormatError(err)
+	}
+
+	return &activityRaw, nil
+}

store/cache.go

@@ -7,13 +7,11 @@ import (
 	"fmt"
 
 	"github.com/VictoriaMetrics/fastcache"
-	"github.com/usememos/memos/api"
 )
 
 var (
 	// 64 MiB.
-	cacheSize                  = 1024 * 1024 * 64
-	_         api.CacheService = (*CacheService)(nil)
+	cacheSize = 1024 * 1024 * 64
 )
 
 // CacheService implements a cache.
@@ -21,6 +19,18 @@ type CacheService struct {
 	cache *fastcache.Cache
 }
 
+// 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"
+)
+
 // NewCacheService creates a cache service.
 func NewCacheService() *CacheService {
 	return &CacheService{
@@ -29,7 +39,7 @@ func NewCacheService() *CacheService {
 }
 
 // FindCache finds the value in cache.
-func (s *CacheService) FindCache(namespace api.CacheNamespace, id int, entry interface{}) (bool, error) {
+func (s *CacheService) FindCache(namespace CacheNamespace, id int, entry interface{}) (bool, error) {
 	buf1 := []byte{0, 0, 0, 0, 0, 0, 0, 0}
 	binary.LittleEndian.PutUint64(buf1, uint64(id))
 
@@ -46,7 +56,7 @@ func (s *CacheService) FindCache(namespace api.CacheNamespace, id int, entry int
 }
 
 // UpsertCache upserts the value to cache.
-func (s *CacheService) UpsertCache(namespace api.CacheNamespace, id int, entry interface{}) error {
+func (s *CacheService) UpsertCache(namespace CacheNamespace, id int, entry interface{}) error {
 	buf1 := []byte{0, 0, 0, 0, 0, 0, 0, 0}
 	binary.LittleEndian.PutUint64(buf1, uint64(id))
 
@@ -61,7 +71,7 @@ func (s *CacheService) UpsertCache(namespace api.CacheNamespace, id int, entry i
 }
 
 // DeleteCache deletes the cache.
-func (s *CacheService) DeleteCache(namespace api.CacheNamespace, id int) {
+func (s *CacheService) DeleteCache(namespace CacheNamespace, id int) {
 	buf1 := []byte{0, 0, 0, 0, 0, 0, 0, 0}
 	binary.LittleEndian.PutUint64(buf1, uint64(id))
 

store/db/db.go

@@ -24,8 +24,8 @@ var seedFS embed.FS
 
 type DB struct {
 	// sqlite db connection instance
-	Db      *sql.DB
-	profile *profile.Profile
+	DBInstance *sql.DB
+	profile    *profile.Profile
 }
 
 // NewDB returns a new instance of DB associated with the given datasource name.
@@ -47,7 +47,7 @@ func (db *DB) Open(ctx context.Context) (err error) {
 	if err != nil {
 		return fmt.Errorf("failed to open db with dsn: %s, err: %w", db.profile.DSN, err)
 	}
-	db.Db = sqliteDB
+	db.DBInstance = sqliteDB
 
 	if db.profile.Mode == "dev" {
 		// In dev mode, we should migrate and seed the database.
@@ -68,20 +68,28 @@ func (db *DB) Open(ctx context.Context) (err error) {
 		}
 
 		currentVersion := version.GetCurrentVersion(db.profile.Mode)
-		migrationHistory, err := db.FindMigrationHistory(ctx, &MigrationHistoryFind{})
+		migrationHistoryList, err := db.FindMigrationHistoryList(ctx, &MigrationHistoryFind{})
 		if err != nil {
 			return fmt.Errorf("failed to find migration history, err: %w", err)
 		}
-		if migrationHistory == nil {
-			if _, err = db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{
+		if len(migrationHistoryList) == 0 {
+			_, err := db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{
 				Version: currentVersion,
-			}); err != nil {
+			})
+			if err != nil {
 				return fmt.Errorf("failed to upsert migration history, err: %w", err)
 			}
 			return nil
 		}
 
-		if version.IsVersionGreaterThan(version.GetSchemaVersion(currentVersion), migrationHistory.Version) {
+		migrationHistoryVersionList := []string{}
+		for _, migrationHistory := range migrationHistoryList {
+			migrationHistoryVersionList = append(migrationHistoryVersionList, migrationHistory.Version)
+		}
+		sort.Sort(version.SortVersion(migrationHistoryVersionList))
+		latestMigrationHistoryVersion := migrationHistoryVersionList[len(migrationHistoryVersionList)-1]
+
+		if version.IsVersionGreaterThan(version.GetSchemaVersion(currentVersion), latestMigrationHistoryVersion) {
 			minorVersionList := getMinorVersionList()
 
 			// backup the raw database file before migration
@@ -98,7 +106,7 @@ func (db *DB) Open(ctx context.Context) (err error) {
 			println("start migrate")
 			for _, minorVersion := range minorVersionList {
 				normalizedVersion := minorVersion + ".0"
-				if version.IsVersionGreaterThan(normalizedVersion, migrationHistory.Version) && version.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
+				if version.IsVersionGreaterThan(normalizedVersion, latestMigrationHistoryVersion) && version.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {
 					println("applying migration for", normalizedVersion)
 					if err := db.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {
 						return fmt.Errorf("failed to apply minor version migration: %w", err)
@@ -156,7 +164,7 @@ func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion st
 		}
 	}
 
-	tx, err := db.Db.Begin()
+	tx, err := db.DBInstance.Begin()
 	if err != nil {
 		return err
 	}
@@ -197,7 +205,7 @@ func (db *DB) seed(ctx context.Context) error {
 
 // execute runs a single SQL statement within a transaction.
 func (db *DB) execute(ctx context.Context, stmt string) error {
-	tx, err := db.Db.Begin()
+	tx, err := db.DBInstance.Begin()
 	if err != nil {
 		return err
 	}
@@ -229,7 +237,7 @@ func getMinorVersionList() []string {
 		panic(err)
 	}
 
-	sort.Strings(minorVersionList)
+	sort.Sort(version.SortVersion(minorVersionList))
 
 	return minorVersionList
 }

store/db/migration/dev/LATEST__SCHEMA.sql

@@ -93,3 +93,13 @@ CREATE TABLE tag (
   creator_id INTEGER NOT NULL,
   UNIQUE(name, creator_id)
 );
+
+-- activity
+CREATE TABLE activity (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  creator_id INTEGER NOT NULL,
+  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
+  type TEXT NOT NULL DEFAULT '',
+  level TEXT NOT NULL CHECK (level IN ('INFO', 'WARN', 'ERROR')) DEFAULT 'INFO',
+  payload TEXT NOT NULL DEFAULT '{}'
+);

store/db/migration/prod/0.10/00__activity.sql

@@ -0,0 +1,9 @@
+-- activity
+CREATE TABLE activity (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  creator_id INTEGER NOT NULL,
+  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
+  type TEXT NOT NULL DEFAULT '',
+  level TEXT NOT NULL CHECK (level IN ('INFO', 'WARN', 'ERROR')) DEFAULT 'INFO',
+  payload TEXT NOT NULL DEFAULT '{}'
+);

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

@@ -1,53 +1,60 @@
 -- change user role field from "OWNER"/"USER" to "HOST"/"USER".
-
 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, 
-  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', 
-  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, 
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  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',
+  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 user (
-  id, created_ts, updated_ts, row_status, 
-  email, name, password_hash, open_id
-) 
-SELECT 
-  id, 
-  created_ts, 
-  updated_ts, 
-  row_status, 
-  email, 
-  name, 
-  password_hash, 
-  open_id 
-FROM 
+INSERT INTO
+  user (
+    id,
+    created_ts,
+    updated_ts,
+    row_status,
+    email,
+    name,
+    password_hash,
+    open_id
+  )
+SELECT
+  id,
+  created_ts,
+  updated_ts,
+  row_status,
+  email,
+  name,
+  password_hash,
+  open_id
+FROM
   _user_old;
 
-UPDATE 
-  user 
-SET 
-  role = 'HOST' 
-WHERE 
+UPDATE
+  user
+SET
+  role = 'HOST'
+WHERE
   id IN (
-    SELECT 
-      id 
-    FROM 
-      _user_old 
-    WHERE 
+    SELECT
+      id
+    FROM
+      _user_old
+    WHERE
       role = 'OWNER'
   );
 
 DROP TABLE IF EXISTS _user_old;
 
-PRAGMA foreign_keys = on;
+PRAGMA foreign_keys = on;

store/db/migration/prod/0.2/01__memo_visibility.sql

@@ -1 +1,4 @@
-ALTER TABLE memo ADD COLUMN visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PRIVATE')) DEFAULT 'PRIVATE';
+ALTER TABLE
+  memo
+ADD
+  COLUMN visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PRIVATE')) DEFAULT 'PRIVATE';

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

@@ -1,37 +1,43 @@
 -- 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;
+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', 
+  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, 
+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 
+FROM
   _memo_old;
 
 DROP TABLE IF EXISTS _memo_old;
 
-PRAGMA foreign_keys = on;
+PRAGMA foreign_keys = on;

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

@@ -6,4 +6,4 @@ CREATE TABLE user_setting (
   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);
+CREATE UNIQUE INDEX user_setting_key_user_id_index ON user_setting(key, user_id);

store/db/migration/prod/0.5/00__regenerate_foreign_keys.sql

@@ -1,8 +1,9 @@
-PRAGMA foreign_keys=off;
+PRAGMA foreign_keys = off;
 
 DROP TABLE IF EXISTS _user_old;
 
-ALTER TABLE user RENAME TO _user_old;
+ALTER TABLE
+  user RENAME TO _user_old;
 
 -- user
 CREATE TABLE user (
@@ -17,7 +18,12 @@ CREATE TABLE user (
   open_id TEXT NOT NULL UNIQUE
 );
 
-INSERT INTO user SELECT * FROM _user_old;
+INSERT INTO
+  user
+SELECT
+  *
+FROM
+  _user_old;
 
 DROP TABLE IF EXISTS _user_old;
 
@@ -33,11 +39,13 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TABLE IF EXISTS _memo_old;
 
-ALTER TABLE memo RENAME TO _memo_old;
+ALTER TABLE
+  memo RENAME TO _memo_old;
 
 -- memo
 CREATE TABLE memo (
@@ -51,7 +59,12 @@ CREATE TABLE memo (
   FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
 );
 
-INSERT INTO memo SELECT * FROM _memo_old;
+INSERT INTO
+  memo
+SELECT
+  *
+FROM
+  _memo_old;
 
 DROP TABLE IF EXISTS _memo_old;
 
@@ -67,11 +80,13 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TABLE IF EXISTS _memo_organizer_old;
 
-ALTER TABLE memo_organizer RENAME TO _memo_organizer_old;
+ALTER TABLE
+  memo_organizer RENAME TO _memo_organizer_old;
 
 -- memo_organizer
 CREATE TABLE memo_organizer (
@@ -84,13 +99,19 @@ CREATE TABLE memo_organizer (
   UNIQUE(memo_id, user_id)
 );
 
-INSERT INTO memo_organizer SELECT * FROM _memo_organizer_old;
+INSERT INTO
+  memo_organizer
+SELECT
+  *
+FROM
+  _memo_organizer_old;
 
 DROP TABLE IF EXISTS _memo_organizer_old;
 
 DROP TABLE IF EXISTS _shortcut_old;
 
-ALTER TABLE shortcut RENAME TO _shortcut_old;
+ALTER TABLE
+  shortcut RENAME TO _shortcut_old;
 
 -- shortcut
 CREATE TABLE shortcut (
@@ -104,7 +125,12 @@ CREATE TABLE shortcut (
   FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
 );
 
-INSERT INTO shortcut SELECT * FROM _shortcut_old;
+INSERT INTO
+  shortcut
+SELECT
+  *
+FROM
+  _shortcut_old;
 
 DROP TABLE IF EXISTS _shortcut_old;
 
@@ -120,11 +146,13 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TABLE IF EXISTS _resource_old;
 
-ALTER TABLE resource RENAME TO _resource_old;
+ALTER TABLE
+  resource RENAME TO _resource_old;
 
 -- resource
 CREATE TABLE resource (
@@ -139,7 +167,12 @@ CREATE TABLE resource (
   FOREIGN KEY(creator_id) REFERENCES user(id) ON DELETE CASCADE
 );
 
-INSERT INTO resource SELECT * FROM _resource_old;
+INSERT INTO
+  resource
+SELECT
+  *
+FROM
+  _resource_old;
 
 DROP TABLE IF EXISTS _resource_old;
 
@@ -155,11 +188,13 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TABLE IF EXISTS _user_setting_old;
 
-ALTER TABLE user_setting RENAME TO _user_setting_old;
+ALTER TABLE
+  user_setting RENAME TO _user_setting_old;
 
 -- user_setting
 CREATE TABLE user_setting (
@@ -170,8 +205,13 @@ CREATE TABLE user_setting (
   UNIQUE(user_id, key)
 );
 
-INSERT INTO user_setting SELECT * FROM _user_setting_old;
+INSERT INTO
+  user_setting
+SELECT
+  *
+FROM
+  _user_setting_old;
 
 DROP TABLE IF EXISTS _user_setting_old;
 
-PRAGMA foreign_keys=on;
+PRAGMA foreign_keys = on;

store/db/migration/prod/0.5/01__memo_resource.sql

@@ -7,4 +7,4 @@ CREATE TABLE memo_resource (
   FOREIGN KEY(memo_id) REFERENCES memo(id) ON DELETE CASCADE,
   FOREIGN KEY(resource_id) REFERENCES resource(id) ON DELETE CASCADE,
   UNIQUE(memo_id, resource_id)
-);
+);

store/db/migration/prod/0.5/02__system_setting.sql

@@ -4,4 +4,4 @@ CREATE TABLE system_setting (
   value TEXT NOT NULL,
   description TEXT NOT NULL DEFAULT '',
   UNIQUE(name)
-);
+);

store/db/migration/prod/0.5/03__resource_extermal_link.sql

@@ -1 +1,4 @@
-ALTER TABLE resource ADD COLUMN external_link TEXT NOT NULL DEFAULT '';
+ALTER TABLE
+  resource
+ADD
+  COLUMN external_link TEXT NOT NULL DEFAULT '';

store/db/migration/prod/0.6/00__recreate_triggers.sql

@@ -10,6 +10,7 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TRIGGER IF EXISTS `trigger_update_memo_modification_time`;
@@ -24,6 +25,7 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TRIGGER IF EXISTS `trigger_update_shortcut_modification_time`;
@@ -38,6 +40,7 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
+
 END;
 
 DROP TRIGGER IF EXISTS `trigger_update_resource_modification_time`;
@@ -52,4 +55,5 @@ SET
   updated_ts = (strftime('%s', 'now'))
 WHERE
   rowid = old.rowid;
-END;
+
+END;

store/db/migration/prod/0.7/00__remove_fk.sql

@@ -1,8 +1,9 @@
-PRAGMA foreign_keys=off;
+PRAGMA foreign_keys = off;
 
 DROP TABLE IF EXISTS _user_old;
 
-ALTER TABLE user RENAME TO _user_old;
+ALTER TABLE
+  user RENAME TO _user_old;
 
 -- user
 CREATE TABLE user (
@@ -17,13 +18,19 @@ CREATE TABLE user (
   open_id TEXT NOT NULL UNIQUE
 );
 
-INSERT INTO user SELECT * FROM _user_old;
+INSERT INTO
+  user
+SELECT
+  *
+FROM
+  _user_old;
 
 DROP TABLE IF EXISTS _user_old;
 
 DROP TABLE IF EXISTS _memo_old;
 
-ALTER TABLE memo RENAME TO _memo_old;
+ALTER TABLE
+  memo RENAME TO _memo_old;
 
 -- memo
 CREATE TABLE memo (
@@ -36,13 +43,19 @@ CREATE TABLE memo (
   visibility TEXT NOT NULL CHECK (visibility IN ('PUBLIC', 'PROTECTED', 'PRIVATE')) DEFAULT 'PRIVATE'
 );
 
-INSERT INTO memo SELECT * FROM _memo_old;
+INSERT INTO
+  memo
+SELECT
+  *
+FROM
+  _memo_old;
 
 DROP TABLE IF EXISTS _memo_old;
 
 DROP TABLE IF EXISTS _memo_organizer_old;
 
-ALTER TABLE memo_organizer RENAME TO _memo_organizer_old;
+ALTER TABLE
+  memo_organizer RENAME TO _memo_organizer_old;
 
 -- memo_organizer
 CREATE TABLE memo_organizer (
@@ -53,13 +66,19 @@ CREATE TABLE memo_organizer (
   UNIQUE(memo_id, user_id)
 );
 
-INSERT INTO memo_organizer SELECT * FROM _memo_organizer_old;
+INSERT INTO
+  memo_organizer
+SELECT
+  *
+FROM
+  _memo_organizer_old;
 
 DROP TABLE IF EXISTS _memo_organizer_old;
 
 DROP TABLE IF EXISTS _shortcut_old;
 
-ALTER TABLE shortcut RENAME TO _shortcut_old;
+ALTER TABLE
+  shortcut RENAME TO _shortcut_old;
 
 -- shortcut
 CREATE TABLE shortcut (
@@ -72,13 +91,19 @@ CREATE TABLE shortcut (
   payload TEXT NOT NULL DEFAULT '{}'
 );
 
-INSERT INTO shortcut SELECT * FROM _shortcut_old;
+INSERT INTO
+  shortcut
+SELECT
+  *
+FROM
+  _shortcut_old;
 
 DROP TABLE IF EXISTS _shortcut_old;
 
 DROP TABLE IF EXISTS _resource_old;
 
-ALTER TABLE resource RENAME TO _resource_old;
+ALTER TABLE
+  resource RENAME TO _resource_old;
 
 -- resource
 CREATE TABLE resource (
@@ -93,29 +118,37 @@ CREATE TABLE resource (
   size INTEGER NOT NULL DEFAULT 0
 );
 
-INSERT INTO resource (
-  id, creator_id, created_ts, updated_ts, 
-  filename, blob, external_link, type, 
+INSERT INTO
+  resource (
+    id,
+    creator_id,
+    created_ts,
+    updated_ts,
+    filename,
+    blob,
+    external_link,
+    type,
+    size
+  )
+SELECT
+  id,
+  creator_id,
+  created_ts,
+  updated_ts,
+  filename,
+  blob,
+  external_link,
+  type,
   size
-) 
-SELECT 
-  id, 
-  creator_id, 
-  created_ts, 
-  updated_ts, 
-  filename, 
-  blob, 
-  external_link, 
-  type, 
-  size 
-FROM 
+FROM
   _resource_old;
 
 DROP TABLE IF EXISTS _resource_old;
 
 DROP TABLE IF EXISTS _user_setting_old;
 
-ALTER TABLE user_setting RENAME TO _user_setting_old;
+ALTER TABLE
+  user_setting RENAME TO _user_setting_old;
 
 -- user_setting
 CREATE TABLE user_setting (
@@ -125,13 +158,19 @@ CREATE TABLE user_setting (
   UNIQUE(user_id, key)
 );
 
-INSERT INTO user_setting SELECT * FROM _user_setting_old;
+INSERT INTO
+  user_setting
+SELECT
+  *
+FROM
+  _user_setting_old;
 
 DROP TABLE IF EXISTS _user_setting_old;
 
 DROP TABLE IF EXISTS _memo_resource_old;
 
-ALTER TABLE memo_resource RENAME TO _memo_resource_old;
+ALTER TABLE
+  memo_resource RENAME TO _memo_resource_old;
 
 -- memo_resource
 CREATE TABLE memo_resource (
@@ -142,6 +181,11 @@ CREATE TABLE memo_resource (
   UNIQUE(memo_id, resource_id)
 );
 
-INSERT INTO memo_resource SELECT * FROM _memo_resource_old;
+INSERT INTO
+  memo_resource
+SELECT
+  *
+FROM
+  _memo_resource_old;
 
-DROP TABLE IF EXISTS _memo_resource_old;
+DROP TABLE IF EXISTS _memo_resource_old;

store/db/migration/prod/0.7/01__remove_triggers.sql

@@ -1,4 +1,7 @@
 DROP TRIGGER IF EXISTS `trigger_update_user_modification_time`;
+
 DROP TRIGGER IF EXISTS `trigger_update_memo_modification_time`;
+
 DROP TRIGGER IF EXISTS `trigger_update_shortcut_modification_time`;
-DROP TRIGGER IF EXISTS `trigger_update_resource_modification_time`;
+
+DROP TRIGGER IF EXISTS `trigger_update_resource_modification_time`;

store/db/migration/prod/0.8/00__migration_history.sql

@@ -2,4 +2,4 @@
 CREATE TABLE IF NOT EXISTS migration_history (
   version TEXT NOT NULL PRIMARY KEY,
   created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now'))
-);
+);

store/db/migration/prod/0.8/01__user_username.sql

@@ -3,7 +3,8 @@
 -- add role `ADMIN`
 DROP TABLE IF EXISTS _user_old;
 
-ALTER TABLE user RENAME TO _user_old;
+ALTER TABLE
+  user RENAME TO _user_old;
 
 -- user
 CREATE TABLE user (
@@ -19,23 +20,31 @@ CREATE TABLE user (
   open_id TEXT NOT NULL UNIQUE
 );
 
-INSERT INTO user (
-  id, created_ts, updated_ts, row_status, 
-  username, role, email, nickname, password_hash, 
+INSERT INTO
+  user (
+    id,
+    created_ts,
+    updated_ts,
+    row_status,
+    username,
+    role,
+    email,
+    nickname,
+    password_hash,
+    open_id
+  )
+SELECT
+  id,
+  created_ts,
+  updated_ts,
+  row_status,
+  email,
+  role,
+  email,
+  name,
+  password_hash,
   open_id
-) 
-SELECT 
-  id, 
-  created_ts, 
-  updated_ts, 
-  row_status, 
-  email, 
-  role, 
-  email, 
-  name, 
-  password_hash, 
-  open_id 
-FROM 
+FROM
   _user_old;
 
-DROP TABLE IF EXISTS _user_old;
+DROP TABLE IF EXISTS _user_old;

store/db/migration/prod/0.9/00__tag.sql

@@ -3,4 +3,4 @@ CREATE TABLE tag (
   name TEXT NOT NULL,
   creator_id INTEGER NOT NULL,
   UNIQUE(name, creator_id)
-);
+);

store/db/migration/prod/LATEST__SCHEMA.sql

@@ -93,3 +93,13 @@ CREATE TABLE tag (
   creator_id INTEGER NOT NULL,
   UNIQUE(name, creator_id)
 );
+
+-- activity
+CREATE TABLE activity (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  creator_id INTEGER NOT NULL,
+  created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
+  type TEXT NOT NULL DEFAULT '',
+  level TEXT NOT NULL CHECK (level IN ('INFO', 'WARN', 'ERROR')) DEFAULT 'INFO',
+  payload TEXT NOT NULL DEFAULT '{}'
+);

store/db/migration_history.go

@@ -19,8 +19,8 @@ type MigrationHistoryFind struct {
 	Version *string
 }
 
-func (db *DB) FindMigrationHistory(ctx context.Context, find *MigrationHistoryFind) (*MigrationHistory, error) {
-	tx, err := db.Db.BeginTx(ctx, nil)
+func (db *DB) FindMigrationHistoryList(ctx context.Context, find *MigrationHistoryFind) ([]*MigrationHistory, error) {
+	tx, err := db.DBInstance.BeginTx(ctx, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -31,16 +31,11 @@ func (db *DB) FindMigrationHistory(ctx context.Context, find *MigrationHistoryFi
 		return nil, err
 	}
 
-	if len(list) == 0 {
-		return nil, nil
-	}
-
-	migrationHistory := list[0]
-	return migrationHistory, nil
+	return list, nil
 }
 
 func (db *DB) UpsertMigrationHistory(ctx context.Context, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {
-	tx, err := db.Db.BeginTx(ctx, nil)
+	tx, err := db.DBInstance.BeginTx(ctx, nil)
 	if err != nil {
 		return nil, err
 	}

store/db/seed/10000__reset.sql

@@ -1,5 +1,14 @@
-DELETE FROM memo_organizer;
-DELETE FROM resource;
-DELETE FROM shortcut;
-DELETE FROM memo;
-DELETE FROM user;
+DELETE FROM
+  memo_organizer;
+
+DELETE FROM
+  resource;
+
+DELETE FROM
+  shortcut;
+
+DELETE FROM
+  memo;
+
+DELETE FROM
+  user;

store/db/seed/10001__user.sql

@@ -1,67 +1,67 @@
-INSERT INTO 
+INSERT INTO
   user (
-    `id`, 
-    `username`, 
+    `id`,
+    `username`,
     `role`,
     `email`,
-    `nickname`, 
+    `nickname`,
     `open_id`,
     `password_hash`
   )
 VALUES
   (
-    101, 
+    101,
     'demohero',
     'HOST',
     'demo@usememos.com',
     'Demo Hero',
-    'demo_open_id',
+    hex(randomblob(16)),
     -- raw password: secret
     '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
   );
 
-INSERT INTO 
+INSERT INTO
   user (
-    `id`, 
-    `username`, 
+    `id`,
+    `username`,
     `role`,
     `email`,
-    `nickname`, 
+    `nickname`,
     `open_id`,
     `password_hash`
   )
 VALUES
   (
-    102, 
+    102,
     'jack',
     'USER',
     'jack@usememos.com',
     'Jack',
-    'jack_open_id',
+    hex(randomblob(16)),
     -- raw password: secret
     '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
   );
 
-INSERT INTO 
+INSERT INTO
   user (
-    `id`, 
-    `row_status`, 
-    `username`, 
+    `id`,
+    `row_status`,
+    `username`,
     `role`,
     `email`,
-    `nickname`, 
+    `nickname`,
     `open_id`,
     `password_hash`
   )
 VALUES
   (
-    103, 
-    'ARCHIVED', 
+    103,
+    'ARCHIVED',
     'bob',
     'USER',
     'bob@usememos.com',
     'Bob',
-    'bob_open_id',
+    hex(randomblob(16)),
     -- raw password: secret
     '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
   );

store/db/seed/10002__memo.sql

@@ -1,20 +1,16 @@
-INSERT INTO 
-  memo (
-    `id`,
-    `content`, 
-    `creator_id`
-  )
+INSERT INTO
+  memo (`id`, `content`, `creator_id`)
 VALUES
   (
     1001,
-    "#Hello 👋 Welcome to memos.", 
+    "#Hello 👋 Welcome to memos.",
     101
   );
 
-INSERT INTO 
+INSERT INTO
   memo (
     `id`,
-    `content`, 
+    `content`,
     `creator_id`,
     `visibility`
   )
@@ -25,32 +21,31 @@ VALUES
 - [x] Take more photos about **🌄 sunset**;
 - [x] Clean the room;
 - [ ] Read *📖 The Little Prince*;
-(👆 click to toggle status)', 
+(👆 click to toggle status)',
     101,
     'PROTECTED'
   );
 
-INSERT INTO 
+INSERT INTO
   memo (
     `id`,
-    `content`, 
+    `content`,
     `creator_id`,
     `visibility`
   )
 VALUES
   (
     1003,
-    "**Bytebase** - An open source Database CI/CD for DevOps teams.
-![](https://star-history.com/bytebase.webp)
-🌐 [Source code](https://github.com/bytebase/bytebase)",
+    "**[star-history.com](https://star-history.com/)**: The missing GitHub star history graph of GitHub repos.
+![](https://api.star-history.com/svg?repos=usememos/memos&type=Date)",
     101,
     'PUBLIC'
   );
 
-INSERT INTO 
+INSERT INTO
   memo (
     `id`,
-    `content`, 
+    `content`,
     `creator_id`,
     `visibility`
   )
@@ -62,22 +57,22 @@ VALUES
 - [ ] Clean the classroom;
 - [ ] Watch *👦 The Boys*;
 (👆 click to toggle status)
-', 
+',
     102,
     'PROTECTED'
   );
 
-INSERT INTO 
+INSERT INTO
   memo (
     `id`,
-    `content`, 
+    `content`,
     `creator_id`,
     `visibility`
   )
 VALUES
   (
     1005,
-    '三人行，必有我师焉！👨‍🏫', 
+    '三人行，必有我师焉！👨‍🏫',
     102,
     'PUBLIC'
-  );
+  );

store/db/seed/10003__memo_organizer.sql

@@ -1,25 +1,9 @@
-INSERT INTO 
-  memo_organizer (
-    `memo_id`,
-    `user_id`,
-    `pinned`
-  )
+INSERT INTO
+  memo_organizer (`memo_id`, `user_id`, `pinned`)
 VALUES
-  (
-    1001,
-    101,
-    1 
-  );
+  (1001, 101, 1);
 
-INSERT INTO 
-  memo_organizer (
-    `memo_id`,
-    `user_id`,
-    `pinned`
-  )
+INSERT INTO
+  memo_organizer (`memo_id`, `user_id`, `pinned`)
 VALUES
-  (
-    1003,
-    101,
-    1 
-  );
+  (1003, 101, 1);

store/db/seed/10004__shortcut.sql

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

store/db/seed/10005__system_setting.sql

@@ -1,12 +1,4 @@
-INSERT INTO 
-  system_setting (
-    `name`, 
-    `value`,
-    `description`
-  )
+INSERT INTO
+  system_setting (`name`, `value`, `description`)
 VALUES
-  (
-    'allowSignUp', 
-    'true',
-    ''
-  );
+  ('allowSignUp', 'true', '');

store/db/seed/10006__tag.sql

@@ -1,32 +1,14 @@
-INSERT INTO 
-  tag (
-    `name`, 
-    `creator_id`
-  )
+INSERT INTO
+  tag (`name`, `creator_id`)
 VALUES
-  (
-    'Hello', 
-    101
-  );
+  ('Hello', 101);
 
-INSERT INTO 
-  tag (
-    `name`, 
-    `creator_id`
-  )
+INSERT INTO
+  tag (`name`, `creator_id`)
 VALUES
-  (
-    'TODO', 
-    101
-  );
+  ('TODO', 101);
 
-INSERT INTO 
-  tag (
-    `name`, 
-    `creator_id`
-  )
+INSERT INTO
+  tag (`name`, `creator_id`)
 VALUES
-  (
-    'TODO', 
-    102
-  );
+  ('TODO', 102);

store/memo.go

@@ -102,7 +102,7 @@ func (s *Store) CreateMemo(ctx context.Context, create *api.MemoCreate) (*api.Me
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.MemoCache, memoRaw.ID, memoRaw); err != nil {
+	if err := s.cache.UpsertCache(MemoCache, memoRaw.ID, memoRaw); err != nil {
 		return nil, err
 	}
 
@@ -130,7 +130,7 @@ func (s *Store) PatchMemo(ctx context.Context, patch *api.MemoPatch) (*api.Memo,
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.MemoCache, memoRaw.ID, memoRaw); err != nil {
+	if err := s.cache.UpsertCache(MemoCache, memoRaw.ID, memoRaw); err != nil {
 		return nil, err
 	}
 
@@ -170,7 +170,7 @@ func (s *Store) FindMemoList(ctx context.Context, find *api.MemoFind) ([]*api.Me
 func (s *Store) FindMemo(ctx context.Context, find *api.MemoFind) (*api.Memo, error) {
 	if find.ID != nil {
 		memoRaw := &memoRaw{}
-		has, err := s.cache.FindCache(api.MemoCache, *find.ID, memoRaw)
+		has, err := s.cache.FindCache(MemoCache, *find.ID, memoRaw)
 		if err != nil {
 			return nil, err
 		}
@@ -199,7 +199,7 @@ func (s *Store) FindMemo(ctx context.Context, find *api.MemoFind) (*api.Memo, er
 	}
 
 	memoRaw := list[0]
-	if err := s.cache.UpsertCache(api.MemoCache, memoRaw.ID, memoRaw); err != nil {
+	if err := s.cache.UpsertCache(MemoCache, memoRaw.ID, memoRaw); err != nil {
 		return nil, err
 	}
 
@@ -229,7 +229,7 @@ func (s *Store) DeleteMemo(ctx context.Context, delete *api.MemoDelete) error {
 		return FormatError(err)
 	}
 
-	s.cache.DeleteCache(api.MemoCache, delete.ID)
+	s.cache.DeleteCache(MemoCache, delete.ID)
 
 	return nil
 }

store/resource.go

@@ -22,10 +22,11 @@ type resourceRaw struct {
 	UpdatedTs int64
 
 	// Domain specific fields
-	Filename string
-	Blob     []byte
-	Type     string
-	Size     int64
+	Filename     string
+	Blob         []byte
+	ExternalLink string
+	Type         string
+	Size         int64
 }
 
 func (raw *resourceRaw) toResource() *api.Resource {
@@ -38,10 +39,11 @@ func (raw *resourceRaw) toResource() *api.Resource {
 		UpdatedTs: raw.UpdatedTs,
 
 		// Domain specific fields
-		Filename: raw.Filename,
-		Blob:     raw.Blob,
-		Type:     raw.Type,
-		Size:     raw.Size,
+		Filename:     raw.Filename,
+		Blob:         raw.Blob,
+		ExternalLink: raw.ExternalLink,
+		Type:         raw.Type,
+		Size:         raw.Size,
 	}
 }
 
@@ -95,10 +97,6 @@ func (s *Store) CreateResource(ctx context.Context, create *api.ResourceCreate)
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.ResourceCache, resourceRaw.ID, resourceRaw); err != nil {
-		return nil, err
-	}
-
 	resource := resourceRaw.toResource()
 
 	return resource, nil
@@ -125,17 +123,6 @@ func (s *Store) FindResourceList(ctx context.Context, find *api.ResourceFind) ([
 }
 
 func (s *Store) FindResource(ctx context.Context, find *api.ResourceFind) (*api.Resource, error) {
-	if find.ID != nil {
-		resourceRaw := &resourceRaw{}
-		has, err := s.cache.FindCache(api.ResourceCache, *find.ID, resourceRaw)
-		if err != nil {
-			return nil, err
-		}
-		if has {
-			return resourceRaw.toResource(), nil
-		}
-	}
-
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
 		return nil, FormatError(err)
@@ -152,11 +139,6 @@ func (s *Store) FindResource(ctx context.Context, find *api.ResourceFind) (*api.
 	}
 
 	resourceRaw := list[0]
-
-	if err := s.cache.UpsertCache(api.ResourceCache, resourceRaw.ID, resourceRaw); err != nil {
-		return nil, err
-	}
-
 	resource := resourceRaw.toResource()
 
 	return resource, nil
@@ -180,8 +162,6 @@ func (s *Store) DeleteResource(ctx context.Context, delete *api.ResourceDelete)
 		return FormatError(err)
 	}
 
-	s.cache.DeleteCache(api.ResourceCache, delete.ID)
-
 	return nil
 }
 
@@ -201,10 +181,6 @@ func (s *Store) PatchResource(ctx context.Context, patch *api.ResourcePatch) (*a
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.ResourceCache, resourceRaw.ID, resourceRaw); err != nil {
-		return nil, err
-	}
-
 	resource := resourceRaw.toResource()
 
 	return resource, nil
@@ -215,18 +191,20 @@ func createResource(ctx context.Context, tx *sql.Tx, create *api.ResourceCreate)
 		INSERT INTO resource (
 			filename,
 			blob,
+			external_link,
 			type,
 			size,
 			creator_id
 		)
-		VALUES (?, ?, ?, ?, ?)
-		RETURNING id, filename, blob, type, size, creator_id, created_ts, updated_ts
+		VALUES (?, ?, ?, ?, ?, ?)
+		RETURNING id, filename, blob, external_link, type, size, creator_id, created_ts, updated_ts
 	`
 	var resourceRaw resourceRaw
-	if err := tx.QueryRowContext(ctx, query, create.Filename, create.Blob, create.Type, create.Size, create.CreatorID).Scan(
+	if err := tx.QueryRowContext(ctx, query, create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID).Scan(
 		&resourceRaw.ID,
 		&resourceRaw.Filename,
 		&resourceRaw.Blob,
+		&resourceRaw.ExternalLink,
 		&resourceRaw.Type,
 		&resourceRaw.Size,
 		&resourceRaw.CreatorID,
@@ -255,13 +233,14 @@ func patchResource(ctx context.Context, tx *sql.Tx, patch *api.ResourcePatch) (*
 		UPDATE resource
 		SET ` + strings.Join(set, ", ") + `
 		WHERE id = ?
-		RETURNING id, filename, blob, type, size, creator_id, created_ts, updated_ts
+		RETURNING id, filename, blob, external_link, type, size, creator_id, created_ts, updated_ts
 	`
 	var resourceRaw resourceRaw
 	if err := tx.QueryRowContext(ctx, query, args...).Scan(
 		&resourceRaw.ID,
 		&resourceRaw.Filename,
 		&resourceRaw.Blob,
+		&resourceRaw.ExternalLink,
 		&resourceRaw.Type,
 		&resourceRaw.Size,
 		&resourceRaw.CreatorID,
@@ -290,20 +269,18 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 		where, args = append(where, "id in (SELECT resource_id FROM memo_resource WHERE memo_id = ?)"), append(args, *v)
 	}
 
-	query := `
+	fields := []string{"id", "filename", "external_link", "type", "size", "creator_id", "created_ts", "updated_ts"}
+	if find.GetBlob {
+		fields = append(fields, "blob")
+	}
+
+	query := fmt.Sprintf(`
 		SELECT
-			id,
-			filename,
-			blob,
-			type,
-			size,
-			creator_id,
-			created_ts,
-			updated_ts
+			%s
 		FROM resource
-		WHERE ` + strings.Join(where, " AND ") + `
+		WHERE %s
 		ORDER BY id DESC
-	`
+	`, strings.Join(fields, ", "), strings.Join(where, " AND "))
 	rows, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
 		return nil, FormatError(err)
@@ -313,15 +290,21 @@ func findResourceList(ctx context.Context, tx *sql.Tx, find *api.ResourceFind) (
 	resourceRawList := make([]*resourceRaw, 0)
 	for rows.Next() {
 		var resourceRaw resourceRaw
-		if err := rows.Scan(
+		dest := []interface{}{
 			&resourceRaw.ID,
 			&resourceRaw.Filename,
-			&resourceRaw.Blob,
+			&resourceRaw.ExternalLink,
 			&resourceRaw.Type,
 			&resourceRaw.Size,
 			&resourceRaw.CreatorID,
 			&resourceRaw.CreatedTs,
 			&resourceRaw.UpdatedTs,
+		}
+		if find.GetBlob {
+			dest = append(dest, &resourceRaw.Blob)
+		}
+		if err := rows.Scan(
+			dest...,
 		); err != nil {
 			return nil, FormatError(err)
 		}

store/shortcut.go

@@ -56,7 +56,7 @@ func (s *Store) CreateShortcut(ctx context.Context, create *api.ShortcutCreate)
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.ShortcutCache, shortcutRaw.ID, shortcutRaw); err != nil {
+	if err := s.cache.UpsertCache(ShortcutCache, shortcutRaw.ID, shortcutRaw); err != nil {
 		return nil, err
 	}
 
@@ -81,7 +81,7 @@ func (s *Store) PatchShortcut(ctx context.Context, patch *api.ShortcutPatch) (*a
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.ShortcutCache, shortcutRaw.ID, shortcutRaw); err != nil {
+	if err := s.cache.UpsertCache(ShortcutCache, shortcutRaw.ID, shortcutRaw); err != nil {
 		return nil, err
 	}
 
@@ -113,7 +113,7 @@ func (s *Store) FindShortcutList(ctx context.Context, find *api.ShortcutFind) ([
 func (s *Store) FindShortcut(ctx context.Context, find *api.ShortcutFind) (*api.Shortcut, error) {
 	if find.ID != nil {
 		shortcutRaw := &shortcutRaw{}
-		has, err := s.cache.FindCache(api.ShortcutCache, *find.ID, shortcutRaw)
+		has, err := s.cache.FindCache(ShortcutCache, *find.ID, shortcutRaw)
 		if err != nil {
 			return nil, err
 		}
@@ -139,7 +139,7 @@ func (s *Store) FindShortcut(ctx context.Context, find *api.ShortcutFind) (*api.
 
 	shortcutRaw := list[0]
 
-	if err := s.cache.UpsertCache(api.ShortcutCache, shortcutRaw.ID, shortcutRaw); err != nil {
+	if err := s.cache.UpsertCache(ShortcutCache, shortcutRaw.ID, shortcutRaw); err != nil {
 		return nil, err
 	}
 
@@ -164,7 +164,7 @@ func (s *Store) DeleteShortcut(ctx context.Context, delete *api.ShortcutDelete)
 		return FormatError(err)
 	}
 
-	s.cache.DeleteCache(api.ShortcutCache, *delete.ID)
+	s.cache.DeleteCache(ShortcutCache, *delete.ID)
 
 	return nil
 }
@@ -217,13 +217,14 @@ func patchShortcut(ctx context.Context, tx *sql.Tx, patch *api.ShortcutPatch) (*
 		UPDATE shortcut
 		SET ` + strings.Join(set, ", ") + `
 		WHERE id = ?
-		RETURNING id, title, payload, created_ts, updated_ts, row_status
+		RETURNING id, title, payload, creator_id, created_ts, updated_ts, row_status
 	`
 	var shortcutRaw shortcutRaw
 	if err := tx.QueryRowContext(ctx, query, args...).Scan(
 		&shortcutRaw.ID,
 		&shortcutRaw.Title,
 		&shortcutRaw.Payload,
+		&shortcutRaw.CreatorID,
 		&shortcutRaw.CreatedTs,
 		&shortcutRaw.UpdatedTs,
 		&shortcutRaw.RowStatus,

store/store.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 
-	"github.com/usememos/memos/api"
 	"github.com/usememos/memos/server/profile"
 )
 
@@ -12,7 +11,7 @@ import (
 type Store struct {
 	db      *sql.DB
 	profile *profile.Profile
-	cache   api.CacheService
+	cache   *CacheService
 }
 
 // New creates a new instance of Store.

store/user.go

@@ -78,7 +78,7 @@ func (s *Store) CreateUser(ctx context.Context, create *api.UserCreate) (*api.Us
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.UserCache, userRaw.ID, userRaw); err != nil {
+	if err := s.cache.UpsertCache(UserCache, userRaw.ID, userRaw); err != nil {
 		return nil, err
 	}
 
@@ -103,7 +103,7 @@ func (s *Store) PatchUser(ctx context.Context, patch *api.UserPatch) (*api.User,
 		return nil, FormatError(err)
 	}
 
-	if err := s.cache.UpsertCache(api.UserCache, userRaw.ID, userRaw); err != nil {
+	if err := s.cache.UpsertCache(UserCache, userRaw.ID, userRaw); err != nil {
 		return nil, err
 	}
 
@@ -135,7 +135,7 @@ func (s *Store) FindUserList(ctx context.Context, find *api.UserFind) ([]*api.Us
 func (s *Store) FindUser(ctx context.Context, find *api.UserFind) (*api.User, error) {
 	if find.ID != nil {
 		userRaw := &userRaw{}
-		has, err := s.cache.FindCache(api.UserCache, *find.ID, userRaw)
+		has, err := s.cache.FindCache(UserCache, *find.ID, userRaw)
 		if err != nil {
 			return nil, err
 		}
@@ -161,7 +161,7 @@ func (s *Store) FindUser(ctx context.Context, find *api.UserFind) (*api.User, er
 
 	userRaw := list[0]
 
-	if err := s.cache.UpsertCache(api.UserCache, userRaw.ID, userRaw); err != nil {
+	if err := s.cache.UpsertCache(UserCache, userRaw.ID, userRaw); err != nil {
 		return nil, err
 	}
 
@@ -188,7 +188,7 @@ func (s *Store) DeleteUser(ctx context.Context, delete *api.UserDelete) error {
 		return err
 	}
 
-	s.cache.DeleteCache(api.UserCache, delete.ID)
+	s.cache.DeleteCache(UserCache, delete.ID)
 
 	return nil
 }

web/.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "lokalise.i18n-ally",
+    "bradlc.vscode-tailwindcss",
+    "dbaeumer.vscode-eslint",
+    "csstools.postcss"
+  ]
+}

web/.vscode/settings.json

@@ -2,5 +2,8 @@
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
-  }
+  },
+  "i18n-ally.localesPaths": [
+    "src/locales"
+  ]
 }

web/jest.config.js

@@ -1,9 +0,0 @@
-/* eslint-disable no-undef */
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: "ts-jest",
-  testEnvironment: "node",
-  moduleNameMapper: {
-    "lodash-es": "lodash",
-  },
-};

web/package.json

@@ -3,13 +3,12 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "lint": "eslint --ext .js,.ts,.tsx, src",
-    "test": "jest --passWithNoTests"
+    "lint": "eslint --ext .js,.ts,.tsx, src"
   },
   "dependencies": {
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "@mui/joy": "^5.0.0-alpha.56",
+    "@mui/joy": "^5.0.0-alpha.63",
     "@reduxjs/toolkit": "^1.8.1",
     "axios": "^0.27.2",
     "copy-to-clipboard": "^3.3.2",
@@ -17,38 +16,36 @@
     "highlight.js": "^11.6.0",
     "i18next": "^21.9.2",
     "lodash-es": "^4.17.21",
+    "lucide-react": "^0.105.0",
+    "qrcode.react": "^3.1.0",
     "qs": "^6.11.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-feather": "^2.0.10",
     "react-i18next": "^11.18.6",
     "react-redux": "^8.0.1",
     "react-router-dom": "^6.4.0",
+    "semver": "^7.3.8",
     "tailwindcss": "^3.2.4"
   },
   "devDependencies": {
-    "@jest/globals": "^29.1.2",
     "@types/lodash-es": "^4.17.5",
     "@types/node": "^18.0.3",
     "@types/qs": "^6.9.7",
-    "@types/react": "^18.0.21",
-    "@types/react-dom": "^18.0.6",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.10",
+    "@types/semver": "^7.3.13",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@typescript-eslint/parser": "^5.6.0",
-    "@vitejs/plugin-legacy": "^3.0.1",
     "@vitejs/plugin-react-swc": "^3.0.0",
     "autoprefixer": "^10.4.2",
     "eslint": "^8.4.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.27.1",
-    "jest": "^29.1.2",
     "less": "^4.1.1",
-    "lodash": "^4.17.21",
     "postcss": "^8.4.5",
     "prettier": "2.5.1",
     "terser": "^5.16.1",
-    "ts-jest": "^29.0.3",
     "typescript": "^4.3.2",
     "vite": "^4.0.0"
   }

web/src/App.tsx

@@ -48,7 +48,7 @@ const App = () => {
       const styleEl = document.createElement("style");
       styleEl.innerHTML = systemStatus.additionalStyle;
       styleEl.setAttribute("type", "text/css");
-      document.head.appendChild(styleEl);
+      document.body.insertAdjacentElement("beforeend", styleEl);
     }
     if (systemStatus.additionalScript) {
       const scriptEl = document.createElement("script");

web/src/components/AboutSiteDialog.tsx

@@ -11,6 +11,7 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
   const { t } = useTranslation();
   const globalStore = useGlobalStore();
   const profile = globalStore.state.systemStatus.profile;
+  const customizedProfile = globalStore.state.systemStatus.customizedProfile;
 
   const handleCloseBtnClick = () => {
     destroy();
@@ -20,36 +21,36 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
     <>
       <div className="dialog-header-container">
         <p className="title-text flex items-center">
-          <img className="w-7 h-auto mr-1" src="/logo.png" alt="" />
-          {t("common.about")} memos
+          {t("common.about")} {customizedProfile.name}
         </p>
         <button className="btn close-btn" onClick={handleCloseBtnClick}>
           <Icon.X />
         </button>
       </div>
       <div className="dialog-content-container">
-        <p>{t("slogan")}</p>
-        <div className="border-t mt-1 pt-2 flex flex-row justify-start items-center">
-          <span className=" text-gray-500 mr-2">Other projects:</span>
+        <p className="text-sm">{customizedProfile.description || "No description"}</p>
+        <div className="mt-4 flex flex-row text-sm justify-start items-center">
+          <div className="flex flex-row justify-start items-center mr-2">
+            Powered by
+            <a href="https://usememos.com" className="flex flex-row justify-start items-center mr-1 hover:underline">
+              <img className="w-6 h-auto" src="/logo.png" alt="" />
+              memos
+            </a>
+            <span>v{profile.version}</span>
+          </div>
+          <GitHubBadge />
+        </div>
+        <div className="border-t mt-3 pt-2 text-sm flex flex-row justify-start items-center">
+          <span className="text-gray-500 mr-2">Other projects:</span>
           <a href="https://github.com/boojack/sticky-notes" className="flex items-center underline text-blue-600 hover:opacity-80">
             <img
-              className="w-5 h-auto mr-1"
+              className="w-4 h-auto mr-1"
               src="https://raw.githubusercontent.com/boojack/sticky-notes/main/public/sticky-notes.ico"
               alt=""
             />
             <span>Sticky notes</span>
           </a>
         </div>
-        <div className="mt-4 flex flex-row text-sm justify-start items-center">
-          <GitHubBadge />
-          <span className="ml-2">
-            {t("common.version")}:
-            <span className="font-mono">
-              {profile.version}-{profile.mode}
-            </span>
-            🎉
-          </span>
-        </div>
       </div>
     </>
   );

web/src/components/CreateResourceDialog.tsx

@@ -0,0 +1,243 @@
+import { Button, Input, Select, Option, Typography, List, ListItem, Autocomplete } from "@mui/joy";
+import React, { useRef, useState } from "react";
+import { useResourceStore } from "../store/module";
+import Icon from "./Icon";
+import toastHelper from "./Toast";
+import { generateDialog } from "./Dialog";
+
+const fileTypeAutocompleteOptions = ["image/*", "text/*", "audio/*", "video/*", "application/*"];
+
+interface Props extends DialogProps {
+  onCancel?: () => void;
+  onConfirm?: (resourceList: Resource[]) => void;
+}
+
+type SelectedMode = "local-file" | "external-link";
+
+interface State {
+  selectedMode: SelectedMode;
+  uploadingFlag: boolean;
+}
+
+const CreateResourceDialog: React.FC<Props> = (props: Props) => {
+  const { destroy, onCancel, onConfirm } = props;
+  const resourceStore = useResourceStore();
+  const [state, setState] = useState<State>({
+    selectedMode: "local-file",
+    uploadingFlag: false,
+  });
+  const [resourceCreate, setResourceCreate] = useState<ResourceCreate>({
+    filename: "",
+    externalLink: "",
+    type: "",
+  });
+  const [fileList, setFileList] = useState<File[]>([]);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const handleCloseDialog = () => {
+    if (onCancel) {
+      onCancel();
+    }
+    destroy();
+  };
+
+  const handleSelectedModeChanged = (mode: "local-file" | "external-link") => {
+    setState((state) => {
+      return {
+        ...state,
+        selectedMode: mode,
+      };
+    });
+  };
+
+  const handleExternalLinkChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const externalLink = event.target.value;
+    setResourceCreate((state) => {
+      return {
+        ...state,
+        externalLink,
+      };
+    });
+  };
+
+  const handleFileNameChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const filename = event.target.value;
+    setResourceCreate((state) => {
+      return {
+        ...state,
+        filename,
+      };
+    });
+  };
+
+  const handleFileTypeChanged = (fileType: string) => {
+    setResourceCreate((state) => {
+      return {
+        ...state,
+        type: fileType,
+      };
+    });
+  };
+
+  const handleFileInputChange = async () => {
+    if (!fileInputRef.current || !fileInputRef.current.files) {
+      return;
+    }
+
+    const files: File[] = [];
+    for (const file of fileInputRef.current.files) {
+      files.push(file);
+    }
+    setFileList(files);
+  };
+
+  const allowConfirmAction = () => {
+    if (state.selectedMode === "local-file") {
+      if (!fileInputRef.current || !fileInputRef.current.files || fileInputRef.current.files.length === 0) {
+        return false;
+      }
+    } else if (state.selectedMode === "external-link") {
+      if (resourceCreate.filename === "" || resourceCreate.externalLink === "" || resourceCreate.type === "") {
+        return false;
+      }
+    }
+    return true;
+  };
+
+  const handleConfirmBtnClick = async () => {
+    if (state.uploadingFlag) {
+      return;
+    }
+
+    setState((state) => {
+      return {
+        ...state,
+        uploadingFlag: true,
+      };
+    });
+
+    const createdResourceList: Resource[] = [];
+    try {
+      if (state.selectedMode === "local-file") {
+        if (!fileInputRef.current || !fileInputRef.current.files) {
+          return;
+        }
+        for (const file of fileInputRef.current.files) {
+          const resource = await resourceStore.createResourceWithBlob(file);
+          createdResourceList.push(resource);
+        }
+      } else {
+        const resource = await resourceStore.createResource(resourceCreate);
+        createdResourceList.push(resource);
+      }
+    } catch (error: any) {
+      console.error(error);
+      toastHelper.error(error.response.data.message);
+    }
+
+    if (onConfirm) {
+      onConfirm(createdResourceList);
+    }
+    destroy();
+  };
+
+  return (
+    <>
+      <div className="dialog-header-container">
+        <p className="title-text">Create Resource</p>
+        <button className="btn close-btn" onClick={handleCloseDialog}>
+          <Icon.X />
+        </button>
+      </div>
+      <div className="dialog-content-container !w-80">
+        <Typography className="!mb-1" level="body2">
+          Upload method
+        </Typography>
+        <Select
+          className="w-full mb-2"
+          onChange={(_, value) => handleSelectedModeChanged(value as SelectedMode)}
+          value={state.selectedMode}
+          startDecorator={<Icon.File className="w-4 h-auto" />}
+        >
+          <Option value="local-file">Local file</Option>
+          <Option value="external-link">External link</Option>
+        </Select>
+
+        {state.selectedMode === "local-file" && (
+          <>
+            <div className="w-full relative bg-blue-50 rounded-md flex flex-row justify-center items-center py-8">
+              <label htmlFor="files" className="p-2 px-4 text-sm text-white cursor-pointer bg-blue-500 block rounded hover:opacity-80">
+                Choose a file...
+              </label>
+              <input
+                className="absolute inset-0 hidden"
+                ref={fileInputRef}
+                onChange={handleFileInputChange}
+                type="file"
+                id="files"
+                multiple={true}
+                accept="*"
+              />
+            </div>
+            <List size="sm">
+              {fileList.map((file) => (
+                <ListItem key={file.name}>{file.name}</ListItem>
+              ))}
+            </List>
+          </>
+        )}
+
+        {state.selectedMode === "external-link" && (
+          <>
+            <Typography className="!mb-1" level="body2">
+              Link
+            </Typography>
+            <Input
+              className="mb-2"
+              placeholder="File link"
+              value={resourceCreate.externalLink}
+              onChange={handleExternalLinkChanged}
+              fullWidth
+            />
+            <Typography className="!mb-1" level="body2">
+              File name
+            </Typography>
+            <Input className="mb-2" placeholder="File name" value={resourceCreate.filename} onChange={handleFileNameChanged} fullWidth />
+            <Typography className="!mb-1" level="body2">
+              Type
+            </Typography>
+            <Autocomplete
+              className="w-full"
+              size="sm"
+              placeholder="File type"
+              freeSolo={true}
+              options={fileTypeAutocompleteOptions}
+              onChange={(_, value) => handleFileTypeChanged(value || "")}
+            />
+          </>
+        )}
+
+        <div className="mt-2 w-full flex flex-row justify-end items-center space-x-1">
+          <Button variant="plain" color="neutral" onClick={handleCloseDialog}>
+            Cancel
+          </Button>
+          <Button onClick={handleConfirmBtnClick} loading={state.uploadingFlag} disabled={!allowConfirmAction()}>
+            Create
+          </Button>
+        </div>
+      </div>
+    </>
+  );
+};
+
+function showCreateResourceDialog(props: Omit<Props, "destroy">) {
+  generateDialog<Props>(
+    {
+      dialogName: "create-resource-dialog",
+    },
+    CreateResourceDialog,
+    props
+  );
+}
+
+export default showCreateResourceDialog;

web/src/components/CreateTagDialog.tsx

@@ -1,7 +1,8 @@
-import { TextField } from "@mui/joy";
+import { Input } from "@mui/joy";
 import React, { useEffect, useState } from "react";
 import { useTagStore } from "../store/module";
 import { getTagSuggestionList } from "../helpers/api";
+import { matcher } from "../labs/marked/matcher";
 import Tag from "../labs/marked/parser/Tag";
 import Icon from "./Icon";
 import toastHelper from "./Toast";
@@ -10,7 +11,7 @@ import { generateDialog } from "./Dialog";
 type Props = DialogProps;
 
 const validateTagName = (tagName: string): boolean => {
-  const matchResult = Tag.matcher(`#${tagName}`);
+  const matchResult = matcher(`#${tagName}`, Tag.regexp);
   if (!matchResult || matchResult[1] !== tagName) {
     return false;
   }
@@ -22,6 +23,7 @@ const CreateTagDialog: React.FC<Props> = (props: Props) => {
   const tagStore = useTagStore();
   const [tagName, setTagName] = useState<string>("");
   const [suggestTagNameList, setSuggestTagNameList] = useState<string[]>([]);
+  const [showTagSuggestions, setShowTagSuggestions] = useState<boolean>(false);
   const tagNameList = tagStore.state.tags;
   const shownSuggestTagNameList = suggestTagNameList.filter((tag) => !tagNameList.includes(tag));
 
@@ -42,10 +44,14 @@ const CreateTagDialog: React.FC<Props> = (props: Props) => {
     setTagName(tagName.trim());
   };
 
-  const handleUpsertSuggestTag = async (tagName: string) => {
+  const handleUpsertTag = async (tagName: string) => {
     await tagStore.upsertTag(tagName);
   };
 
+  const handleToggleShowSuggestionTags = () => {
+    setShowTagSuggestions((state) => !state);
+  };
+
   const handleSaveBtnClick = async () => {
     if (!validateTagName(tagName)) {
       toastHelper.error("Invalid tag name");
@@ -82,8 +88,9 @@ const CreateTagDialog: React.FC<Props> = (props: Props) => {
         </button>
       </div>
       <div className="dialog-content-container !w-80">
-        <TextField
+        <Input
           className="mb-2"
+          size="md"
           placeholder="TAG_NAME"
           value={tagName}
           onChange={handleTagNameChanged}
@@ -111,24 +118,30 @@ const CreateTagDialog: React.FC<Props> = (props: Props) => {
 
         {shownSuggestTagNameList.length > 0 && (
           <>
-            <p className="w-full mt-2 mb-1 text-sm text-gray-400">Tag suggestions</p>
-            <div className="w-full flex flex-row justify-start items-start flex-wrap">
-              {shownSuggestTagNameList.map((tag) => (
-                <span
-                  className="max-w-[120px] text-sm mr-2 mt-1 font-mono cursor-pointer truncate dark:text-gray-300 hover:opacity-60"
-                  key={tag}
-                  onClick={() => handleUpsertSuggestTag(tag)}
-                >
-                  #{tag}
-                </span>
-              ))}
+            <div className="mt-4 mb-1 text-sm w-full flex flex-row justify-start items-center">
+              <span className="text-gray-400">Tag suggestions</span>
+              <button className="btn-normal ml-2 px-2 py-0 leading-6 font-mono" onClick={handleToggleShowSuggestionTags}>
+                {showTagSuggestions ? "hide" : "show"}
+              </button>
             </div>
-            <button
-              className="mt-2 text-sm border px-2 leading-6 rounded cursor-pointer dark:border-gray-400 dark:text-gray-300 hover:opacity-80 hover:shadow"
-              onClick={handleSaveSuggestTagList}
-            >
-              Save all
-            </button>
+            {showTagSuggestions && (
+              <>
+                <div className="w-full flex flex-row justify-start items-start flex-wrap">
+                  {shownSuggestTagNameList.map((tag) => (
+                    <span
+                      className="max-w-[120px] text-sm mr-2 mt-1 font-mono cursor-pointer truncate dark:text-gray-300 hover:opacity-60"
+                      key={tag}
+                      onClick={() => handleUpsertTag(tag)}
+                    >
+                      #{tag}
+                    </span>
+                  ))}
+                </div>
+                <button className="btn-normal mt-2 px-2 py-0 leading-6 font-mono" onClick={handleSaveSuggestTagList}>
+                  Save all
+                </button>
+              </>
+            )}
           </>
         )}
       </div>

web/src/components/DailyMemo.tsx

@@ -21,7 +21,7 @@ const DailyMemo: React.FC<Props> = (props: Props) => {
       </div>
       <div className="memo-container">
         <MemoContent content={memo.content} displayConfig={displayConfig} />
-        <MemoResources resourceList={memo.resourceList} style="col" />
+        <MemoResources resourceList={memo.resourceList} />
       </div>
       <div className="split-line"></div>
     </div>

web/src/components/DailyReviewDialog.tsx

@@ -73,7 +73,7 @@ const DailyReviewDialog: React.FC<Props> = (props: Props) => {
             <Icon.ChevronRight className="icon-img" />
           </button>
           <button className="btn-text share" onClick={handleShareBtnClick}>
-            <Icon.Share className="icon-img" />
+            <Icon.Share2 size={16} />
           </button>
           <span className="split-line">/</span>
           <button className="btn-text" onClick={() => props.destroy()}>

web/src/components/Dialog/BaseDialog.tsx

@@ -9,8 +9,8 @@ import theme from "../../theme";
 import "../../less/base-dialog.less";
 
 interface DialogConfig {
-  className: string;
   dialogName: string;
+  className?: string;
   clickSpaceDestroy?: boolean;
 }
 
@@ -55,7 +55,7 @@ const BaseDialog: React.FC<Props> = (props: Props) => {
   };
 
   return (
-    <div className={`dialog-wrapper ${className}`} onMouseDown={handleSpaceClicked}>
+    <div className={`dialog-wrapper ${className ?? ""}`} onMouseDown={handleSpaceClicked}>
       <div ref={dialogContainerRef} className="dialog-container" onMouseDown={(e) => e.stopPropagation()}>
         {children}
       </div>

web/src/components/Editor/Editor.tsx

@@ -3,6 +3,7 @@ import "../../less/editor.less";
 
 export interface EditorRefActions {
   focus: FunctionType;
+  scrollToCursor: FunctionType;
   insertText: (text: string, prefix?: string, suffix?: string) => void;
   removeText: (start: number, length: number) => void;
   setContent: (text: string) => void;
@@ -52,6 +53,10 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<
       focus: () => {
         editorRef.current?.focus();
       },
+      scrollToCursor: () => {
+        editorRef.current?.blur();
+        editorRef.current?.focus();
+      },
       insertText: (content = "", prefix = "", suffix = "") => {
         if (!editorRef.current) {
           return;

web/src/components/EmbedMemoDialog.tsx

@@ -0,0 +1,60 @@
+import React from "react";
+import Icon from "./Icon";
+import { generateDialog } from "./Dialog";
+import copy from "copy-to-clipboard";
+import toastHelper from "./Toast";
+
+interface Props extends DialogProps {
+  memoId: MemoId;
+}
+
+const EmbedMemoDialog: React.FC<Props> = (props: Props) => {
+  const { memoId, destroy } = props;
+
+  const memoEmbeddedCode = () => {
+    return `<iframe style="width:100%;height:auto;min-width:256px;" src="${window.location.origin}/m/${memoId}/embed" frameBorder="0"></iframe>`;
+  };
+
+  const handleCopyCode = () => {
+    copy(memoEmbeddedCode());
+    toastHelper.success("Succeed to copy code to clipboard.");
+  };
+
+  return (
+    <>
+      <div className="dialog-header-container">
+        <p className="title-text">Embed Memo</p>
+        <button className="btn close-btn" onClick={() => destroy()}>
+          <Icon.X />
+        </button>
+      </div>
+      <div className="dialog-content-container !w-80">
+        <p className="text-base leading-6 mb-2">Copy and paste the below codes into your blog or website.</p>
+        <pre className="w-full font-mono text-sm p-3 border rounded-lg">
+          <code className="w-full break-all whitespace-pre-wrap">{memoEmbeddedCode()}</code>
+        </pre>
+        <p className="w-full text-sm leading-6 flex flex-row justify-between items-center mt-2">
+          <span className="italic opacity-80">* Only the public memo supports.</span>
+          <span className="btn-primary" onClick={handleCopyCode}>
+            Copy
+          </span>
+        </p>
+      </div>
+    </>
+  );
+};
+
+function showEmbedMemoDialog(memoId: MemoId) {
+  generateDialog(
+    {
+      className: "embed-memo-dialog",
+      dialogName: "embed-memo-dialog",
+    },
+    EmbedMemoDialog,
+    {
+      memoId,
+    }
+  );
+}
+
+export default showEmbedMemoDialog;