Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat(usage): add default limits and explicit rule targets
johnnyjoygh9e3a164dff90
diff --git a/.github/workflows/proto-linter.yml b/.github/workflows/proto-linter.ymlindex d13e7d026..2d15af7ec 100644--- a/.github/workflows/proto-linter.yml+++ b/.github/workflows/proto-linter.yml@@ -19,8 +19,6 @@ jobs:steps:- name: Checkout codeuses: actions/checkout@v6- with:- fetch-depth: 0- name: Setup bufuses: bufbuild/buf-setup-action@v1@@ -38,23 +36,3 @@ jobs:echo "❌ Proto files are not formatted. Run 'buf format -w' to fix."exit 1fi-- # A breaking change to the public API is allowed only when the same change- # records it in proto/api/CHANGELOG.md.- - name: Check breaking API changes- working-directory: proto- env:- BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.before }}- run: |- if [[ -z "$BASE_SHA" || "$BASE_SHA" =~ ^0+$ ]] || ! git cat-file -e "$BASE_SHA^{commit}" 2>/dev/null; then- echo "No comparable base commit; skipping."- exit 0- fi- if buf breaking --against "../.git#ref=$BASE_SHA,subdir=proto" --path api; then- exit 0- fi- if git diff --quiet "$BASE_SHA" HEAD -- api/CHANGELOG.md; then- echo "❌ Breaking API change. Record it in proto/api/CHANGELOG.md, or make the change compatible."- exit 1- fi- echo "::warning::Breaking API change recorded in proto/api/CHANGELOG.md."diff --git a/AGENTS.md b/AGENTS.mdindex 0617d2280..c6c3e8db5 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -130,7 +130,7 @@ Black-box service tests live in `server/api/test/`, unit tests next to the code.- Schema changes require SQLite, MySQL, and PostgreSQL migrations plus `LATEST.sql` updates.- Fresh-install SQL and incremental migrations must stay equivalent.- Proto field changes must preserve compatibility unless the task explicitly allows a breaking API change. Record every- allowed break in `proto/api/CHANGELOG.md`; CI fails a `buf breaking` failure without an edit there.+ allowed break in `proto/api/CHANGELOG.md`; compatibility is checked during review.- Regenerate after proto edits and include both Go/OpenAPI and TypeScript generated outputs.## Verification Policydiff --git a/core/README.md b/core/README.mdindex 37aa3671a..e6ead176c 100644--- a/core/README.md+++ b/core/README.md@@ -10,7 +10,7 @@ apply the same way.| `notification/` | building and dispatching inbox and email notifications || `memopayload/` | rebuilding a memo's derived payload from its markdown || `memoexport/` | the Memos Export Format container and records used for export and import |-| `usagelimit/` | which usage limits apply to a user, and whether a memo create or an upload stays within them |+| `usagelimit/` | which usage limits apply to a user, and whether memo counts, memo content, and uploads stay within them |Layering: `core` may import `store`, `provider`, `markdown`, `filter`,`proto/gen`, and `internal`. It must not import `server` or `cmd`. Newdiff --git a/core/usagelimit/usagelimit.go b/core/usagelimit/usagelimit.goindex 0d21b8d2c..f871939b0 100644--- a/core/usagelimit/usagelimit.go+++ b/core/usagelimit/usagelimit.go@@ -1,5 +1,5 @@// Package usagelimit resolves the usage limits that apply to a user and-// decides whether creating a memo or uploading a file stays within them.+// decides whether creating or editing a memo, or uploading a file, stays within them.//// A usage limit sets one value for one metric, for every user (a default) or// for one user. For each metric, the user's own limit applies if there is@@ -23,9 +23,10 @@ type Metric = storepb.InstanceUsageLimitsSetting_Metric// The metrics a usage limit can set.const (- MetricMemos = storepb.InstanceUsageLimitsSetting_MEMOS- MetricStorageBytes = storepb.InstanceUsageLimitsSetting_STORAGE_BYTES- MetricUploadBytes = storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES+ MetricMemoCount = storepb.InstanceUsageLimitsSetting_MEMO_COUNT+ MetricStorageBytes = storepb.InstanceUsageLimitsSetting_STORAGE_BYTES+ MetricUploadBytes = storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES+ MetricMemoContentBytes = storepb.InstanceUsageLimitsSetting_MEMO_CONTENT_BYTES)// Store is the data the checks read. *store.Store implements it.@@ -51,9 +52,10 @@ func (l Limit) Limited() bool {// Effective is the limit in effect for each metric of one user.type Effective struct {- Memos Limit- StorageBytes Limit- UploadBytes Limit+ MemoCount Limit+ StorageBytes Limit+ UploadBytes Limit+ MemoContentBytes Limit}// Resolve returns the limits in effect for userID: for each metric, the user's@@ -61,30 +63,41 @@ type Effective struct {func Resolve(setting *storepb.InstanceUsageLimitsSetting, userID int32) Effective {var effective Effectivefor _, limit := range setting.GetLimits() {- if limit.UserId != 0 && limit.UserId != userID {+ if limit == nil {continue}- target := effective.get(limit.Metric)- if target == nil {+ selected := effective.get(limit.Metric)+ if selected == nil {continue}- // A user's own limit replaces the default, whatever the order.- if limit.UserId == 0 && target.Source != "" {+ switch target := limit.Target.(type) {+ case *storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers:+ // A user's own limit replaces the default, whatever the order.+ if target == nil || target.AllUsers == nil || selected.Source != "" {+ continue+ }+ case *storepb.InstanceUsageLimitsSetting_UsageLimit_UserId:+ if target == nil || target.UserId <= 0 || target.UserId != userID {+ continue+ }+ default:continue}- *target = Limit{Value: limit.Value, Source: limit.Uid}+ *selected = Limit{Value: limit.Value, Source: limit.Uid}}return effective}func (e *Effective) get(metric Metric) *Limit {switch metric {- case MetricMemos:- return &e.Memos+ case MetricMemoCount:+ return &e.MemoCountcase MetricStorageBytes:return &e.StorageBytescase MetricUploadBytes:return &e.UploadBytes+ case MetricMemoContentBytes:+ return &e.MemoContentBytesdefault:return nil}@@ -96,7 +109,8 @@ type Refusal struct {// Limit is the value of the usage limit that applied.Limit int64// Usage is the current usage: the memo count, the stored bytes, or for- // UPLOAD_BYTES the size of the refused file.+ // UPLOAD_BYTES the size of the refused file, or for MEMO_CONTENT_BYTES the+ // size of the refused memo content.Usage int64// Source is the ID of the usage limit that applied.Source string@@ -131,15 +145,15 @@ func CheckMemoCreate(ctx context.Context, s Store, userID int32) error {if err != nil {return err}- if !effective.Memos.Limited() {+ if !effective.MemoCount.Limited() {return nil}count, err := s.CountUserMemos(ctx, userID)if err != nil {return errors.Wrap(err, "failed to count memos")}- if count >= effective.Memos.Value {- return &Refusal{Metric: MetricMemos, Limit: effective.Memos.Value, Usage: count, Source: effective.Memos.Source}+ if count >= effective.MemoCount.Value {+ return &Refusal{Metric: MetricMemoCount, Limit: effective.MemoCount.Value, Usage: count, Source: effective.MemoCount.Source}}return nil}@@ -154,6 +168,19 @@ func CheckFileSize(ctx context.Context, s Store, userID int32, size int64) errorreturn effective.checkFileSize(size)}+// CheckMemoContentSize returns a *Refusal when content of size bytes is larger+// than the per-memo content limit of userID. It runs no count or sum query.+func CheckMemoContentSize(ctx context.Context, s Store, userID int32, size int64) error {+ effective, err := EffectiveFor(ctx, s, userID)+ if err != nil {+ return err+ }+ if content := effective.MemoContentBytes; content.Limited() && size > content.Value {+ return &Refusal{Metric: MetricMemoContentBytes, Limit: content.Value, Usage: size, Source: content.Source}+ }+ return nil+}+func (e Effective) checkFileSize(size int64) error {if upload := e.UploadBytes; upload.Limited() && size > upload.Value {return &Refusal{Metric: MetricUploadBytes, Limit: upload.Value, Usage: size, Source: upload.Source}diff --git a/core/usagelimit/usagelimit_test.go b/core/usagelimit/usagelimit_test.goindex 5473a3fbb..7e5aa8c58 100644--- a/core/usagelimit/usagelimit_test.go+++ b/core/usagelimit/usagelimit_test.go@@ -6,6 +6,7 @@ import ("github.com/pkg/errors""github.com/stretchr/testify/require"+ "google.golang.org/protobuf/types/known/emptypb"storepb "github.com/usememos/memos/proto/gen/store")@@ -41,7 +42,14 @@ func (f *fakeStore) GetAttachmentStorageUsage(context.Context, int32) (int64, er}func limit(uid string, metric Metric, userID int32, value int64) *storepb.InstanceUsageLimitsSetting_UsageLimit {- return &storepb.InstanceUsageLimitsSetting_UsageLimit{Uid: uid, Metric: metric, UserId: userID, Value: value}+ limit := &storepb.InstanceUsageLimitsSetting_UsageLimit{+ Uid: uid, Metric: metric, Value: value,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{AllUsers: &emptypb.Empty{}},+ }+ if userID != 0 {+ limit.Target = &storepb.InstanceUsageLimitsSetting_UsageLimit_UserId{UserId: userID}+ }+ return limit}func TestResolve(t *testing.T) {@@ -50,21 +58,26 @@ func TestResolve(t *testing.T) {// A user's limit listed before the default still wins.limit("alice-storage", MetricStorageBytes, alice, 5<<30),limit("default-storage", MetricStorageBytes, 0, 1<<30),- limit("default-memos", MetricMemos, 0, 1000),- limit("alice-memos", MetricMemos, alice, 0),+ limit("default-memos", MetricMemoCount, 0, 1000),+ limit("alice-memos", MetricMemoCount, alice, 0),limit("bob-upload", MetricUploadBytes, bob, 10<<20),}}require.Equal(t, Effective{- Memos: Limit{Value: 0, Source: "alice-memos"},+ MemoCount: Limit{Value: 0, Source: "alice-memos"},StorageBytes: Limit{Value: 5 << 30, Source: "alice-storage"},}, Resolve(setting, alice), "a user's own limit, even unlimited, replaces the default")require.Equal(t, Effective{- Memos: Limit{Value: 1000, Source: "default-memos"},+ MemoCount: Limit{Value: 1000, Source: "default-memos"},StorageBytes: Limit{Value: 1 << 30, Source: "default-storage"},UploadBytes: Limit{Value: 10 << 20, Source: "bob-upload"},}, Resolve(setting, bob))require.Equal(t, Effective{}, Resolve(&storepb.InstanceUsageLimitsSetting{}, alice), "no limits means unlimited")+ invalid := &storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{+ {Uid: "missing-target", Metric: MetricMemoCount, Value: 1},+ {Uid: "zero-user", Metric: MetricStorageBytes, Value: 1, Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_UserId{UserId: 0}},+ }}+ require.Equal(t, Effective{}, Resolve(invalid, alice), "an absent target or user ID zero never becomes an all-users rule")}func TestCheckMemoCreate(t *testing.T) {@@ -75,12 +88,12 @@ func TestCheckMemoCreate(t *testing.T) {require.Zero(t, unlimited.countCalls, "no count query runs without a memo limit")limited := &fakeStore{memos: 2, setting: &storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{- limit("default-memos", MetricMemos, 0, 3),+ limit("default-memos", MetricMemoCount, 0, 3),}}}require.NoError(t, CheckMemoCreate(ctx, limited, 1))limited.memos = 3refusal := AsRefusal(CheckMemoCreate(ctx, limited, 1))- require.Equal(t, &Refusal{Metric: MetricMemos, Limit: 3, Usage: 3, Source: "default-memos"}, refusal)+ require.Equal(t, &Refusal{Metric: MetricMemoCount, Limit: 3, Usage: 3, Source: "default-memos"}, refusal)limited.countingErr = errors.New("database down")err := CheckMemoCreate(ctx, limited, 1)@@ -120,3 +133,22 @@ func TestCheckFileSize(t *testing.T) {require.Equal(t, &Refusal{Metric: MetricUploadBytes, Limit: 200, Usage: 201, Source: "default-upload"}, AsRefusal(CheckFileSize(ctx, s, 1, 201)))require.Zero(t, s.sumCalls, "no sum query runs for a per-file check")}++func TestCheckMemoContentSize(t *testing.T) {+ ctx := context.Background()+ s := &fakeStore{setting: &storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{+ limit("default-content", MetricMemoContentBytes, 0, 8192),+ limit("alice-content", MetricMemoContentBytes, 2, 6),+ limit("bob-content", MetricMemoContentBytes, 3, 0),+ }}}+ require.NoError(t, CheckMemoContentSize(ctx, s, 1, 8192))+ require.Equal(t, &Refusal{Metric: MetricMemoContentBytes, Limit: 8192, Usage: 8193, Source: "default-content"}, AsRefusal(CheckMemoContentSize(ctx, s, 1, 8193)))+ require.NoError(t, CheckMemoContentSize(ctx, s, 2, int64(len("中文"))))+ require.Equal(t, &Refusal{Metric: MetricMemoContentBytes, Limit: 6, Usage: 9, Source: "alice-content"}, AsRefusal(CheckMemoContentSize(ctx, s, 2, int64(len("中文字")))))+ require.NoError(t, CheckMemoContentSize(ctx, s, 3, 1<<20), "a user's explicit zero overrides the default")+ require.NoError(t, CheckMemoContentSize(ctx, &fakeStore{}, 1, 1<<20), "no content limit means unlimited")+ require.Zero(t, s.countCalls)+ require.Zero(t, s.sumCalls)+ s.settingErr = errors.New("database down")+ require.Error(t, CheckMemoContentSize(ctx, s, 1, 1), "setting read failures do not bypass limits")+}diff --git a/proto/README.md b/proto/README.mdindex 6360cadb2..8e7b04756 100644--- a/proto/README.md+++ b/proto/README.md@@ -15,3 +15,9 @@ buf generate```shbuf format -w```++## Deployment settings++Instance setting JSON files use the same `store.InstanceSetting` schema as storage. Usage limits explicitly set+`allUsers: {}` for an all-users default or `userId: <positive integer>` for a user. A reload with invalid configuration+leaves the active configuration intact.diff --git a/proto/api/CHANGELOG.md b/proto/api/CHANGELOG.mdindex 6d4e9fc5a..01e49a38c 100644--- a/proto/api/CHANGELOG.md+++ b/proto/api/CHANGELOG.md@@ -2,9 +2,7 @@Breaking and deprecated changes to the public API in `proto/api/`, newest release first. Additive changes are not listed.-The Proto Linter workflow runs `buf breaking` against the base commit and fails when a schema break lands without an edit to-this file. It cannot see REST route changes in `google.api.http` annotations or behavior changes with an unchanged schema;-record those by hand.+Record schema, REST route, and behavior breaks here. API compatibility is checked during review.Add entries under a `## Unreleased` heading. After the release ships, rename it to the release tag.@@ -24,6 +22,14 @@ Add entries under a `## Unreleased` heading. After the release ships, rename it### Breaking+- Memo content size now uses the `MEMO_CONTENT_BYTES` usage limit, including creates, edits, comments, and imports.+ The default is 8 KiB when the usage limits setting is absent. `MemoRelatedSetting.content_length_limit` is removed;+ old values are not migrated. Exceeding the content limit returns `RESOURCE_EXHAUSTED`+ with quota details.+ `MemoRelatedSetting` fields are now `enable_double_click_edit = 1` and `reactions = 2`, matching the storage proto.+- The memo-count usage metric is now `MEMO_COUNT`, and `UserUsage.memos_limit` is now `memo_count_limit`.+ Metric values are `MEMO_COUNT = 1`, `MEMO_CONTENT_BYTES = 2`, `STORAGE_BYTES = 3`, and `UPLOAD_BYTES = 4`.+- The API no longer carries a `v1` version marker. Every client must update its paths:- REST routes move from `/api/v1/...` to `/api/...` (for example `GET /api/memos`). Server-sent events move from`/api/v1/sse` to `/api/sse`.@@ -35,6 +41,8 @@ Add entries under a `## Unreleased` heading. After the release ships, rename iterror that points here. The next release removes these routes.- Field numbers in every message are renumbered from 1 in declaration order, and all `reserved` ranges are removed.JSON field names are unchanged; clients that use the binary protobuf encoding must regenerate from the new schema.+- Enum values are renumbered from 0 in declaration order, including `User.Role` (`ADMIN = 1`, `USER = 2`) and+ `UserSetting.Key` (`GENERAL = 1`, `WEBHOOKS = 2`, `TAGS = 3`). Clients that send numeric enum values must update them.- Names now follow AIP conventions:- `MemoService`: `ListMemoAttachments`, `ListMemoRelations`, `ListMemoComments`, `CreateMemoComment`,`ListMemoReactions`, and `UpsertMemoReaction` take `parent` instead of `name` (REST path variablediff --git a/proto/api/instance_service.proto b/proto/api/instance_service.protoindex 8fd5395c1..a4016659a 100644--- a/proto/api/instance_service.proto+++ b/proto/api/instance_service.proto@@ -371,14 +371,11 @@ message InstanceSetting {// MemoRelatedSetting is the memo-related instance configuration.message MemoRelatedSetting {- // The maximum memo content length in bytes. Default and minimum is 8192.- int32 content_length_limit = 1;+ // Whether double-clicking a memo opens it for editing.+ bool enable_double_click_edit = 1;// The reactions users can choose from. Defaults to a built-in emoji set when empty.repeated string reactions = 2;-- // Whether double-clicking a memo opens it for editing.- bool enable_double_click_edit = 3;}// TagsSetting is the instance-wide tag metadata configuration.@@ -611,12 +608,14 @@ message UsageLimit {METRIC_UNSPECIFIED = 0;// The number of memos the user created, including comments, archived// memos, and memos in Spaces.- MEMOS = 1;+ MEMO_COUNT = 1;+ // The UTF-8 size in bytes of one memo's content.+ MEMO_CONTENT_BYTES = 2;// The total size in bytes of the user's uploads, including uploads not// attached to a memo. External links do not count.- STORAGE_BYTES = 2;+ STORAGE_BYTES = 3;// The size in bytes of one uploaded file.- UPLOAD_BYTES = 3;+ UPLOAD_BYTES = 4;}}diff --git a/proto/api/user_service.proto b/proto/api/user_service.protoindex 9650b14bb..53b102b0d 100644--- a/proto/api/user_service.proto+++ b/proto/api/user_service.proto@@ -348,9 +348,9 @@ message User {enum Role {ROLE_UNSPECIFIED = 0;// An administrator of the instance.- ADMIN = 2;+ ADMIN = 1;// A regular user.- USER = 3;+ USER = 2;}}@@ -494,9 +494,9 @@ message UserSetting {// General user preferences.GENERAL = 1;// The user's webhooks.- WEBHOOKS = 4;+ WEBHOOKS = 2;// Per-user tag metadata.- TAGS = 5;+ TAGS = 3;}// GeneralSetting holds general user preferences.@@ -706,7 +706,7 @@ message UserUsage {int64 storage_bytes = 3;// The limit on memo_count.- EffectiveLimit memos_limit = 4;+ EffectiveLimit memo_count_limit = 4;// The limit on storage_bytes.EffectiveLimit storage_bytes_limit = 5;@@ -714,6 +714,9 @@ message UserUsage {// The limit on the size of one uploaded file.EffectiveLimit upload_bytes_limit = 6;+ // The limit on the UTF-8 size in bytes of one memo's content.+ EffectiveLimit memo_content_bytes_limit = 7;+// EffectiveLimit is the limit in effect for one metric, and where it comes// from.message EffectiveLimit {diff --git a/proto/gen/api/instance_service.pb.go b/proto/gen/api/instance_service.pb.goindex 8eda4fae8..da69bbb79 100644--- a/proto/gen/api/instance_service.pb.go+++ b/proto/gen/api/instance_service.pb.go@@ -322,27 +322,31 @@ const (UsageLimit_METRIC_UNSPECIFIED UsageLimit_Metric = 0// The number of memos the user created, including comments, archived// memos, and memos in Spaces.- UsageLimit_MEMOS UsageLimit_Metric = 1+ UsageLimit_MEMO_COUNT UsageLimit_Metric = 1+ // The UTF-8 size in bytes of one memo's content.+ UsageLimit_MEMO_CONTENT_BYTES UsageLimit_Metric = 2// The total size in bytes of the user's uploads, including uploads not// attached to a memo. External links do not count.- UsageLimit_STORAGE_BYTES UsageLimit_Metric = 2+ UsageLimit_STORAGE_BYTES UsageLimit_Metric = 3// The size in bytes of one uploaded file.- UsageLimit_UPLOAD_BYTES UsageLimit_Metric = 3+ UsageLimit_UPLOAD_BYTES UsageLimit_Metric = 4)// Enum value maps for UsageLimit_Metric.var (UsageLimit_Metric_name = map[int32]string{0: "METRIC_UNSPECIFIED",- 1: "MEMOS",- 2: "STORAGE_BYTES",- 3: "UPLOAD_BYTES",+ 1: "MEMO_COUNT",+ 2: "MEMO_CONTENT_BYTES",+ 3: "STORAGE_BYTES",+ 4: "UPLOAD_BYTES",}UsageLimit_Metric_value = map[string]int32{"METRIC_UNSPECIFIED": 0,- "MEMOS": 1,- "STORAGE_BYTES": 2,- "UPLOAD_BYTES": 3,+ "MEMO_COUNT": 1,+ "MEMO_CONTENT_BYTES": 2,+ "STORAGE_BYTES": 3,+ "UPLOAD_BYTES": 4,})@@ -1832,14 +1836,12 @@ func (*InstanceSetting_Storage_S3Config_) isInstanceSetting_Storage_Config() {}// MemoRelatedSetting is the memo-related instance configuration.type InstanceSetting_MemoRelatedSetting struct {state protoimpl.MessageState `protogen:"open.v1"`- // The maximum memo content length in bytes. Default and minimum is 8192.- ContentLengthLimit int32 `protobuf:"varint,1,opt,name=content_length_limit,json=contentLengthLimit,proto3" json:"content_length_limit,omitempty"`- // The reactions users can choose from. Defaults to a built-in emoji set when empty.- Reactions []string `protobuf:"bytes,2,rep,name=reactions,proto3" json:"reactions,omitempty"`// Whether double-clicking a memo opens it for editing.- EnableDoubleClickEdit bool `protobuf:"varint,3,opt,name=enable_double_click_edit,json=enableDoubleClickEdit,proto3" json:"enable_double_click_edit,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ EnableDoubleClickEdit bool `protobuf:"varint,1,opt,name=enable_double_click_edit,json=enableDoubleClickEdit,proto3" json:"enable_double_click_edit,omitempty"`+ // The reactions users can choose from. Defaults to a built-in emoji set when empty.+ Reactions []string `protobuf:"bytes,2,rep,name=reactions,proto3" json:"reactions,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *InstanceSetting_MemoRelatedSetting) Reset() {@@ -1872,11 +1874,11 @@ func (*InstanceSetting_MemoRelatedSetting) Descriptor() ([]byte, []int) {return file_api_instance_service_proto_rawDescGZIP(), []int{2, 3}}-func (x *InstanceSetting_MemoRelatedSetting) GetContentLengthLimit() int32 {+func (x *InstanceSetting_MemoRelatedSetting) GetEnableDoubleClickEdit() bool {if x != nil {- return x.ContentLengthLimit+ return x.EnableDoubleClickEdit}- return 0+ return false}func (x *InstanceSetting_MemoRelatedSetting) GetReactions() []string {@@ -1886,13 +1888,6 @@ func (x *InstanceSetting_MemoRelatedSetting) GetReactions() []string {return nil}-func (x *InstanceSetting_MemoRelatedSetting) GetEnableDoubleClickEdit() bool {- if x != nil {- return x.EnableDoubleClickEdit- }- return false-}-// TagsSetting is the instance-wide tag metadata configuration.// Active tag metadata is stored in per-user tag settings. This message remains for backward compatibility with// existing clients and migrations.@@ -2795,7 +2790,7 @@ const file_api_instance_service_proto_rawDesc = "" +"\tChallenge\x12\x1a\n" +"\bprovider\x18\x01 \x01(\tR\bprovider\x12\x19\n" +"\bsite_key\x18\x02 \x01(\tR\asiteKey\"\x1b\n" +- "\x19GetInstanceProfileRequest\"\xc0!\n" ++ "\x19GetInstanceProfileRequest\"\x8d!\n" +"\x0fInstanceSetting\x12\x17\n" +"\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12T\n" +"\x0fgeneral_setting\x18\x02 \x01(\v2).memos.api.InstanceSetting.GeneralSettingH\x00R\x0egeneralSetting\x12T\n" +@@ -2851,11 +2846,10 @@ const file_api_instance_service_proto_rawDesc = "" +"\x11access_key_secret\x18\x05 \x01(\tB\x03\xe0A\x04R\x0faccessKeySecret\x12$\n" +"\x0euse_path_style\x18\x06 \x01(\bR\fusePathStyle\x127\n" +"\x18insecure_skip_tls_verify\x18\a \x01(\bR\x15insecureSkipTlsVerifyB\b\n" +- "\x06config\x1a\x9d\x01\n" +- "\x12MemoRelatedSetting\x120\n" +- "\x14content_length_limit\x18\x01 \x01(\x05R\x12contentLengthLimit\x12\x1c\n" +- "\treactions\x18\x02 \x03(\tR\treactions\x127\n" +- "\x18enable_double_click_edit\x18\x03 \x01(\bR\x15enableDoubleClickEdit\x1a\xb4\x01\n" ++ "\x06config\x1ak\n" ++ "\x12MemoRelatedSetting\x127\n" ++ "\x18enable_double_click_edit\x18\x01 \x01(\bR\x15enableDoubleClickEdit\x12\x1c\n" ++ "\treactions\x18\x02 \x03(\tR\treactions\x1a\xb4\x01\n" +"\vTagsSetting\x12D\n" +"\x04tags\x18\x01 \x03(\v20.memos.api.InstanceSetting.TagsSetting.TagsEntryR\x04tags\x1a_\n" +"\tTagsEntry\x12\x10\n" +@@ -2946,7 +2940,7 @@ const file_api_instance_service_proto_rawDesc = "" +"\x06driver\x18\x01 \x01(\tR\x06driver\x12\x1d\n" +"\n" +"size_bytes\x18\x02 \x01(\x03R\tsizeBytes\"\x19\n" +- "\x17GetInstanceStatsRequest\"\xd2\x03\n" ++ "\x17GetInstanceStatsRequest\"\xef\x03\n" +"\n" +"UsageLimit\x12\x17\n" +"\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12<\n" +@@ -2957,12 +2951,14 @@ const file_api_instance_service_proto_rawDesc = "" +"\vcreate_time\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +"createTime\x12@\n" +"\vupdate_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +- "updateTime\"P\n" ++ "updateTime\"m\n" +"\x06Metric\x12\x16\n" +- "\x12METRIC_UNSPECIFIED\x10\x00\x12\t\n" +- "\x05MEMOS\x10\x01\x12\x11\n" +- "\rSTORAGE_BYTES\x10\x02\x12\x10\n" +- "\fUPLOAD_BYTES\x10\x03:M\xeaAJ\n" ++ "\x12METRIC_UNSPECIFIED\x10\x00\x12\x0e\n" ++ "\n" ++ "MEMO_COUNT\x10\x01\x12\x16\n" ++ "\x12MEMO_CONTENT_BYTES\x10\x02\x12\x11\n" ++ "\rSTORAGE_BYTES\x10\x03\x12\x10\n" ++ "\fUPLOAD_BYTES\x10\x04:M\xeaAJ\n" +"\x14memos.api/UsageLimit\x12\x19usageLimits/{usage_limit}*\vusageLimits2\n" +"usageLimit\"{\n" +"\x16ListUsageLimitsRequest\x12 \n" +diff --git a/proto/gen/api/user_service.pb.go b/proto/gen/api/user_service.pb.goindex 660dad41d..b5d51b07f 100644--- a/proto/gen/api/user_service.pb.go+++ b/proto/gen/api/user_service.pb.go@@ -33,22 +33,22 @@ type User_Role int32const (User_ROLE_UNSPECIFIED User_Role = 0// An administrator of the instance.- User_ADMIN User_Role = 2+ User_ADMIN User_Role = 1// A regular user.- User_USER User_Role = 3+ User_USER User_Role = 2)// Enum value maps for User_Role.var (User_Role_name = map[int32]string{0: "ROLE_UNSPECIFIED",- 2: "ADMIN",- 3: "USER",+ 1: "ADMIN",+ 2: "USER",}User_Role_value = map[string]int32{"ROLE_UNSPECIFIED": 0,- "ADMIN": 2,- "USER": 3,+ "ADMIN": 1,+ "USER": 2,})@@ -87,9 +87,9 @@ const (// General user preferences.UserSetting_GENERAL UserSetting_Key = 1// The user's webhooks.- UserSetting_WEBHOOKS UserSetting_Key = 4+ UserSetting_WEBHOOKS UserSetting_Key = 2// Per-user tag metadata.- UserSetting_TAGS UserSetting_Key = 5+ UserSetting_TAGS UserSetting_Key = 3)// Enum value maps for UserSetting_Key.@@ -97,14 +97,14 @@ var (UserSetting_Key_name = map[int32]string{0: "KEY_UNSPECIFIED",1: "GENERAL",- 4: "WEBHOOKS",- 5: "TAGS",+ 2: "WEBHOOKS",+ 3: "TAGS",}UserSetting_Key_value = map[string]int32{"KEY_UNSPECIFIED": 0,"GENERAL": 1,- "WEBHOOKS": 4,- "TAGS": 5,+ "WEBHOOKS": 2,+ "TAGS": 3,})@@ -1616,13 +1616,15 @@ type UserUsage struct {// attached to a memo. External links do not count.StorageBytes int64 `protobuf:"varint,3,opt,name=storage_bytes,json=storageBytes,proto3" json:"storage_bytes,omitempty"`// The limit on memo_count.- MemosLimit *UserUsage_EffectiveLimit `protobuf:"bytes,4,opt,name=memos_limit,json=memosLimit,proto3" json:"memos_limit,omitempty"`+ MemoCountLimit *UserUsage_EffectiveLimit `protobuf:"bytes,4,opt,name=memo_count_limit,json=memoCountLimit,proto3" json:"memo_count_limit,omitempty"`// The limit on storage_bytes.StorageBytesLimit *UserUsage_EffectiveLimit `protobuf:"bytes,5,opt,name=storage_bytes_limit,json=storageBytesLimit,proto3" json:"storage_bytes_limit,omitempty"`// The limit on the size of one uploaded file.UploadBytesLimit *UserUsage_EffectiveLimit `protobuf:"bytes,6,opt,name=upload_bytes_limit,json=uploadBytesLimit,proto3" json:"upload_bytes_limit,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ // The limit on the UTF-8 size in bytes of one memo's content.+ MemoContentBytesLimit *UserUsage_EffectiveLimit `protobuf:"bytes,7,opt,name=memo_content_bytes_limit,json=memoContentBytesLimit,proto3" json:"memo_content_bytes_limit,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *UserUsage) Reset() {@@ -1676,9 +1678,9 @@ func (x *UserUsage) GetStorageBytes() int64 {return 0}-func (x *UserUsage) GetMemosLimit() *UserUsage_EffectiveLimit {+func (x *UserUsage) GetMemoCountLimit() *UserUsage_EffectiveLimit {if x != nil {- return x.MemosLimit+ return x.MemoCountLimit}return nil}@@ -1697,6 +1699,13 @@ func (x *UserUsage) GetUploadBytesLimit() *UserUsage_EffectiveLimit {return nil}+func (x *UserUsage) GetMemoContentBytesLimit() *UserUsage_EffectiveLimit {+ if x != nil {+ return x.MemoContentBytesLimit+ }+ return nil+}+// Request message for UserService.GetUserUsage.type GetUserUsageRequest struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -4999,8 +5008,8 @@ const file_api_user_service_proto_rawDesc = "" +"updateTime\"1\n" +"\x04Role\x12\x14\n" +"\x10ROLE_UNSPECIFIED\x10\x00\x12\t\n" +- "\x05ADMIN\x10\x02\x12\b\n" +- "\x04USER\x10\x03:.\xeaA+\n" ++ "\x05ADMIN\x10\x01\x12\b\n" ++ "\x04USER\x10\x02:.\xeaA+\n" +"\x0ememos.api/User\x12\fusers/{user}*\x05users2\x04user\"\x9d\x01\n" +"\x10ListUsersRequest\x12 \n" +"\tpage_size\x18\x01 \x01(\x05B\x03\xe0A\x01R\bpageSize\x12\"\n" +@@ -5058,8 +5067,8 @@ const file_api_user_service_proto_rawDesc = "" +"\x03Key\x12\x13\n" +"\x0fKEY_UNSPECIFIED\x10\x00\x12\v\n" +"\aGENERAL\x10\x01\x12\f\n" +- "\bWEBHOOKS\x10\x04\x12\b\n" +- "\x04TAGS\x10\x05:V\xeaAS\n" ++ "\bWEBHOOKS\x10\x02\x12\b\n" ++ "\x04TAGS\x10\x03:V\xeaAS\n" +"\x15memos.api/UserSetting\x12\x1fusers/{user}/settings/{setting}*\fuserSettings2\vuserSettingB\a\n" +"\x05value\"\x8f\x01\n" +"\x17ListUserSettingsRequest\x12.\n" +@@ -5113,16 +5122,16 @@ const file_api_user_service_proto_rawDesc = "" +"\x13GetUserStatsRequest\x12*\n" +"\x04name\x18\x01 \x01(\tB\x16\xe0A\x02\xfaA\x10\n" +"\x0ememos.api/UserR\x04name\x12\x1b\n" +- "\x06filter\x18\x02 \x01(\tB\x03\xe0A\x01R\x06filter\"\xff\x03\n" ++ "\x06filter\x18\x02 \x01(\tB\x03\xe0A\x01R\x06filter\"\xe6\x04\n" +"\tUserUsage\x12\x17\n" +"\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12\x1d\n" +"\n" +"memo_count\x18\x02 \x01(\x03R\tmemoCount\x12#\n" +- "\rstorage_bytes\x18\x03 \x01(\x03R\fstorageBytes\x12D\n" +- "\vmemos_limit\x18\x04 \x01(\v2#.memos.api.UserUsage.EffectiveLimitR\n" +- "memosLimit\x12S\n" ++ "\rstorage_bytes\x18\x03 \x01(\x03R\fstorageBytes\x12M\n" ++ "\x10memo_count_limit\x18\x04 \x01(\v2#.memos.api.UserUsage.EffectiveLimitR\x0ememoCountLimit\x12S\n" +"\x13storage_bytes_limit\x18\x05 \x01(\v2#.memos.api.UserUsage.EffectiveLimitR\x11storageBytesLimit\x12Q\n" +- "\x12upload_bytes_limit\x18\x06 \x01(\v2#.memos.api.UserUsage.EffectiveLimitR\x10uploadBytesLimit\x1ab\n" ++ "\x12upload_bytes_limit\x18\x06 \x01(\v2#.memos.api.UserUsage.EffectiveLimitR\x10uploadBytesLimit\x12\\\n" ++ "\x18memo_content_bytes_limit\x18\a \x01(\v2#.memos.api.UserUsage.EffectiveLimitR\x15memoContentBytesLimit\x1ab\n" +"\x0eEffectiveLimit\x12\x14\n" +"\x05value\x18\x01 \x01(\x03R\x05value\x12:\n" +"\vusage_limit\x18\x02 \x01(\tB\x19\xfaA\x16\n" +@@ -5526,124 +5535,125 @@ var file_api_user_service_proto_depIdxs = []int32{78, // 19: memos.api.UserStats.memo_updated_timestamps:type_name -> google.protobuf.Timestamp77, // 20: memos.api.ListUserStatsRequest.state:type_name -> memos.api.State20, // 21: memos.api.ListUserStatsResponse.user_stats:type_name -> memos.api.UserStats- 72, // 22: memos.api.UserUsage.memos_limit:type_name -> memos.api.UserUsage.EffectiveLimit+ 72, // 22: memos.api.UserUsage.memo_count_limit:type_name -> memos.api.UserUsage.EffectiveLimit72, // 23: memos.api.UserUsage.storage_bytes_limit:type_name -> memos.api.UserUsage.EffectiveLimit72, // 24: memos.api.UserUsage.upload_bytes_limit:type_name -> memos.api.UserUsage.EffectiveLimit- 73, // 25: memos.api.MemoView.icon:type_name -> memos.api.MemoView.Icon- 26, // 26: memos.api.ListMemoViewsResponse.memo_views:type_name -> memos.api.MemoView- 26, // 27: memos.api.CreateMemoViewRequest.memo_view:type_name -> memos.api.MemoView- 26, // 28: memos.api.UpdateMemoViewRequest.memo_view:type_name -> memos.api.MemoView- 79, // 29: memos.api.UpdateMemoViewRequest.update_mask:type_name -> google.protobuf.FieldMask- 6, // 30: memos.api.UserNotification.sender_user:type_name -> memos.api.User- 3, // 31: memos.api.UserNotification.type:type_name -> memos.api.UserNotification.Type- 74, // 32: memos.api.UserNotification.memo_comment:type_name -> memos.api.UserNotification.MemoCommentPayload- 75, // 33: memos.api.UserNotification.memo_mention:type_name -> memos.api.UserNotification.MemoMentionPayload- 76, // 34: memos.api.UserNotification.space_invitation:type_name -> memos.api.UserNotification.SpaceInvitationPayload- 2, // 35: memos.api.UserNotification.status:type_name -> memos.api.UserNotification.Status- 78, // 36: memos.api.UserNotification.create_time:type_name -> google.protobuf.Timestamp- 33, // 37: memos.api.ListUserNotificationsResponse.notifications:type_name -> memos.api.UserNotification- 33, // 38: memos.api.UpdateUserNotificationRequest.notification:type_name -> memos.api.UserNotification- 79, // 39: memos.api.UpdateUserNotificationRequest.update_mask:type_name -> google.protobuf.FieldMask- 78, // 40: memos.api.UserWebhook.create_time:type_name -> google.protobuf.Timestamp- 78, // 41: memos.api.UserWebhook.update_time:type_name -> google.protobuf.Timestamp- 38, // 42: memos.api.ListUserWebhooksResponse.webhooks:type_name -> memos.api.UserWebhook- 38, // 43: memos.api.CreateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook- 38, // 44: memos.api.UpdateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook- 79, // 45: memos.api.UpdateUserWebhookRequest.update_mask:type_name -> google.protobuf.FieldMask- 46, // 46: memos.api.ListLinkedIdentitiesResponse.linked_identities:type_name -> memos.api.LinkedIdentity- 78, // 47: memos.api.PersonalAccessToken.create_time:type_name -> google.protobuf.Timestamp- 78, // 48: memos.api.PersonalAccessToken.expire_time:type_name -> google.protobuf.Timestamp- 78, // 49: memos.api.PersonalAccessToken.last_use_time:type_name -> google.protobuf.Timestamp- 52, // 50: memos.api.ListPersonalAccessTokensResponse.personal_access_tokens:type_name -> memos.api.PersonalAccessToken- 52, // 51: memos.api.CreatePersonalAccessTokenResponse.personal_access_token:type_name -> memos.api.PersonalAccessToken- 61, // 52: memos.api.ImportMemosRequest.spec:type_name -> memos.api.ImportMemosSpec- 5, // 53: memos.api.ImportMemosRequest.conflict_policy:type_name -> memos.api.ImportMemosRequest.ConflictPolicy- 62, // 54: memos.api.ImportMemosResponse.plan:type_name -> memos.api.ImportMemosPlan- 63, // 55: memos.api.ImportMemosResponse.report:type_name -> memos.api.ImportMemosReport- 78, // 56: memos.api.ImportMemosPlan.export_time:type_name -> google.protobuf.Timestamp- 64, // 57: memos.api.ImportMemosPlan.warnings:type_name -> memos.api.ImportMemosIssue- 64, // 58: memos.api.ImportMemosReport.warnings:type_name -> memos.api.ImportMemosIssue- 64, // 59: memos.api.ImportMemosReport.failures:type_name -> memos.api.ImportMemosIssue- 38, // 60: memos.api.UserSetting.WebhooksSetting.webhooks:type_name -> memos.api.UserWebhook- 69, // 61: memos.api.UserSetting.TagsSetting.tags:type_name -> memos.api.UserSetting.TagsSetting.TagsEntry- 80, // 62: memos.api.UserSetting.TagMetadata.background_color:type_name -> google.type.Color- 68, // 63: memos.api.UserSetting.TagsSetting.TagsEntry.value:type_name -> memos.api.UserSetting.TagMetadata- 81, // 64: memos.api.UserNotification.SpaceInvitationPayload.space:type_name -> memos.api.Space- 82, // 65: memos.api.UserNotification.SpaceInvitationPayload.role:type_name -> memos.api.SpaceMember.Role- 4, // 66: memos.api.UserNotification.SpaceInvitationPayload.state:type_name -> memos.api.UserNotification.SpaceInvitationPayload.InvitationState- 7, // 67: memos.api.UserService.ListUsers:input_type -> memos.api.ListUsersRequest- 9, // 68: memos.api.UserService.GetUser:input_type -> memos.api.GetUserRequest- 10, // 69: memos.api.UserService.BatchGetUsers:input_type -> memos.api.BatchGetUsersRequest- 12, // 70: memos.api.UserService.CreateUser:input_type -> memos.api.CreateUserRequest- 13, // 71: memos.api.UserService.UpdateUser:input_type -> memos.api.UpdateUserRequest- 14, // 72: memos.api.UserService.DeleteUser:input_type -> memos.api.DeleteUserRequest- 16, // 73: memos.api.UserService.ListUserSettings:input_type -> memos.api.ListUserSettingsRequest- 18, // 74: memos.api.UserService.GetUserSetting:input_type -> memos.api.GetUserSettingRequest- 19, // 75: memos.api.UserService.UpdateUserSetting:input_type -> memos.api.UpdateUserSettingRequest- 21, // 76: memos.api.UserService.ListUserStats:input_type -> memos.api.ListUserStatsRequest- 23, // 77: memos.api.UserService.GetUserStats:input_type -> memos.api.GetUserStatsRequest- 25, // 78: memos.api.UserService.GetUserUsage:input_type -> memos.api.GetUserUsageRequest- 27, // 79: memos.api.UserService.ListMemoViews:input_type -> memos.api.ListMemoViewsRequest- 29, // 80: memos.api.UserService.GetMemoView:input_type -> memos.api.GetMemoViewRequest- 30, // 81: memos.api.UserService.CreateMemoView:input_type -> memos.api.CreateMemoViewRequest- 31, // 82: memos.api.UserService.UpdateMemoView:input_type -> memos.api.UpdateMemoViewRequest- 32, // 83: memos.api.UserService.DeleteMemoView:input_type -> memos.api.DeleteMemoViewRequest- 34, // 84: memos.api.UserService.ListUserNotifications:input_type -> memos.api.ListUserNotificationsRequest- 36, // 85: memos.api.UserService.UpdateUserNotification:input_type -> memos.api.UpdateUserNotificationRequest- 37, // 86: memos.api.UserService.DeleteUserNotification:input_type -> memos.api.DeleteUserNotificationRequest- 39, // 87: memos.api.UserService.ListUserWebhooks:input_type -> memos.api.ListUserWebhooksRequest- 41, // 88: memos.api.UserService.CreateUserWebhook:input_type -> memos.api.CreateUserWebhookRequest- 42, // 89: memos.api.UserService.UpdateUserWebhook:input_type -> memos.api.UpdateUserWebhookRequest- 43, // 90: memos.api.UserService.DeleteUserWebhook:input_type -> memos.api.DeleteUserWebhookRequest- 44, // 91: memos.api.UserService.GetUserWebhookSigningSecret:input_type -> memos.api.GetUserWebhookSigningSecretRequest- 47, // 92: memos.api.UserService.ListLinkedIdentities:input_type -> memos.api.ListLinkedIdentitiesRequest- 49, // 93: memos.api.UserService.GetLinkedIdentity:input_type -> memos.api.GetLinkedIdentityRequest- 50, // 94: memos.api.UserService.CreateLinkedIdentity:input_type -> memos.api.CreateLinkedIdentityRequest- 51, // 95: memos.api.UserService.DeleteLinkedIdentity:input_type -> memos.api.DeleteLinkedIdentityRequest- 53, // 96: memos.api.UserService.ListPersonalAccessTokens:input_type -> memos.api.ListPersonalAccessTokensRequest- 55, // 97: memos.api.UserService.CreatePersonalAccessToken:input_type -> memos.api.CreatePersonalAccessTokenRequest- 57, // 98: memos.api.UserService.DeletePersonalAccessToken:input_type -> memos.api.DeletePersonalAccessTokenRequest- 58, // 99: memos.api.UserService.ExportMemos:input_type -> memos.api.ExportMemosRequest- 59, // 100: memos.api.UserService.ImportMemos:input_type -> memos.api.ImportMemosRequest- 8, // 101: memos.api.UserService.ListUsers:output_type -> memos.api.ListUsersResponse- 6, // 102: memos.api.UserService.GetUser:output_type -> memos.api.User- 11, // 103: memos.api.UserService.BatchGetUsers:output_type -> memos.api.BatchGetUsersResponse- 6, // 104: memos.api.UserService.CreateUser:output_type -> memos.api.User- 6, // 105: memos.api.UserService.UpdateUser:output_type -> memos.api.User- 83, // 106: memos.api.UserService.DeleteUser:output_type -> google.protobuf.Empty- 17, // 107: memos.api.UserService.ListUserSettings:output_type -> memos.api.ListUserSettingsResponse- 15, // 108: memos.api.UserService.GetUserSetting:output_type -> memos.api.UserSetting- 15, // 109: memos.api.UserService.UpdateUserSetting:output_type -> memos.api.UserSetting- 22, // 110: memos.api.UserService.ListUserStats:output_type -> memos.api.ListUserStatsResponse- 20, // 111: memos.api.UserService.GetUserStats:output_type -> memos.api.UserStats- 24, // 112: memos.api.UserService.GetUserUsage:output_type -> memos.api.UserUsage- 28, // 113: memos.api.UserService.ListMemoViews:output_type -> memos.api.ListMemoViewsResponse- 26, // 114: memos.api.UserService.GetMemoView:output_type -> memos.api.MemoView- 26, // 115: memos.api.UserService.CreateMemoView:output_type -> memos.api.MemoView- 26, // 116: memos.api.UserService.UpdateMemoView:output_type -> memos.api.MemoView- 83, // 117: memos.api.UserService.DeleteMemoView:output_type -> google.protobuf.Empty- 35, // 118: memos.api.UserService.ListUserNotifications:output_type -> memos.api.ListUserNotificationsResponse- 33, // 119: memos.api.UserService.UpdateUserNotification:output_type -> memos.api.UserNotification- 83, // 120: memos.api.UserService.DeleteUserNotification:output_type -> google.protobuf.Empty- 40, // 121: memos.api.UserService.ListUserWebhooks:output_type -> memos.api.ListUserWebhooksResponse- 38, // 122: memos.api.UserService.CreateUserWebhook:output_type -> memos.api.UserWebhook- 38, // 123: memos.api.UserService.UpdateUserWebhook:output_type -> memos.api.UserWebhook- 83, // 124: memos.api.UserService.DeleteUserWebhook:output_type -> google.protobuf.Empty- 45, // 125: memos.api.UserService.GetUserWebhookSigningSecret:output_type -> memos.api.GetUserWebhookSigningSecretResponse- 48, // 126: memos.api.UserService.ListLinkedIdentities:output_type -> memos.api.ListLinkedIdentitiesResponse- 46, // 127: memos.api.UserService.GetLinkedIdentity:output_type -> memos.api.LinkedIdentity- 46, // 128: memos.api.UserService.CreateLinkedIdentity:output_type -> memos.api.LinkedIdentity- 83, // 129: memos.api.UserService.DeleteLinkedIdentity:output_type -> google.protobuf.Empty- 54, // 130: memos.api.UserService.ListPersonalAccessTokens:output_type -> memos.api.ListPersonalAccessTokensResponse- 56, // 131: memos.api.UserService.CreatePersonalAccessToken:output_type -> memos.api.CreatePersonalAccessTokenResponse- 83, // 132: memos.api.UserService.DeletePersonalAccessToken:output_type -> google.protobuf.Empty- 84, // 133: memos.api.UserService.ExportMemos:output_type -> google.api.HttpBody- 60, // 134: memos.api.UserService.ImportMemos:output_type -> memos.api.ImportMemosResponse- 101, // [101:135] is the sub-list for method output_type- 67, // [67:101] is the sub-list for method input_type- 67, // [67:67] is the sub-list for extension type_name- 67, // [67:67] is the sub-list for extension extendee- 0, // [0:67] is the sub-list for field type_name+ 72, // 25: memos.api.UserUsage.memo_content_bytes_limit:type_name -> memos.api.UserUsage.EffectiveLimit+ 73, // 26: memos.api.MemoView.icon:type_name -> memos.api.MemoView.Icon+ 26, // 27: memos.api.ListMemoViewsResponse.memo_views:type_name -> memos.api.MemoView+ 26, // 28: memos.api.CreateMemoViewRequest.memo_view:type_name -> memos.api.MemoView+ 26, // 29: memos.api.UpdateMemoViewRequest.memo_view:type_name -> memos.api.MemoView+ 79, // 30: memos.api.UpdateMemoViewRequest.update_mask:type_name -> google.protobuf.FieldMask+ 6, // 31: memos.api.UserNotification.sender_user:type_name -> memos.api.User+ 3, // 32: memos.api.UserNotification.type:type_name -> memos.api.UserNotification.Type+ 74, // 33: memos.api.UserNotification.memo_comment:type_name -> memos.api.UserNotification.MemoCommentPayload+ 75, // 34: memos.api.UserNotification.memo_mention:type_name -> memos.api.UserNotification.MemoMentionPayload+ 76, // 35: memos.api.UserNotification.space_invitation:type_name -> memos.api.UserNotification.SpaceInvitationPayload+ 2, // 36: memos.api.UserNotification.status:type_name -> memos.api.UserNotification.Status+ 78, // 37: memos.api.UserNotification.create_time:type_name -> google.protobuf.Timestamp+ 33, // 38: memos.api.ListUserNotificationsResponse.notifications:type_name -> memos.api.UserNotification+ 33, // 39: memos.api.UpdateUserNotificationRequest.notification:type_name -> memos.api.UserNotification+ 79, // 40: memos.api.UpdateUserNotificationRequest.update_mask:type_name -> google.protobuf.FieldMask+ 78, // 41: memos.api.UserWebhook.create_time:type_name -> google.protobuf.Timestamp+ 78, // 42: memos.api.UserWebhook.update_time:type_name -> google.protobuf.Timestamp+ 38, // 43: memos.api.ListUserWebhooksResponse.webhooks:type_name -> memos.api.UserWebhook+ 38, // 44: memos.api.CreateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook+ 38, // 45: memos.api.UpdateUserWebhookRequest.webhook:type_name -> memos.api.UserWebhook+ 79, // 46: memos.api.UpdateUserWebhookRequest.update_mask:type_name -> google.protobuf.FieldMask+ 46, // 47: memos.api.ListLinkedIdentitiesResponse.linked_identities:type_name -> memos.api.LinkedIdentity+ 78, // 48: memos.api.PersonalAccessToken.create_time:type_name -> google.protobuf.Timestamp+ 78, // 49: memos.api.PersonalAccessToken.expire_time:type_name -> google.protobuf.Timestamp+ 78, // 50: memos.api.PersonalAccessToken.last_use_time:type_name -> google.protobuf.Timestamp+ 52, // 51: memos.api.ListPersonalAccessTokensResponse.personal_access_tokens:type_name -> memos.api.PersonalAccessToken+ 52, // 52: memos.api.CreatePersonalAccessTokenResponse.personal_access_token:type_name -> memos.api.PersonalAccessToken+ 61, // 53: memos.api.ImportMemosRequest.spec:type_name -> memos.api.ImportMemosSpec+ 5, // 54: memos.api.ImportMemosRequest.conflict_policy:type_name -> memos.api.ImportMemosRequest.ConflictPolicy+ 62, // 55: memos.api.ImportMemosResponse.plan:type_name -> memos.api.ImportMemosPlan+ 63, // 56: memos.api.ImportMemosResponse.report:type_name -> memos.api.ImportMemosReport+ 78, // 57: memos.api.ImportMemosPlan.export_time:type_name -> google.protobuf.Timestamp+ 64, // 58: memos.api.ImportMemosPlan.warnings:type_name -> memos.api.ImportMemosIssue+ 64, // 59: memos.api.ImportMemosReport.warnings:type_name -> memos.api.ImportMemosIssue+ 64, // 60: memos.api.ImportMemosReport.failures:type_name -> memos.api.ImportMemosIssue+ 38, // 61: memos.api.UserSetting.WebhooksSetting.webhooks:type_name -> memos.api.UserWebhook+ 69, // 62: memos.api.UserSetting.TagsSetting.tags:type_name -> memos.api.UserSetting.TagsSetting.TagsEntry+ 80, // 63: memos.api.UserSetting.TagMetadata.background_color:type_name -> google.type.Color+ 68, // 64: memos.api.UserSetting.TagsSetting.TagsEntry.value:type_name -> memos.api.UserSetting.TagMetadata+ 81, // 65: memos.api.UserNotification.SpaceInvitationPayload.space:type_name -> memos.api.Space+ 82, // 66: memos.api.UserNotification.SpaceInvitationPayload.role:type_name -> memos.api.SpaceMember.Role+ 4, // 67: memos.api.UserNotification.SpaceInvitationPayload.state:type_name -> memos.api.UserNotification.SpaceInvitationPayload.InvitationState+ 7, // 68: memos.api.UserService.ListUsers:input_type -> memos.api.ListUsersRequest+ 9, // 69: memos.api.UserService.GetUser:input_type -> memos.api.GetUserRequest+ 10, // 70: memos.api.UserService.BatchGetUsers:input_type -> memos.api.BatchGetUsersRequest+ 12, // 71: memos.api.UserService.CreateUser:input_type -> memos.api.CreateUserRequest+ 13, // 72: memos.api.UserService.UpdateUser:input_type -> memos.api.UpdateUserRequest+ 14, // 73: memos.api.UserService.DeleteUser:input_type -> memos.api.DeleteUserRequest+ 16, // 74: memos.api.UserService.ListUserSettings:input_type -> memos.api.ListUserSettingsRequest+ 18, // 75: memos.api.UserService.GetUserSetting:input_type -> memos.api.GetUserSettingRequest+ 19, // 76: memos.api.UserService.UpdateUserSetting:input_type -> memos.api.UpdateUserSettingRequest+ 21, // 77: memos.api.UserService.ListUserStats:input_type -> memos.api.ListUserStatsRequest+ 23, // 78: memos.api.UserService.GetUserStats:input_type -> memos.api.GetUserStatsRequest+ 25, // 79: memos.api.UserService.GetUserUsage:input_type -> memos.api.GetUserUsageRequest+ 27, // 80: memos.api.UserService.ListMemoViews:input_type -> memos.api.ListMemoViewsRequest+ 29, // 81: memos.api.UserService.GetMemoView:input_type -> memos.api.GetMemoViewRequest+ 30, // 82: memos.api.UserService.CreateMemoView:input_type -> memos.api.CreateMemoViewRequest+ 31, // 83: memos.api.UserService.UpdateMemoView:input_type -> memos.api.UpdateMemoViewRequest+ 32, // 84: memos.api.UserService.DeleteMemoView:input_type -> memos.api.DeleteMemoViewRequest+ 34, // 85: memos.api.UserService.ListUserNotifications:input_type -> memos.api.ListUserNotificationsRequest+ 36, // 86: memos.api.UserService.UpdateUserNotification:input_type -> memos.api.UpdateUserNotificationRequest+ 37, // 87: memos.api.UserService.DeleteUserNotification:input_type -> memos.api.DeleteUserNotificationRequest+ 39, // 88: memos.api.UserService.ListUserWebhooks:input_type -> memos.api.ListUserWebhooksRequest+ 41, // 89: memos.api.UserService.CreateUserWebhook:input_type -> memos.api.CreateUserWebhookRequest+ 42, // 90: memos.api.UserService.UpdateUserWebhook:input_type -> memos.api.UpdateUserWebhookRequest+ 43, // 91: memos.api.UserService.DeleteUserWebhook:input_type -> memos.api.DeleteUserWebhookRequest+ 44, // 92: memos.api.UserService.GetUserWebhookSigningSecret:input_type -> memos.api.GetUserWebhookSigningSecretRequest+ 47, // 93: memos.api.UserService.ListLinkedIdentities:input_type -> memos.api.ListLinkedIdentitiesRequest+ 49, // 94: memos.api.UserService.GetLinkedIdentity:input_type -> memos.api.GetLinkedIdentityRequest+ 50, // 95: memos.api.UserService.CreateLinkedIdentity:input_type -> memos.api.CreateLinkedIdentityRequest+ 51, // 96: memos.api.UserService.DeleteLinkedIdentity:input_type -> memos.api.DeleteLinkedIdentityRequest+ 53, // 97: memos.api.UserService.ListPersonalAccessTokens:input_type -> memos.api.ListPersonalAccessTokensRequest+ 55, // 98: memos.api.UserService.CreatePersonalAccessToken:input_type -> memos.api.CreatePersonalAccessTokenRequest+ 57, // 99: memos.api.UserService.DeletePersonalAccessToken:input_type -> memos.api.DeletePersonalAccessTokenRequest+ 58, // 100: memos.api.UserService.ExportMemos:input_type -> memos.api.ExportMemosRequest+ 59, // 101: memos.api.UserService.ImportMemos:input_type -> memos.api.ImportMemosRequest+ 8, // 102: memos.api.UserService.ListUsers:output_type -> memos.api.ListUsersResponse+ 6, // 103: memos.api.UserService.GetUser:output_type -> memos.api.User+ 11, // 104: memos.api.UserService.BatchGetUsers:output_type -> memos.api.BatchGetUsersResponse+ 6, // 105: memos.api.UserService.CreateUser:output_type -> memos.api.User+ 6, // 106: memos.api.UserService.UpdateUser:output_type -> memos.api.User+ 83, // 107: memos.api.UserService.DeleteUser:output_type -> google.protobuf.Empty+ 17, // 108: memos.api.UserService.ListUserSettings:output_type -> memos.api.ListUserSettingsResponse+ 15, // 109: memos.api.UserService.GetUserSetting:output_type -> memos.api.UserSetting+ 15, // 110: memos.api.UserService.UpdateUserSetting:output_type -> memos.api.UserSetting+ 22, // 111: memos.api.UserService.ListUserStats:output_type -> memos.api.ListUserStatsResponse+ 20, // 112: memos.api.UserService.GetUserStats:output_type -> memos.api.UserStats+ 24, // 113: memos.api.UserService.GetUserUsage:output_type -> memos.api.UserUsage+ 28, // 114: memos.api.UserService.ListMemoViews:output_type -> memos.api.ListMemoViewsResponse+ 26, // 115: memos.api.UserService.GetMemoView:output_type -> memos.api.MemoView+ 26, // 116: memos.api.UserService.CreateMemoView:output_type -> memos.api.MemoView+ 26, // 117: memos.api.UserService.UpdateMemoView:output_type -> memos.api.MemoView+ 83, // 118: memos.api.UserService.DeleteMemoView:output_type -> google.protobuf.Empty+ 35, // 119: memos.api.UserService.ListUserNotifications:output_type -> memos.api.ListUserNotificationsResponse+ 33, // 120: memos.api.UserService.UpdateUserNotification:output_type -> memos.api.UserNotification+ 83, // 121: memos.api.UserService.DeleteUserNotification:output_type -> google.protobuf.Empty+ 40, // 122: memos.api.UserService.ListUserWebhooks:output_type -> memos.api.ListUserWebhooksResponse+ 38, // 123: memos.api.UserService.CreateUserWebhook:output_type -> memos.api.UserWebhook+ 38, // 124: memos.api.UserService.UpdateUserWebhook:output_type -> memos.api.UserWebhook+ 83, // 125: memos.api.UserService.DeleteUserWebhook:output_type -> google.protobuf.Empty+ 45, // 126: memos.api.UserService.GetUserWebhookSigningSecret:output_type -> memos.api.GetUserWebhookSigningSecretResponse+ 48, // 127: memos.api.UserService.ListLinkedIdentities:output_type -> memos.api.ListLinkedIdentitiesResponse+ 46, // 128: memos.api.UserService.GetLinkedIdentity:output_type -> memos.api.LinkedIdentity+ 46, // 129: memos.api.UserService.CreateLinkedIdentity:output_type -> memos.api.LinkedIdentity+ 83, // 130: memos.api.UserService.DeleteLinkedIdentity:output_type -> google.protobuf.Empty+ 54, // 131: memos.api.UserService.ListPersonalAccessTokens:output_type -> memos.api.ListPersonalAccessTokensResponse+ 56, // 132: memos.api.UserService.CreatePersonalAccessToken:output_type -> memos.api.CreatePersonalAccessTokenResponse+ 83, // 133: memos.api.UserService.DeletePersonalAccessToken:output_type -> google.protobuf.Empty+ 84, // 134: memos.api.UserService.ExportMemos:output_type -> google.api.HttpBody+ 60, // 135: memos.api.UserService.ImportMemos:output_type -> memos.api.ImportMemosResponse+ 102, // [102:136] is the sub-list for method output_type+ 68, // [68:102] is the sub-list for method input_type+ 68, // [68:68] is the sub-list for extension type_name+ 68, // [68:68] is the sub-list for extension extendee+ 0, // [0:68] is the sub-list for field type_name}func init() { file_api_user_service_proto_init() }diff --git a/proto/gen/openapi.yaml b/proto/gen/openapi.yamlindex 1ad845a0a..4d8e8f057 100644--- a/proto/gen/openapi.yaml+++ b/proto/gen/openapi.yaml@@ -4191,18 +4191,14 @@ components:InstanceSetting_MemoRelatedSetting:type: objectproperties:- contentLengthLimit:- type: integer- description: The maximum memo content length in bytes. Default and minimum is 8192.- format: int32+ enableDoubleClickEdit:+ type: boolean+ description: Whether double-clicking a memo opens it for editing.reactions:type: arrayitems:type: stringdescription: The reactions users can choose from. Defaults to a built-in emoji set when empty.- enableDoubleClickEdit:- type: boolean- description: Whether double-clicking a memo opens it for editing.description: MemoRelatedSetting is the memo-related instance configuration.InstanceSetting_NotificationSetting:type: object@@ -5559,7 +5555,8 @@ components:metric:enum:- METRIC_UNSPECIFIED- - MEMOS+ - MEMO_COUNT+ - MEMO_CONTENT_BYTES- STORAGE_BYTES- UPLOAD_BYTEStype: string@@ -5948,7 +5945,7 @@ components:description: |-The total size in bytes of the user's uploads, including uploads notattached to a memo. External links do not count.- memosLimit:+ memoCountLimit:allOf:- $ref: '#/components/schemas/UserUsage_EffectiveLimit'description: The limit on memo_count.@@ -5960,6 +5957,10 @@ components:allOf:- $ref: '#/components/schemas/UserUsage_EffectiveLimit'description: The limit on the size of one uploaded file.+ memoContentBytesLimit:+ allOf:+ - $ref: '#/components/schemas/UserUsage_EffectiveLimit'+ description: The limit on the UTF-8 size in bytes of one memo's content.description: UserUsage is a user's usage and the usage limits in effect for the user.UserUsage_EffectiveLimit:type: objectdiff --git a/proto/gen/store/attachment.pb.go b/proto/gen/store/attachment.pb.goindex b7a35e5ed..df718ce47 100644--- a/proto/gen/store/attachment.pb.go+++ b/proto/gen/store/attachment.pb.go@@ -629,8 +629,8 @@ type AttachmentPayload struct {//// *AttachmentPayload_S3Object_Payload isAttachmentPayload_Payload `protobuf_oneof:"payload"`- MotionMedia *MotionMedia `protobuf:"bytes,10,opt,name=motion_media,json=motionMedia,proto3" json:"motion_media,omitempty"`- MediaMetadata *MediaMetadata `protobuf:"bytes,11,opt,name=media_metadata,json=mediaMetadata,proto3" json:"media_metadata,omitempty"`+ MotionMedia *MotionMedia `protobuf:"bytes,2,opt,name=motion_media,json=motionMedia,proto3" json:"motion_media,omitempty"`+ MediaMetadata *MediaMetadata `protobuf:"bytes,3,opt,name=media_metadata,json=mediaMetadata,proto3" json:"media_metadata,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -713,7 +713,7 @@ type AttachmentPayload_S3Object struct {// key is the S3 object key.Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`// storage_id identifies the configured storage containing this object.- StorageId string `protobuf:"bytes,4,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"`+ StorageId string `protobuf:"bytes,3,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -822,17 +822,16 @@ const file_store_attachment_proto_rawDesc = "" +"\x10_altitude_meters\"T\n" +"\rVideoMetadata\x12.\n" +"\x10duration_seconds\x18\x01 \x01(\x01H\x00R\x0fdurationSeconds\x88\x01\x01B\x13\n" +- "\x11_duration_seconds\"\xfa\x02\n" ++ "\x11_duration_seconds\"\xde\x02\n" +"\x11AttachmentPayload\x12F\n" +"\ts3_object\x18\x01 \x01(\v2'.memos.store.AttachmentPayload.S3ObjectH\x00R\bs3Object\x12;\n" +- "\fmotion_media\x18\n" +- " \x01(\v2\x18.memos.store.MotionMediaR\vmotionMedia\x12A\n" +- "\x0emedia_metadata\x18\v \x01(\v2\x1a.memos.store.MediaMetadataR\rmediaMetadata\x1a\x91\x01\n" ++ "\fmotion_media\x18\x02 \x01(\v2\x18.memos.store.MotionMediaR\vmotionMedia\x12A\n" ++ "\x0emedia_metadata\x18\x03 \x01(\v2\x1a.memos.store.MediaMetadataR\rmediaMetadata\x1av\n" +"\bS3Object\x129\n" +"\ts3_config\x18\x01 \x01(\v2\x1c.memos.store.StorageS3ConfigR\bs3Config\x12\x10\n" +"\x03key\x18\x02 \x01(\tR\x03key\x12\x1d\n" +"\n" +- "storage_id\x18\x04 \x01(\tR\tstorageIdJ\x04\b\x03\x10\x04R\x13last_presigned_timeB\t\n" ++ "storage_id\x18\x03 \x01(\tR\tstorageIdB\t\n" +"\apayload*a\n" +"\x15AttachmentStorageType\x12'\n" +"#ATTACHMENT_STORAGE_TYPE_UNSPECIFIED\x10\x00\x12\t\n" +diff --git a/proto/gen/store/instance_setting.pb.go b/proto/gen/store/instance_setting.pb.goindex e781b336d..c77fb94af 100644--- a/proto/gen/store/instance_setting.pb.go+++ b/proto/gen/store/instance_setting.pb.go@@ -10,6 +10,7 @@ import (color "google.golang.org/genproto/googleapis/type/color"protoreflect "google.golang.org/protobuf/reflect/protoreflect"protoimpl "google.golang.org/protobuf/runtime/protoimpl"+ emptypb "google.golang.org/protobuf/types/known/emptypb"timestamppb "google.golang.org/protobuf/types/known/timestamppb"reflect "reflect"sync "sync"@@ -316,28 +317,32 @@ type InstanceUsageLimitsSetting_Metric int32const (InstanceUsageLimitsSetting_METRIC_UNSPECIFIED InstanceUsageLimitsSetting_Metric = 0- // MEMOS limits the number of memos a user created, comments included.- InstanceUsageLimitsSetting_MEMOS InstanceUsageLimitsSetting_Metric = 1+ // MEMO_COUNT limits the number of memos a user created, comments included.+ InstanceUsageLimitsSetting_MEMO_COUNT InstanceUsageLimitsSetting_Metric = 1+ // MEMO_CONTENT_BYTES limits the UTF-8 size of one memo's content.+ InstanceUsageLimitsSetting_MEMO_CONTENT_BYTES InstanceUsageLimitsSetting_Metric = 2// STORAGE_BYTES limits the total size of a user's uploads. External links// do not count.- InstanceUsageLimitsSetting_STORAGE_BYTES InstanceUsageLimitsSetting_Metric = 2+ InstanceUsageLimitsSetting_STORAGE_BYTES InstanceUsageLimitsSetting_Metric = 3// UPLOAD_BYTES limits the size of one uploaded file.- InstanceUsageLimitsSetting_UPLOAD_BYTES InstanceUsageLimitsSetting_Metric = 3+ InstanceUsageLimitsSetting_UPLOAD_BYTES InstanceUsageLimitsSetting_Metric = 4)// Enum value maps for InstanceUsageLimitsSetting_Metric.var (InstanceUsageLimitsSetting_Metric_name = map[int32]string{0: "METRIC_UNSPECIFIED",- 1: "MEMOS",- 2: "STORAGE_BYTES",- 3: "UPLOAD_BYTES",+ 1: "MEMO_COUNT",+ 2: "MEMO_CONTENT_BYTES",+ 3: "STORAGE_BYTES",+ 4: "UPLOAD_BYTES",}InstanceUsageLimitsSetting_Metric_value = map[string]int32{"METRIC_UNSPECIFIED": 0,- "MEMOS": 1,- "STORAGE_BYTES": 2,- "UPLOAD_BYTES": 3,+ "MEMO_COUNT": 1,+ "MEMO_CONTENT_BYTES": 2,+ "STORAGE_BYTES": 3,+ "UPLOAD_BYTES": 4,})@@ -627,23 +632,23 @@ func (x *InstanceBasicSetting) GetSchemaVersion() string {type InstanceGeneralSetting struct {state protoimpl.MessageState `protogen:"open.v1"`// disallow_user_registration disallows user registration.- DisallowUserRegistration bool `protobuf:"varint,2,opt,name=disallow_user_registration,json=disallowUserRegistration,proto3" json:"disallow_user_registration,omitempty"`+ DisallowUserRegistration bool `protobuf:"varint,1,opt,name=disallow_user_registration,json=disallowUserRegistration,proto3" json:"disallow_user_registration,omitempty"`// disallow_password_auth disallows password authentication.- DisallowPasswordAuth bool `protobuf:"varint,3,opt,name=disallow_password_auth,json=disallowPasswordAuth,proto3" json:"disallow_password_auth,omitempty"`+ DisallowPasswordAuth bool `protobuf:"varint,2,opt,name=disallow_password_auth,json=disallowPasswordAuth,proto3" json:"disallow_password_auth,omitempty"`// additional_script is the additional script.- AdditionalScript string `protobuf:"bytes,4,opt,name=additional_script,json=additionalScript,proto3" json:"additional_script,omitempty"`+ AdditionalScript string `protobuf:"bytes,3,opt,name=additional_script,json=additionalScript,proto3" json:"additional_script,omitempty"`// additional_style is the additional style.- AdditionalStyle string `protobuf:"bytes,5,opt,name=additional_style,json=additionalStyle,proto3" json:"additional_style,omitempty"`+ AdditionalStyle string `protobuf:"bytes,4,opt,name=additional_style,json=additionalStyle,proto3" json:"additional_style,omitempty"`// custom_profile is the custom profile.- CustomProfile *InstanceCustomProfile `protobuf:"bytes,6,opt,name=custom_profile,json=customProfile,proto3" json:"custom_profile,omitempty"`+ CustomProfile *InstanceCustomProfile `protobuf:"bytes,5,opt,name=custom_profile,json=customProfile,proto3" json:"custom_profile,omitempty"`// week_start_day_offset is the week start day offset from Sunday.// 0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday// Default is Sunday.- WeekStartDayOffset int32 `protobuf:"varint,7,opt,name=week_start_day_offset,json=weekStartDayOffset,proto3" json:"week_start_day_offset,omitempty"`+ WeekStartDayOffset int32 `protobuf:"varint,6,opt,name=week_start_day_offset,json=weekStartDayOffset,proto3" json:"week_start_day_offset,omitempty"`// disallow_change_username disallows changing username.- DisallowChangeUsername bool `protobuf:"varint,8,opt,name=disallow_change_username,json=disallowChangeUsername,proto3" json:"disallow_change_username,omitempty"`+ DisallowChangeUsername bool `protobuf:"varint,7,opt,name=disallow_change_username,json=disallowChangeUsername,proto3" json:"disallow_change_username,omitempty"`// disallow_change_nickname disallows changing nickname.- DisallowChangeNickname bool `protobuf:"varint,9,opt,name=disallow_change_nickname,json=disallowChangeNickname,proto3" json:"disallow_change_nickname,omitempty"`+ DisallowChangeNickname bool `protobuf:"varint,8,opt,name=disallow_change_nickname,json=disallowChangeNickname,proto3" json:"disallow_change_nickname,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -882,7 +887,7 @@ type isStorage_Config interface {}type Storage_S3Config struct {- S3Config *StorageS3Config `protobuf:"bytes,10,opt,name=s3_config,json=s3Config,proto3,oneof"`+ S3Config *StorageS3Config `protobuf:"bytes,4,opt,name=s3_config,json=s3Config,proto3,oneof"`}func (*Storage_S3Config) isStorage_Config() {}@@ -1068,12 +1073,10 @@ func (x *StorageS3Config) GetInsecureSkipTlsVerify() bool {type InstanceMemoRelatedSetting struct {state protoimpl.MessageState `protogen:"open.v1"`- // content_length_limit is the limit of content length. Unit is byte.- ContentLengthLimit int32 `protobuf:"varint,3,opt,name=content_length_limit,json=contentLengthLimit,proto3" json:"content_length_limit,omitempty"`// enable_double_click_edit enables editing on double click.- EnableDoubleClickEdit bool `protobuf:"varint,4,opt,name=enable_double_click_edit,json=enableDoubleClickEdit,proto3" json:"enable_double_click_edit,omitempty"`+ EnableDoubleClickEdit bool `protobuf:"varint,1,opt,name=enable_double_click_edit,json=enableDoubleClickEdit,proto3" json:"enable_double_click_edit,omitempty"`// reactions is the list of reactions.- Reactions []string `protobuf:"bytes,7,rep,name=reactions,proto3" json:"reactions,omitempty"`+ Reactions []string `protobuf:"bytes,2,rep,name=reactions,proto3" json:"reactions,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -1108,13 +1111,6 @@ func (*InstanceMemoRelatedSetting) Descriptor() ([]byte, []int) {return file_store_instance_setting_proto_rawDescGZIP(), []int{7}}-func (x *InstanceMemoRelatedSetting) GetContentLengthLimit() int32 {- if x != nil {- return x.ContentLengthLimit- }- return 0-}-func (x *InstanceMemoRelatedSetting) GetEnableDoubleClickEdit() bool {if x != nil {return x.EnableDoubleClickEdit@@ -1542,7 +1538,7 @@ func (x *InstanceAccessSetting) GetAccessMode() InstanceAccessMode {}// InstanceUsageLimitsSetting holds every usage limit of the instance. A limit-// applies to one user, or to every user when user_id is 0. For each metric, a+// applies to one user, or independently to every user. For each metric, a// user's own limit replaces the default.type InstanceUsageLimitsSetting struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -1709,12 +1705,17 @@ type InstanceUsageLimitsSetting_UsageLimit struct {// uid is the {usage_limit} segment of the usageLimits/{usage_limit} name.Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`Metric InstanceUsageLimitsSetting_Metric `protobuf:"varint,2,opt,name=metric,proto3,enum=memos.store.InstanceUsageLimitsSetting_Metric" json:"metric,omitempty"`- // user_id is the user the limit applies to. 0 means every user.- UserId int32 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`+ // Exactly one target must be set.+ //+ // Types that are valid to be assigned to Target:+ //+ // *InstanceUsageLimitsSetting_UsageLimit_AllUsers+ // *InstanceUsageLimitsSetting_UsageLimit_UserId+ Target isInstanceUsageLimitsSetting_UsageLimit_Target `protobuf_oneof:"target"`// value is the limit. 0 means unlimited.- Value int64 `protobuf:"varint,4,opt,name=value,proto3" json:"value,omitempty"`- CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`- UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`+ Value int64 `protobuf:"varint,5,opt,name=value,proto3" json:"value,omitempty"`+ CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`+ UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -1763,9 +1764,27 @@ func (x *InstanceUsageLimitsSetting_UsageLimit) GetMetric() InstanceUsageLimitsSreturn InstanceUsageLimitsSetting_METRIC_UNSPECIFIED}+func (x *InstanceUsageLimitsSetting_UsageLimit) GetTarget() isInstanceUsageLimitsSetting_UsageLimit_Target {+ if x != nil {+ return x.Target+ }+ return nil+}++func (x *InstanceUsageLimitsSetting_UsageLimit) GetAllUsers() *emptypb.Empty {+ if x != nil {+ if x, ok := x.Target.(*InstanceUsageLimitsSetting_UsageLimit_AllUsers); ok {+ return x.AllUsers+ }+ }+ return nil+}+func (x *InstanceUsageLimitsSetting_UsageLimit) GetUserId() int32 {if x != nil {- return x.UserId+ if x, ok := x.Target.(*InstanceUsageLimitsSetting_UsageLimit_UserId); ok {+ return x.UserId+ }}return 0}@@ -1791,11 +1810,31 @@ func (x *InstanceUsageLimitsSetting_UsageLimit) GetUpdateTime() *timestamppb.Timreturn nil}+type isInstanceUsageLimitsSetting_UsageLimit_Target interface {+ isInstanceUsageLimitsSetting_UsageLimit_Target()+}++type InstanceUsageLimitsSetting_UsageLimit_AllUsers struct {+ // The default limit applied independently to every user.+ AllUsers *emptypb.Empty `protobuf:"bytes,3,opt,name=all_users,json=allUsers,proto3,oneof"`+}++type InstanceUsageLimitsSetting_UsageLimit_UserId struct {+ // The user this limit applies to. Must be positive.+ UserId int32 `protobuf:"varint,4,opt,name=user_id,json=userId,proto3,oneof"`+}++func (*InstanceUsageLimitsSetting_UsageLimit_AllUsers) isInstanceUsageLimitsSetting_UsageLimit_Target() {+}++func (*InstanceUsageLimitsSetting_UsageLimit_UserId) isInstanceUsageLimitsSetting_UsageLimit_Target() {+}+var File_store_instance_setting_proto protoreflect.FileDescriptorconst file_store_instance_setting_proto_rawDesc = "" +"\n" +- "\x1cstore/instance_setting.proto\x12\vmemos.store\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/type/color.proto\"\xa5\x06\n" ++ "\x1cstore/instance_setting.proto\x12\vmemos.store\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/type/color.proto\"\xa5\x06\n" +"\x0fInstanceSetting\x121\n" +"\x03key\x18\x01 \x01(\x0e2\x1f.memos.store.InstanceSettingKeyR\x03key\x12H\n" +"\rbasic_setting\x18\x02 \x01(\v2!.memos.store.InstanceBasicSettingH\x00R\fbasicSetting\x12N\n" +@@ -1815,14 +1854,14 @@ const file_store_instance_setting_proto_rawDesc = "" +"secret_key\x18\x01 \x01(\tR\tsecretKey\x12%\n" +"\x0eschema_version\x18\x02 \x01(\tR\rschemaVersion\"\xd6\x03\n" +"\x16InstanceGeneralSetting\x12<\n" +- "\x1adisallow_user_registration\x18\x02 \x01(\bR\x18disallowUserRegistration\x124\n" +- "\x16disallow_password_auth\x18\x03 \x01(\bR\x14disallowPasswordAuth\x12+\n" +- "\x11additional_script\x18\x04 \x01(\tR\x10additionalScript\x12)\n" +- "\x10additional_style\x18\x05 \x01(\tR\x0fadditionalStyle\x12I\n" +- "\x0ecustom_profile\x18\x06 \x01(\v2\".memos.store.InstanceCustomProfileR\rcustomProfile\x121\n" +- "\x15week_start_day_offset\x18\a \x01(\x05R\x12weekStartDayOffset\x128\n" +- "\x18disallow_change_username\x18\b \x01(\bR\x16disallowChangeUsername\x128\n" +- "\x18disallow_change_nickname\x18\t \x01(\bR\x16disallowChangeNickname\"j\n" ++ "\x1adisallow_user_registration\x18\x01 \x01(\bR\x18disallowUserRegistration\x124\n" ++ "\x16disallow_password_auth\x18\x02 \x01(\bR\x14disallowPasswordAuth\x12+\n" ++ "\x11additional_script\x18\x03 \x01(\tR\x10additionalScript\x12)\n" ++ "\x10additional_style\x18\x04 \x01(\tR\x0fadditionalStyle\x12I\n" ++ "\x0ecustom_profile\x18\x05 \x01(\v2\".memos.store.InstanceCustomProfileR\rcustomProfile\x121\n" ++ "\x15week_start_day_offset\x18\x06 \x01(\x05R\x12weekStartDayOffset\x128\n" ++ "\x18disallow_change_username\x18\a \x01(\bR\x16disallowChangeUsername\x128\n" ++ "\x18disallow_change_nickname\x18\b \x01(\bR\x16disallowChangeNickname\"j\n" +"\x15InstanceCustomProfile\x12\x14\n" +"\x05title\x18\x01 \x01(\tR\x05title\x12 \n" +"\vdescription\x18\x02 \x01(\tR\vdescription\x12\x19\n" +@@ -1831,8 +1870,7 @@ const file_store_instance_setting_proto_rawDesc = "" +"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +"\x04name\x18\x02 \x01(\tR\x04name\x12,\n" +"\x04type\x18\x03 \x01(\x0e2\x18.memos.store.StorageTypeR\x04type\x12;\n" +- "\ts3_config\x18\n" +- " \x01(\v2\x1c.memos.store.StorageS3ConfigH\x00R\bs3ConfigB\b\n" ++ "\ts3_config\x18\x04 \x01(\v2\x1c.memos.store.StorageS3ConfigH\x00R\bs3ConfigB\b\n" +"\x06config\"\x82\x03\n" +"\x16InstanceStorageSetting\x12R\n" +"\fstorage_type\x18\x01 \x01(\x0e2/.memos.store.InstanceStorageSetting.StorageTypeR\vstorageType\x12+\n" +@@ -1852,11 +1890,10 @@ const file_store_instance_setting_proto_rawDesc = "" +"\x06region\x18\x04 \x01(\tR\x06region\x12\x16\n" +"\x06bucket\x18\x05 \x01(\tR\x06bucket\x12$\n" +"\x0euse_path_style\x18\x06 \x01(\bR\fusePathStyle\x127\n" +- "\x18insecure_skip_tls_verify\x18\a \x01(\bR\x15insecureSkipTlsVerify\"\xc5\x01\n" +- "\x1aInstanceMemoRelatedSetting\x120\n" +- "\x14content_length_limit\x18\x03 \x01(\x05R\x12contentLengthLimit\x127\n" +- "\x18enable_double_click_edit\x18\x04 \x01(\bR\x15enableDoubleClickEdit\x12\x1c\n" +- "\treactions\x18\a \x03(\tR\treactionsJ\x04\b\x02\x10\x03R\x18display_with_update_time\"w\n" ++ "\x18insecure_skip_tls_verify\x18\a \x01(\bR\x15insecureSkipTlsVerify\"s\n" ++ "\x1aInstanceMemoRelatedSetting\x127\n" ++ "\x18enable_double_click_edit\x18\x01 \x01(\bR\x15enableDoubleClickEdit\x12\x1c\n" ++ "\treactions\x18\x02 \x03(\tR\treactions\"w\n" +"\x13InstanceTagMetadata\x12=\n" +"\x10background_color\x18\x01 \x01(\v2\x12.google.type.ColorR\x0fbackgroundColor\x12!\n" +"\fblur_content\x18\x02 \x01(\bR\vblurContent\"\xb0\x01\n" +@@ -1897,24 +1934,28 @@ const file_store_instance_setting_proto_rawDesc = "" +"\x06prompt\x18\x04 \x01(\tR\x06prompt\"Y\n" +"\x15InstanceAccessSetting\x12@\n" +"\vaccess_mode\x18\x01 \x01(\x0e2\x1f.memos.store.InstanceAccessModeR\n" +- "accessMode\"\xcc\x03\n" ++ "accessMode\"\xac\x04\n" +"\x1aInstanceUsageLimitsSetting\x12J\n" +- "\x06limits\x18\x01 \x03(\v22.memos.store.InstanceUsageLimitsSetting.UsageLimitR\x06limits\x1a\x8f\x02\n" ++ "\x06limits\x18\x01 \x03(\v22.memos.store.InstanceUsageLimitsSetting.UsageLimitR\x06limits\x1a\xd2\x02\n" +"\n" +"UsageLimit\x12\x10\n" +"\x03uid\x18\x01 \x01(\tR\x03uid\x12F\n" +- "\x06metric\x18\x02 \x01(\x0e2..memos.store.InstanceUsageLimitsSetting.MetricR\x06metric\x12\x17\n" +- "\auser_id\x18\x03 \x01(\x05R\x06userId\x12\x14\n" +- "\x05value\x18\x04 \x01(\x03R\x05value\x12;\n" +- "\vcreate_time\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\n" ++ "\x06metric\x18\x02 \x01(\x0e2..memos.store.InstanceUsageLimitsSetting.MetricR\x06metric\x125\n" ++ "\tall_users\x18\x03 \x01(\v2\x16.google.protobuf.EmptyH\x00R\ballUsers\x12\x19\n" ++ "\auser_id\x18\x04 \x01(\x05H\x00R\x06userId\x12\x14\n" ++ "\x05value\x18\x05 \x01(\x03R\x05value\x12;\n" ++ "\vcreate_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\n" +"createTime\x12;\n" +- "\vupdate_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\n" +- "updateTime\"P\n" ++ "\vupdate_time\x18\a \x01(\v2\x1a.google.protobuf.TimestampR\n" ++ "updateTimeB\b\n" ++ "\x06target\"m\n" +"\x06Metric\x12\x16\n" +- "\x12METRIC_UNSPECIFIED\x10\x00\x12\t\n" +- "\x05MEMOS\x10\x01\x12\x11\n" +- "\rSTORAGE_BYTES\x10\x02\x12\x10\n" +- "\fUPLOAD_BYTES\x10\x03*\xb3\x01\n" ++ "\x12METRIC_UNSPECIFIED\x10\x00\x12\x0e\n" ++ "\n" ++ "MEMO_COUNT\x10\x01\x12\x16\n" ++ "\x12MEMO_CONTENT_BYTES\x10\x02\x12\x11\n" ++ "\rSTORAGE_BYTES\x10\x03\x12\x10\n" ++ "\fUPLOAD_BYTES\x10\x04*\xb3\x01\n" +"\x12InstanceSettingKey\x12$\n" +" INSTANCE_SETTING_KEY_UNSPECIFIED\x10\x00\x12\t\n" +"\x05BASIC\x10\x01\x12\v\n" +@@ -1985,7 +2026,8 @@ var file_store_instance_setting_proto_goTypes = []any{(*InstanceNotificationSetting_EmailSetting)(nil), // 23: memos.store.InstanceNotificationSetting.EmailSetting(*InstanceUsageLimitsSetting_UsageLimit)(nil), // 24: memos.store.InstanceUsageLimitsSetting.UsageLimit(*color.Color)(nil), // 25: google.type.Color- (*timestamppb.Timestamp)(nil), // 26: google.protobuf.Timestamp+ (*emptypb.Empty)(nil), // 26: google.protobuf.Empty+ (*timestamppb.Timestamp)(nil), // 27: google.protobuf.Timestamp}var file_store_instance_setting_proto_depIdxs = []int32{0, // 0: memos.store.InstanceSetting.key:type_name -> memos.store.InstanceSettingKey@@ -2014,13 +2056,14 @@ var file_store_instance_setting_proto_depIdxs = []int32{24, // 23: memos.store.InstanceUsageLimitsSetting.limits:type_name -> memos.store.InstanceUsageLimitsSetting.UsageLimit14, // 24: memos.store.InstanceTagsSetting.TagsEntry.value:type_name -> memos.store.InstanceTagMetadata5, // 25: memos.store.InstanceUsageLimitsSetting.UsageLimit.metric:type_name -> memos.store.InstanceUsageLimitsSetting.Metric- 26, // 26: memos.store.InstanceUsageLimitsSetting.UsageLimit.create_time:type_name -> google.protobuf.Timestamp- 26, // 27: memos.store.InstanceUsageLimitsSetting.UsageLimit.update_time:type_name -> google.protobuf.Timestamp- 28, // [28:28] is the sub-list for method output_type- 28, // [28:28] is the sub-list for method input_type- 28, // [28:28] is the sub-list for extension type_name- 28, // [28:28] is the sub-list for extension extendee- 0, // [0:28] is the sub-list for field type_name+ 26, // 26: memos.store.InstanceUsageLimitsSetting.UsageLimit.all_users:type_name -> google.protobuf.Empty+ 27, // 27: memos.store.InstanceUsageLimitsSetting.UsageLimit.create_time:type_name -> google.protobuf.Timestamp+ 27, // 28: memos.store.InstanceUsageLimitsSetting.UsageLimit.update_time:type_name -> google.protobuf.Timestamp+ 29, // [29:29] is the sub-list for method output_type+ 29, // [29:29] is the sub-list for method input_type+ 29, // [29:29] is the sub-list for extension type_name+ 29, // [29:29] is the sub-list for extension extendee+ 0, // [0:29] is the sub-list for field type_name}func init() { file_store_instance_setting_proto_init() }@@ -2042,6 +2085,10 @@ func file_store_instance_setting_proto_init() {file_store_instance_setting_proto_msgTypes[4].OneofWrappers = []any{(*Storage_S3Config)(nil),}+ file_store_instance_setting_proto_msgTypes[18].OneofWrappers = []any{+ (*InstanceUsageLimitsSetting_UsageLimit_AllUsers)(nil),+ (*InstanceUsageLimitsSetting_UsageLimit_UserId)(nil),+ }type x struct{}out := protoimpl.TypeBuilder{File: protoimpl.DescBuilder{diff --git a/proto/gen/store/user_setting.pb.go b/proto/gen/store/user_setting.pb.goindex 8a09555f6..edf81878a 100644--- a/proto/gen/store/user_setting.pb.go+++ b/proto/gen/store/user_setting.pb.go@@ -30,15 +30,15 @@ const (// General user settings.UserSetting_GENERAL UserSetting_Key = 1// The memo views of the user.- UserSetting_MEMO_VIEWS UserSetting_Key = 4+ UserSetting_MEMO_VIEWS UserSetting_Key = 2// The webhooks of the user.- UserSetting_WEBHOOKS UserSetting_Key = 5+ UserSetting_WEBHOOKS UserSetting_Key = 3// Refresh tokens for the user.- UserSetting_REFRESH_TOKENS UserSetting_Key = 6+ UserSetting_REFRESH_TOKENS UserSetting_Key = 4// Personal access tokens for the user.- UserSetting_PERSONAL_ACCESS_TOKENS UserSetting_Key = 7+ UserSetting_PERSONAL_ACCESS_TOKENS UserSetting_Key = 5// Per-user tag metadata.- UserSetting_TAGS UserSetting_Key = 8+ UserSetting_TAGS UserSetting_Key = 6)// Enum value maps for UserSetting_Key.@@ -46,20 +46,20 @@ var (UserSetting_Key_name = map[int32]string{0: "KEY_UNSPECIFIED",1: "GENERAL",- 4: "MEMO_VIEWS",- 5: "WEBHOOKS",- 6: "REFRESH_TOKENS",- 7: "PERSONAL_ACCESS_TOKENS",- 8: "TAGS",+ 2: "MEMO_VIEWS",+ 3: "WEBHOOKS",+ 4: "REFRESH_TOKENS",+ 5: "PERSONAL_ACCESS_TOKENS",+ 6: "TAGS",}UserSetting_Key_value = map[string]int32{"KEY_UNSPECIFIED": 0,"GENERAL": 1,- "MEMO_VIEWS": 4,- "WEBHOOKS": 5,- "REFRESH_TOKENS": 6,- "PERSONAL_ACCESS_TOKENS": 7,- "TAGS": 8,+ "MEMO_VIEWS": 2,+ "WEBHOOKS": 3,+ "REFRESH_TOKENS": 4,+ "PERSONAL_ACCESS_TOKENS": 5,+ "TAGS": 6,})@@ -221,23 +221,23 @@ type UserSetting_General struct {}type UserSetting_MemoViews struct {- MemoViews *MemoViewsUserSetting `protobuf:"bytes,6,opt,name=memo_views,json=memoViews,proto3,oneof"`+ MemoViews *MemoViewsUserSetting `protobuf:"bytes,4,opt,name=memo_views,json=memoViews,proto3,oneof"`}type UserSetting_Webhooks struct {- Webhooks *WebhooksUserSetting `protobuf:"bytes,7,opt,name=webhooks,proto3,oneof"`+ Webhooks *WebhooksUserSetting `protobuf:"bytes,5,opt,name=webhooks,proto3,oneof"`}type UserSetting_RefreshTokens struct {- RefreshTokens *RefreshTokensUserSetting `protobuf:"bytes,8,opt,name=refresh_tokens,json=refreshTokens,proto3,oneof"`+ RefreshTokens *RefreshTokensUserSetting `protobuf:"bytes,6,opt,name=refresh_tokens,json=refreshTokens,proto3,oneof"`}type UserSetting_PersonalAccessTokens struct {- PersonalAccessTokens *PersonalAccessTokensUserSetting `protobuf:"bytes,9,opt,name=personal_access_tokens,json=personalAccessTokens,proto3,oneof"`+ PersonalAccessTokens *PersonalAccessTokensUserSetting `protobuf:"bytes,7,opt,name=personal_access_tokens,json=personalAccessTokens,proto3,oneof"`}type UserSetting_Tags struct {- Tags *TagsUserSetting `protobuf:"bytes,10,opt,name=tags,proto3,oneof"`+ Tags *TagsUserSetting `protobuf:"bytes,8,opt,name=tags,proto3,oneof"`}func (*UserSetting_General) isUserSetting_Value() {}@@ -1090,21 +1090,20 @@ const file_store_user_setting_proto_rawDesc = "" +"\x03key\x18\x02 \x01(\x0e2\x1c.memos.store.UserSetting.KeyR\x03key\x12;\n" +"\ageneral\x18\x03 \x01(\v2\x1f.memos.store.GeneralUserSettingH\x00R\ageneral\x12B\n" +"\n" +- "memo_views\x18\x06 \x01(\v2!.memos.store.MemoViewsUserSettingH\x00R\tmemoViews\x12>\n" +- "\bwebhooks\x18\a \x01(\v2 .memos.store.WebhooksUserSettingH\x00R\bwebhooks\x12N\n" +- "\x0erefresh_tokens\x18\b \x01(\v2%.memos.store.RefreshTokensUserSettingH\x00R\rrefreshTokens\x12d\n" +- "\x16personal_access_tokens\x18\t \x01(\v2,.memos.store.PersonalAccessTokensUserSettingH\x00R\x14personalAccessTokens\x122\n" +- "\x04tags\x18\n" +- " \x01(\v2\x1c.memos.store.TagsUserSettingH\x00R\x04tags\"\x7f\n" ++ "memo_views\x18\x04 \x01(\v2!.memos.store.MemoViewsUserSettingH\x00R\tmemoViews\x12>\n" ++ "\bwebhooks\x18\x05 \x01(\v2 .memos.store.WebhooksUserSettingH\x00R\bwebhooks\x12N\n" ++ "\x0erefresh_tokens\x18\x06 \x01(\v2%.memos.store.RefreshTokensUserSettingH\x00R\rrefreshTokens\x12d\n" ++ "\x16personal_access_tokens\x18\a \x01(\v2,.memos.store.PersonalAccessTokensUserSettingH\x00R\x14personalAccessTokens\x122\n" ++ "\x04tags\x18\b \x01(\v2\x1c.memos.store.TagsUserSettingH\x00R\x04tags\"\x7f\n" +"\x03Key\x12\x13\n" +"\x0fKEY_UNSPECIFIED\x10\x00\x12\v\n" +"\aGENERAL\x10\x01\x12\x0e\n" +"\n" +- "MEMO_VIEWS\x10\x04\x12\f\n" +- "\bWEBHOOKS\x10\x05\x12\x12\n" +- "\x0eREFRESH_TOKENS\x10\x06\x12\x1a\n" +- "\x16PERSONAL_ACCESS_TOKENS\x10\a\x12\b\n" +- "\x04TAGS\x10\bB\a\n" ++ "MEMO_VIEWS\x10\x02\x12\f\n" ++ "\bWEBHOOKS\x10\x03\x12\x12\n" ++ "\x0eREFRESH_TOKENS\x10\x04\x12\x1a\n" ++ "\x16PERSONAL_ACCESS_TOKENS\x10\x05\x12\b\n" ++ "\x04TAGS\x10\x06B\a\n" +"\x05value\"\x9b\x01\n" +"\x12GeneralUserSetting\x12\x16\n" +"\x06locale\x18\x01 \x01(\tR\x06locale\x12'\n" +diff --git a/proto/store/attachment.proto b/proto/store/attachment.protoindex bcc70ab1d..d476e53de 100644--- a/proto/store/attachment.proto+++ b/proto/store/attachment.proto@@ -80,8 +80,8 @@ message AttachmentPayload {S3Object s3_object = 1;}- MotionMedia motion_media = 10;- MediaMetadata media_metadata = 11;+ MotionMedia motion_media = 2;+ MediaMetadata media_metadata = 3;message S3Object {// Legacy attachments embedded their complete S3 configuration.@@ -89,10 +89,7 @@ message AttachmentPayload {StorageS3Config s3_config = 1;// key is the S3 object key.string key = 2;- // Field 3 held last_presigned_time before presigned attachment URLs were removed.- reserved 3;- reserved "last_presigned_time";// storage_id identifies the configured storage containing this object.- string storage_id = 4;+ string storage_id = 3;}}diff --git a/proto/store/instance_setting.proto b/proto/store/instance_setting.protoindex f405160b9..0a35711e8 100644--- a/proto/store/instance_setting.proto+++ b/proto/store/instance_setting.proto@@ -2,6 +2,7 @@ syntax = "proto3";package memos.store;+import "google/protobuf/empty.proto";import "google/protobuf/timestamp.proto";import "google/type/color.proto";@@ -54,23 +55,23 @@ message InstanceBasicSetting {message InstanceGeneralSetting {// disallow_user_registration disallows user registration.- bool disallow_user_registration = 2;+ bool disallow_user_registration = 1;// disallow_password_auth disallows password authentication.- bool disallow_password_auth = 3;+ bool disallow_password_auth = 2;// additional_script is the additional script.- string additional_script = 4;+ string additional_script = 3;// additional_style is the additional style.- string additional_style = 5;+ string additional_style = 4;// custom_profile is the custom profile.- InstanceCustomProfile custom_profile = 6;+ InstanceCustomProfile custom_profile = 5;// week_start_day_offset is the week start day offset from Sunday.// 0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday// Default is Sunday.- int32 week_start_day_offset = 7;+ int32 week_start_day_offset = 6;// disallow_change_username disallows changing username.- bool disallow_change_username = 8;+ bool disallow_change_username = 7;// disallow_change_nickname disallows changing nickname.- bool disallow_change_nickname = 9;+ bool disallow_change_nickname = 8;}message InstanceCustomProfile {@@ -98,7 +99,7 @@ message Storage {StorageType type = 3;oneof config {- StorageS3Config s3_config = 10;+ StorageS3Config s3_config = 4;}}@@ -142,14 +143,10 @@ message StorageS3Config {}message InstanceMemoRelatedSetting {- reserved 2;- reserved "display_with_update_time";- // content_length_limit is the limit of content length. Unit is byte.- int32 content_length_limit = 3;// enable_double_click_edit enables editing on double click.- bool enable_double_click_edit = 4;+ bool enable_double_click_edit = 1;// reactions is the list of reactions.- repeated string reactions = 7;+ repeated string reactions = 2;}message InstanceTagMetadata {@@ -250,7 +247,7 @@ message InstanceAccessSetting {}// InstanceUsageLimitsSetting holds every usage limit of the instance. A limit-// applies to one user, or to every user when user_id is 0. For each metric, a+// applies to one user, or independently to every user. For each metric, a// user's own limit replaces the default.message InstanceUsageLimitsSetting {repeated UsageLimit limits = 1;@@ -259,22 +256,29 @@ message InstanceUsageLimitsSetting {// uid is the {usage_limit} segment of the usageLimits/{usage_limit} name.string uid = 1;Metric metric = 2;- // user_id is the user the limit applies to. 0 means every user.- int32 user_id = 3;+ // Exactly one target must be set.+ oneof target {+ // The default limit applied independently to every user.+ google.protobuf.Empty all_users = 3;+ // The user this limit applies to. Must be positive.+ int32 user_id = 4;+ }// value is the limit. 0 means unlimited.- int64 value = 4;- google.protobuf.Timestamp create_time = 5;- google.protobuf.Timestamp update_time = 6;+ int64 value = 5;+ google.protobuf.Timestamp create_time = 6;+ google.protobuf.Timestamp update_time = 7;}enum Metric {METRIC_UNSPECIFIED = 0;- // MEMOS limits the number of memos a user created, comments included.- MEMOS = 1;+ // MEMO_COUNT limits the number of memos a user created, comments included.+ MEMO_COUNT = 1;+ // MEMO_CONTENT_BYTES limits the UTF-8 size of one memo's content.+ MEMO_CONTENT_BYTES = 2;// STORAGE_BYTES limits the total size of a user's uploads. External links// do not count.- STORAGE_BYTES = 2;+ STORAGE_BYTES = 3;// UPLOAD_BYTES limits the size of one uploaded file.- UPLOAD_BYTES = 3;+ UPLOAD_BYTES = 4;}}diff --git a/proto/store/user_setting.proto b/proto/store/user_setting.protoindex d94d9951d..e1a193237 100644--- a/proto/store/user_setting.proto+++ b/proto/store/user_setting.proto@@ -13,15 +13,15 @@ message UserSetting {// General user settings.GENERAL = 1;// The memo views of the user.- MEMO_VIEWS = 4;+ MEMO_VIEWS = 2;// The webhooks of the user.- WEBHOOKS = 5;+ WEBHOOKS = 3;// Refresh tokens for the user.- REFRESH_TOKENS = 6;+ REFRESH_TOKENS = 4;// Personal access tokens for the user.- PERSONAL_ACCESS_TOKENS = 7;+ PERSONAL_ACCESS_TOKENS = 5;// Per-user tag metadata.- TAGS = 8;+ TAGS = 6;}int32 user_id = 1;@@ -29,11 +29,11 @@ message UserSetting {Key key = 2;oneof value {GeneralUserSetting general = 3;- MemoViewsUserSetting memo_views = 6;- WebhooksUserSetting webhooks = 7;- RefreshTokensUserSetting refresh_tokens = 8;- PersonalAccessTokensUserSetting personal_access_tokens = 9;- TagsUserSetting tags = 10;+ MemoViewsUserSetting memo_views = 4;+ WebhooksUserSetting webhooks = 5;+ RefreshTokensUserSetting refresh_tokens = 6;+ PersonalAccessTokensUserSetting personal_access_tokens = 7;+ TagsUserSetting tags = 8;}}diff --git a/server/api/attachment_upload_test.go b/server/api/attachment_upload_test.goindex 5852f9798..ea807993b 100644--- a/server/api/attachment_upload_test.go+++ b/server/api/attachment_upload_test.go@@ -18,7 +18,6 @@ import ("github.com/usememos/memos/internal/testutil"apipb "github.com/usememos/memos/proto/gen/api"- storepb "github.com/usememos/memos/proto/gen/store""github.com/usememos/memos/store")@@ -98,6 +97,17 @@ func TestUploadAttachmentChunksAndRetries(t *testing.T) {require.Equal(t, codes.NotFound, status.Code(err))}+func TestUploadAttachmentDefaultFileSizeLimit(t *testing.T) {+ svc, ctx := newUploadTestService(t)+ _, err := svc.UploadAttachment(ctx, &apipb.UploadAttachmentRequest{Upload: uploadSpec("large.bin", 32*MebiByte+1)})+ require.Equal(t, codes.ResourceExhausted, status.Code(err))+ require.Empty(t, svc.attachmentUploads.entries, "the refused upload creates no session")+ files, err := filepath.Glob(filepath.Join(svc.Profile.Data, attachmentUploadTempPrefix+"*"))+ require.NoError(t, err)+ require.Empty(t, files, "the refused upload creates no temporary file")+ startTestUpload(ctx, t, svc, 32*MebiByte)+}+func TestUploadAttachmentSingleCall(t *testing.T) {svc, ctx := newUploadTestService(t)spec := uploadSpec("note.txt", 3)@@ -149,9 +159,7 @@ func TestUploadAttachmentValidation(t *testing.T) {}_, err = svc.UploadAttachment(ctx, &apipb.UploadAttachmentRequest{Upload: uploadSpec("file", 3), WriteOffset: 1, Data: []byte("abc")})require.Equal(t, codes.OutOfRange, status.Code(err))- _, err = svc.Store.CreateUsageLimit(ctx, &storepb.InstanceUsageLimitsSetting_UsageLimit{- Uid: "default-upload", Metric: storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, Value: 1 << 30,- })+ _, err = svc.Store.UpdateUsageLimit(ctx, "default-upload", 1<<30)require.NoError(t, err)_, err = svc.UploadAttachment(ctx, &apipb.UploadAttachmentRequest{Upload: uploadSpec("file", 1<<60)})require.Equal(t, codes.ResourceExhausted, status.Code(err))@@ -240,9 +248,7 @@ func TestUploadAttachmentRechecksMemoAndSize(t *testing.T) {// A per-file limit set after the upload started applies at finish.id := startTestUpload(ctx, t, svc, 2*MebiByte)- _, err = svc.Store.CreateUsageLimit(ctx, &storepb.InstanceUsageLimitsSetting_UsageLimit{- Uid: "default-upload", Metric: storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, Value: MebiByte,- })+ _, err = svc.Store.UpdateUsageLimit(ctx, "default-upload", MebiByte)require.NoError(t, err)_, err = svc.UploadAttachment(ctx, &apipb.UploadAttachmentRequest{Upload: uploadID(id), Data: make([]byte, 2*MebiByte), FinishWrite: true})require.Equal(t, codes.ResourceExhausted, status.Code(err))@@ -292,11 +298,12 @@ func TestUploadAttachmentExpiryAndLimits(t *testing.T) {func TestUploadAttachmentAboveLegacyRequestLimit(t *testing.T) {svc, ctx := newUploadTestService(t)+ _, err := svc.Store.UpdateUsageLimit(ctx, "default-upload", 0)+ require.NoError(t, err)const size = 300 * MebiByteid := startTestUpload(ctx, t, svc, size)chunk := bytes.Repeat([]byte{0x5a}, uploadChunkSize)var response *apipb.UploadAttachmentResponse- var err errorfor offset := int64(0); offset < size; offset += int64(len(chunk)) {response, err = svc.UploadAttachment(ctx, &apipb.UploadAttachmentRequest{Upload: uploadID(id), WriteOffset: offset, Data: chunk, FinishWrite: offset+int64(len(chunk)) == size,diff --git a/server/api/instance_service.go b/server/api/instance_service.goindex 3dc8702aa..86f6abb8a 100644--- a/server/api/instance_service.go+++ b/server/api/instance_service.go@@ -215,7 +215,6 @@ func (s *APIService) UpdateInstanceSetting(ctx context.Context, request *apipb.Ureturn nil, status.Errorf(codes.FailedPrecondition, "instance setting %q is configured by the deployment", settingKeyString)}- applyInstanceSettingDefaults(request.InstanceSetting)// TODO: Apply update_mask if specified_ = request.UpdateMaskdiff --git a/server/api/instance_service_converters.go b/server/api/instance_service_converters.goindex bbe71703f..89c48da3f 100644--- a/server/api/instance_service_converters.go+++ b/server/api/instance_service_converters.go@@ -265,7 +265,6 @@ func convertInstanceMemoRelatedSettingFromStore(setting *storepb.InstanceMemoRelreturn nil}return &apipb.InstanceSetting_MemoRelatedSetting{- ContentLengthLimit: setting.ContentLengthLimit,EnableDoubleClickEdit: setting.EnableDoubleClickEdit,Reactions: setting.Reactions,}@@ -276,7 +275,6 @@ func convertInstanceMemoRelatedSettingToStore(setting *apipb.InstanceSetting_Memreturn nil}return &storepb.InstanceMemoRelatedSetting{- ContentLengthLimit: setting.ContentLengthLimit,EnableDoubleClickEdit: setting.EnableDoubleClickEdit,Reactions: setting.Reactions,}diff --git a/server/api/instance_service_validation.go b/server/api/instance_service_validation.goindex e16724b19..8c7937e88 100644--- a/server/api/instance_service_validation.go+++ b/server/api/instance_service_validation.go@@ -12,17 +12,8 @@ import (apipb "github.com/usememos/memos/proto/gen/api"storepb "github.com/usememos/memos/proto/gen/store"- "github.com/usememos/memos/store")-func applyInstanceSettingDefaults(setting *apipb.InstanceSetting) {- memoRelatedSetting := setting.GetMemoRelatedSetting()- if memoRelatedSetting == nil || memoRelatedSetting.ContentLengthLimit != 0 {- return- }- memoRelatedSetting.ContentLengthLimit = store.DefaultContentLengthLimit-}-func validateInstanceSetting(setting *apipb.InstanceSetting) error {key, err := ExtractInstanceSettingKeyFromName(setting.Name)if err != nil {@@ -30,7 +21,10 @@ func validateInstanceSetting(setting *apipb.InstanceSetting) error {}switch key {case storepb.InstanceSettingKey_MEMO_RELATED.String():- return validateInstanceMemoRelatedSetting(setting.GetMemoRelatedSetting())+ if setting.GetMemoRelatedSetting() == nil {+ return errors.New("memo related setting is required")+ }+ return nilcase storepb.InstanceSettingKey_TAGS.String():return validateInstanceTagsSetting(setting.GetTagsSetting())case storepb.InstanceSettingKey_ACCESS.String():@@ -40,16 +34,6 @@ func validateInstanceSetting(setting *apipb.InstanceSetting) error {}}-func validateInstanceMemoRelatedSetting(setting *apipb.InstanceSetting_MemoRelatedSetting) error {- if setting == nil {- return errors.New("memo related setting is required")- }- if setting.ContentLengthLimit < store.DefaultContentLengthLimit {- return errors.Errorf("content_length_limit must be at least %d bytes", store.DefaultContentLengthLimit)- }- return nil-}-func validateInstanceAccessSetting(setting *apipb.InstanceSetting_AccessSetting) error {if setting == nil {return errors.New("access setting is required")diff --git a/server/api/memo_create_helpers.go b/server/api/memo_create_helpers.goindex e9d2ff015..d3b1cd809 100644--- a/server/api/memo_create_helpers.go+++ b/server/api/memo_create_helpers.go@@ -62,12 +62,8 @@ func (s *APIService) prepareMemoCreate(ctx context.Context, user *store.User, inmemo.UpdatedTs = input.UpdateTime.AsTime().Unix()}- contentLengthLimit, err := s.getContentLengthLimit(ctx)- if err != nil {- return nil, status.Error(codes.Internal, "failed to get content length limit")- }- if len(memo.Content) > contentLengthLimit {- return nil, status.Errorf(codes.InvalidArgument, "content too long (max %d bytes)", contentLengthLimit)+ if err := s.checkMemoContentQuota(ctx, user.ID, memo.Content); err != nil {+ return nil, err}if err := memopayload.RebuildMemoPayload(ctx, memo, s.MarkdownService); err != nil {return nil, status.Errorf(codes.Internal, "failed to rebuild memo payload: %v", err)diff --git a/server/api/memo_service.go b/server/api/memo_service.goindex 2ddb822b1..09cd364b1 100644--- a/server/api/memo_service.go+++ b/server/api/memo_service.go@@ -385,12 +385,8 @@ func (s *APIService) UpdateMemo(ctx context.Context, request *apipb.UpdateMemoRe}if path == "content" {contentUpdated = true- contentLengthLimit, err := s.getContentLengthLimit(ctx)- if err != nil {- return nil, status.Errorf(codes.Internal, "failed to get content length limit")- }- if len(request.Memo.Content) > contentLengthLimit {- return nil, status.Errorf(codes.InvalidArgument, "content too long (max %d bytes)", contentLengthLimit)+ if err := s.checkMemoContentQuota(ctx, memo.CreatorID, request.Memo.Content); err != nil {+ return nil, err}nextMemo.Content = request.Memo.Contentif err := memopayload.RebuildMemoPayload(ctx, &nextMemo, s.MarkdownService); err != nil {@@ -563,12 +559,4 @@ func (s *APIService) DeleteMemo(ctx context.Context, request *apipb.DeleteMemoRereturn &emptypb.Empty{}, nil}-func (s *APIService) getContentLengthLimit(ctx context.Context) (int, error) {- instanceMemoRelatedSetting, err := s.Store.GetInstanceMemoRelatedSetting(ctx)- if err != nil {- return 0, status.Errorf(codes.Internal, "failed to get instance memo related setting")- }- return int(instanceMemoRelatedSetting.ContentLengthLimit), nil-}-// DispatchMemoCreatedWebhook dispatches webhook when memo is created.diff --git a/server/api/ratelimit.go b/server/api/ratelimit.goindex e7ed8c1d6..bec84986c 100644--- a/server/api/ratelimit.go+++ b/server/api/ratelimit.go@@ -104,12 +104,14 @@ func newQuotaExceededError(username string, refusal *usagelimit.Refusal) error {func quotaExceededDescription(refusal *usagelimit.Refusal) string {switch refusal.Metric {- case usagelimit.MetricMemos:+ case usagelimit.MetricMemoCount:return "You have reached the limit of " + strconv.FormatInt(refusal.Limit, 10) + " memos."case usagelimit.MetricStorageBytes:return "This upload would exceed your storage limit of " + strconv.FormatInt(refusal.Limit, 10) + " bytes."case usagelimit.MetricUploadBytes:return "The file is larger than the limit of " + strconv.FormatInt(refusal.Limit, 10) + " bytes per file."+ case usagelimit.MetricMemoContentBytes:+ return "The content is larger than the limit of " + strconv.FormatInt(refusal.Limit, 10) + " bytes per memo."default:return "A usage limit was reached."}diff --git a/server/api/test/instance_service_test.go b/server/api/test/instance_service_test.goindex c3294e495..e888d2146 100644--- a/server/api/test/instance_service_test.go+++ b/server/api/test/instance_service_test.go@@ -468,45 +468,6 @@ func TestTestInstanceEmailSettingRequiresPasswordWhenSMTPIdentityChanges(t *testfunc TestUpdateInstanceSetting(t *testing.T) {ctx := context.Background()- t.Run("UpdateInstanceSetting - memo related content length limit", func(t *testing.T) {- ts := NewTestService(t)- defer ts.Cleanup()-- admin, err := ts.CreateHostUser(ctx, "memo-setting-admin")- require.NoError(t, err)- adminCtx := ts.CreateUserContext(ctx, admin.ID)- settingForLimit := func(limit int32) *apipb.InstanceSetting {- return &apipb.InstanceSetting{- Name: "instance/settings/MEMO_RELATED",- Value: &apipb.InstanceSetting_MemoRelatedSetting_{- MemoRelatedSetting: &apipb.InstanceSetting_MemoRelatedSetting{- ContentLengthLimit: limit,- },- },- }- }-- updated, err := ts.Service.UpdateInstanceSetting(adminCtx, &apipb.UpdateInstanceSettingRequest{InstanceSetting: settingForLimit(0)})- require.NoError(t, err)- require.Equal(t, int32(8192), updated.GetMemoRelatedSetting().GetContentLengthLimit())- got, err := ts.Service.GetInstanceSetting(ctx, &apipb.GetInstanceSettingRequest{Name: "instance/settings/MEMO_RELATED"})- require.NoError(t, err)- require.Equal(t, int32(8192), got.GetMemoRelatedSetting().GetContentLengthLimit())-- _, err = ts.Service.UpdateInstanceSetting(adminCtx, &apipb.UpdateInstanceSettingRequest{InstanceSetting: settingForLimit(8191)})- require.Equal(t, codes.InvalidArgument, status.Code(err))-- for _, limit := range []int32{8192, 16384} {- updated, err := ts.Service.UpdateInstanceSetting(adminCtx, &apipb.UpdateInstanceSettingRequest{InstanceSetting: settingForLimit(limit)})- require.NoError(t, err, "limit %d", limit)- require.Equal(t, limit, updated.GetMemoRelatedSetting().GetContentLengthLimit())-- got, err := ts.Service.GetInstanceSetting(ctx, &apipb.GetInstanceSettingRequest{Name: "instance/settings/MEMO_RELATED"})- require.NoError(t, err, "limit %d", limit)- require.Equal(t, limit, got.GetMemoRelatedSetting().GetContentLengthLimit())- }- })-t.Run("UpdateInstanceSetting - notification email validation", func(t *testing.T) {ts := NewTestService(t)defer ts.Cleanup()diff --git a/server/api/test/memo_export_test.go b/server/api/test/memo_export_test.goindex 28f3b47ce..d62e89f43 100644--- a/server/api/test/memo_export_test.go+++ b/server/api/test/memo_export_test.go@@ -20,7 +20,6 @@ import ("github.com/usememos/memos/core/memoexport""github.com/usememos/memos/internal/ratelimit"apipb "github.com/usememos/memos/proto/gen/api"- storepb "github.com/usememos/memos/proto/gen/store""github.com/usememos/memos/server/api""github.com/usememos/memos/store")@@ -612,9 +611,7 @@ func TestImportMemosFailureKeepsPreexistingAttachment(t *testing.T) {defer ts.Cleanup()t.Cleanup(ts.Service.CloseUploads)ctx := context.Background()- _, err := ts.Store.CreateUsageLimit(ctx, &storepb.InstanceUsageLimitsSetting_UsageLimit{- Uid: "default-upload", Metric: storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, Value: 1 << 20,- })+ _, err := ts.Store.UpdateUsageLimit(ctx, "default-upload", 1<<20)require.NoError(t, err)user, err := ts.CreateRegularUser(ctx, "keeper")require.NoError(t, err)diff --git a/server/api/test/usage_limit_service_test.go b/server/api/test/usage_limit_service_test.goindex 815435e0e..d86c1c828 100644--- a/server/api/test/usage_limit_service_test.go+++ b/server/api/test/usage_limit_service_test.go@@ -4,6 +4,7 @@ import ("context""os""path/filepath"+ "strings""testing""github.com/stretchr/testify/require"@@ -68,7 +69,7 @@ func TestUsageLimitServicePermissions(t *testing.T) {user, err := ts.CreateRegularUser(ctx, "limits-user")require.NoError(t, err)adminCtx := ts.CreateUserContext(ctx, admin.ID)- limit := createUsageLimit(adminCtx, t, ts, "default-memos", apipb.UsageLimit_MEMOS, "", 10)+ limit := createUsageLimit(adminCtx, t, ts, "default-memos", apipb.UsageLimit_MEMO_COUNT, "", 10)for _, caller := range []struct {ctx context.Context@@ -110,6 +111,18 @@ func TestUsageLimitServiceCRUD(t *testing.T) {adminCtx := ts.CreateUserContext(ctx, admin.ID)aliceName := api.BuildUserName(alice.Username)+ defaults, err := ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{})+ require.NoError(t, err)+ require.Len(t, defaults.UsageLimits, 2)+ require.Equal(t, "usageLimits/default-memo-content", defaults.UsageLimits[0].Name)+ require.Equal(t, apipb.UsageLimit_MEMO_CONTENT_BYTES, defaults.UsageLimits[0].Metric)+ require.Equal(t, store.DefaultMemoContentBytes, defaults.UsageLimits[0].Value)+ require.Empty(t, defaults.UsageLimits[0].User)+ require.Equal(t, "usageLimits/default-upload", defaults.UsageLimits[1].Name)+ require.Equal(t, apipb.UsageLimit_UPLOAD_BYTES, defaults.UsageLimits[1].Metric)+ require.Equal(t, store.DefaultUploadBytes, defaults.UsageLimits[1].Value)+ require.Empty(t, defaults.UsageLimits[1].User)+defaultStorage := createUsageLimit(adminCtx, t, ts, "default-storage", apipb.UsageLimit_STORAGE_BYTES, "", 1<<30)require.Equal(t, "usageLimits/default-storage", defaultStorage.Name)require.Empty(t, defaultStorage.User)@@ -117,20 +130,20 @@ func TestUsageLimitServiceCRUD(t *testing.T) {aliceStorage := createUsageLimit(adminCtx, t, ts, "", apipb.UsageLimit_STORAGE_BYTES, aliceName, 5<<30)require.Regexp(t, `^usageLimits/limit-[a-z2-7]{12}$`, aliceStorage.Name, "an ID is generated when none is given")require.Equal(t, aliceName, aliceStorage.User)- createUsageLimit(adminCtx, t, ts, "default-memos", apipb.UsageLimit_MEMOS, "", 1000)+ createUsageLimit(adminCtx, t, ts, "default-memos", apipb.UsageLimit_MEMO_COUNT, "", 1000)for name, request := range map[string]*apipb.CreateUsageLimitRequest{- "negative value": {UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMOS, User: aliceName, Value: -1}},+ "negative value": {UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMO_COUNT, User: aliceName, Value: -1}},"no metric": {UsageLimit: &apipb.UsageLimit{User: aliceName, Value: 1}},- "bad user name": {UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMOS, User: "people/alice", Value: 1}},- "bad ID": {UsageLimitId: "Alice_Memos", UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMOS, Value: 1}},- "long ID": {UsageLimitId: "a-very-long-usage-limit-identifier-x", UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMOS, Value: 1}},+ "bad user name": {UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMO_COUNT, User: "people/alice", Value: 1}},+ "bad ID": {UsageLimitId: "Alice_Memos", UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMO_COUNT, Value: 1}},+ "long ID": {UsageLimitId: "a-very-long-usage-limit-identifier-x", UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMO_COUNT, Value: 1}},"missing limit": {},} {_, err := ts.Service.CreateUsageLimit(adminCtx, request)require.Equal(t, codes.InvalidArgument, status.Code(err), name)}- _, err = ts.Service.CreateUsageLimit(adminCtx, &apipb.CreateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMOS, User: "users/nobody", Value: 1}})+ _, err = ts.Service.CreateUsageLimit(adminCtx, &apipb.CreateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_MEMO_COUNT, User: "users/nobody", Value: 1}})require.Equal(t, codes.NotFound, status.Code(err))_, err = ts.Service.CreateUsageLimit(adminCtx, &apipb.CreateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Metric: apipb.UsageLimit_STORAGE_BYTES, User: aliceName, Value: 1}})require.Equal(t, codes.AlreadyExists, status.Code(err), "one limit per metric and user")@@ -144,7 +157,7 @@ func TestUsageLimitServiceCRUD(t *testing.T) {})require.NoError(t, err)require.Equal(t, int64(6<<30), updated.Value)- _, err = ts.Service.UpdateUsageLimit(adminCtx, &apipb.UpdateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Name: aliceStorage.Name, Value: 1, Metric: apipb.UsageLimit_MEMOS}})+ _, err = ts.Service.UpdateUsageLimit(adminCtx, &apipb.UpdateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Name: aliceStorage.Name, Value: 1, Metric: apipb.UsageLimit_MEMO_COUNT}})require.Equal(t, codes.InvalidArgument, status.Code(err))_, err = ts.Service.UpdateUsageLimit(adminCtx, &apipb.UpdateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Name: defaultStorage.Name, Value: 1, User: aliceName}})require.Equal(t, codes.InvalidArgument, status.Code(err))@@ -161,10 +174,12 @@ func TestUsageLimitServiceCRUD(t *testing.T) {// List, filter and page. Defaults come first.list, err := ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{})require.NoError(t, err)- require.Len(t, list.UsageLimits, 3)+ require.Len(t, list.UsageLimits, 5)require.Empty(t, list.UsageLimits[0].User)require.Empty(t, list.UsageLimits[1].User)- require.Equal(t, aliceName, list.UsageLimits[2].User)+ require.Empty(t, list.UsageLimits[2].User)+ require.Empty(t, list.UsageLimits[3].User)+ require.Equal(t, aliceName, list.UsageLimits[4].User)filtered, err := ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{Filter: `user == "` + aliceName + `"`})require.NoError(t, err)require.Len(t, filtered.UsageLimits, 1)@@ -182,6 +197,10 @@ func TestUsageLimitServiceCRUD(t *testing.T) {require.NotEmpty(t, page.NextPageToken)page, err = ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{PageToken: page.NextPageToken})require.NoError(t, err)+ require.Len(t, page.UsageLimits, 2)+ require.NotEmpty(t, page.NextPageToken)+ page, err = ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{PageToken: page.NextPageToken})+ require.NoError(t, err)require.Len(t, page.UsageLimits, 1)require.Empty(t, page.NextPageToken)@@ -203,7 +222,7 @@ func TestUsageLimitServiceCRUD(t *testing.T) {require.Equal(t, codes.NotFound, status.Code(err))list, err = ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{})require.NoError(t, err)- require.Len(t, list.UsageLimits, 1)+ require.Len(t, list.UsageLimits, 3)}func TestUsageLimitServiceDeploymentFile(t *testing.T) {@@ -216,7 +235,7 @@ func TestUsageLimitServiceDeploymentFile(t *testing.T) {dir := t.TempDir()require.NoError(t, os.WriteFile(filepath.Join(dir, "memos-instance-setting-usage-limits.json"),- []byte(`{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"default-memos","metric":"MEMOS","value":"1"}]}}`), 0o600))+ []byte(`{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"default-memos","metric":"MEMO_COUNT","allUsers":{},"value":"1"}]}}`), 0o600))require.NoError(t, ts.Store.LoadDeploymentConfigurationDir(ctx, dir))list, err := ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{})@@ -233,7 +252,7 @@ func TestUsageLimitServiceDeploymentFile(t *testing.T) {_, err = ts.Service.CreateMemo(adminCtx, &apipb.CreateMemoRequest{Memo: &apipb.Memo{Content: "first", Visibility: apipb.Visibility_PRIVATE}})require.NoError(t, err)_, err = ts.Service.CreateMemo(adminCtx, &apipb.CreateMemoRequest{Memo: &apipb.Memo{Content: "second", Visibility: apipb.Visibility_PRIVATE}})- requireQuotaExceeded(t, err, "MEMOS", api.BuildUserName(admin.Username))+ requireQuotaExceeded(t, err, "MEMO_COUNT", api.BuildUserName(admin.Username))}func TestMemoLimitEnforcement(t *testing.T) {@@ -256,22 +275,24 @@ func TestMemoLimitEnforcement(t *testing.T) {usage, err := ts.Service.GetUserUsage(userCtx, &apipb.GetUserUsageRequest{Name: api.BuildUserName(user.Username) + "/usage"})require.NoError(t, err)require.Equal(t, int64(1), usage.MemoCount)- require.Zero(t, usage.MemosLimit.Value)- require.Empty(t, usage.MemosLimit.UsageLimit)+ require.Zero(t, usage.MemoCountLimit.Value)+ require.Empty(t, usage.MemoCountLimit.UsageLimit)+ require.Equal(t, store.DefaultUploadBytes, usage.UploadBytesLimit.Value)+ require.Equal(t, "usageLimits/default-upload", usage.UploadBytesLimit.UsageLimit)- createUsageLimit(adminCtx, t, ts, "default-memos", apipb.UsageLimit_MEMOS, "", 2)+ createUsageLimit(adminCtx, t, ts, "default-memos", apipb.UsageLimit_MEMO_COUNT, "", 2)second, err := createMemo(userCtx, "second")require.NoError(t, err)_, err = createMemo(userCtx, "third")- metadata := requireQuotaExceeded(t, err, "MEMOS", api.BuildUserName(user.Username))- require.Equal(t, map[string]string{"metric": "MEMOS", "limit": "2", "usage": "2", "usage_limit": "usageLimits/default-memos"}, metadata)+ metadata := requireQuotaExceeded(t, err, "MEMO_COUNT", api.BuildUserName(user.Username))+ require.Equal(t, map[string]string{"metric": "MEMO_COUNT", "limit": "2", "usage": "2", "usage_limit": "usageLimits/default-memos"}, metadata)count, err := ts.Store.CountUserMemos(ctx, user.ID)require.NoError(t, err)require.Equal(t, int64(2), count, "a refused create writes no memo")// A comment is a memo row: it is refused at the limit and writes nothing._, err = ts.Service.CreateMemoComment(userCtx, &apipb.CreateMemoCommentRequest{Parent: first.Name, Comment: &apipb.Memo{Content: "a comment", Visibility: apipb.Visibility_PUBLIC}})- requireQuotaExceeded(t, err, "MEMOS", api.BuildUserName(user.Username))+ requireQuotaExceeded(t, err, "MEMO_COUNT", api.BuildUserName(user.Username))count, err = ts.Store.CountUserMemos(ctx, user.ID)require.NoError(t, err)require.Equal(t, int64(2), count)@@ -289,7 +310,7 @@ func TestMemoLimitEnforcement(t *testing.T) {require.NoError(t, err)// A user's own limit replaces the default, and admins are limited too.- createUsageLimit(adminCtx, t, ts, "user-memos", apipb.UsageLimit_MEMOS, api.BuildUserName(user.Username), 0)+ createUsageLimit(adminCtx, t, ts, "user-memos", apipb.UsageLimit_MEMO_COUNT, api.BuildUserName(user.Username), 0)_, err = createMemo(userCtx, "unlimited now")require.NoError(t, err)_, err = createMemo(adminCtx, "admin one")@@ -297,12 +318,12 @@ func TestMemoLimitEnforcement(t *testing.T) {_, err = createMemo(adminCtx, "admin two")require.NoError(t, err)_, err = createMemo(adminCtx, "admin three")- requireQuotaExceeded(t, err, "MEMOS", api.BuildUserName(admin.Username))+ requireQuotaExceeded(t, err, "MEMO_COUNT", api.BuildUserName(admin.Username))usage, err = ts.Service.GetUserUsage(userCtx, &apipb.GetUserUsageRequest{Name: api.BuildUserName(user.Username) + "/usage"})require.NoError(t, err)- require.Equal(t, "usageLimits/user-memos", usage.MemosLimit.UsageLimit)- require.Zero(t, usage.MemosLimit.Value)+ require.Equal(t, "usageLimits/user-memos", usage.MemoCountLimit.UsageLimit)+ require.Zero(t, usage.MemoCountLimit.Value)// Deleting every limit restores the previous behavior.limits, err := ts.Service.ListUsageLimits(adminCtx, &apipb.ListUsageLimitsRequest{})@@ -315,6 +336,78 @@ func TestMemoLimitEnforcement(t *testing.T) {require.NoError(t, err)}+func TestMemoContentLimitEnforcement(t *testing.T) {+ ctx := context.Background()+ ts := NewTestService(t)+ defer ts.Cleanup()+ t.Cleanup(ts.Service.CloseUploads)+ admin, err := ts.CreateHostUser(ctx, "content-admin")+ require.NoError(t, err)+ user, err := ts.CreateRegularUser(ctx, "content-user")+ require.NoError(t, err)+ adminCtx := ts.CreateUserContext(ctx, admin.ID)+ userCtx := ts.CreateUserContext(ctx, user.ID)+ subject := api.BuildUserName(user.Username)++ usage, err := ts.Service.GetUserUsage(userCtx, &apipb.GetUserUsageRequest{Name: subject + "/usage"})+ require.NoError(t, err)+ require.Equal(t, store.DefaultMemoContentBytes, usage.MemoContentBytesLimit.Value)+ require.Equal(t, "usageLimits/default-memo-content", usage.MemoContentBytesLimit.UsageLimit)+ create := func(content string) (*apipb.Memo, error) {+ return ts.Service.CreateMemo(userCtx, &apipb.CreateMemoRequest{Memo: &apipb.Memo{Content: content, Visibility: apipb.Visibility_PRIVATE}})+ }+ memo, err := create(strings.Repeat("a", 8192))+ require.NoError(t, err)+ _, err = create(strings.Repeat("a", 8193))+ metadata := requireQuotaExceeded(t, err, "MEMO_CONTENT_BYTES", subject)+ require.Equal(t, "8193", metadata["usage"])+ require.Equal(t, "usageLimits/default-memo-content", metadata["usage_limit"])+ _, err = ts.Service.UpdateMemo(userCtx, &apipb.UpdateMemoRequest{+ Memo: &apipb.Memo{Name: memo.Name, Content: strings.Repeat("a", 8193)},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"content"}},+ })+ requireQuotaExceeded(t, err, "MEMO_CONTENT_BYTES", subject)+ got, err := ts.Service.GetMemo(userCtx, &apipb.GetMemoRequest{Name: memo.Name})+ require.NoError(t, err)+ require.Equal(t, memo.Content, got.Content, "a refused edit leaves content unchanged")+ _, err = ts.Service.CreateMemoComment(userCtx, &apipb.CreateMemoCommentRequest{Parent: memo.Name, Comment: &apipb.Memo{Content: strings.Repeat("a", 8193), Visibility: apipb.Visibility_PRIVATE}})+ requireQuotaExceeded(t, err, "MEMO_CONTENT_BYTES", subject)++ own := createUsageLimit(adminCtx, t, ts, "user-content", apipb.UsageLimit_MEMO_CONTENT_BYTES, subject, 6)+ unicodeMemo, err := create("中文")+ require.NoError(t, err)+ _, err = create("中文字")+ requireQuotaExceeded(t, err, "MEMO_CONTENT_BYTES", subject)+ // An admin editing another user's memo uses the memo owner's limit.+ _, err = ts.Service.UpdateMemo(adminCtx, &apipb.UpdateMemoRequest{+ Memo: &apipb.Memo{Name: unicodeMemo.Name, Content: "中文字"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"content"}},+ })+ metadata = requireQuotaExceeded(t, err, "MEMO_CONTENT_BYTES", subject)+ require.Equal(t, "6", metadata["limit"])+ require.Equal(t, "usageLimits/user-content", metadata["usage_limit"])++ archive := buildImportArchive(t, user.Username, nil)+ importArchive := func() *apipb.ImportMemosReport {+ response, err := ts.Service.ImportMemos(userCtx, &apipb.ImportMemosRequest{+ Name: subject, Upload: &apipb.ImportMemosRequest_Spec{Spec: &apipb.ImportMemosSpec{TotalSize: int64(len(archive))}},+ Data: archive, FinishWrite: true,+ })+ require.NoError(t, err)+ return response.GetReport()+ }+ report := importArchive()+ require.Equal(t, int32(1), report.Failed)+ require.Zero(t, report.Created)+ _, err = ts.Service.UpdateUsageLimit(adminCtx, &apipb.UpdateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Name: own.Name, Value: 0}})+ require.NoError(t, err)+ _, err = create(strings.Repeat("a", 65536))+ require.NoError(t, err, "explicit zero disables the content limit")+ report = importArchive()+ require.Zero(t, report.Failed)+ require.Equal(t, int32(1), report.Created)+}+func TestUploadLimitEnforcement(t *testing.T) {ctx := context.Background()ts := NewTestService(t)@@ -347,7 +440,8 @@ func TestUploadLimitEnforcement(t *testing.T) {}createUsageLimit(adminCtx, t, ts, "default-storage", apipb.UsageLimit_STORAGE_BYTES, "", 100)- createUsageLimit(adminCtx, t, ts, "default-upload", apipb.UsageLimit_UPLOAD_BYTES, "", 60)+ _, err = ts.Service.UpdateUsageLimit(adminCtx, &apipb.UpdateUsageLimitRequest{UsageLimit: &apipb.UsageLimit{Name: "usageLimits/default-upload", Value: 60}})+ require.NoError(t, err)require.NoError(t, create(60))metadata := requireQuotaExceeded(t, create(61), "UPLOAD_BYTES", subject)diff --git a/server/api/usage_limit_service.go b/server/api/usage_limit_service.goindex 3b97cc21b..1df2bb687 100644--- a/server/api/usage_limit_service.go+++ b/server/api/usage_limit_service.go@@ -59,15 +59,15 @@ func (s *APIService) ListUsageLimits(ctx context.Context, request *apipb.ListUsareturn nil, err}limits = slices.DeleteFunc(limits, func(limit *storepb.InstanceUsageLimitsSetting_UsageLimit) bool {- return (filter.userID != nil && limit.UserId != *filter.userID) || (filter.metric != nil && limit.Metric != *filter.metric)+ return (filter.userID != nil && limit.GetUserId() != *filter.userID) || (filter.metric != nil && limit.Metric != *filter.metric)})// Defaults first, then by user and metric, so pages are stable.slices.SortStableFunc(limits, func(a, b *storepb.InstanceUsageLimitsSetting_UsageLimit) int {- if a.UserId != b.UserId {- if a.UserId == 0 || b.UserId == 0 {- return int(min(a.UserId, 1)) - int(min(b.UserId, 1))+ if a.GetUserId() != b.GetUserId() {+ if a.GetUserId() == 0 || b.GetUserId() == 0 {+ return int(min(a.GetUserId(), 1)) - int(min(b.GetUserId(), 1))}- return strings.Compare(usernames[a.UserId], usernames[b.UserId])+ return strings.Compare(usernames[a.GetUserId()], usernames[b.GetUserId()])}return int(a.Metric) - int(b.Metric)})@@ -76,7 +76,7 @@ func (s *APIService) ListUsageLimits(ctx context.Context, request *apipb.ListUsaif offset < len(limits) {end := min(offset+limit, len(limits))for _, item := range limits[offset:end] {- response.UsageLimits = append(response.UsageLimits, convertUsageLimitFromStore(item, usernames[item.UserId]))+ response.UsageLimits = append(response.UsageLimits, convertUsageLimitFromStore(item, usernames[item.GetUserId()]))}if end < len(limits) {response.NextPageToken, err = getPageToken(limit, end)@@ -103,7 +103,7 @@ func (s *APIService) GetUsageLimit(ctx context.Context, request *apipb.GetUsageL}for _, limit := range limits {if limit.Uid == uid {- return convertUsageLimitFromStore(limit, usernames[limit.UserId]), nil+ return convertUsageLimitFromStore(limit, usernames[limit.GetUserId()]), nil}}return nil, status.Errorf(codes.NotFound, "usage limit not found")@@ -123,7 +123,7 @@ func (s *APIService) CreateUsageLimit(ctx context.Context, request *apipb.Create}metric := storepb.InstanceUsageLimitsSetting_Metric(request.UsageLimit.Metric)if !store.IsValidUsageLimitMetric(metric) {- return nil, status.Errorf(codes.InvalidArgument, "metric must be MEMOS, STORAGE_BYTES, or UPLOAD_BYTES")+ return nil, status.Errorf(codes.InvalidArgument, "metric must be MEMO_COUNT, STORAGE_BYTES, UPLOAD_BYTES, or MEMO_CONTENT_BYTES")}if request.UsageLimit.Value < 0 {return nil, status.Errorf(codes.InvalidArgument, "value must not be negative")@@ -139,10 +139,11 @@ func (s *APIService) CreateUsageLimit(ctx context.Context, request *apipb.CreateUid: uid,Metric: metric,Value: request.UsageLimit.Value,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{AllUsers: &emptypb.Empty{}},}username := ""if user != nil {- create.UserId = user.ID+ create.Target = &storepb.InstanceUsageLimitsSetting_UsageLimit_UserId{UserId: user.ID}username = user.Username}created, err := s.Store.CreateUsageLimit(ctx, create)@@ -185,14 +186,14 @@ func (s *APIService) UpdateUsageLimit(ctx context.Context, request *apipb.Updateif request.UsageLimit.Metric != apipb.UsageLimit_METRIC_UNSPECIFIED && storepb.InstanceUsageLimitsSetting_Metric(request.UsageLimit.Metric) != current.Metric {return nil, status.Errorf(codes.InvalidArgument, "metric is immutable")}- if request.UsageLimit.User != "" && request.UsageLimit.User != usageLimitUserName(usernames[current.UserId]) {+ if request.UsageLimit.User != "" && request.UsageLimit.User != usageLimitUserName(usernames[current.GetUserId()]) {return nil, status.Errorf(codes.InvalidArgument, "user is immutable")}updated, err := s.Store.UpdateUsageLimit(ctx, uid, request.UsageLimit.Value)if err != nil {return nil, usageLimitStoreError(err)}- return convertUsageLimitFromStore(updated, usernames[updated.UserId]), nil+ return convertUsageLimitFromStore(updated, usernames[updated.GetUserId()]), nil}// DeleteUsageLimit deletes a usage limit. Admin only.@@ -233,8 +234,8 @@ func (s *APIService) listVisibleUsageLimits(ctx context.Context) ([]*storepb.Ins}userIDs := []int32{}for _, limit := range setting.GetLimits() {- if limit.UserId != 0 && !slices.Contains(userIDs, limit.UserId) {- userIDs = append(userIDs, limit.UserId)+ if limit.GetUserId() != 0 && !slices.Contains(userIDs, limit.GetUserId()) {+ userIDs = append(userIDs, limit.GetUserId())}}usernames := map[int32]string{}@@ -249,7 +250,7 @@ func (s *APIService) listVisibleUsageLimits(ctx context.Context) ([]*storepb.Ins}limits := make([]*storepb.InstanceUsageLimitsSetting_UsageLimit, 0, len(setting.GetLimits()))for _, limit := range setting.GetLimits() {- if _, ok := usernames[limit.UserId]; limit.UserId != 0 && !ok {+ if _, ok := usernames[limit.GetUserId()]; limit.GetUserId() != 0 && !ok {continue}limits = append(limits, limit)@@ -306,21 +307,26 @@ func (s *APIService) checkMemoQuota(ctx context.Context, user *store.User) errorreturn usageLimitCheckError(user.Username, usagelimit.CheckMemoCreate(ctx, s.Store, user.ID))}+// checkMemoContentQuota refuses content larger than the memo owner's limit.+func (s *APIService) checkMemoContentQuota(ctx context.Context, userID int32, content string) error {+ return s.userQuotaError(ctx, userID, usagelimit.CheckMemoContentSize(ctx, s.Store, userID, int64(len(content))))+}+// checkUploadQuota refuses an upload of size bytes that would break the// per-file or storage limit of the user.func (s *APIService) checkUploadQuota(ctx context.Context, userID int32, size int64) error {- return s.uploadQuotaError(ctx, userID, usagelimit.CheckUpload(ctx, s.Store, userID, size))+ return s.userQuotaError(ctx, userID, usagelimit.CheckUpload(ctx, s.Store, userID, size))}// checkFileSizeQuota refuses a file of size bytes that is larger than the// per-file limit of the user. It runs no count or sum query.func (s *APIService) checkFileSizeQuota(ctx context.Context, userID int32, size int64) error {- return s.uploadQuotaError(ctx, userID, usagelimit.CheckFileSize(ctx, s.Store, userID, size))+ return s.userQuotaError(ctx, userID, usagelimit.CheckFileSize(ctx, s.Store, userID, size))}-// uploadQuotaError maps an upload check result to a service error, naming the+// userQuotaError maps a usage limit check result to a service error, naming the// user in a refusal.-func (s *APIService) uploadQuotaError(ctx context.Context, userID int32, err error) error {+func (s *APIService) userQuotaError(ctx context.Context, userID int32, err error) error {if err == nil {return nil}diff --git a/server/api/user_service_memo_import.go b/server/api/user_service_memo_import.goindex e656dc963..28ba1ed63 100644--- a/server/api/user_service_memo_import.go+++ b/server/api/user_service_memo_import.go@@ -18,6 +18,7 @@ import ("github.com/usememos/memos/core/memoexport""github.com/usememos/memos/core/memopayload"+ "github.com/usememos/memos/core/usagelimit""github.com/usememos/memos/internal/ratelimit"apipb "github.com/usememos/memos/proto/gen/api"storepb "github.com/usememos/memos/proto/gen/store"@@ -109,8 +110,7 @@ type memoImporter struct {policy apipb.ImportMemosRequest_ConflictPolicyreport *apipb.ImportMemosReport- storageSetting *storepb.InstanceStorageSetting- contentLengthLimit int+ storageSetting *storepb.InstanceStorageSetting// existing holds the instance memos whose UIDs the archive uses, keyed by// UID, loaded once before any write.existing map[string]*store.Memo@@ -140,26 +140,21 @@ func (s *APIService) ImportMemoExport(ctx context.Context, user *store.User, arcif err != nil {return nil, errors.Wrap(err, "failed to get instance storage setting")}- contentLengthLimit, err := s.getContentLengthLimit(ctx)- if err != nil {- return nil, errors.Wrap(err, "failed to get content length limit")- }existing, err := s.findMemosByUID(ctx, archive, false)if err != nil {return nil, err}importer := &memoImporter{- service: s,- ctx: ctx,- user: user,- archive: archive,- policy: policy,- report: &apipb.ImportMemosReport{Warnings: archiveIssues(archive.Warnings)},- storageSetting: storageSetting,- contentLengthLimit: contentLengthLimit,- existing: existing,- resolved: make(map[string]*store.Memo, len(archive.Memos)),- spaces: make(map[string]*int32),+ service: s,+ ctx: ctx,+ user: user,+ archive: archive,+ policy: policy,+ report: &apipb.ImportMemosReport{Warnings: archiveIssues(archive.Warnings)},+ storageSetting: storageSetting,+ existing: existing,+ resolved: make(map[string]*store.Memo, len(archive.Memos)),+ spaces: make(map[string]*int32),}for _, record := range archive.Memos {if err := ctx.Err(); err != nil {@@ -197,8 +192,8 @@ func (i *memoImporter) importMemo(record *memoexport.Memo) error {if err != nil {return err}- if len(content) > i.contentLengthLimit {- return errors.Errorf("content too long (max %d bytes)", i.contentLengthLimit)+ if err := usagelimit.CheckMemoContentSize(i.ctx, i.service.Store, i.user.ID, int64(len(content))); err != nil {+ return err}targetUID := record.UIDif existing := i.existing[record.UID]; existing != nil {diff --git a/server/api/user_service_usage.go b/server/api/user_service_usage.goindex 00bc5f4e8..eedeeffba 100644--- a/server/api/user_service_usage.go+++ b/server/api/user_service_usage.go@@ -49,11 +49,12 @@ func (s *APIService) GetUserUsage(ctx context.Context, request *apipb.GetUserUsareturn nil, status.Errorf(codes.Internal, "failed to get usage: %v", err)}return &apipb.UserUsage{- Name: BuildUserName(user.Username) + "/usage",- MemoCount: usage.MemoCount,- StorageBytes: usage.StorageBytes,- MemosLimit: convertEffectiveLimitToProto(usage.Limits.Memos),- StorageBytesLimit: convertEffectiveLimitToProto(usage.Limits.StorageBytes),- UploadBytesLimit: convertEffectiveLimitToProto(usage.Limits.UploadBytes),+ Name: BuildUserName(user.Username) + "/usage",+ MemoCount: usage.MemoCount,+ StorageBytes: usage.StorageBytes,+ MemoCountLimit: convertEffectiveLimitToProto(usage.Limits.MemoCount),+ StorageBytesLimit: convertEffectiveLimitToProto(usage.Limits.StorageBytes),+ UploadBytesLimit: convertEffectiveLimitToProto(usage.Limits.UploadBytes),+ MemoContentBytesLimit: convertEffectiveLimitToProto(usage.Limits.MemoContentBytes),}, nil}diff --git a/server/test/usage_limit_test.go b/server/test/usage_limit_test.goindex 37562457f..dc06a4df9 100644--- a/server/test/usage_limit_test.go+++ b/server/test/usage_limit_test.go@@ -39,7 +39,7 @@ func TestUsageLimitRefusalOnBothTransports(t *testing.T) {}status, body := inst.do(t, http.MethodPost, "/api/usageLimits?usageLimitId=default-memos", token, map[string]any{- "metric": "MEMOS",+ "metric": "MEMO_COUNT","value": "1",})require.Equal(t, http.StatusOK, status, "creating a usage limit should succeed: %s", body)@@ -54,8 +54,14 @@ func TestUsageLimitRefusalOnBothTransports(t *testing.T) {} `json:"usageLimits"`}require.NoError(t, json.Unmarshal(body, &listed))- require.Len(t, listed.UsageLimits, 1)+ require.Len(t, listed.UsageLimits, 3)require.Equal(t, "usageLimits/default-memos", listed.UsageLimits[0].Name)+ require.Equal(t, "usageLimits/default-memo-content", listed.UsageLimits[1].Name)+ require.Equal(t, "MEMO_CONTENT_BYTES", listed.UsageLimits[1].Metric)+ require.Equal(t, "8192", listed.UsageLimits[1].Value)+ require.Equal(t, "usageLimits/default-upload", listed.UsageLimits[2].Name)+ require.Equal(t, "UPLOAD_BYTES", listed.UsageLimits[2].Metric)+ require.Equal(t, "33554432", listed.UsageLimits[2].Value)inst.createMemo(t, token, "first", "the only memo the limit allows")@@ -63,18 +69,18 @@ func TestUsageLimitRefusalOnBothTransports(t *testing.T) {status, body = inst.do(t, http.MethodGet, "/api/"+userName+"/usage", token, nil)require.Equal(t, http.StatusOK, status, "%s", body)var usage struct {- Name string `json:"name"`- MemoCount string `json:"memoCount"`- MemosLimit struct {+ Name string `json:"name"`+ MemoCount string `json:"memoCount"`+ MemoCountLimit struct {Value string `json:"value"`UsageLimit string `json:"usageLimit"`- } `json:"memosLimit"`+ } `json:"memoCountLimit"`}require.NoError(t, json.Unmarshal(body, &usage))require.Equal(t, userName+"/usage", usage.Name)require.Equal(t, "1", usage.MemoCount)- require.Equal(t, "1", usage.MemosLimit.Value)- require.Equal(t, "usageLimits/default-memos", usage.MemosLimit.UsageLimit)+ require.Equal(t, "1", usage.MemoCountLimit.Value)+ require.Equal(t, "usageLimits/default-memos", usage.MemoCountLimit.UsageLimit)requireNoWaitHeaders := func(resp *http.Response) {t.Helper()@@ -111,7 +117,7 @@ func TestUsageLimitRefusalOnBothTransports(t *testing.T) {case "type.googleapis.com/google.rpc.ErrorInfo":require.Equal(t, "QUOTA_EXCEEDED", detail.Reason)require.Equal(t, "memos.api", detail.Domain)- require.Equal(t, map[string]string{"metric": "MEMOS", "limit": "1", "usage": "1", "usage_limit": "usageLimits/default-memos"}, detail.Metadata)+ require.Equal(t, map[string]string{"metric": "MEMO_COUNT", "limit": "1", "usage": "1", "usage_limit": "usageLimits/default-memos"}, detail.Metadata)case "type.googleapis.com/google.rpc.QuotaFailure":require.Len(t, detail.Violations, 1)require.Equal(t, userName, detail.Violations[0].Subject)diff --git a/store/deployment_config_test.go b/store/deployment_config_test.goindex db3237729..a88eec7e9 100644--- a/store/deployment_config_test.go+++ b/store/deployment_config_test.go@@ -12,6 +12,7 @@ import ("github.com/stretchr/testify/require""google.golang.org/protobuf/encoding/protojson""google.golang.org/protobuf/proto"+ "google.golang.org/protobuf/types/known/emptypb""github.com/usememos/memos/internal/profile"storepb "github.com/usememos/memos/proto/gen/store"@@ -223,8 +224,7 @@ func TestLoadDeploymentConfigurationSupportsEveryProvisionableSettingGroup(t *te"memos-instance-setting-memo-related.json": {Key: storepb.InstanceSettingKey_MEMO_RELATED,Value: &storepb.InstanceSetting_MemoRelatedSetting{MemoRelatedSetting: &storepb.InstanceMemoRelatedSetting{- ContentLengthLimit: store.DefaultContentLengthLimit,- Reactions: []string{"👍"},+ Reactions: []string{"👍"},}},},"memos-instance-setting-notification.json": {@@ -286,6 +286,76 @@ func TestLoadDeploymentConfigurationRejectsInvalidSettingResources(t *testing.T)}}+func TestLoadDeploymentUsageLimitsPreservesStoreTargets(t *testing.T) {+ ctx := context.Background()+ stores := newDeploymentConfigurationTestStore(t)+ alice, err := stores.CreateUser(ctx, &store.User{Username: "alice", Role: store.RoleUser, PasswordHash: "hash"})+ require.NoError(t, err)+ dir := t.TempDir()+ path := filepath.Join(dir, "memos-instance-setting-usage-limits.json")+ input := &storepb.InstanceSetting{+ Key: storepb.InstanceSettingKey_USAGE_LIMITS,+ Value: &storepb.InstanceSetting_UsageLimitsSetting{UsageLimitsSetting: &storepb.InstanceUsageLimitsSetting{+ Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{+ {+ Uid: "default-upload", Metric: storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, Value: 32 << 20,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{AllUsers: &emptypb.Empty{}},+ },+ {+ Uid: "alice-upload", Metric: storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, Value: 0,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_UserId{UserId: alice.ID},+ },+ },+ }},+ }+ writeDeploymentMessage(t, path, input)+ require.NoError(t, stores.LoadDeploymentConfigurationDir(ctx, dir))+ setting, err := stores.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.True(t, proto.Equal(input.GetUsageLimitsSetting(), setting), "configuration uses the stored schema without converting targets")++ _, err = stores.UpdateUser(ctx, &store.UpdateUser{ID: alice.ID, Username: new("alice-renamed")})+ require.NoError(t, err)+ require.NoError(t, stores.LoadDeploymentConfigurationDir(ctx, dir), "a rename does not require editing the configuration")+ setting, err = stores.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.True(t, proto.Equal(input.GetUsageLimitsSetting(), setting))+}++func TestLoadDeploymentUsageLimitsRejectsInvalidTargets(t *testing.T) {+ for name, limits := range map[string]string{+ "missing target": `[{"uid":"bad-user","metric":"UPLOAD_BYTES","value":"1"}]`,+ "zero user ID": `[{"uid":"bad-user","metric":"UPLOAD_BYTES","userId":0,"value":"1"}]`,+ "negative user ID": `[{"uid":"bad-user","metric":"UPLOAD_BYTES","userId":-1,"value":"1"}]`,+ "null all users": `[{"uid":"bad-user","metric":"UPLOAD_BYTES","allUsers":null,"value":"1"}]`,+ "both targets": `[{"uid":"bad-user","metric":"UPLOAD_BYTES","allUsers":{},"userId":1,"value":"1"}]`,+ "user resource name": `[{"uid":"bad-user","metric":"UPLOAD_BYTES","user":"users/alice","value":"1"}]`,+ "duplicate user": `[{"uid":"first","metric":"UPLOAD_BYTES","userId":1,"value":"1"},{"uid":"second","metric":"UPLOAD_BYTES","userId":1,"value":"0"}]`,+ "duplicate all users": `[{"uid":"first","metric":"UPLOAD_BYTES","allUsers":{},"value":"1"},{"uid":"second","metric":"UPLOAD_BYTES","allUsers":{},"value":"0"}]`,+ } {+ t.Run(name, func(t *testing.T) {+ ctx := context.Background()+ stores := newDeploymentConfigurationTestStore(t)+ dir := t.TempDir()+ path := filepath.Join(dir, "memos-instance-setting-usage-limits.json")+ valid := `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"default-upload","metric":"UPLOAD_BYTES","allUsers":{},"value":"33554432"}]}}`+ require.NoError(t, os.WriteFile(path, []byte(valid), 0600))+ require.NoError(t, stores.LoadDeploymentConfigurationDir(ctx, dir))+ previous, err := stores.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)++ content := `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":` + limits + `}}`+ require.NoError(t, os.WriteFile(path, []byte(content), 0600))+ err = stores.LoadDeploymentConfigurationDir(ctx, dir)+ require.Error(t, err)+ require.ErrorContains(t, err, "memos-instance-setting-usage-limits.json")+ setting, err := stores.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.True(t, proto.Equal(previous, setting), "an invalid reload preserves the active configuration")+ })+ }+}+func TestLoadDeploymentConfigurationBoundsFilesAndRedactsDecodeErrors(t *testing.T) {t.Run("oversized file", func(t *testing.T) {stores := newDeploymentConfigurationTestStore(t)diff --git a/store/instance_setting.go b/store/instance_setting.goindex 3047674a2..9cd09cb1d 100644--- a/store/instance_setting.go+++ b/store/instance_setting.go@@ -262,9 +262,6 @@ func (s *Store) AllowsAnonymousAccess(ctx context.Context) (bool, error) {return setting.AccessMode == storepb.InstanceAccessMode_INSTANCE_ACCESS_MODE_PUBLIC, nil}-// DefaultContentLengthLimit is the default limit of content length in bytes. 8KB.-const DefaultContentLengthLimit = 8 * 1024-// DefaultReactions is the default reactions for memo related setting.var DefaultReactions = []string{"👍", "👎", "❤️", "🎉", "😄", "😕", "😢", "😡"}@@ -280,9 +277,6 @@ func (s *Store) GetInstanceMemoRelatedSetting(ctx context.Context) (*storepb.Insif instanceSetting != nil {instanceMemoRelatedSetting = instanceSetting.GetMemoRelatedSetting()}- if instanceMemoRelatedSetting.ContentLengthLimit < DefaultContentLengthLimit {- instanceMemoRelatedSetting.ContentLengthLimit = DefaultContentLengthLimit- }if len(instanceMemoRelatedSetting.Reactions) == 0 {instanceMemoRelatedSetting.Reactions = append(instanceMemoRelatedSetting.Reactions, DefaultReactions...)}diff --git a/store/seed/sqlite/01__dump.sql b/store/seed/sqlite/01__dump.sqlindex ac338eb6b..96950047c 100644--- a/store/seed/sqlite/01__dump.sql+++ b/store/seed/sqlite/01__dump.sql@@ -239,4 +239,4 @@ INSERT INTO attachment (id,uid,creator_id,created_ts,updated_ts,filename,type,si-- so a readable demo value works just as well as a random one.INSERT INTO user_setting (user_id,key,value) VALUES(1,'PERSONAL_ACCESS_TOKENS','{"tokens":[{"tokenId":"demo-access-token","tokenHash":"7631cdaa5b56a39371dab01d5d186fd73f05602cc8ad29bf72ffef3713badd9d","description":"Demo access token","createdAt":"2024-01-01T00:00:00Z"}]}');-INSERT INTO system_setting VALUES ('MEMO_RELATED', '{"contentLengthLimit":8192,"enableAutoCompact":true,"enableComment":true,"enableLocation":true,"defaultVisibility":"PUBLIC","reactions":["👍","💛","🔥","👏","😂","👌","🚀","👀","🤔","🤡","❓","+1","🎉","💡","✅"]}', '');+INSERT INTO system_setting VALUES ('MEMO_RELATED', '{"enableAutoCompact":true,"enableComment":true,"enableLocation":true,"defaultVisibility":"PUBLIC","reactions":["👍","💛","🔥","👏","😂","👌","🚀","👀","🤔","🤡","❓","+1","🎉","💡","✅"]}', '');diff --git a/store/test/instance_setting_test.go b/store/test/instance_setting_test.goindex 78c5255a8..1079151e2 100644--- a/store/test/instance_setting_test.go+++ b/store/test/instance_setting_test.go@@ -250,7 +250,6 @@ func TestInstanceSettingMemoRelatedSetting(t *testing.T) {memoSetting, err := ts.GetInstanceMemoRelatedSetting(ctx)require.NoError(t, err)require.NotNil(t, memoSetting)- require.GreaterOrEqual(t, memoSetting.ContentLengthLimit, int32(store.DefaultContentLengthLimit))require.NotEmpty(t, memoSetting.Reactions)// Set custom memo related setting@@ -259,8 +258,7 @@ func TestInstanceSettingMemoRelatedSetting(t *testing.T) {Key: storepb.InstanceSettingKey_MEMO_RELATED,Value: &storepb.InstanceSetting_MemoRelatedSetting{MemoRelatedSetting: &storepb.InstanceMemoRelatedSetting{- ContentLengthLimit: 16384,- Reactions: customReactions,+ Reactions: customReactions,},},})@@ -269,7 +267,6 @@ func TestInstanceSettingMemoRelatedSetting(t *testing.T) {// VerifymemoSetting, err = ts.GetInstanceMemoRelatedSetting(ctx)require.NoError(t, err)- require.Equal(t, int32(16384), memoSetting.ContentLengthLimit)require.Equal(t, customReactions, memoSetting.Reactions)ts.Close()@@ -628,8 +625,7 @@ func TestInstanceSettingEdgeCases(t *testing.T) {Key: storepb.InstanceSettingKey_MEMO_RELATED,Value: &storepb.InstanceSetting_MemoRelatedSetting{MemoRelatedSetting: &storepb.InstanceMemoRelatedSetting{- ContentLengthLimit: 1000,- Reactions: unicodeReactions,+ Reactions: unicodeReactions,},},})diff --git a/store/test/usage_limit_test.go b/store/test/usage_limit_test.goindex b4342769a..5b20090b4 100644--- a/store/test/usage_limit_test.go+++ b/store/test/usage_limit_test.go@@ -10,6 +10,7 @@ import ("testing""github.com/stretchr/testify/require"+ "google.golang.org/protobuf/types/known/emptypb"storepb "github.com/usememos/memos/proto/gen/store""github.com/usememos/memos/store"@@ -17,7 +18,14 @@ import ()func usageLimit(uid string, metric storepb.InstanceUsageLimitsSetting_Metric, userID int32, value int64) *storepb.InstanceUsageLimitsSetting_UsageLimit {- return &storepb.InstanceUsageLimitsSetting_UsageLimit{Uid: uid, Metric: metric, UserId: userID, Value: value}+ limit := &storepb.InstanceUsageLimitsSetting_UsageLimit{+ Uid: uid, Metric: metric, Value: value,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{AllUsers: &emptypb.Empty{}},+ }+ if userID != 0 {+ limit.Target = &storepb.InstanceUsageLimitsSetting_UsageLimit_UserId{UserId: userID}+ }+ return limit}func storedUsageLimitUIDs(ctx context.Context, t *testing.T, ts *store.Store) []string {@@ -116,25 +124,27 @@ func TestUsageLimitLifecycle(t *testing.T) {setting, err := ts.GetInstanceUsageLimitsSetting(ctx)require.NoError(t, err)- require.Empty(t, setting.Limits, "an instance starts with no usage limits")+ require.Len(t, setting.Limits, 2)+ require.Equal(t, "default-upload", setting.Limits[0].Uid)+ require.Equal(t, store.DefaultUploadBytes, setting.Limits[0].Value)- created, err := ts.CreateUsageLimit(ctx, usageLimit("default-memos", storepb.InstanceUsageLimitsSetting_MEMOS, 0, 1000))+ created, err := ts.CreateUsageLimit(ctx, usageLimit("default-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, 0, 1000))require.NoError(t, err)require.NotNil(t, created.CreateTime)require.Equal(t, created.CreateTime.AsTime(), created.UpdateTime.AsTime())_, err = ts.CreateUsageLimit(ctx, usageLimit("alice-storage", storepb.InstanceUsageLimitsSetting_STORAGE_BYTES, alice.ID, 5<<30))require.NoError(t, err)- require.Equal(t, []string{"default-memos", "alice-storage"}, storedUsageLimitUIDs(ctx, t, ts))+ require.Equal(t, []string{"default-upload", "default-memo-content", "default-memos", "alice-storage"}, storedUsageLimitUIDs(ctx, t, ts))_, err = ts.CreateUsageLimit(ctx, usageLimit("default-memos", storepb.InstanceUsageLimitsSetting_STORAGE_BYTES, 0, 1))require.ErrorIs(t, err, store.ErrUsageLimitAlreadyExists, "IDs are unique")- _, err = ts.CreateUsageLimit(ctx, usageLimit("other-memos", storepb.InstanceUsageLimitsSetting_MEMOS, 0, 1))+ _, err = ts.CreateUsageLimit(ctx, usageLimit("other-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, 0, 1))require.ErrorIs(t, err, store.ErrUsageLimitAlreadyExists, "one default per metric")_, err = ts.CreateUsageLimit(ctx, usageLimit("alice-storage-2", storepb.InstanceUsageLimitsSetting_STORAGE_BYTES, alice.ID, 1))require.ErrorIs(t, err, store.ErrUsageLimitAlreadyExists, "one limit per metric and user")- _, err = ts.CreateUsageLimit(ctx, usageLimit("negative", storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, 0, -1))+ _, err = ts.CreateUsageLimit(ctx, usageLimit("negative", storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, alice.ID, -1))require.ErrorIs(t, err, store.ErrInvalidUsageLimit)- _, err = ts.CreateUsageLimit(ctx, usageLimit("Bad_ID", storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, 0, 1))+ _, err = ts.CreateUsageLimit(ctx, usageLimit("Bad_ID", storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, alice.ID, 1))require.ErrorIs(t, err, store.ErrInvalidUsageLimit)_, err = ts.CreateUsageLimit(ctx, usageLimit("no-metric", storepb.InstanceUsageLimitsSetting_METRIC_UNSPECIFIED, 0, 1))require.ErrorIs(t, err, store.ErrInvalidUsageLimit)@@ -148,13 +158,50 @@ func TestUsageLimitLifecycle(t *testing.T) {require.NoError(t, ts.DeleteUsageLimit(ctx, "alice-storage"))require.ErrorIs(t, ts.DeleteUsageLimit(ctx, "alice-storage"), store.ErrUsageLimitNotFound)- require.Equal(t, []string{"default-memos"}, storedUsageLimitUIDs(ctx, t, ts))+ require.Equal(t, []string{"default-upload", "default-memo-content", "default-memos"}, storedUsageLimitUIDs(ctx, t, ts))// The row is store only: the generic setting reads see it, but its key has// no API counterpart, and it round-trips through the raw conversion.stored, err := ts.GetStoredInstanceSetting(ctx, &store.FindInstanceSetting{Name: storepb.InstanceSettingKey_USAGE_LIMITS.String()})require.NoError(t, err)- require.Equal(t, int64(2000), stored.GetUsageLimitsSetting().Limits[0].Value)+ require.Equal(t, int64(2000), stored.GetUsageLimitsSetting().Limits[2].Value)+}++func TestUsageLimitDefaultSetting(t *testing.T) {+ t.Parallel()+ ctx := context.Background()+ ts := NewTestingStore(ctx, t)+ defer ts.Close()++ setting, err := ts.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.Len(t, setting.Limits, 2)+ require.Equal(t, storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, setting.Limits[0].Metric)+ require.NotNil(t, setting.Limits[0].GetAllUsers())+ require.Equal(t, store.DefaultUploadBytes, setting.Limits[0].Value)+ require.Equal(t, store.DefaultMemoContentBytes, setting.Limits[1].Value)+ require.Equal(t, storepb.InstanceUsageLimitsSetting_MEMO_CONTENT_BYTES, setting.Limits[1].Metric)+ stored, err := ts.GetStoredInstanceSetting(ctx, &store.FindInstanceSetting{Name: storepb.InstanceSettingKey_USAGE_LIMITS.String()})+ require.NoError(t, err)+ require.Nil(t, stored, "reading defaults does not persist a setting")++ setting.Limits[0].Value = 1+ setting, err = ts.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.Equal(t, store.DefaultUploadBytes, setting.Limits[0].Value, "each read returns fresh defaults")++ updated, err := ts.UpdateUsageLimit(ctx, "default-upload", 0)+ require.NoError(t, err)+ require.Zero(t, updated.Value)+ setting, err = ts.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.Zero(t, setting.Limits[0].Value, "an explicit zero remains unlimited")++ require.NoError(t, ts.DeleteUsageLimit(ctx, "default-upload"))+ require.NoError(t, ts.DeleteUsageLimit(ctx, "default-memo-content"))+ setting, err = ts.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.Empty(t, setting.Limits, "a stored empty setting does not restore defaults")}func TestUsageLimitCap(t *testing.T) {@@ -167,13 +214,56 @@ func TestUsageLimitCap(t *testing.T) {for i := range store.MaxUsageLimits {// Writes prune limits of missing users, so the cap is checked on the// validator that every write runs.- limits = append(limits, usageLimit(fmt.Sprintf("limit-%d", i), storepb.InstanceUsageLimitsSetting_MEMOS, int32(i), 1))+ limits = append(limits, usageLimit(fmt.Sprintf("limit-%d", i), storepb.InstanceUsageLimitsSetting_MEMO_COUNT, int32(i), 1))}require.NoError(t, store.ValidateInstanceUsageLimitsSetting(&storepb.InstanceUsageLimitsSetting{Limits: limits}))limits = append(limits, usageLimit("one-too-many", storepb.InstanceUsageLimitsSetting_STORAGE_BYTES, 0, 1))require.ErrorIs(t, store.ValidateInstanceUsageLimitsSetting(&storepb.InstanceUsageLimitsSetting{Limits: limits}), store.ErrInvalidUsageLimit)}+func TestUsageLimitTargetValidation(t *testing.T) {+ for name, target := range map[string]*storepb.InstanceUsageLimitsSetting_UsageLimit{+ "missing target": {Uid: "invalid-target", Metric: storepb.InstanceUsageLimitsSetting_MEMO_COUNT, Value: 1},+ "zero user": {Uid: "invalid-target", Metric: storepb.InstanceUsageLimitsSetting_MEMO_COUNT, Value: 1,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_UserId{UserId: 0}},+ "negative user": usageLimit("invalid-target", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, -1, 1),+ "nil all users": {Uid: "invalid-target", Metric: storepb.InstanceUsageLimitsSetting_MEMO_COUNT, Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{}},+ } {+ t.Run(name, func(t *testing.T) {+ err := store.ValidateInstanceUsageLimitsSetting(&storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{target}})+ require.ErrorIs(t, err, store.ErrInvalidUsageLimit)+ })+ }+ for name, userID := range map[string]int32{"duplicate default": 0, "duplicate user": 7} {+ t.Run(name, func(t *testing.T) {+ err := store.ValidateInstanceUsageLimitsSetting(&storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{+ usageLimit("first", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, userID, 1),+ usageLimit("second", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, userID, 0),+ }})+ require.ErrorIs(t, err, store.ErrUsageLimitAlreadyExists)+ })+ }+}++func TestUsageLimitsRejectMissingTarget(t *testing.T) {+ t.Parallel()+ ctx := context.Background()+ ts := NewTestingStore(ctx, t)+ defer ts.Close()+ invalid := &storepb.InstanceUsageLimitsSetting_UsageLimit{Uid: "missing-target", Metric: storepb.InstanceUsageLimitsSetting_MEMO_COUNT, Value: 1}+ _, err := ts.CreateUsageLimit(ctx, invalid)+ require.ErrorIs(t, err, store.ErrInvalidUsageLimit)+ _, err = ts.GetDriver().UpsertInstanceSetting(ctx, &store.InstanceSetting{+ Name: storepb.InstanceSettingKey_USAGE_LIMITS.String(),+ Value: `{"limits":[{"uid":"missing-target","metric":"MEMO_COUNT","value":"1"}]}`,+ })+ require.NoError(t, err)+ _, err = ts.GetInstanceUsageLimitsSetting(ctx)+ require.ErrorIs(t, err, store.ErrInvalidUsageLimit, "a missing target fails closed instead of removing a limit")+ _, err = ts.UpdateUsageLimit(ctx, "missing-target", 2)+ require.ErrorIs(t, err, store.ErrInvalidUsageLimit)+}+func TestDeleteUserRemovesUsageLimits(t *testing.T) {t.Parallel()ctx := context.Background()@@ -186,8 +276,8 @@ func TestDeleteUserRemovesUsageLimits(t *testing.T) {for _, limit := range []*storepb.InstanceUsageLimitsSetting_UsageLimit{usageLimit("default-storage", storepb.InstanceUsageLimitsSetting_STORAGE_BYTES, 0, 1<<30),usageLimit("alice-storage", storepb.InstanceUsageLimitsSetting_STORAGE_BYTES, alice.ID, 5<<30),- usageLimit("alice-memos", storepb.InstanceUsageLimitsSetting_MEMOS, alice.ID, 10),- usageLimit("bob-memos", storepb.InstanceUsageLimitsSetting_MEMOS, bob.ID, 20),+ usageLimit("alice-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, alice.ID, 10),+ usageLimit("bob-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, bob.ID, 20),} {_, err := ts.CreateUsageLimit(ctx, limit)require.NoError(t, err)@@ -195,7 +285,7 @@ func TestDeleteUserRemovesUsageLimits(t *testing.T) {_, err = ts.DeleteUser(ctx, &store.DeleteUser{ID: alice.ID})require.NoError(t, err)- require.Equal(t, []string{"default-storage", "bob-memos"}, storedUsageLimitUIDs(ctx, t, ts))+ require.Equal(t, []string{"default-upload", "default-memo-content", "default-storage", "bob-memos"}, storedUsageLimitUIDs(ctx, t, ts))}func TestUsageLimitWritesPruneMissingUsers(t *testing.T) {@@ -209,11 +299,11 @@ func TestUsageLimitWritesPruneMissingUsers(t *testing.T) {// An entry for a user that no longer exists, as a failed cleanup would leave._, err = ts.GetDriver().UpsertInstanceSetting(ctx, &store.InstanceSetting{Name: storepb.InstanceSettingKey_USAGE_LIMITS.String(),- Value: `{"limits":[{"uid":"ghost-memos","metric":"MEMOS","userId":99999,"value":"1"}]}`,+ Value: `{"limits":[{"uid":"ghost-memos","metric":"MEMO_COUNT","userId":99999,"value":"1"}]}`,})require.NoError(t, err)- _, err = ts.CreateUsageLimit(ctx, usageLimit("alice-memos", storepb.InstanceUsageLimitsSetting_MEMOS, alice.ID, 5))+ _, err = ts.CreateUsageLimit(ctx, usageLimit("alice-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, alice.ID, 5))require.NoError(t, err)require.Equal(t, []string{"alice-memos"}, storedUsageLimitUIDs(ctx, t, ts))}@@ -223,32 +313,38 @@ func TestUsageLimitsDeploymentFile(t *testing.T) {ctx := context.Background()ts := NewTestingStore(ctx, t)defer ts.Close()- _, err := ts.CreateUsageLimit(ctx, usageLimit("stored-memos", storepb.InstanceUsageLimitsSetting_MEMOS, 0, 10))+ alice, err := ts.CreateUser(ctx, &store.User{Username: "alice", Role: store.RoleUser, PasswordHash: "hash"})+ require.NoError(t, err)+ _, err = ts.CreateUsageLimit(ctx, usageLimit("stored-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, 0, 10))require.NoError(t, err)dir := t.TempDir()path := filepath.Join(dir, "memos-instance-setting-usage-limits.json")require.NoError(t, os.WriteFile(path, []byte(`{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[- {"uid":"default-storage","metric":"STORAGE_BYTES","value":"1073741824"},- {"uid":"alice-storage","metric":"STORAGE_BYTES","userId":7,"value":"5368709120"}+ {"uid":"default-storage","metric":"STORAGE_BYTES","allUsers":{},"value":"1073741824"},+ {"uid":"alice-storage","metric":"STORAGE_BYTES","userId":`+fmt.Sprint(alice.ID)+`,"value":"5368709120"}]}}`), 0o600))require.NoError(t, ts.LoadDeploymentConfigurationDir(ctx, dir))require.Equal(t, []string{"default-storage", "alice-storage"}, storedUsageLimitUIDs(ctx, t, ts), "the file shadows the stored row")+ effective, err := ts.GetInstanceUsageLimitsSetting(ctx)+ require.NoError(t, err)+ require.NotNil(t, effective.Limits[0].GetAllUsers())+ require.Equal(t, alice.ID, effective.Limits[1].GetUserId())_, err = ts.CreateUsageLimit(ctx, usageLimit("new-memos", storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, 0, 1))require.ErrorIs(t, err, store.ErrUsageLimitsDeploymentConfigured)require.ErrorIs(t, ts.DeleteUsageLimit(ctx, "default-storage"), store.ErrUsageLimitsDeploymentConfigured)- require.NoError(t, ts.DeleteUsageLimitsForUser(ctx, 7), "user deletion cleanup skips file-provided limits")+ require.NoError(t, ts.DeleteUsageLimitsForUser(ctx, alice.ID), "user deletion cleanup skips file-provided limits")stored, err := ts.GetStoredInstanceSetting(ctx, &store.FindInstanceSetting{Name: storepb.InstanceSettingKey_USAGE_LIMITS.String()})require.NoError(t, err)- require.Equal(t, "stored-memos", stored.GetUsageLimitsSetting().Limits[0].Uid, "the stored row is unchanged")+ require.Equal(t, "stored-memos", stored.GetUsageLimitsSetting().Limits[2].Uid, "the stored row is unchanged")for name, content := range map[string]string{"missing value": `{"key":"USAGE_LIMITS"}`,- "negative value": `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"bad","metric":"MEMOS","value":"-1"}]}}`,- "duplicate pair": `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"a","metric":"MEMOS","value":"1"},{"uid":"b","metric":"MEMOS","value":"2"}]}}`,- "unknown field": `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"a","metric":"MEMOS","value":"1","plan":"pro"}]}}`,+ "negative value": `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"bad","metric":"MEMO_COUNT","allUsers":{},"value":"-1"}]}}`,+ "duplicate pair": `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"a","metric":"MEMO_COUNT","allUsers":{},"value":"1"},{"uid":"b","metric":"MEMO_COUNT","allUsers":{},"value":"2"}]}}`,+ "unknown field": `{"key":"USAGE_LIMITS","usageLimitsSetting":{"limits":[{"uid":"a","metric":"MEMO_COUNT","value":"1","plan":"pro"}]}}`,} {invalidDir := t.TempDir()require.NoError(t, os.WriteFile(filepath.Join(invalidDir, "memos-instance-setting-usage-limits.json"), []byte(content), 0o600))@@ -277,9 +373,9 @@ func TestUsageLimitsAcrossReplicas(t *testing.T) {// Warm the second replica's settings cache; usage limit reads must bypass it._, err := second.GetInstanceUsageLimitsSetting(ctx)require.NoError(t, err)- _, err = first.CreateUsageLimit(ctx, usageLimit("default-memos", storepb.InstanceUsageLimitsSetting_MEMOS, 0, 3))+ _, err = first.CreateUsageLimit(ctx, usageLimit("default-memos", storepb.InstanceUsageLimitsSetting_MEMO_COUNT, 0, 3))require.NoError(t, err)- require.Equal(t, []string{"default-memos"}, storedUsageLimitUIDs(ctx, t, second))+ require.Equal(t, []string{"default-upload", "default-memo-content", "default-memos"}, storedUsageLimitUIDs(ctx, t, second))users := make([]*store.User, 6)for i := range users {@@ -322,7 +418,7 @@ func TestUsageLimitsAcrossReplicas(t *testing.T) {}uid := fmt.Sprintf("memos-user-%d", i)wg.Go(func() {- _, err := replica.CreateUsageLimit(ctx, usageLimit(uid, storepb.InstanceUsageLimitsSetting_MEMOS, user.ID, 5))+ _, err := replica.CreateUsageLimit(ctx, usageLimit(uid, storepb.InstanceUsageLimitsSetting_MEMO_COUNT, user.ID, 5))if err == nil {mu.Lock()created = append(created, uid)@@ -340,7 +436,7 @@ func TestUsageLimitsAcrossReplicas(t *testing.T) {for _, uid := range created {require.Contains(t, stored, uid)}- require.Len(t, stored, 2+len(created))+ require.Len(t, stored, 4+len(created))}// isExpectedUsageLimitRace reports the errors a losing concurrent writer maydiff --git a/store/usage_limit.go b/store/usage_limit.goindex 3c3bd5ca8..577221340 100644--- a/store/usage_limit.go+++ b/store/usage_limit.go@@ -9,6 +9,7 @@ import ("github.com/pkg/errors""google.golang.org/protobuf/encoding/protojson""google.golang.org/protobuf/proto"+ "google.golang.org/protobuf/types/known/emptypb""google.golang.org/protobuf/types/known/timestamppb"storepb "github.com/usememos/memos/proto/gen/store"@@ -18,6 +19,22 @@ import (// share one system_setting row, so the cap also bounds that row's size.const MaxUsageLimits = 1000+// DefaultUploadBytes is the default per-file upload limit in bytes. 32 MiB.+const DefaultUploadBytes int64 = 32 << 20++// DefaultMemoContentBytes is the default per-memo content limit in bytes. 8 KiB.+const DefaultMemoContentBytes int64 = 8 << 10++func newDefaultInstanceUsageLimitsSetting() *storepb.InstanceUsageLimitsSetting {+ return &storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{{+ Uid: "default-upload", Metric: storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES, Value: DefaultUploadBytes,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{AllUsers: &emptypb.Empty{}},+ }, {+ Uid: "default-memo-content", Metric: storepb.InstanceUsageLimitsSetting_MEMO_CONTENT_BYTES, Value: DefaultMemoContentBytes,+ Target: &storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers{AllUsers: &emptypb.Empty{}},+ }}}+}+// usageLimitWriteAttempts bounds the read, modify, and conditional write cycle// when other writers keep changing the usage limits row.const usageLimitWriteAttempts = 5@@ -47,7 +64,8 @@ var (// ValidateInstanceUsageLimitsSetting checks the rules every stored list of// usage limits meets, whether it comes from the API or from a deployment file:// at most MaxUsageLimits entries, valid and unique IDs, known metrics,-// non-negative values and user IDs, and at most one limit per metric and user.+// non-negative values, an explicit all-users target or a positive user ID,+// and at most one limit per metric and target.func ValidateInstanceUsageLimitsSetting(setting *storepb.InstanceUsageLimitsSetting) error {limits := setting.GetLimits()if len(limits) > MaxUsageLimits {@@ -67,10 +85,19 @@ func ValidateInstanceUsageLimitsSetting(setting *storepb.InstanceUsageLimitsSettreturn errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].uid %q must be lowercase kebab case, start with a letter, and have at most %d characters", i, limit.Uid, maxUsageLimitUIDLength)}if !IsValidUsageLimitMetric(limit.Metric) {- return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].metric must be MEMOS, STORAGE_BYTES, or UPLOAD_BYTES", i)+ return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].metric must be MEMO_COUNT, STORAGE_BYTES, UPLOAD_BYTES, or MEMO_CONTENT_BYTES", i)}- if limit.UserId < 0 {- return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].userId must not be negative", i)+ switch target := limit.Target.(type) {+ case *storepb.InstanceUsageLimitsSetting_UsageLimit_AllUsers:+ if target == nil || target.AllUsers == nil {+ return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].allUsers must be populated", i)+ }+ case *storepb.InstanceUsageLimitsSetting_UsageLimit_UserId:+ if target == nil || target.UserId <= 0 {+ return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].userId must be positive", i)+ }+ default:+ return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].target must be allUsers or userId", i)}if limit.Value < 0 {return errors.Wrapf(ErrInvalidUsageLimit, "limits[%d].value must not be negative", i)@@ -79,9 +106,9 @@ func ValidateInstanceUsageLimitsSetting(setting *storepb.InstanceUsageLimitsSettreturn errors.Wrapf(ErrUsageLimitAlreadyExists, "usage limit ID %q is used more than once", limit.Uid)}uids[limit.Uid] = struct{}{}- key := target{metric: limit.Metric, userID: limit.UserId}+ key := target{metric: limit.Metric, userID: limit.GetUserId()}if _, ok := targets[key]; ok {- return errors.Wrapf(ErrUsageLimitAlreadyExists, "more than one %s limit for user ID %d", limit.Metric, limit.UserId)+ return errors.Wrapf(ErrUsageLimitAlreadyExists, "more than one %s limit for user ID %d", limit.Metric, limit.GetUserId())}targets[key] = struct{}{}}@@ -91,9 +118,10 @@ func ValidateInstanceUsageLimitsSetting(setting *storepb.InstanceUsageLimitsSett// IsValidUsageLimitMetric reports whether metric is one that limits can be set for.func IsValidUsageLimitMetric(metric storepb.InstanceUsageLimitsSetting_Metric) bool {switch metric {- case storepb.InstanceUsageLimitsSetting_MEMOS,+ case storepb.InstanceUsageLimitsSetting_MEMO_COUNT,storepb.InstanceUsageLimitsSetting_STORAGE_BYTES,- storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES:+ storepb.InstanceUsageLimitsSetting_UPLOAD_BYTES,+ storepb.InstanceUsageLimitsSetting_MEMO_CONTENT_BYTES:return truedefault:return false@@ -103,7 +131,9 @@ func IsValidUsageLimitMetric(metric storepb.InstanceUsageLimitsSetting_Metric) b// GetInstanceUsageLimitsSetting returns every usage limit. A deployment file// takes precedence over the database. The database row is read directly,// without the instance setting cache, so a change made through any replica-// applies at the next check on every replica.+// applies at the next check on every replica. An absent setting defaults to+// a 32 MiB per-file limit and an 8 KiB per-memo content limit. Existing settings,+// including empty lists, are preserved.func (s *Store) GetInstanceUsageLimitsSetting(ctx context.Context) (*storepb.InstanceUsageLimitsSetting, error) {instanceSetting := s.getDeploymentInstanceSetting(storepb.InstanceSettingKey_USAGE_LIMITS)if instanceSetting == nil {@@ -114,21 +144,27 @@ func (s *Store) GetInstanceUsageLimitsSetting(ctx context.Context) (*storepb.Ins}}if setting := instanceSetting.GetUsageLimitsSetting(); setting != nil {+ if err := ValidateInstanceUsageLimitsSetting(setting); err != nil {+ return nil, errors.Wrap(err, "invalid usage limits setting")+ }return setting, nil}- return &storepb.InstanceUsageLimitsSetting{}, nil+ return newDefaultInstanceUsageLimitsSetting(), nil}-// CreateUsageLimit adds a usage limit. create.Uid, Metric, UserId, and Value+// CreateUsageLimit adds a usage limit. create.Uid, Metric, Target, and Value// must be set; the create and update times are set here.func (s *Store) CreateUsageLimit(ctx context.Context, create *storepb.InstanceUsageLimitsSetting_UsageLimit) (*storepb.InstanceUsageLimitsSetting_UsageLimit, error) {+ if err := ValidateInstanceUsageLimitsSetting(&storepb.InstanceUsageLimitsSetting{Limits: []*storepb.InstanceUsageLimitsSetting_UsageLimit{create}}); err != nil {+ return nil, err+ }var created *storepb.InstanceUsageLimitsSetting_UsageLimiterr := s.mutateUsageLimits(ctx, func(limits []*storepb.InstanceUsageLimitsSetting_UsageLimit) ([]*storepb.InstanceUsageLimitsSetting_UsageLimit, bool, error) {for _, limit := range limits {if limit.Uid == create.Uid {return nil, false, errors.Wrapf(ErrUsageLimitAlreadyExists, "usage limit ID %q already exists", create.Uid)}- if limit.Metric == create.Metric && limit.UserId == create.UserId {+ if limit.Metric == create.Metric && limit.GetUserId() == create.GetUserId() {return nil, false, errors.Wrapf(ErrUsageLimitAlreadyExists, "usage limit %q already sets %s for this user", limit.Uid, limit.Metric)}}@@ -186,7 +222,7 @@ func (s *Store) DeleteUsageLimitsForUser(ctx context.Context, userID int32) erro}return s.mutateUsageLimits(ctx, func(limits []*storepb.InstanceUsageLimitsSetting_UsageLimit) ([]*storepb.InstanceUsageLimitsSetting_UsageLimit, bool, error) {before := len(limits)- next := slices.DeleteFunc(limits, func(limit *storepb.InstanceUsageLimitsSetting_UsageLimit) bool { return limit.UserId == userID })+ next := slices.DeleteFunc(limits, func(limit *storepb.InstanceUsageLimitsSetting_UsageLimit) bool { return limit.GetUserId() == userID })return next, len(next) != before, nil})}@@ -218,6 +254,11 @@ func (s *Store) mutateUsageLimits(ctx context.Context, mutate usageLimitsMutatioif err := protojsonUnmarshaler.Unmarshal([]byte(oldValue), current); err != nil {return errors.Wrap(err, "failed to parse stored usage limits")}+ } else {+ current = newDefaultInstanceUsageLimitsSetting()+ }+ if err := ValidateInstanceUsageLimitsSetting(current); err != nil {+ return errors.Wrap(err, "invalid stored usage limits")}next, changed, err := mutate(current.Limits)@@ -263,8 +304,8 @@ func (s *Store) mutateUsageLimits(ctx context.Context, mutate usageLimitsMutatiofunc (s *Store) pruneUsageLimitsOfMissingUsers(ctx context.Context, limits []*storepb.InstanceUsageLimitsSetting_UsageLimit) ([]*storepb.InstanceUsageLimitsSetting_UsageLimit, error) {userIDs := []int32{}for _, limit := range limits {- if limit.UserId != 0 && !slices.Contains(userIDs, limit.UserId) {- userIDs = append(userIDs, limit.UserId)+ if limit.GetUserId() != 0 && !slices.Contains(userIDs, limit.GetUserId()) {+ userIDs = append(userIDs, limit.GetUserId())}}if len(userIDs) == 0 {@@ -279,10 +320,10 @@ func (s *Store) pruneUsageLimitsOfMissingUsers(ctx context.Context, limits []*stexisting[user.ID] = struct{}{}}return slices.DeleteFunc(limits, func(limit *storepb.InstanceUsageLimitsSetting_UsageLimit) bool {- if limit.UserId == 0 {+ if limit.GetUserId() == 0 {return false}- _, ok := existing[limit.UserId]+ _, ok := existing[limit.GetUserId()]return !ok}), nil}diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsxindex 9181ccbe5..7c3999a00 100644--- a/web/src/components/Settings/MemoRelatedSettings.tsx+++ b/web/src/components/Settings/MemoRelatedSettings.tsx@@ -20,35 +20,15 @@ import { SettingList, SettingListItem, SettingPanel } from "./SettingList";import SettingSection from "./SettingSection";import useInstanceSettingUpdater, { buildInstanceSettingName } from "./useInstanceSettingUpdater";-const MIN_CONTENT_LENGTH_LIMIT = 8 * 1024;-const MAX_CONTENT_LENGTH_LIMIT = 2_147_483_647;--const parseContentLengthLimit = (value: string): number | undefined => {- if (value.trim() === "") {- return undefined;- }-- const parsed = Number(value);- if (!Number.isFinite(parsed) || !Number.isInteger(parsed)) {- return undefined;- }- if (parsed < MIN_CONTENT_LENGTH_LIMIT || parsed > MAX_CONTENT_LENGTH_LIMIT) {- return undefined;- }- return parsed;-};-const MemoRelatedSettings = () => {const t = useTranslate();const saveInstanceSetting = useInstanceSettingUpdater();const { memoRelatedSetting: originalSetting } = useInstance();const [memoRelatedSetting, setMemoRelatedSetting] = useState<InstanceSetting_MemoRelatedSetting>(originalSetting);- const [contentLengthLimitInput, setContentLengthLimitInput] = useState(String(originalSetting.contentLengthLimit));const [editingReaction, setEditingReaction] = useState<string>("");useEffect(() => {setMemoRelatedSetting(originalSetting);- setContentLengthLimitInput(String(originalSetting.contentLengthLimit));}, [originalSetting]);const updatePartialSetting = (partial: Partial<InstanceSetting_MemoRelatedSetting>) => {@@ -70,34 +50,18 @@ const MemoRelatedSettings = () => {};const handleUpdateSetting = async () => {- const contentLengthLimit = parseContentLengthLimit(contentLengthLimitInput);- if (contentLengthLimit === undefined) {- toast.error(- t("setting.memo.content-length-limit-error", {- min: MIN_CONTENT_LENGTH_LIMIT,- max: MAX_CONTENT_LENGTH_LIMIT,- }),- );- return;- }-if (memoRelatedSetting.reactions.length === 0) {toast.error(t("setting.memo.reactions-required"));return;}- const updatedMemoRelatedSetting = create(InstanceSetting_MemoRelatedSettingSchema, {- ...memoRelatedSetting,- contentLengthLimit,- });-await saveInstanceSetting({key: InstanceSetting_Key.MEMO_RELATED,setting: create(InstanceSettingSchema, {name: buildInstanceSettingName(InstanceSetting_Key.MEMO_RELATED),value: {case: "memoRelatedSetting",- value: updatedMemoRelatedSetting,+ value: memoRelatedSetting,},}),errorContext: "Update memo-related settings",@@ -106,7 +70,7 @@ const MemoRelatedSettings = () => {return (<SettingSection title={t("setting.memo.label")}>- <SettingGroup title={t("setting.memo.editing-title")} description={t("setting.memo.editing-description")}>+ <SettingGroup title={t("setting.memo.editing-title")}><SettingList><SettingListItemlabel={t("setting.system.enable-double-click-to-edit")}@@ -117,25 +81,6 @@ const MemoRelatedSettings = () => {onCheckedChange={(checked) => updatePartialSetting({ enableDoubleClickEdit: checked })}/></SettingListItem>-- <SettingListItem label={t("setting.memo.content-length-limit")} description={t("setting.memo.content-length-limit-description")}>- <div className="flex items-center gap-2">- <Input- className="w-28 font-mono"- type="number"- min={MIN_CONTENT_LENGTH_LIMIT}- max={MAX_CONTENT_LENGTH_LIMIT}- step={1}- required- aria-label={t("setting.memo.content-length-limit")}- value={contentLengthLimitInput}- onChange={(event) => setContentLengthLimitInput(event.target.value)}- />- <span className="text-xs text-muted-foreground">- {t("setting.memo.content-length-limit-minimum", { min: MIN_CONTENT_LENGTH_LIMIT })}- </span>- </div>- </SettingListItem></SettingList></SettingGroup>@@ -184,10 +129,7 @@ const MemoRelatedSettings = () => {</SettingGroup><div className="w-full flex justify-end">- <Button- disabled={isEqual(memoRelatedSetting, originalSetting) && contentLengthLimitInput === String(originalSetting.contentLengthLimit)}- onClick={handleUpdateSetting}- >+ <Button disabled={isEqual(memoRelatedSetting, originalSetting)} onClick={handleUpdateSetting}>{t("common.save")}</Button></div>diff --git a/web/src/components/Settings/UsageLimitDialog.tsx b/web/src/components/Settings/UsageLimitDialog.tsxindex 578d977d2..5efdd6899 100644--- a/web/src/components/Settings/UsageLimitDialog.tsx+++ b/web/src/components/Settings/UsageLimitDialog.tsx@@ -101,7 +101,12 @@ function UsageLimitDialog({ open, onOpenChange, target, candidates }: Props) {};const fields = [- { metric: UsageLimit_Metric.MEMOS, label: t("setting.usage-limits.memos"), help: t("setting.usage-limits.memos-description") },+ { metric: UsageLimit_Metric.MEMO_COUNT, label: t("setting.usage-limits.memos"), help: t("setting.usage-limits.memos-description") },+ {+ metric: UsageLimit_Metric.MEMO_CONTENT_BYTES,+ label: t("setting.usage-limits.content-size"),+ help: t("setting.usage-limits.content-size-description"),+ },{metric: UsageLimit_Metric.STORAGE_BYTES,label: t("setting.usage-limits.storage"),@@ -155,9 +160,14 @@ function UsageLimitDialog({ open, onOpenChange, target, candidates }: Props) {placeholder={placeholder(metric)}value={inputs[metric]}aria-invalid={isInvalid(metric)}+ aria-describedby={message ? `usage-limit-help-${metric}` : undefined}onChange={(event) => setInputs((current) => ({ ...current, [metric]: event.target.value }))}/>- {message && <p className="text-xs text-muted-foreground">{message}</p>}+ {message && (+ <p id={`usage-limit-help-${metric}`} className="text-xs text-muted-foreground">+ {message}+ </p>+ )}</div>);})}diff --git a/web/src/components/Settings/UsageLimitsSection.tsx b/web/src/components/Settings/UsageLimitsSection.tsxindex ec6cb846d..061c2b255 100644--- a/web/src/components/Settings/UsageLimitsSection.tsx+++ b/web/src/components/Settings/UsageLimitsSection.tsx@@ -125,7 +125,12 @@ const UsageLimitsSection = () => {</div>),},- { key: "memos", header: t("setting.usage-limits.memos"), render: renderLimit(UsageLimit_Metric.MEMOS) },+ { key: "memos", header: t("setting.usage-limits.memos"), render: renderLimit(UsageLimit_Metric.MEMO_COUNT) },+ {+ key: "contentSize",+ header: t("setting.usage-limits.content-size-column"),+ render: renderLimit(UsageLimit_Metric.MEMO_CONTENT_BYTES),+ },{ key: "storage", header: t("setting.usage-limits.storage-column"), render: renderLimit(UsageLimit_Metric.STORAGE_BYTES) },{ key: "fileSize", header: t("setting.usage-limits.file-size-column"), render: renderLimit(UsageLimit_Metric.UPLOAD_BYTES) },{diff --git a/web/src/components/Settings/UsageSection.tsx b/web/src/components/Settings/UsageSection.tsxindex 8b5659e75..7cded0555 100644--- a/web/src/components/Settings/UsageSection.tsx+++ b/web/src/components/Settings/UsageSection.tsx@@ -17,10 +17,11 @@ const UsageSection = () => {if (!usage) return null;- const memosLimit = usage.memosLimit?.value ?? 0n;+ const memoCountLimit = usage.memoCountLimit?.value ?? 0n;const storageLimit = usage.storageBytesLimit?.value ?? 0n;const fileSizeLimit = usage.uploadBytesLimit?.value ?? 0n;- if (memosLimit === 0n && storageLimit === 0n && fileSizeLimit === 0n) return null;+ const contentSizeLimit = usage.memoContentBytesLimit?.value ?? 0n;+ if (memoCountLimit === 0n && storageLimit === 0n && fileSizeLimit === 0n && contentSizeLimit === 0n) return null;const of = (metric: UsageLimit_Metric, used: bigint, limit: bigint) =>limit === 0n@@ -30,8 +31,14 @@ const UsageSection = () => {return (<SettingGroup showSeparator title={t("setting.account.usage-title")} description={t("setting.account.usage-description")}><SettingList>- <StatRow label={t("setting.account.usage-memos")} value={of(UsageLimit_Metric.MEMOS, usage.memoCount, memosLimit)} />+ <StatRow label={t("setting.account.usage-memos")} value={of(UsageLimit_Metric.MEMO_COUNT, usage.memoCount, memoCountLimit)} /><StatRow label={t("setting.account.usage-storage")} value={of(UsageLimit_Metric.STORAGE_BYTES, usage.storageBytes, storageLimit)} />+ {contentSizeLimit > 0n && (+ <StatRow+ label={t("setting.usage-limits.content-size-column")}+ value={formatLimitValue(UsageLimit_Metric.MEMO_CONTENT_BYTES, contentSizeLimit)}+ />+ )}{fileSizeLimit > 0n && (<StatRow label={t("setting.account.usage-file-size")} value={formatLimitValue(UsageLimit_Metric.UPLOAD_BYTES, fileSizeLimit)} />)}diff --git a/web/src/components/Settings/usageLimitValues.ts b/web/src/components/Settings/usageLimitValues.tsindex bb6e75e0f..185179e23 100644--- a/web/src/components/Settings/usageLimitValues.ts+++ b/web/src/components/Settings/usageLimitValues.ts@@ -2,16 +2,17 @@ import { UsageLimit_Metric } from "@/types/proto/api/instance_service_pb";import { formatFileSize } from "@/utils/format";const MIB = 1024 * 1024;+const inputUnit = (metric: UsageLimit_Metric) => (metric === UsageLimit_Metric.MEMO_CONTENT_BYTES ? 1024 : MIB);-/** Whether the metric counts bytes. Forms enter byte limits in MiB. */-export const isByteMetric = (metric: UsageLimit_Metric) => metric !== UsageLimit_Metric.MEMOS;+/** Whether the metric counts bytes. Forms enter content limits in KiB and other byte limits in MiB. */+export const isByteMetric = (metric: UsageLimit_Metric) => metric !== UsageLimit_Metric.MEMO_COUNT;-/** Formats a limit for a form field: memos as a count, bytes in MiB. Unlimited is empty. */+/** Formats a limit for a form field: memos as a count, content in KiB, other bytes in MiB. Unlimited is empty. */export function toLimitInput(metric: UsageLimit_Metric, value: bigint | undefined): string {if (value === undefined || value === 0n) return "";if (!isByteMetric(metric)) return value.toString();- const mebibytes = Number(value) / MIB;- return Number.isInteger(mebibytes) ? String(mebibytes) : String(Number(mebibytes.toFixed(2)));+ const size = Number(value) / inputUnit(metric);+ return Number.isInteger(size) ? String(size) : String(Number(size.toFixed(2)));}/**@@ -25,7 +26,7 @@ export function parseLimitInput(metric: UsageLimit_Metric, input: string): biginreturn /^\d+$/.test(text) ? BigInt(text) : undefined;}if (!/^\d+(\.\d+)?$/.test(text)) return undefined;- return BigInt(Math.round(Number(text) * MIB));+ return BigInt(Math.round(Number(text) * inputUnit(metric)));}/** Formats a limit or a usage figure for display. */diff --git a/web/src/hooks/useUsageLimitQueries.ts b/web/src/hooks/useUsageLimitQueries.tsindex 76e8c2818..ea37b5e7e 100644--- a/web/src/hooks/useUsageLimitQueries.ts+++ b/web/src/hooks/useUsageLimitQueries.ts@@ -11,7 +11,12 @@ export const usageLimitKeys = {};/** The metrics an admin can limit, in display order. */-export const USAGE_LIMIT_METRICS = [UsageLimit_Metric.MEMOS, UsageLimit_Metric.STORAGE_BYTES, UsageLimit_Metric.UPLOAD_BYTES] as const;+export const USAGE_LIMIT_METRICS = [+ UsageLimit_Metric.MEMO_COUNT,+ UsageLimit_Metric.MEMO_CONTENT_BYTES,+ UsageLimit_Metric.STORAGE_BYTES,+ UsageLimit_Metric.UPLOAD_BYTES,+] as const;/** Lists every usage limit. Admin only on the server side. */export function useUsageLimits(options?: { enabled?: boolean }) {diff --git a/web/src/lib/error.ts b/web/src/lib/error.tsindex ed8793980..2fe2cf76c 100644--- a/web/src/lib/error.ts+++ b/web/src/lib/error.ts@@ -93,12 +93,14 @@ export function getQuotaExceededMessage(error: unknown): string | undefined {const limit = Number(info.metadata.limit ?? "");const usage = Number(info.metadata.usage ?? "");switch (info.metadata.metric) {- case "MEMOS":+ case "MEMO_COUNT":return `You have reached your limit of ${limit} memos. Delete memos to create new ones.`;case "STORAGE_BYTES":return `This upload would exceed your storage limit of ${formatFileSize(limit)}. You are using ${formatFileSize(usage)}.`;case "UPLOAD_BYTES":return `This file is larger than your limit of ${formatFileSize(limit)} per file.`;+ case "MEMO_CONTENT_BYTES":+ return `This memo is larger than your limit of ${formatFileSize(limit)} per memo. Shorten the content to save it.`;default:return "You have reached a usage limit.";}diff --git a/web/src/locales/ar.json b/web/src/locales/ar.jsonindex b2caa5d28..bb92ac507 100644--- a/web/src/locales/ar.json+++ b/web/src/locales/ar.json@@ -579,17 +579,12 @@"week-start-day-description": "التحكم في اليوم الأول المعروض في العروض التي تشبه التقويم."},"memo": {- "content-length-limit": "حد طول المحتوى (بايت)","reactions": "تفاعلات","label": "مذكرة","reactions-required": "يجب ألا تكون قائمة التفاعلات فارغة","add-reaction": "إضافة رد فعل","configured-reactions": "ردود الفعل المُهيأة",- "content-length-limit-description": "الحد الأقصى لحجم نص المذكرة الذي يقبله الخادم.",- "content-length-limit-error": "يجب أن يكون الحد الأقصى لطول المحتوى عددًا صحيحًا بين{{min}}و{{max}}بايت.",- "content-length-limit-minimum": "الحد الأدنى:{{min}}بايت","double-click-edit-description": "السماح للمستخدمين بفتح تحرير المذكرة بالنقر المزدوج عليها.",- "editing-description": "التحكم في سلوك تحرير المذكرة وحدود المحتوى من جانب الخادم.","editing-title": "التحرير","reaction-placeholder": "مثال: 👍","reactions-description": "حدد خيارات التفاعل التي يمكن للمستخدمين تطبيقها على المذكرات.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/az.json b/web/src/locales/az.jsonindex 8e552d982..ffb1d4d7c 100644--- a/web/src/locales/az.json+++ b/web/src/locales/az.json@@ -597,12 +597,7 @@"memo": {"add-reaction": "Reaksiya əlavə et","configured-reactions": "Təyin edilmiş reaksiyalar",- "content-length-limit": "Məzmun uzunluğu limiti (Bayt)",- "content-length-limit-description": "Serverin qəbul etdiyi maksimum qeyd mətni ölçüsü.",- "content-length-limit-error": "Məzmun uzunluğu limiti {{min}} və {{max}} bayt arasında tam ədəd olmalıdır.",- "content-length-limit-minimum": "Minimum: {{min}} bayt","double-click-edit-description": "İstifadəçilərə qeydə iki dəfə klikləməklə redaktəni açmağa icazə verin.",- "editing-description": "Qeyd redaktəsinin davranışını və server tərəfindəki məzmun limitlərini idarə edin.","editing-title": "Redaktə","label": "Qeyd","reaction-placeholder": "məs. 👍",@@ -918,9 +913,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/bg.json b/web/src/locales/bg.jsonindex dfc75630a..d1eddea17 100644--- a/web/src/locales/bg.json+++ b/web/src/locales/bg.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Добавете реакция","configured-reactions": "Конфигурирани реакции",- "content-length-limit": "Ограничение за дължина на съдържанието (байтове)",- "content-length-limit-description": "Максимален размер на тялото на бележката, приет от сървъра.","double-click-edit-description": "Позволете на потребителите да отварят редактиране на бележки чрез двукратно щракване върху бележка.",- "editing-description": "Контролирайте поведението при редактиране на бележки и ограниченията на съдържанието от страна на сървъра.","editing-title": "Редактиране","label": "Бележка","reaction-placeholder": "напр. 👍","reactions-description": "Определете опциите за реакция, които потребителите могат да прилагат към бележките.","remove-reaction": "Премахнете реакцията","reactions": "Reactions",- "reactions-required": "Списъкът Reactions не трябва да е празен",- "content-length-limit-error": "Ограничението за дължина на съдържанието трябва да е цяло число между {{min}} и {{max}} байта.",- "content-length-limit-minimum": "Минимум: {{min}} байта"+ "reactions-required": "Списъкът Reactions не трябва да е празен"},"my-account": {"label": "Моят акаунт"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/ca.json b/web/src/locales/ca.jsonindex 27fa9bc8a..dc1ccaa4e 100644--- a/web/src/locales/ca.json+++ b/web/src/locales/ca.json@@ -441,21 +441,16 @@"summary-column": "Resum"},"memo": {- "content-length-limit": "Límit de longitud del contingut (Bytes)","label": "Nota","reactions": "Reaccions","reactions-required": "La llista de reaccions no ha d'estar buida","add-reaction": "Afegeix reacció","configured-reactions": "Reaccions configurades",- "content-length-limit-description": "Mida màxima del cos de la nota acceptada pel servidor.","double-click-edit-description": "Permet als usuaris obrir l'edició de notes fent doble clic en una nota.",- "editing-description": "Controleu el comportament d'edició de notes i els límits de contingut del servidor.","editing-title": "Edició","reaction-placeholder": "p. ex. 👍","reactions-description": "Definiu les opcions de reacció que els usuaris poden aplicar a les notes.",- "remove-reaction": "Elimina la reacció",- "content-length-limit-error": "El límit de longitud del contingut ha de ser un nombre enter entre {{min}} i {{max}} bytes.",- "content-length-limit-minimum": "Mínim: {{min}} bytes"+ "remove-reaction": "Elimina la reacció"},"my-account": {"label": "El meu compte"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/cs.json b/web/src/locales/cs.jsonindex 7b1907db8..23b9ab4e2 100644--- a/web/src/locales/cs.json+++ b/web/src/locales/cs.json@@ -441,21 +441,16 @@"summary-column": "Shrnutí"},"memo": {- "content-length-limit": "Omezení velikosti obsahu (bajty)","label": "Poznámky","reactions": "Reakce","reactions-required": "Seznam reakcí nesmí být prázdný","add-reaction": "Přidejte reakci","configured-reactions": "Nastavené reakce",- "content-length-limit-description": "Maximální velikost těla poznámky akceptovaná serverem.","double-click-edit-description": "Umožněte uživatelům otevřít úpravy poznámek dvojitým kliknutím na poznámku.",- "editing-description": "Ovládejte chování při úpravách poznámek a omezení obsahu na straně serveru.","editing-title": "Editace","reaction-placeholder": "např. 👍","reactions-description": "Definujte možnosti reakce, které mohou uživatelé použít na poznámky.",- "remove-reaction": "Odstraňte reakci",- "content-length-limit-error": "Limit délky obsahu musí být celé číslo mezi {{min}} a {{max}} bajty.",- "content-length-limit-minimum": "Minimálně: {{min}} bajtů"+ "remove-reaction": "Odstraňte reakci"},"my-account": {"label": "Můj účet"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/da.json b/web/src/locales/da.jsonindex 7a07f57bd..0c700d07e 100644--- a/web/src/locales/da.json+++ b/web/src/locales/da.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Tilføj reaktion","configured-reactions": "Konfigurerede reaktioner",- "content-length-limit": "Indholdslængdegrænse (Byte)",- "content-length-limit-description": "Maksimal memo-tekststørrelse accepteret af serveren.","double-click-edit-description": "Tillad brugere at åbne notatredigering ved at dobbeltklikke på et memo.",- "editing-description": "Kontroller memoredigeringsadfærd og indholdsgrænser på serversiden.","editing-title": "Redigering","label": "Memo","reaction-placeholder": "f.eks. 👍","reactions-description": "Definer de reaktionsmuligheder, som brugere kan anvende på notater.","remove-reaction": "Fjern reaktion","reactions": "Reactions",- "reactions-required": "Reactions-listen må ikke være tom",- "content-length-limit-error": "Indholdslængdegrænsen skal være et helt tal mellem {{min}} og {{max}} bytes.",- "content-length-limit-minimum": "Minimum: {{min}} bytes"+ "reactions-required": "Reactions-listen må ikke være tom"},"my-account": {"label": "Min konto"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/de.json b/web/src/locales/de.jsonindex fc3192941..4c9a42c74 100644--- a/web/src/locales/de.json+++ b/web/src/locales/de.json@@ -441,21 +441,16 @@"summary-column": "Zusammenfassung"},"memo": {- "content-length-limit": "Limitierung der Inhaltslänge (Byte)","label": "Notiz","reactions": "Reaktionen","reactions-required": "Die Reaktionsliste darf nicht leer sein","add-reaction": "Reaktion hinzufügen","configured-reactions": "Konfigurierte Reaktionen",- "content-length-limit-description": "Maximale vom Server akzeptierte Größe des Memokörpers.","double-click-edit-description": "Ermöglichen Sie Benutzern, die Memobearbeitung zu öffnen, indem sie auf ein Memo doppelklicken.",- "editing-description": "Steuern Sie das Bearbeitungsverhalten von Memos und serverseitige Inhaltsbeschränkungen.","editing-title": "Bearbeitung","reaction-placeholder": "z.B. 👍","reactions-description": "Definieren Sie die Reaktionsoptionen, die Benutzer auf Memos anwenden können.",- "remove-reaction": "Reaktion entfernen",- "content-length-limit-error": "Die maximale Inhaltslänge muss eine ganze Zahl zwischen {{min}} und {{max}} Bytes sein.",- "content-length-limit-minimum": "Minimum: {{min}} Bytes"+ "remove-reaction": "Reaktion entfernen"},"my-account": {"label": "Mein Konto"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/el.json b/web/src/locales/el.jsonindex a0455e48d..cd9952dab 100644--- a/web/src/locales/el.json+++ b/web/src/locales/el.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Προσθέστε την αντίδραση","configured-reactions": "Διαμορφωμένες αντιδράσεις",- "content-length-limit": "Όριο μήκους περιεχομένου (Byte)",- "content-length-limit-description": "Μέγιστο μέγεθος σώματος σημειώματος αποδεκτό από τον διακομιστή.","double-click-edit-description": "Επιτρέψτε στους χρήστες να ανοίξουν την επεξεργασία σημειώσεων κάνοντας διπλό κλικ σε ένα σημείωμα.",- "editing-description": "Ελέγξτε τη συμπεριφορά επεξεργασίας σημειώσεων και τα όρια περιεχομένου από την πλευρά του διακομιστή.","editing-title": "Επεξεργασία","label": "Σημείωμα","reaction-placeholder": "π.χ. 👍","reactions-description": "Καθορίστε τις επιλογές αντίδρασης που μπορούν να εφαρμόσουν οι χρήστες σε σημειώσεις.","remove-reaction": "Αφαιρέστε την αντίδραση","reactions": "Reactions",- "reactions-required": "Η λίστα Reactions δεν πρέπει να είναι κενή",- "content-length-limit-error": "Το όριο μήκους περιεχομένου πρέπει να είναι ακέραιος αριθμός μεταξύ {{min}} και {{max}} byte.",- "content-length-limit-minimum": "Ελάχιστο: {{min}} byte"+ "reactions-required": "Η λίστα Reactions δεν πρέπει να είναι κενή"},"my-account": {"label": "Ο λογαριασμός μου"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/en-GB.json b/web/src/locales/en-GB.jsonindex 8abceff6a..cfb33bcc5 100644--- a/web/src/locales/en-GB.json+++ b/web/src/locales/en-GB.json@@ -441,21 +441,16 @@"summary-column": "Summary"},"memo": {- "content-length-limit": "Content length limit (Byte)","label": "Memo","reactions": "Reactions","reactions-required": "Reactions list must not be empty","add-reaction": "Add reaction","configured-reactions": "Configured reactions",- "content-length-limit-description": "Maximum memo body size accepted by the server.","double-click-edit-description": "Allow users to open memo editing by double-clicking a memo.",- "editing-description": "Control memo editing behaviour and server-side content limits.","editing-title": "Editing","reaction-placeholder": "e.g. 👍","reactions-description": "Define the reaction options users can apply to memos.",- "remove-reaction": "Remove reaction",- "content-length-limit-error": "Content length limit must be a whole number between {{min}} and {{max}} bytes.",- "content-length-limit-minimum": "Minimum: {{min}} bytes"+ "remove-reaction": "Remove reaction"},"my-account": {"label": "My Account"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/en.json b/web/src/locales/en.jsonindex e0cd7c45f..2c02667cb 100644--- a/web/src/locales/en.json+++ b/web/src/locales/en.json@@ -597,12 +597,7 @@"memo": {"add-reaction": "Add reaction","configured-reactions": "Configured reactions",- "content-length-limit": "Content length limit (Byte)",- "content-length-limit-description": "Maximum memo body size accepted by the server.",- "content-length-limit-error": "Content length limit must be a whole number between {{min}} and {{max}} bytes.",- "content-length-limit-minimum": "Minimum: {{min}} bytes","double-click-edit-description": "Allow users to open memo editing by double-clicking a memo.",- "editing-description": "Control memo editing behavior and server-side content limits.","editing-title": "Editing","label": "Memo","reaction-placeholder": "e.g. 👍",@@ -918,9 +913,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/es.json b/web/src/locales/es.jsonindex cdc91765a..56258bd90 100644--- a/web/src/locales/es.json+++ b/web/src/locales/es.json@@ -441,21 +441,16 @@"summary-column": "Resumen"},"memo": {- "content-length-limit": "Límite de longitud de contenido (Bytes)","label": "Memo","reactions": "Reacciones","reactions-required": "La lista de reacciones no debe estar vacía.","add-reaction": "Añadir reacción","configured-reactions": "Reacciones configuradas",- "content-length-limit-description": "Tamaño máximo del cuerpo de la nota aceptado por el servidor.","double-click-edit-description": "Permita a los usuarios abrir la edición de notas haciendo doble clic en una nota.",- "editing-description": "Controle el comportamiento de edición de notas y los límites de contenido del lado del servidor.","editing-title": "Edición","reaction-placeholder": "p.ej. 👍","reactions-description": "Defina las opciones de reacción que los usuarios pueden aplicar a las notas.",- "remove-reaction": "Eliminar reacción",- "content-length-limit-error": "El límite de longitud del contenido debe ser un número entero entre{{min}}y{{max}}bytes.",- "content-length-limit-minimum": "Mínimo: {{min}} bytes"+ "remove-reaction": "Eliminar reacción"},"my-account": {"label": "Mi cuenta"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/et.json b/web/src/locales/et.jsonindex c6879b9f6..9f0a07c03 100644--- a/web/src/locales/et.json+++ b/web/src/locales/et.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Lisa reaktsioon","configured-reactions": "Konfigureeritud reaktsioonid",- "content-length-limit": "Sisu pikkuse piirang (bait)",- "content-length-limit-description": "Serveri poolt aktsepteeritud memokorpuse maksimaalne suurus.","double-click-edit-description": "Lubage kasutajatel memo redigeerimist avada, topeltklõpsates memo.",- "editing-description": "Kontrollige memode redigeerimise käitumist ja serveripoolseid sisupiiranguid.","editing-title": "Redigeerimine","label": "Memo","reaction-placeholder": "nt. 👍","reactions-description": "Määratlege reaktsioonivalikud, mida kasutajad saavad memodele rakendada.","remove-reaction": "Eemaldage reaktsioon","reactions": "Reactions",- "reactions-required": "Reactionsi loend ei tohi olla tühi",- "content-length-limit-error": "Sisu pikkuse piirang peab olema täisarv vahemikus {{min}} kuni {{max}} baiti.",- "content-length-limit-minimum": "Minimaalselt: {{min}} baiti"+ "reactions-required": "Reactionsi loend ei tohi olla tühi"},"my-account": {"label": "Minu konto"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/fa.json b/web/src/locales/fa.jsonindex de4414bf3..975df1a41 100644--- a/web/src/locales/fa.json+++ b/web/src/locales/fa.json@@ -579,17 +579,12 @@"week-start-day-description": "اولین روزی که در نماهای تقویم مانند نشان داده میشود را کنترل میکند."},"memo": {- "content-length-limit": "محدودیت طول محتوا (بایت)","reactions": "واکنشها","label": "یادداشت","reactions-required": "لیست واکنش ها نباید خالی باشد","add-reaction": "افزودن واکنش","configured-reactions": "واکنشهای پیکربندی شده",- "content-length-limit-description": "حداکثر اندازه بدنه یادداشت که توسط سرور پذیرفته میشود.",- "content-length-limit-error": "محدودیت طول محتوا باید یک عدد صحیح بین {{min}} و {{max}} بایت باشد.",- "content-length-limit-minimum": "حداقل: {{min}} بایت","double-click-edit-description": "به کاربران اجازه دهید با دوبار کلیک کردن روی یک یادداشت، ویرایش یادداشت را باز کنند.",- "editing-description": "رفتار ویرایش یادداشت و محدودیتهای محتوای سمت سرور را کنترل کنید.","editing-title": "ویرایش","reaction-placeholder": "مثلاً 👍","reactions-description": "گزینههای واکنشی را که کاربران میتوانند برای یادداشتها اعمال کنند، تعریف کنید.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/fi.json b/web/src/locales/fi.jsonindex 783b06c33..dffe5623a 100644--- a/web/src/locales/fi.json+++ b/web/src/locales/fi.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Lisää reaktio","configured-reactions": "Konfiguroidut reaktiot",- "content-length-limit": "Sisällön pituusrajoitus (tavu)",- "content-length-limit-description": "Palvelimen hyväksymä muistion rungon enimmäiskoko.","double-click-edit-description": "Salli käyttäjien avata muistion muokkaus kaksoisnapsauttamalla muistiota.",- "editing-description": "Hallitse muistioiden muokkauskäyttäytymistä ja palvelinpuolen sisältörajoituksia.","editing-title": "Muokkaus","label": "Muistio","reaction-placeholder": "esim. 👍","reactions-description": "Määritä reaktiovaihtoehdot, joita käyttäjät voivat soveltaa muistioihin.","remove-reaction": "Poista reaktio","reactions": "Reactions",- "reactions-required": "Reactions-luettelo ei saa olla tyhjä",- "content-length-limit-error": "Sisällön pituusrajan on oltava kokonaisluku väliltä {{min}} ja {{max}} tavua.",- "content-length-limit-minimum": "Vähintään: {{min}} tavua"+ "reactions-required": "Reactions-luettelo ei saa olla tyhjä"},"my-account": {"label": "Oma tili"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/fr.json b/web/src/locales/fr.jsonindex fb7db0e8d..9a63dad36 100644--- a/web/src/locales/fr.json+++ b/web/src/locales/fr.json@@ -441,21 +441,16 @@"summary-column": "Résumé"},"memo": {- "content-length-limit": "Limite de longueur du contenu (octets)","label": "Note","reactions": "Réactions","reactions-required": "La liste des réactions ne doit pas être vide","add-reaction": "Ajouter une réaction","configured-reactions": "Réactions configurées",- "content-length-limit-description": "Taille maximale du corps du mémo acceptée par le serveur.","double-click-edit-description": "Autorisez les utilisateurs à ouvrir l'édition d'un mémo en double-cliquant sur un mémo.",- "editing-description": "Contrôlez le comportement d’édition des mémos et les limites de contenu côté serveur.","editing-title": "Édition","reaction-placeholder": "par ex. 👍","reactions-description": "Définissez les options de réaction que les utilisateurs peuvent appliquer aux mémos.",- "remove-reaction": "Supprimer la réaction",- "content-length-limit-error": "La longueur du contenu doit être un nombre entier compris entre {{min}} et {{max}} octets.",- "content-length-limit-minimum": "Minimum : {{min}} octets"+ "remove-reaction": "Supprimer la réaction"},"my-account": {"label": "Mon compte"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/gl.json b/web/src/locales/gl.jsonindex 7da03d85c..e3dcfc61c 100644--- a/web/src/locales/gl.json+++ b/web/src/locales/gl.json@@ -441,21 +441,16 @@"summary-column": "Resumo"},"memo": {- "content-length-limit": "Límite de lonxitude do contido (Byte)","label": "Memo","reactions": "Reaccións","reactions-required": "A lista de reaccións non debe estar baleira","add-reaction": "Engadir reacción","configured-reactions": "Reaccións configuradas",- "content-length-limit-description": "Tamaño máximo do corpo da nota aceptado polo servidor.","double-click-edit-description": "Permite aos usuarios abrir a edición de notas facendo dobre clic nunha nota.",- "editing-description": "Controla o comportamento de edición de notas e os límites de contido do servidor.","editing-title": "Edición","reaction-placeholder": "p.ex. 👍","reactions-description": "Define as opcións de reacción que os usuarios poden aplicar ás notas.",- "remove-reaction": "Eliminar a reacción",- "content-length-limit-error": "O límite de lonxitude do contido debe ser un número enteiro entre {{min}} e {{max}} bytes.",- "content-length-limit-minimum": "Mínimo: {{min}} bytes"+ "remove-reaction": "Eliminar a reacción"},"my-account": {"label": "A miña conta"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/he.json b/web/src/locales/he.jsonindex bb65fb09d..47d01cbf7 100644--- a/web/src/locales/he.json+++ b/web/src/locales/he.json@@ -557,19 +557,14 @@"memo": {"add-reaction": "הוסף תגובה","configured-reactions": "תגובות שהוגדרו",- "content-length-limit": "מגבלת אורך תוכן (בתים)",- "content-length-limit-description": "גודל גוף הפתק המרבי שהשרת מקבל.","double-click-edit-description": "אפשרו למשתמשים לפתוח עריכת פתק בלחיצה כפולה על פתק.",- "editing-description": "שליטה בהתנהגות עריכת הפתקים ובמגבלות התוכן בצד השרת.","editing-title": "עריכה","label": "פתק","reaction-placeholder": "לדוגמה 👍","reactions-description": "הגדירו את אפשרויות התגובה שמשתמשים יכולים להחיל על פתקים.","remove-reaction": "הסר תגובה","reactions": "תגובות",- "reactions-required": "רשימת התגובות לא יכולה להיות ריקה",- "content-length-limit-error": "מגבלת אורך התוכן חייבת להיות מספר שלם בין {{min}} ל-{{max}} בתים.",- "content-length-limit-minimum": "מינימום: {{min}} בתים"+ "reactions-required": "רשימת התגובות לא יכולה להיות ריקה"},"my-account": {"label": "החשבון שלי"@@ -757,9 +752,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/hi.json b/web/src/locales/hi.jsonindex 3b9894cc2..34a9b3bff 100644--- a/web/src/locales/hi.json+++ b/web/src/locales/hi.json@@ -579,17 +579,12 @@"week-start-day-description": "कैलेंडर-स्टाइल व्यू में दिखाए जाने वाले पहले दिन को कंट्रोल करता है।"},"memo": {- "content-length-limit": "सामग्री की अधिकतम लंबाई (बाइट)","reactions": "प्रतिक्रियाएँ","label": "मेमो","reactions-required": "प्रतिक्रिया सूची खाली नहीं होनी चाहिए","add-reaction": "रिएक्शन जोड़ें","configured-reactions": "कॉन्फ़िगर किए गए रिएक्शन",- "content-length-limit-description": "सर्वर द्वारा मंज़ूर किया जाने वाला ज़्यादा से ज़्यादा मेमो बॉडी साइज़।",- "content-length-limit-error": "कंटेंट की लंबाई की लिमिट {{min}} और {{max}} बाइट्स के बीच एक पूरा नंबर होना चाहिए।",- "content-length-limit-minimum": "कम से कम: {{min}} बाइट्स","double-click-edit-description": "यूज़र्स को मेमो पर डबल-क्लिक करके मेमो एडिटिंग खोलने की अनुमति दें।",- "editing-description": "मेमो एडिटिंग बिहेवियर और सर्वर-साइड कंटेंट लिमिट को कंट्रोल करें।","editing-title": "एडिटिंग","reaction-placeholder": "जैसे 👍","reactions-description": "उन रिएक्शन ऑप्शन को डिफाइन करें जिन्हें यूज़र्स मेमो पर अप्लाई कर सकते हैं।",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/hr.json b/web/src/locales/hr.jsonindex 768c42378..b95cb105f 100644--- a/web/src/locales/hr.json+++ b/web/src/locales/hr.json@@ -441,21 +441,16 @@"summary-column": "Sažetak"},"memo": {- "content-length-limit": "Ograničenje duljine sadržaja (Bajt)","label": "Memo","reactions": "Reakcije","reactions-required": "Popis reakcija ne smije biti prazan","add-reaction": "Dodajte reakciju","configured-reactions": "Konfigurirane reakcije",- "content-length-limit-description": "Maksimalna veličina tijela bilješke koju prihvaća poslužitelj.","double-click-edit-description": "Omogućite korisnicima da otvore uređivanje bilješki dvostrukim klikom na bilješku.",- "editing-description": "Kontrolirajte ponašanje uređivanja bilješki i ograničenja sadržaja na strani poslužitelja.","editing-title": "Uređivanje","reaction-placeholder": "npr. 👍","reactions-description": "Definirajte opcije reakcije koje korisnici mogu primijeniti na dopise.",- "remove-reaction": "Ukloni reakciju",- "content-length-limit-error": "Ograničenje duljine sadržaja mora biti cijeli broj između {{min}} i {{max}} bajtova.",- "content-length-limit-minimum": "Minimum: {{min}} bajtova"+ "remove-reaction": "Ukloni reakciju"},"my-account": {"label": "Moj račun"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/hu.json b/web/src/locales/hu.jsonindex 591904c76..451e8f695 100644--- a/web/src/locales/hu.json+++ b/web/src/locales/hu.json@@ -441,21 +441,16 @@"summary-column": "Összegzés"},"memo": {- "content-length-limit": "Tartalom hosszának korlátja (bájt)","label": "Jegyzet","reactions": "Reakciók","reactions-required": "A reakciólista nem lehet üres","add-reaction": "Adja hozzá a reakciót","configured-reactions": "Konfigurált reakciók",- "content-length-limit-description": "A kiszolgáló által elfogadott maximális emlékeztető törzsméret.","double-click-edit-description": "Lehetővé teszi a felhasználók számára, hogy a jegyzetre duplán kattintva nyissa meg a jegyzetszerkesztést.",- "editing-description": "Szabályozza a jegyzetszerkesztési viselkedést és a szerveroldali tartalomkorlátokat.","editing-title": "Szerkesztés","reaction-placeholder": "például 👍","reactions-description": "Határozza meg azokat a reakciólehetőségeket, amelyeket a felhasználók a jegyzetekre alkalmazhatnak.",- "remove-reaction": "Távolítsa el a reakciót",- "content-length-limit-error": "A tartalom hosszkorlátjának {{min}} és {{max}} bájt közötti egész számnak kell lennie.",- "content-length-limit-minimum": "Minimum: {{min}} bájt"+ "remove-reaction": "Távolítsa el a reakciót"},"my-account": {"label": "Fiókom"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/id.json b/web/src/locales/id.jsonindex 170108df4..d6b1e4213 100644--- a/web/src/locales/id.json+++ b/web/src/locales/id.json@@ -579,17 +579,12 @@"week-start-day-description": "Mengontrol hari pertama yang ditampilkan dalam tampilan bergaya kalender."},"memo": {- "content-length-limit": "Batas panjang konten (Byte)","reactions": "Reaksi","label": "Memo","reactions-required": "Daftar reaksi wajib diisi","add-reaction": "Tambahkan reaksi","configured-reactions": "Reaksi yang dikonfigurasi",- "content-length-limit-description": "Ukuran maksimum isi memo yang diterima oleh server.",- "content-length-limit-error": "Batas panjang konten harus berupa bilangan bulat antara {{min}} dan {{max}} byte.",- "content-length-limit-minimum": "Minimum: {{min}} byte","double-click-edit-description": "Izinkan pengguna untuk membuka pengeditan memo dengan mengklik dua kali memo.",- "editing-description": "Kontrol perilaku pengeditan memo dan batasan konten sisi server.","editing-title": "Pengeditan","reaction-placeholder": "contoh: 👍","reactions-description": "Tentukan opsi reaksi yang dapat diterapkan pengguna pada memo.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/it.json b/web/src/locales/it.jsonindex 86a81ac7d..699eebbca 100644--- a/web/src/locales/it.json+++ b/web/src/locales/it.json@@ -441,21 +441,16 @@"summary-column": "Riepilogo"},"memo": {- "content-length-limit": "Massima lunghezza contenuto (byte)","label": "Memo","reactions": "Reazioni","reactions-required": "L'elenco delle reazioni non deve essere vuoto","add-reaction": "Aggiungi reazione","configured-reactions": "Reazioni configurate",- "content-length-limit-description": "Dimensione massima del corpo del promemoria accettata dal server.","double-click-edit-description": "Consenti agli utenti di aprire la modifica dei promemoria facendo doppio clic su un promemoria.",- "editing-description": "Controlla il comportamento di modifica dei promemoria e i limiti dei contenuti lato server.","editing-title": "Modifica","reaction-placeholder": "per esempio. 👍","reactions-description": "Definire le opzioni di reazione che gli utenti possono applicare ai promemoria.",- "remove-reaction": "Rimuovi la reazione",- "content-length-limit-error": "Il limite di lunghezza del contenuto deve essere un numero intero compreso tra {{min}} e {{max}} byte.",- "content-length-limit-minimum": "Minimo: {{min}} byte"+ "remove-reaction": "Rimuovi la reazione"},"my-account": {"label": "Il mio account"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/ja.json b/web/src/locales/ja.jsonindex 763f2c8aa..ae050bf4f 100644--- a/web/src/locales/ja.json+++ b/web/src/locales/ja.json@@ -441,21 +441,16 @@"summary-column": "まとめ"},"memo": {- "content-length-limit": "内容の最大長(バイト)","label": "メモ","reactions": "リアクション","reactions-required": "リアクションリストは空にできません","add-reaction": "リアクションを追加","configured-reactions": "設定された反応",- "content-length-limit-description": "サーバーが受け入れるメモ本体の最大サイズ。","double-click-edit-description": "ユーザーがメモをダブルクリックしてメモ編集を開くことができるようにします。",- "editing-description": "メモの編集動作とサーバー側のコンテンツ制限を制御します。","editing-title": "編集","reaction-placeholder": "例えば 👍","reactions-description": "ユーザーがメモに適用できる反応オプションを定義します。",- "remove-reaction": "反応を取り除く",- "content-length-limit-error": "コンテンツの長さ制限は、{{min}}バイトから{{max}}バイトまでの整数である必要があります。",- "content-length-limit-minimum": "最小サイズ: {{min}} バイト"+ "remove-reaction": "反応を取り除く"},"my-account": {"label": "アカウント設定"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/ka-GE.json b/web/src/locales/ka-GE.jsonindex f2b4aec06..f3b983003 100644--- a/web/src/locales/ka-GE.json+++ b/web/src/locales/ka-GE.json@@ -441,21 +441,16 @@"summary-column": "რეზიუმე"},"memo": {- "content-length-limit": "კონტენტის სიგრძის ლიმიტი (ბაიტი)","label": "მემო","reactions": "რეაქციები","reactions-required": "რეაქციების სია არ უნდა იყოს ცარიელი","add-reaction": "დაამატეთ რეაქცია","configured-reactions": "კონფიგურირებული რეაქციები",- "content-length-limit-description": "შენიშვნების სხეულის მაქსიმალური ზომა მიღებულია სერვერის მიერ.","double-click-edit-description": "მიეცით საშუალება მომხმარებლებს გახსნან შენიშვნების რედაქტირება შენიშვნაზე ორჯერ დაწკაპუნებით.",- "editing-description": "აკონტროლეთ შენიშვნების რედაქტირების ქცევა და სერვერის მხრიდან კონტენტის ლიმიტები.","editing-title": "რედაქტირება","reaction-placeholder": "მაგ. 👍","reactions-description": "განსაზღვრეთ რეაქციის ვარიანტები, რომლებიც მომხმარებლებს შეუძლიათ მიმართონ შენიშვნებზე.",- "remove-reaction": "რეაქციის ამოღება",- "content-length-limit-error": "კონტენტის სიგრძის ლიმიტი უნდა იყოს მთელი რიცხვი {{min}}-დან {{max}} ბაიტამდე.",- "content-length-limit-minimum": "მინიმუმი: {{min}} ბაიტი"+ "remove-reaction": "რეაქციის ამოღება"},"my-account": {"label": "ჩემი ანგარიში"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/ko.json b/web/src/locales/ko.jsonindex 6fac393d6..11561712d 100644--- a/web/src/locales/ko.json+++ b/web/src/locales/ko.json@@ -579,17 +579,12 @@"week-start-day-description": "캘린더 스타일 보기에서 표시되는 첫 번째 날짜를 제어합니다."},"memo": {- "content-length-limit": "내용 길이 제한 (바이트)","reactions": "반응","label": "메모","reactions-required": "반응 목록은 비워둘 수 없습니다.","add-reaction": "반응 추가","configured-reactions": "구성된 반응",- "content-length-limit-description": "서버에서 허용하는 최대 메모 본문 크기",- "content-length-limit-error": "콘텐츠 길이 제한은 {{min}}바이트에서 {{max}}바이트 사이의 정수여야 합니다.",- "content-length-limit-minimum": "최소값: {{min}}바이트","double-click-edit-description": "사용자가 메모를 두 번 클릭하여 메모 편집을 시작할 수 있도록 허용합니다.",- "editing-description": "메모 편집 동작 및 서버 측 콘텐츠 제한을 제어합니다.","editing-title": "편집","reaction-placeholder": "예: 👍","reactions-description": "사용자가 메모에 적용할 수 있는 반응 옵션을 정의합니다.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/lt.json b/web/src/locales/lt.jsonindex de98215a1..798b8c710 100644--- a/web/src/locales/lt.json+++ b/web/src/locales/lt.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Pridėti reakciją","configured-reactions": "Sukonfigūruotos reakcijos",- "content-length-limit": "Turinio ilgio riba (baitai)",- "content-length-limit-description": "Didžiausias serverio priimtinas atmintinės korpuso dydis.","double-click-edit-description": "Leiskite vartotojams atidaryti atmintinės redagavimą dukart spustelėdami užrašą.",- "editing-description": "Valdykite atmintinių redagavimo elgseną ir serverio turinio apribojimus.","editing-title": "Redagavimas","label": "Atmintinė","reaction-placeholder": "pvz. 👍","reactions-description": "Apibrėžkite reakcijos parinktis, kurias vartotojai gali pritaikyti atmintinėms.","remove-reaction": "Pašalinti reakciją","reactions": "Reactions",- "reactions-required": "Reactions sąrašas negali būti tuščias",- "content-length-limit-error": "Turinio ilgio riba turi būti sveikasis skaičius nuo {{min}} iki {{max}} baitų.",- "content-length-limit-minimum": "Mažiausiai: {{min}} baitų"+ "reactions-required": "Reactions sąrašas negali būti tuščias"},"my-account": {"label": "Mano paskyra"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/lv.json b/web/src/locales/lv.jsonindex 9b4a1560a..d997a437f 100644--- a/web/src/locales/lv.json+++ b/web/src/locales/lv.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Pievienojiet reakciju","configured-reactions": "Konfigurētas reakcijas",- "content-length-limit": "Satura garuma ierobežojums (baiti)",- "content-length-limit-description": "Maksimālais piezīmes pamatteksta izmērs, ko pieņem serveris.","double-click-edit-description": "Ļaujiet lietotājiem atvērt piezīmju rediģēšanu, veicot dubultklikšķi uz piezīmes.",- "editing-description": "Kontrolējiet piezīmju rediģēšanas uzvedību un servera puses satura ierobežojumus.","editing-title": "Rediģēšana","label": "Piezīme","reaction-placeholder": "piem. 👍","reactions-description": "Definējiet reakcijas opcijas, kuras lietotāji var lietot piezīmēm.","remove-reaction": "Noņemiet reakciju","reactions": "Reactions",- "reactions-required": "Reactions saraksts nedrīkst būt tukšs",- "content-length-limit-error": "Satura garuma ierobežojumam jābūt veselam skaitlim no {{min}} līdz {{max}} baitiem.",- "content-length-limit-minimum": "Minimums: {{min}} baiti"+ "reactions-required": "Reactions saraksts nedrīkst būt tukšs"},"my-account": {"label": "Mans konts"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/mr.json b/web/src/locales/mr.jsonindex f9d253fee..bf66bc4cf 100644--- a/web/src/locales/mr.json+++ b/web/src/locales/mr.json@@ -579,17 +579,12 @@"week-start-day-description": "कॅलेंडर-शैलीतील दृश्यांमध्ये दर्शविल्या जाणाऱ्या पहिल्या दिवसावर नियंत्रण ठेवते."},"memo": {- "content-length-limit": "सामग्रीची कमाल लांबी (बाइट)","reactions": "प्रतिक्रिया","label": "मेमो","reactions-required": "प्रतिक्रियांची यादी रिकामी असू नये","add-reaction": "प्रतिक्रिया जोडा","configured-reactions": "कॉन्फिगर केलेल्या प्रतिक्रिया",- "content-length-limit-description": "सर्व्हरद्वारे स्वीकारला जाणारा कमाल मेमो बॉडी आकार.",- "content-length-limit-error": "सामग्री लांबीची मर्यादा {{min}} आणि {{max}} बाइट्स दरम्यानची पूर्ण संख्या असणे आवश्यक आहे.",- "content-length-limit-minimum": "किमान: {{min}} बाइट्स","double-click-edit-description": "वापरकर्त्यांना मेमोवर डबल-क्लिक करून मेमो संपादन उघडण्याची परवानगी द्या.",- "editing-description": "मेमो संपादन वर्तन आणि सर्व्हर-साइड सामग्री मर्यादा नियंत्रित करा.","editing-title": "संपादन","reaction-placeholder": "उदा. 👍","reactions-description": "वापरकर्ते मेमोंवर लागू करू शकतील असे प्रतिक्रिया पर्याय परिभाषित करा.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/nb.json b/web/src/locales/nb.jsonindex 7c7a8ac03..ef6ead353 100644--- a/web/src/locales/nb.json+++ b/web/src/locales/nb.json@@ -441,21 +441,16 @@"summary-column": "Sammendrag"},"memo": {- "content-length-limit": "Maksimal innholdslengde (Byte)","label": "Memo","reactions": "Reaksjoner","reactions-required": "Reaksjonslisten må ikke være tom","add-reaction": "Legg til reaksjon","configured-reactions": "Konfigurerte reaksjoner",- "content-length-limit-description": "Maksimal memo-kroppsstørrelse akseptert av serveren.","double-click-edit-description": "Tillat brukere å åpne notatredigering ved å dobbeltklikke på et memo.",- "editing-description": "Kontroller atferden for memoredigering og innholdsgrenser på serversiden.","editing-title": "Redigering","reaction-placeholder": "f.eks. 👍","reactions-description": "Definer reaksjonsalternativene brukere kan bruke på notater.",- "remove-reaction": "Fjern reaksjonen",- "content-length-limit-error": "Innholdslengdegrensen må være et heltall mellom {{min}} og {{max}} byte.",- "content-length-limit-minimum": "Minimum: {{min}} byte"+ "remove-reaction": "Fjern reaksjonen"},"my-account": {"label": "Min konto"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/nl.json b/web/src/locales/nl.jsonindex 20ed08c68..11d88f1ee 100644--- a/web/src/locales/nl.json+++ b/web/src/locales/nl.json@@ -441,21 +441,16 @@"summary-column": "Samenvatting"},"memo": {- "content-length-limit": "Maximale inhoudslengte (Byte)","label": "Memo","reactions": "Reacties","reactions-required": "Reactielijst mag niet leeg zijn","add-reaction": "Reactie toevoegen","configured-reactions": "Geconfigureerde reacties",- "content-length-limit-description": "Maximale grootte van de memotekst die door de server wordt geaccepteerd.","double-click-edit-description": "Sta gebruikers toe om het bewerken van memo's te openen door te dubbelklikken op een memo.",- "editing-description": "Beheer het bewerkingsgedrag van memo's en de inhoudslimieten op de server.","editing-title": "Bewerken","reaction-placeholder": "bijv. 👍","reactions-description": "Definieer de reactieopties die gebruikers op memo's kunnen toepassen.",- "remove-reaction": "Reactie verwijderen",- "content-length-limit-error": "De maximale lengte van de inhoud moet een geheel getal zijn tussen {{min}} en {{max}} bytes.",- "content-length-limit-minimum": "Minimum: {{min}} bytes"+ "remove-reaction": "Reactie verwijderen"},"my-account": {"label": "Mijn account"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/nn.json b/web/src/locales/nn.jsonindex af5c3b059..999739264 100644--- a/web/src/locales/nn.json+++ b/web/src/locales/nn.json@@ -597,12 +597,7 @@"memo": {"add-reaction": "Legg til reaksjon","configured-reactions": "Oppsette reaksjonar",- "content-length-limit": "Grense for innhaldslengd (byte)",- "content-length-limit-description": "Største notatinnhald som tenaren godtek.",- "content-length-limit-error": "Grensa for innhaldslengd må vera eit heiltal mellom {{min}} og {{max}} byte.",- "content-length-limit-minimum": "Minst: {{min}} byte","double-click-edit-description": "Lat brukarane opne notatredigeringa ved å dobbeltklikke på eit notat.",- "editing-description": "Styr korleis notat vert redigerte, og innhaldsgrensene på tenaren.","editing-title": "Redigering","label": "Notat","reaction-placeholder": "t.d. 👍",@@ -953,9 +948,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/pl.json b/web/src/locales/pl.jsonindex 0b8d3e7ac..07128fa63 100644--- a/web/src/locales/pl.json+++ b/web/src/locales/pl.json@@ -441,21 +441,16 @@"summary-column": "Streszczenie"},"memo": {- "content-length-limit": "Limit długości treści (Bajty)","label": "Notatki","reactions": "Reakcje","reactions-required": "Lista reakcji nie może być pusta","add-reaction": "Dodaj reakcję","configured-reactions": "Skonfigurowane reakcje",- "content-length-limit-description": "Maksymalny rozmiar treści notatki akceptowany przez serwer.","double-click-edit-description": "Zezwalaj użytkownikom na otwieranie edycji notatek poprzez dwukrotne kliknięcie notatki.",- "editing-description": "Kontroluj zachowanie edycji notatek i limity zawartości po stronie serwera.","editing-title": "Redagowanie","reaction-placeholder": "np. 👍","reactions-description": "Zdefiniuj opcje reakcji, które użytkownicy mogą zastosować do notatek.",- "remove-reaction": "Usuń reakcję",- "content-length-limit-error": "Limit długości treści musi być liczbą całkowitą z zakresu od {{min}} do {{max}} bajtów.",- "content-length-limit-minimum": "Minimum: {{min}} bajtów"+ "remove-reaction": "Usuń reakcję"},"my-account": {"label": "Moje konto"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.jsonindex 28592cd5a..6861cfd02 100644--- a/web/src/locales/pt-BR.json+++ b/web/src/locales/pt-BR.json@@ -579,17 +579,12 @@"week-start-day-description": "Controla o primeiro dia exibido nas visualizações em estilo de calendário."},"memo": {- "content-length-limit": "Limite de tamanho do conteúdo (Bytes)","reactions": "Reações","label": "Memo","reactions-required": "A lista de reações não deve estar vazia","add-reaction": "Adicionar reação","configured-reactions": "Reações configuradas",- "content-length-limit-description": "Tamanho máximo do corpo do memorando aceito pelo servidor.",- "content-length-limit-error": "O limite de comprimento do conteúdo deve ser um número inteiro entre {{min}} e {{max}} bytes.",- "content-length-limit-minimum": "Mínimo: {{min}} bytes","double-click-edit-description": "Permitir que os usuários abram a edição do memorando clicando duas vezes nele.",- "editing-description": "Controlar o comportamento de edição do memorando e os limites de conteúdo do lado do servidor.","editing-title": "Edição","reaction-placeholder": "Ex.: 👍","reactions-description": "Definir as opções de reação que os usuários podem aplicar aos memorandos.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/pt-PT.json b/web/src/locales/pt-PT.jsonindex 4fab8df3e..03459dc73 100644--- a/web/src/locales/pt-PT.json+++ b/web/src/locales/pt-PT.json@@ -441,21 +441,16 @@"summary-column": "Resumo"},"memo": {- "content-length-limit": "Limite de comprimento do conteúdo (Bytes)","label": "Memo","reactions": "Reações","reactions-required": "A lista de reações não deve estar vazia","add-reaction": "Adicionar reação","configured-reactions": "Reações configuradas",- "content-length-limit-description": "Tamanho máximo do corpo do memorando aceito pelo servidor.","double-click-edit-description": "Permita que os usuários abram a edição do memorando clicando duas vezes em um memorando.",- "editing-description": "Controle o comportamento de edição de memorandos e os limites de conteúdo do servidor.","editing-title": "Edição","reaction-placeholder": "por exemplo 👍","reactions-description": "Defina as opções de reação que os usuários podem aplicar aos memorandos.",- "remove-reaction": "Remover reação",- "content-length-limit-error": "O limite de tamanho do conteúdo deve ser um número inteiro entre{{min}}e{{max}}bytes.",- "content-length-limit-minimum": "Mínimo: {{min}} bytes"+ "remove-reaction": "Remover reação"},"my-account": {"label": "A Minha Conta"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/ro.json b/web/src/locales/ro.jsonindex fa4760e5a..89671a625 100644--- a/web/src/locales/ro.json+++ b/web/src/locales/ro.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Adăugați reacția","configured-reactions": "Reacții configurate",- "content-length-limit": "Limită de lungime a conținutului (octeți)",- "content-length-limit-description": "Dimensiunea maximă a corpului de nota acceptată de server.","double-click-edit-description": "Permiteți utilizatorilor să deschidă editarea notificărilor făcând dublu clic pe o notă.",- "editing-description": "Controlați comportamentul de editare a notelor și limitele de conținut pe partea serverului.","editing-title": "Editare","label": "Notă","reaction-placeholder": "de ex. 👍","reactions-description": "Definiți opțiunile de reacție pe care utilizatorii le pot aplica la memorii.","remove-reaction": "Îndepărtați reacția","reactions": "Reactions",- "reactions-required": "Lista Reactions nu trebuie să fie goală",- "content-length-limit-error": "Limita de lungime a conținutului trebuie să fie un număr întreg între {{min}} și {{max}} octeți.",- "content-length-limit-minimum": "Minim: {{min}} octeți"+ "reactions-required": "Lista Reactions nu trebuie să fie goală"},"my-account": {"label": "Contul meu"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/ru.json b/web/src/locales/ru.jsonindex 5b98c301a..3f59da1e2 100644--- a/web/src/locales/ru.json+++ b/web/src/locales/ru.json@@ -441,21 +441,16 @@"summary-column": "Краткое содержание"},"memo": {- "content-length-limit": "Макс. длина заметки (байт)","label": "Заметки","reactions": "Реакции","reactions-required": "Список реакций не должен быть пустым.","add-reaction": "Добавить реакцию","configured-reactions": "Настроенные реакции",- "content-length-limit-description": "Максимальный размер тела заметки, принимаемый сервером.","double-click-edit-description": "Разрешить пользователям открывать редактирование заметки, дважды щелкнув заметку.",- "editing-description": "Управляйте поведением при редактировании заметок и ограничениями содержимого на стороне сервера.","editing-title": "Редактирование","reaction-placeholder": "например 👍","reactions-description": "Определите параметры реакции, которые пользователи могут применять к заметкам.",- "remove-reaction": "Удалить реакцию",- "content-length-limit-error": "Ограничение длины содержимого должно быть целым числом от {{min}} до {{max}} байт.",- "content-length-limit-minimum": "Минимум: {{min}} байт"+ "remove-reaction": "Удалить реакцию"},"my-account": {"label": "Мой аккаунт"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/sk.json b/web/src/locales/sk.jsonindex aaee9cf15..f77cf0d93 100644--- a/web/src/locales/sk.json+++ b/web/src/locales/sk.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Pridajte reakciu","configured-reactions": "Nastavené reakcie",- "content-length-limit": "Limit dĺžky obsahu (bajty)",- "content-length-limit-description": "Maximálna veľkosť tela poznámky akceptovaná serverom.","double-click-edit-description": "Umožnite používateľom otvoriť úpravu poznámky dvojitým kliknutím na poznámku.",- "editing-description": "Ovládajte správanie pri úprave poznámok a limity obsahu na strane servera.","editing-title": "Úprava","label": "Memo","reaction-placeholder": "napr. 👍","reactions-description": "Definujte možnosti reakcie, ktoré môžu používatelia použiť na poznámky.","remove-reaction": "Odstráňte reakciu","reactions": "Reactions",- "reactions-required": "Zoznam Reactions nesmie byť prázdny",- "content-length-limit-error": "Limit dĺžky obsahu musí byť celé číslo medzi {{min}} a {{max}} bajtmi.",- "content-length-limit-minimum": "Minimálne: {{min}} bajtov"+ "reactions-required": "Zoznam Reactions nesmie byť prázdny"},"my-account": {"label": "Môj účet"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/sl.json b/web/src/locales/sl.jsonindex 54faa2615..54845bf04 100644--- a/web/src/locales/sl.json+++ b/web/src/locales/sl.json@@ -441,21 +441,16 @@"summary-column": "Povzetek"},"memo": {- "content-length-limit": "Omejitev dolžine vsebine (bajt)","label": "Beležka","reactions": "Odzivi","reactions-required": "Seznam reakcij ne sme biti prazen","add-reaction": "Dodajte reakcijo","configured-reactions": "Konfigurirane reakcije",- "content-length-limit-description": "Največja velikost telesa beležke, ki jo sprejme strežnik.","double-click-edit-description": "Omogočite uporabnikom, da odprejo urejanje beležke tako, da dvokliknejo beležko.",- "editing-description": "Nadzorujte vedenje urejanja beležk in omejitve vsebine na strani strežnika.","editing-title": "Urejanje","reaction-placeholder": "npr. 👍","reactions-description": "Določite možnosti odziva, ki jih lahko uporabniki uporabijo za beležke.",- "remove-reaction": "Odstrani reakcijo",- "content-length-limit-error": "Omejitev dolžine vsebine mora biti celo število med {{min}} in {{max}} bajti.",- "content-length-limit-minimum": "Najmanj: {{min}} bajtov"+ "remove-reaction": "Odstrani reakcijo"},"my-account": {"label": "Moj račun"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/sr.json b/web/src/locales/sr.jsonindex 62bbd160c..0cab0ff41 100644--- a/web/src/locales/sr.json+++ b/web/src/locales/sr.json@@ -524,19 +524,14 @@"memo": {"add-reaction": "Додајте реакцију","configured-reactions": "Конфигурисане реакције",- "content-length-limit": "Ограничење дужине садржаја (бајт)",- "content-length-limit-description": "Максимална величина тела белешке коју прихвата сервер.","double-click-edit-description": "Дозволите корисницима да отворе уређивање белешке двоструким кликом на белешку.",- "editing-description": "Контролишите понашање уређивања белешки и ограничења садржаја на страни сервера.","editing-title": "Уређивање","label": "Мемо","reaction-placeholder": "нпр. 👍","reactions-description": "Дефинишите опције реакције које корисници могу применити на белешке.","remove-reaction": "Уклоните реакцију","reactions": "Reactионс",- "reactions-required": "Листа Reactионс не сме бити празна",- "content-length-limit-error": "Ограничење дужине садржаја мора бити цео број између {{min}} и {{max}} бајтова.",- "content-length-limit-minimum": "Минимум: {{min}} бајтова"+ "reactions-required": "Листа Reactионс не сме бити празна"},"my-account": {"label": "Мој налог"@@ -724,9 +719,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/sv.json b/web/src/locales/sv.jsonindex a9acccfaf..c30201fc7 100644--- a/web/src/locales/sv.json+++ b/web/src/locales/sv.json@@ -441,21 +441,16 @@"summary-column": "Sammanfattning"},"memo": {- "content-length-limit": "Innehållslängdsgräns (Byte)","label": "Anteckning","reactions": "Reaktioner","reactions-required": "Reaktionslistan får inte vara tom","add-reaction": "Lägg till reaktion","configured-reactions": "Konfigurerade reaktioner",- "content-length-limit-description": "Maximal memostorlek accepteras av servern.","double-click-edit-description": "Tillåt användare att öppna memoredigering genom att dubbelklicka på ett memo.",- "editing-description": "Kontrollera memoredigeringsbeteende och innehållsgränser på serversidan.","editing-title": "Redigering","reaction-placeholder": "till exempel 👍","reactions-description": "Definiera reaktionsalternativen som användare kan tillämpa på anteckningar.",- "remove-reaction": "Ta bort reaktionen",- "content-length-limit-error": "Innehållslängdsgränsen måste vara ett heltal mellan {{min}} och {{max}} byte.",- "content-length-limit-minimum": "Minimum: {{min}} byte"+ "remove-reaction": "Ta bort reaktionen"},"my-account": {"label": "Mitt konto"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/th.json b/web/src/locales/th.jsonindex f0839058e..5431a7f97 100644--- a/web/src/locales/th.json+++ b/web/src/locales/th.json@@ -579,17 +579,12 @@"week-start-day-description": "ควบคุมวันแรกที่แสดงในมุมมองแบบปฏิทิน"},"memo": {- "content-length-limit": "จำกัดความยาวเนื้อหา (ไบต์)","reactions": "ปฏิกิริยา","label": "บันทึก","reactions-required": "รายการความรู้สึกต้องไม่ว่��งเปล่า","add-reaction": "เพิ่มปฏิกิริยา","configured-reactions": "ปฏิกิริยาที่กำหนดค่าไว้",- "content-length-limit-description": "ขนาดเนื้อหาบันทึกช่วยจำสูงสุดที่เซิร์ฟเวอร์ยอมรับ",- "content-length-limit-error": "ขีดจำกัดความยาวเนื้อหาต้องเป็นจำนวนเต็มระหว่าง {{min}} และ {{max}} ไบต์",- "content-length-limit-minimum": "ขั้นต่ำ: {{min}} ไบต์","double-click-edit-description": "อนุญาตให้ผู้ใช้เปิดการแก้ไขบันทึกช่วยจำโดยการดับเบิ้ลคลิกที่บันทึกช่วยจำ",- "editing-description": "ควบคุมพฤติกรรมการแก้ไขบันทึกช่วยจำและขีดจำกัดเนื้อหาฝั่งเซิร์ฟเวอร์","editing-title": "การแก้ไข","reaction-placeholder": "เช่น 👍","reactions-description": "กำหนดตัวเลือกการตอบสนองที่ผู้ใช้สามารถใช้กับบันทึกช่วยจำ",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/tr.json b/web/src/locales/tr.jsonindex a97fa92da..b3a123292 100644--- a/web/src/locales/tr.json+++ b/web/src/locales/tr.json@@ -481,17 +481,12 @@"summary-column": "Özet"},"memo": {- "content-length-limit": "İçerik uzunluğu sınırı (Bayt)","label": "Not","reactions": "Tepkiler","reactions-required": "Tepki listesi boş olamaz","add-reaction": "Tepki ekle","configured-reactions": "Yapılandırılmış reaksiyonlar",- "content-length-limit-description": "Sunucu tarafından kabul edilen maksimum not gövdesi boyutu.",- "content-length-limit-error": "İçerik uzunluğu sınırı {{min}} ile {{max}} bayt arasında bir tam sayı olmalıdır.",- "content-length-limit-minimum": "En az: {{min}} bayt","double-click-edit-description": "Kullanıcıların bir notu çift tıklatarak not düzenlemeyi açmasına izin verin.",- "editing-description": "Not düzenleme davranışını ve sunucu tarafı içerik sınırlarını kontrol edin.","editing-title": "Düzenleme","reaction-placeholder": "örneğin 👍","reactions-description": "Kullanıcıların notlara uygulayabileceği reaksiyon seçeneklerini tanımlayın.",@@ -769,9 +764,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/uk.json b/web/src/locales/uk.jsonindex fd55f15d3..baa8fc148 100644--- a/web/src/locales/uk.json+++ b/web/src/locales/uk.json@@ -441,21 +441,16 @@"summary-column": "Резюме"},"memo": {- "content-length-limit": "Обмеження довжини вмісту (байт)","label": "Нотатка","reactions": "Реакції","reactions-required": "Список реакцій не повинен бути порожнім","add-reaction": "Додайте реакцію","configured-reactions": "Налаштовані реакції",- "content-length-limit-description": "Максимальний розмір основної частини нотатки, прийнятний сервером.","double-click-edit-description": "Дозволити користувачам відкривати редагування нагадування, двічі клацнувши нагадування.",- "editing-description": "Контролюйте поведінку редагування нотаток і обмеження вмісту на стороні сервера.","editing-title": "Редагування","reaction-placeholder": "напр. 👍","reactions-description": "Визначте варіанти реакції, які користувачі можуть застосувати до нагадувань.",- "remove-reaction": "Видалити реакцію",- "content-length-limit-error": "Обмеження довжини вмісту має бути цілим числом від {{min}} до {{max}} байт.",- "content-length-limit-minimum": "Мінімум: {{min}} байт"+ "remove-reaction": "Видалити реакцію"},"my-account": {"label": "Мій обліковий запис"@@ -608,9 +603,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/vi.json b/web/src/locales/vi.jsonindex 5b2c73539..a2ac7ae9e 100644--- a/web/src/locales/vi.json+++ b/web/src/locales/vi.json@@ -579,17 +579,12 @@"week-start-day-description": "Kiểm soát ngày đầu tiên được hiển thị trong chế độ xem kiểu lịch."},"memo": {- "content-length-limit": "Giới hạn độ dài nội dung (Byte)","reactions": "Phản ứng","label": "Ghi chú","reactions-required": "Danh sách phản ứng không được trống","add-reaction": "Thêm biểu tượng cảm xúc","configured-reactions": "Biểu tượng cảm xúc đã cấu hình",- "content-length-limit-description": "Kích thước tối đa của nội dung ghi chú được máy chủ chấp nhận.",- "content-length-limit-error": "Giới hạn độ dài nội dung phải là một số nguyên nằm giữa {{min}} và {{max}} byte.",- "content-length-limit-minimum": "Tối thiểu: {{min}} byte","double-click-edit-description": "Cho phép người dùng mở chỉnh sửa ghi chú bằng cách nhấp đúp vào ghi chú.",- "editing-description": "Kiểm soát hành vi chỉnh sửa ghi chú và giới hạn nội dung phía máy chủ.","editing-title": "Đang chỉnh sửa","reaction-placeholder": "ví dụ: 👍","reactions-description": "Xác định các tùy chọn biểu tượng cảm xúc mà người dùng có thể áp dụng cho ghi chú.",@@ -603,9 +598,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.jsonindex 49e9b3880..384d611e6 100644--- a/web/src/locales/zh-Hans.json+++ b/web/src/locales/zh-Hans.json@@ -655,19 +655,14 @@"memo": {"add-reaction": "添加表态","configured-reactions": "已配置表态",- "content-length-limit": "内容长度限制(字节)",- "content-length-limit-description": "服务端接受的备忘录正文最大长度。","double-click-edit-description": "允许用户双击备忘录进入编辑。",- "editing-description": "控制备忘录编辑行为和服务端内容长度限制。","editing-title": "编辑","reactions": "表态","reaction-placeholder": "例如 👍","reactions-description": "定义用户可以添加到备忘录上的表态选项。","remove-reaction": "移除表态","label": "备忘录",- "reactions-required": "反应列表不能为空",- "content-length-limit-error": "内容长度限制必须为介于 {{min}} 和 {{max}} 字节之间的整数。",- "content-length-limit-minimum": "最小值:{{min}} 字节"+ "reactions-required": "反应列表不能为空"},"usage-limits": {"add-user": "Add user limit",@@ -677,9 +672,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "单条内容大小(KiB)",+ "content-size-column": "单条内容大小",+ "content-size-description": "单条备忘录正文的 UTF-8 字节大小,包括 Markdown。","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.jsonindex b00b81b7c..d69c8c3f6 100644--- a/web/src/locales/zh-Hant.json+++ b/web/src/locales/zh-Hant.json@@ -565,12 +565,7 @@"memo": {"add-reaction": "新增表情回應","configured-reactions": "已設定的表情回應",- "content-length-limit": "內容長度限制(位元組)",- "content-length-limit-description": "伺服器接受的備忘錄內容最大長度。",- "content-length-limit-error": "內容長度限制必須是介於 {{min}} 到 {{max}} 位元組之間的整數。",- "content-length-limit-minimum": "最小值:{{min}} 位元組","double-click-edit-description": "允許使用者雙擊備忘錄以開啟編輯。",- "editing-description": "控制備忘錄編輯行為和伺服器端內容限制。","editing-title": "編輯","label": "備忘錄","reaction-placeholder": "例如 👍",@@ -846,9 +841,12 @@"all-users-placeholder": "All users: {{value}}","all-users-title": "Limits for all users","description": "Keep this instance fast and reliable by capping what each user can store. All users applies to everyone, and a user's own limits replace it. Gray values come from All users.",+ "content-size": "Memo content (KiB)",+ "content-size-column": "Memo content",+ "content-size-description": "The UTF-8 size of one memo body, including Markdown.","file-size": "Largest file (MiB)","file-size-column": "Largest file",- "invalid": "Enter a whole number of memos, or a size in MiB.",+ "invalid": "Enter a whole number of memos, or a size in the indicated unit.","label": "Usage limits","memos": "Memos","memos-description": "Includes comments and archived memos.",diff --git a/web/src/types/proto/api/instance_service_pb.ts b/web/src/types/proto/api/instance_service_pb.tsindex 99aa70e5a..0e5f8d8ce 100644--- a/web/src/types/proto/api/instance_service_pb.ts+++ b/web/src/types/proto/api/instance_service_pb.ts@@ -20,7 +20,7 @@ import type { Message } from "@bufbuild/protobuf";* Describes the file api/instance_service.proto.*/export const file_api_instance_service: GenFile = /*@__PURE__*/- fileDesc("ChphcGkvaW5zdGFuY2Vfc2VydmljZS5wcm90bxIJbWVtb3MuYXBpIqkCCg9JbnN0YW5jZVByb2ZpbGUSDwoHdmVyc2lvbhgBIAEoCRIOCgZjb21taXQYAiABKAkSDAoEZGVtbxgDIAEoCBIUCgxpbnN0YW5jZV91cmwYBCABKAkSMgoLYWNjZXNzX21vZGUYBSABKA4yHS5tZW1vcy5hcGkuSW5zdGFuY2VBY2Nlc3NNb2RlEhMKC25lZWRzX3NldHVwGAYgASgIEh4KBWFkbWluGAcgASgLMg8ubWVtb3MuYXBpLlVzZXISNwoJY2hhbGxlbmdlGAggASgLMiQubWVtb3MuYXBpLkluc3RhbmNlUHJvZmlsZS5DaGFsbGVuZ2UaLwoJQ2hhbGxlbmdlEhAKCHByb3ZpZGVyGAEgASgJEhAKCHNpdGVfa2V5GAIgASgJIhsKGUdldEluc3RhbmNlUHJvZmlsZVJlcXVlc3QikxoKD0luc3RhbmNlU2V0dGluZxIRCgRuYW1lGAEgASgJQgPgQQgSRAoPZ2VuZXJhbF9zZXR0aW5nGAIgASgLMikubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5HZW5lcmFsU2V0dGluZ0gAEkQKD3N0b3JhZ2Vfc2V0dGluZxgDIAEoCzIpLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuU3RvcmFnZVNldHRpbmdIABJNChRtZW1vX3JlbGF0ZWRfc2V0dGluZxgEIAEoCzItLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuTWVtb1JlbGF0ZWRTZXR0aW5nSAASPgoMdGFnc19zZXR0aW5nGAUgASgLMiYubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5UYWdzU2V0dGluZ0gAEk4KFG5vdGlmaWNhdGlvbl9zZXR0aW5nGAYgASgLMi4ubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5Ob3RpZmljYXRpb25TZXR0aW5nSAASOgoKYWlfc2V0dGluZxgHIAEoCzIkLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuQUlTZXR0aW5nSAASQgoOYWNjZXNzX3NldHRpbmcYCCABKAsyKC5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLkFjY2Vzc1NldHRpbmdIABqEAwoOR2VuZXJhbFNldHRpbmcSTwoOY3VzdG9tX3Byb2ZpbGUYASABKAsyNy5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLkdlbmVyYWxTZXR0aW5nLkN1c3RvbVByb2ZpbGUSIgoaZGlzYWxsb3dfdXNlcl9yZWdpc3RyYXRpb24YAiABKAgSHgoWZGlzYWxsb3dfcGFzc3dvcmRfYXV0aBgDIAEoCBIgChhkaXNhbGxvd19jaGFuZ2VfdXNlcm5hbWUYBCABKAgSIAoYZGlzYWxsb3dfY2hhbmdlX25pY2tuYW1lGAUgASgIEh0KFXdlZWtfc3RhcnRfZGF5X29mZnNldBgGIAEoBRIYChBhZGRpdGlvbmFsX3N0eWxlGAcgASgJEhkKEWFkZGl0aW9uYWxfc2NyaXB0GAggASgJGkUKDUN1c3RvbVByb2ZpbGUSDQoFdGl0bGUYASABKAkSEwoLZGVzY3JpcHRpb24YAiABKAkSEAoIbG9nb191cmwYAyABKAkajwQKDlN0b3JhZ2VTZXR0aW5nEjQKCHN0b3JhZ2VzGAEgAygLMiIubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5TdG9yYWdlEhoKEmRlZmF1bHRfc3RvcmFnZV9pZBgCIAEoCRIZChFmaWxlcGF0aF90ZW1wbGF0ZRgDIAEoCRJLCgxzdG9yYWdlX3R5cGUYBCABKA4yNS5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLlN0b3JhZ2VTZXR0aW5nLlN0b3JhZ2VUeXBlEkUKCXMzX2NvbmZpZxgFIAEoCzIyLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuU3RvcmFnZVNldHRpbmcuUzNDb25maWcarQEKCFMzQ29uZmlnEhAKCGVuZHBvaW50GAEgASgJEg4KBnJlZ2lvbhgCIAEoCRIOCgZidWNrZXQYAyABKAkSFQoNYWNjZXNzX2tleV9pZBgEIAEoCRIeChFhY2Nlc3Nfa2V5X3NlY3JldBgFIAEoCUID4EEEEhYKDnVzZV9wYXRoX3N0eWxlGAYgASgIEiAKGGluc2VjdXJlX3NraXBfdGxzX3ZlcmlmeRgHIAEoCCJMCgtTdG9yYWdlVHlwZRIcChhTVE9SQUdFX1RZUEVfVU5TUEVDSUZJRUQQABIMCghEQVRBQkFTRRABEgkKBUxPQ0FMEAISBgoCUzMQAxrVAgoHU3RvcmFnZRIKCgJpZBgBIAEoCRIMCgRuYW1lGAIgASgJEjQKBHR5cGUYAyABKA4yJi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLlN0b3JhZ2VUeXBlEkAKCXMzX2NvbmZpZxgEIAEoCzIrLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuU3RvcmFnZS5TM0NvbmZpZ0gAGq0BCghTM0NvbmZpZxIQCghlbmRwb2ludBgBIAEoCRIOCgZyZWdpb24YAiABKAkSDgoGYnVja2V0GAMgASgJEhUKDWFjY2Vzc19rZXlfaWQYBCABKAkSHgoRYWNjZXNzX2tleV9zZWNyZXQYBSABKAlCA+BBBBIWCg51c2VfcGF0aF9zdHlsZRgGIAEoCBIgChhpbnNlY3VyZV9za2lwX3Rsc192ZXJpZnkYByABKAhCCAoGY29uZmlnGmcKEk1lbW9SZWxhdGVkU2V0dGluZxIcChRjb250ZW50X2xlbmd0aF9saW1pdBgBIAEoBRIRCglyZWFjdGlvbnMYAiADKAkSIAoYZW5hYmxlX2RvdWJsZV9jbGlja19lZGl0GAMgASgIGqIBCgtUYWdzU2V0dGluZxI+CgR0YWdzGAEgAygLMjAubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5UYWdzU2V0dGluZy5UYWdzRW50cnkaUwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRI1CgV2YWx1ZRgCIAEoCzImLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuVGFnTWV0YWRhdGE6AjgBGlEKC1RhZ01ldGFkYXRhEiwKEGJhY2tncm91bmRfY29sb3IYASABKAsyEi5nb29nbGUudHlwZS5Db2xvchIUCgxibHVyX2NvbnRlbnQYAiABKAgatwIKE05vdGlmaWNhdGlvblNldHRpbmcSSgoFZW1haWwYASABKAsyOy5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLk5vdGlmaWNhdGlvblNldHRpbmcuRW1haWxTZXR0aW5nGtMBCgxFbWFpbFNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIRCglzbXRwX2hvc3QYAiABKAkSEQoJc210cF9wb3J0GAMgASgFEhUKDXNtdHBfdXNlcm5hbWUYBCABKAkSGgoNc210cF9wYXNzd29yZBgFIAEoCUID4EEEEg8KB3VzZV90bHMYBiABKAgSDwoHdXNlX3NzbBgHIAEoCBISCgpmcm9tX2VtYWlsGAggASgJEhEKCWZyb21fbmFtZRgJIAEoCRIQCghyZXBseV90bxgKIAEoCRqSAQoJQUlTZXR0aW5nEj4KCXByb3ZpZGVycxgBIAMoCzIrLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuQUlQcm92aWRlckNvbmZpZxJFCg10cmFuc2NyaXB0aW9uGAIgASgLMi4ubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5UcmFuc2NyaXB0aW9uQ29uZmlnGsMBChBBSVByb3ZpZGVyQ29uZmlnEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEjcKBHR5cGUYAyABKA4yKS5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLkFJUHJvdmlkZXJUeXBlEhAKCGVuZHBvaW50GAQgASgJEhQKB2FwaV9rZXkYBSABKAlCA+BBBBIYCgthcGlfa2V5X3NldBgGIAEoCEID4EEDEhkKDGFwaV9rZXlfaGludBgHIAEoCUID4EEDGlsKE1RyYW5zY3JpcHRpb25Db25maWcSEwoLcHJvdmlkZXJfaWQYASABKAkSDQoFbW9kZWwYAiABKAkSEAoIbGFuZ3VhZ2UYAyABKAkSDgoGcHJvbXB0GAQgASgJGkMKDUFjY2Vzc1NldHRpbmcSMgoLYWNjZXNzX21vZGUYASABKA4yHS5tZW1vcy5hcGkuSW5zdGFuY2VBY2Nlc3NNb2RlInYKA0tleRITCg9LRVlfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESCwoHU1RPUkFHRRACEhAKDE1FTU9fUkVMQVRFRBADEggKBFRBR1MQBBIQCgxOT1RJRklDQVRJT04QBRIGCgJBSRAGEgoKBkFDQ0VTUxAHIkwKC1N0b3JhZ2VUeXBlEhwKGFNUT1JBR0VfVFlQRV9VTlNQRUNJRklFRBAAEgwKCERBVEFCQVNFEAESCQoFTE9DQUwQAhIGCgJTMxADIkoKDkFJUHJvdmlkZXJUeXBlEiAKHEFJX1BST1ZJREVSX1RZUEVfVU5TUEVDSUZJRUQQABIKCgZPUEVOQUkQARIKCgZHRU1JTkkQAjpe6kFbChltZW1vcy5hcGkvSW5zdGFuY2VTZXR0aW5nEhtpbnN0YW5jZS9zZXR0aW5ncy97c2V0dGluZ30qEGluc3RhbmNlU2V0dGluZ3MyD2luc3RhbmNlU2V0dGluZ0IHCgV2YWx1ZSJMChlHZXRJbnN0YW5jZVNldHRpbmdSZXF1ZXN0Ei8KBG5hbWUYASABKAlCIeBBAvpBGwoZbWVtb3MuYXBpL0luc3RhbmNlU2V0dGluZyJTCh9CYXRjaEdldEluc3RhbmNlU2V0dGluZ3NSZXF1ZXN0EjAKBW5hbWVzGAEgAygJQiHgQQL6QRsKGW1lbW9zLmFwaS9JbnN0YW5jZVNldHRpbmciWQogQmF0Y2hHZXRJbnN0YW5jZVNldHRpbmdzUmVzcG9uc2USNQoRaW5zdGFuY2Vfc2V0dGluZ3MYASADKAsyGi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nIo8BChxVcGRhdGVJbnN0YW5jZVNldHRpbmdSZXF1ZXN0EjkKEGluc3RhbmNlX3NldHRpbmcYASABKAsyGi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nQgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQEikAEKH1Rlc3RJbnN0YW5jZUVtYWlsU2V0dGluZ1JlcXVlc3QSTwoFZW1haWwYASABKAsyOy5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLk5vdGlmaWNhdGlvblNldHRpbmcuRW1haWxTZXR0aW5nQgPgQQESHAoPcmVjaXBpZW50X2VtYWlsGAIgASgJQgPgQQEizwEKDUluc3RhbmNlU3RhdHMSOAoIZGF0YWJhc2UYASABKAsyJi5tZW1vcy5hcGkuSW5zdGFuY2VTdGF0cy5EYXRhYmFzZVN0YXRzEhsKE2xvY2FsX3N0b3JhZ2VfYnl0ZXMYAiABKAMSMgoOZ2VuZXJhdGVkX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wGjMKDURhdGFiYXNlU3RhdHMSDgoGZHJpdmVyGAEgASgJEhIKCnNpemVfYnl0ZXMYAiABKAMiGQoXR2V0SW5zdGFuY2VTdGF0c1JlcXVlc3QinwMKClVzYWdlTGltaXQSEQoEbmFtZRgBIAEoCUID4EEIEjQKBm1ldHJpYxgCIAEoDjIcLm1lbW9zLmFwaS5Vc2FnZUxpbWl0Lk1ldHJpY0IG4EEC4EEFEicKBHVzZXIYAyABKAlCGeBBAeBBBfpBEAoObWVtb3MuYXBpL1VzZXISEgoFdmFsdWUYBCABKANCA+BBAhI0CgtjcmVhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyJQCgZNZXRyaWMSFgoSTUVUUklDX1VOU1BFQ0lGSUVEEAASCQoFTUVNT1MQARIRCg1TVE9SQUdFX0JZVEVTEAISEAoMVVBMT0FEX0JZVEVTEAM6TepBSgoUbWVtb3MuYXBpL1VzYWdlTGltaXQSGXVzYWdlTGltaXRzL3t1c2FnZV9saW1pdH0qC3VzYWdlTGltaXRzMgp1c2FnZUxpbWl0Il4KFkxpc3RVc2FnZUxpbWl0c1JlcXVlc3QSFgoJcGFnZV9zaXplGAEgASgFQgPgQQESFwoKcGFnZV90b2tlbhgCIAEoCUID4EEBEhMKBmZpbHRlchgDIAEoCUID4EEBIl8KF0xpc3RVc2FnZUxpbWl0c1Jlc3BvbnNlEisKDHVzYWdlX2xpbWl0cxgBIAMoCzIVLm1lbW9zLmFwaS5Vc2FnZUxpbWl0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJCChRHZXRVc2FnZUxpbWl0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFG1lbW9zLmFwaS9Vc2FnZUxpbWl0ImcKF0NyZWF0ZVVzYWdlTGltaXRSZXF1ZXN0Ei8KC3VzYWdlX2xpbWl0GAEgASgLMhUubWVtb3MuYXBpLlVzYWdlTGltaXRCA+BBAhIbCg51c2FnZV9saW1pdF9pZBgCIAEoCUID4EEBIoABChdVcGRhdGVVc2FnZUxpbWl0UmVxdWVzdBIvCgt1c2FnZV9saW1pdBgBIAEoCzIVLm1lbW9zLmFwaS5Vc2FnZUxpbWl0QgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQEiRQoXRGVsZXRlVXNhZ2VMaW1pdFJlcXVlc3QSKgoEbmFtZRgBIAEoCUIc4EEC+kEWChRtZW1vcy5hcGkvVXNhZ2VMaW1pdCp9ChJJbnN0YW5jZUFjY2Vzc01vZGUSJAogSU5TVEFOQ0VfQUNDRVNTX01PREVfVU5TUEVDSUZJRUQQABIgChxJTlNUQU5DRV9BQ0NFU1NfTU9ERV9QUklWQVRFEAESHwobSU5TVEFOQ0VfQUNDRVNTX01PREVfUFVCTElDEAIyogwKD0luc3RhbmNlU2VydmljZRJ1ChJHZXRJbnN0YW5jZVByb2ZpbGUSJC5tZW1vcy5hcGkuR2V0SW5zdGFuY2VQcm9maWxlUmVxdWVzdBoaLm1lbW9zLmFwaS5JbnN0YW5jZVByb2ZpbGUiHYLT5JMCFxIVL2FwaS9pbnN0YW5jZS9wcm9maWxlEoYBChJHZXRJbnN0YW5jZVNldHRpbmcSJC5tZW1vcy5hcGkuR2V0SW5zdGFuY2VTZXR0aW5nUmVxdWVzdBoaLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmciLtpBBG5hbWWC0+STAiESHy9hcGkve25hbWU9aW5zdGFuY2Uvc2V0dGluZ3MvKn0SnwEKGEJhdGNoR2V0SW5zdGFuY2VTZXR0aW5ncxIqLm1lbW9zLmFwaS5CYXRjaEdldEluc3RhbmNlU2V0dGluZ3NSZXF1ZXN0GisubWVtb3MuYXBpLkJhdGNoR2V0SW5zdGFuY2VTZXR0aW5nc1Jlc3BvbnNlIiqC0+STAiQ6ASoiHy9hcGkvaW5zdGFuY2Uvc2V0dGluZ3M6YmF0Y2hHZXQSxwEKFVVwZGF0ZUluc3RhbmNlU2V0dGluZxInLm1lbW9zLmFwaS5VcGRhdGVJbnN0YW5jZVNldHRpbmdSZXF1ZXN0GhoubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZyJp2kEcaW5zdGFuY2Vfc2V0dGluZyx1cGRhdGVfbWFza4LT5JMCRDoQaW5zdGFuY2Vfc2V0dGluZzIwL2FwaS97aW5zdGFuY2Vfc2V0dGluZy5uYW1lPWluc3RhbmNlL3NldHRpbmdzLyp9EpgBChhUZXN0SW5zdGFuY2VFbWFpbFNldHRpbmcSKi5tZW1vcy5hcGkuVGVzdEluc3RhbmNlRW1haWxTZXR0aW5nUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI4gtPkkwIyOgEqIi0vYXBpL2luc3RhbmNlL3NldHRpbmdzL25vdGlmaWNhdGlvbjp0ZXN0RW1haWwSbQoQR2V0SW5zdGFuY2VTdGF0cxIiLm1lbW9zLmFwaS5HZXRJbnN0YW5jZVN0YXRzUmVxdWVzdBoYLm1lbW9zLmFwaS5JbnN0YW5jZVN0YXRzIhuC0+STAhUSEy9hcGkvaW5zdGFuY2Uvc3RhdHMScgoPTGlzdFVzYWdlTGltaXRzEiEubWVtb3MuYXBpLkxpc3RVc2FnZUxpbWl0c1JlcXVlc3QaIi5tZW1vcy5hcGkuTGlzdFVzYWdlTGltaXRzUmVzcG9uc2UiGILT5JMCEhIQL2FwaS91c2FnZUxpbWl0cxJxCg1HZXRVc2FnZUxpbWl0Eh8ubWVtb3MuYXBpLkdldFVzYWdlTGltaXRSZXF1ZXN0GhUubWVtb3MuYXBpLlVzYWdlTGltaXQiKNpBBG5hbWWC0+STAhsSGS9hcGkve25hbWU9dXNhZ2VMaW1pdHMvKn0SkQEKEENyZWF0ZVVzYWdlTGltaXQSIi5tZW1vcy5hcGkuQ3JlYXRlVXNhZ2VMaW1pdFJlcXVlc3QaFS5tZW1vcy5hcGkuVXNhZ2VMaW1pdCJC2kEadXNhZ2VfbGltaXQsdXNhZ2VfbGltaXRfaWSC0+STAh86C3VzYWdlX2xpbWl0IhAvYXBpL3VzYWdlTGltaXRzEqMBChBVcGRhdGVVc2FnZUxpbWl0EiIubWVtb3MuYXBpLlVwZGF0ZVVzYWdlTGltaXRSZXF1ZXN0GhUubWVtb3MuYXBpLlVzYWdlTGltaXQiVNpBF3VzYWdlX2xpbWl0LHVwZGF0ZV9tYXNrgtPkkwI0Ogt1c2FnZV9saW1pdDIlL2FwaS97dXNhZ2VfbGltaXQubmFtZT11c2FnZUxpbWl0cy8qfRJ4ChBEZWxldGVVc2FnZUxpbWl0EiIubWVtb3MuYXBpLkRlbGV0ZVVzYWdlTGltaXRSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IijaQQRuYW1lgtPkkwIbKhkvYXBpL3tuYW1lPXVzYWdlTGltaXRzLyp9QpMBCg1jb20ubWVtb3MuYXBpQhRJbnN0YW5jZVNlcnZpY2VQcm90b1ABWidnaXRodWIuY29tL3VzZW1lbW9zL21lbW9zL3Byb3RvL2dlbi9hcGmiAgNNQViqAglNZW1vcy5BcGnKAglNZW1vc1xBcGniAhVNZW1vc1xBcGlcR1BCTWV0YWRhdGHqAgpNZW1vczo6QXBpYgZwcm90bzM", [file_api_user_service, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_color]);+ fileDesc("ChphcGkvaW5zdGFuY2Vfc2VydmljZS5wcm90bxIJbWVtb3MuYXBpIqkCCg9JbnN0YW5jZVByb2ZpbGUSDwoHdmVyc2lvbhgBIAEoCRIOCgZjb21taXQYAiABKAkSDAoEZGVtbxgDIAEoCBIUCgxpbnN0YW5jZV91cmwYBCABKAkSMgoLYWNjZXNzX21vZGUYBSABKA4yHS5tZW1vcy5hcGkuSW5zdGFuY2VBY2Nlc3NNb2RlEhMKC25lZWRzX3NldHVwGAYgASgIEh4KBWFkbWluGAcgASgLMg8ubWVtb3MuYXBpLlVzZXISNwoJY2hhbGxlbmdlGAggASgLMiQubWVtb3MuYXBpLkluc3RhbmNlUHJvZmlsZS5DaGFsbGVuZ2UaLwoJQ2hhbGxlbmdlEhAKCHByb3ZpZGVyGAEgASgJEhAKCHNpdGVfa2V5GAIgASgJIhsKGUdldEluc3RhbmNlUHJvZmlsZVJlcXVlc3Qi9RkKD0luc3RhbmNlU2V0dGluZxIRCgRuYW1lGAEgASgJQgPgQQgSRAoPZ2VuZXJhbF9zZXR0aW5nGAIgASgLMikubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5HZW5lcmFsU2V0dGluZ0gAEkQKD3N0b3JhZ2Vfc2V0dGluZxgDIAEoCzIpLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuU3RvcmFnZVNldHRpbmdIABJNChRtZW1vX3JlbGF0ZWRfc2V0dGluZxgEIAEoCzItLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuTWVtb1JlbGF0ZWRTZXR0aW5nSAASPgoMdGFnc19zZXR0aW5nGAUgASgLMiYubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5UYWdzU2V0dGluZ0gAEk4KFG5vdGlmaWNhdGlvbl9zZXR0aW5nGAYgASgLMi4ubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5Ob3RpZmljYXRpb25TZXR0aW5nSAASOgoKYWlfc2V0dGluZxgHIAEoCzIkLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuQUlTZXR0aW5nSAASQgoOYWNjZXNzX3NldHRpbmcYCCABKAsyKC5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLkFjY2Vzc1NldHRpbmdIABqEAwoOR2VuZXJhbFNldHRpbmcSTwoOY3VzdG9tX3Byb2ZpbGUYASABKAsyNy5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLkdlbmVyYWxTZXR0aW5nLkN1c3RvbVByb2ZpbGUSIgoaZGlzYWxsb3dfdXNlcl9yZWdpc3RyYXRpb24YAiABKAgSHgoWZGlzYWxsb3dfcGFzc3dvcmRfYXV0aBgDIAEoCBIgChhkaXNhbGxvd19jaGFuZ2VfdXNlcm5hbWUYBCABKAgSIAoYZGlzYWxsb3dfY2hhbmdlX25pY2tuYW1lGAUgASgIEh0KFXdlZWtfc3RhcnRfZGF5X29mZnNldBgGIAEoBRIYChBhZGRpdGlvbmFsX3N0eWxlGAcgASgJEhkKEWFkZGl0aW9uYWxfc2NyaXB0GAggASgJGkUKDUN1c3RvbVByb2ZpbGUSDQoFdGl0bGUYASABKAkSEwoLZGVzY3JpcHRpb24YAiABKAkSEAoIbG9nb191cmwYAyABKAkajwQKDlN0b3JhZ2VTZXR0aW5nEjQKCHN0b3JhZ2VzGAEgAygLMiIubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5TdG9yYWdlEhoKEmRlZmF1bHRfc3RvcmFnZV9pZBgCIAEoCRIZChFmaWxlcGF0aF90ZW1wbGF0ZRgDIAEoCRJLCgxzdG9yYWdlX3R5cGUYBCABKA4yNS5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLlN0b3JhZ2VTZXR0aW5nLlN0b3JhZ2VUeXBlEkUKCXMzX2NvbmZpZxgFIAEoCzIyLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuU3RvcmFnZVNldHRpbmcuUzNDb25maWcarQEKCFMzQ29uZmlnEhAKCGVuZHBvaW50GAEgASgJEg4KBnJlZ2lvbhgCIAEoCRIOCgZidWNrZXQYAyABKAkSFQoNYWNjZXNzX2tleV9pZBgEIAEoCRIeChFhY2Nlc3Nfa2V5X3NlY3JldBgFIAEoCUID4EEEEhYKDnVzZV9wYXRoX3N0eWxlGAYgASgIEiAKGGluc2VjdXJlX3NraXBfdGxzX3ZlcmlmeRgHIAEoCCJMCgtTdG9yYWdlVHlwZRIcChhTVE9SQUdFX1RZUEVfVU5TUEVDSUZJRUQQABIMCghEQVRBQkFTRRABEgkKBUxPQ0FMEAISBgoCUzMQAxrVAgoHU3RvcmFnZRIKCgJpZBgBIAEoCRIMCgRuYW1lGAIgASgJEjQKBHR5cGUYAyABKA4yJi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLlN0b3JhZ2VUeXBlEkAKCXMzX2NvbmZpZxgEIAEoCzIrLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuU3RvcmFnZS5TM0NvbmZpZ0gAGq0BCghTM0NvbmZpZxIQCghlbmRwb2ludBgBIAEoCRIOCgZyZWdpb24YAiABKAkSDgoGYnVja2V0GAMgASgJEhUKDWFjY2Vzc19rZXlfaWQYBCABKAkSHgoRYWNjZXNzX2tleV9zZWNyZXQYBSABKAlCA+BBBBIWCg51c2VfcGF0aF9zdHlsZRgGIAEoCBIgChhpbnNlY3VyZV9za2lwX3Rsc192ZXJpZnkYByABKAhCCAoGY29uZmlnGkkKEk1lbW9SZWxhdGVkU2V0dGluZxIgChhlbmFibGVfZG91YmxlX2NsaWNrX2VkaXQYASABKAgSEQoJcmVhY3Rpb25zGAIgAygJGqIBCgtUYWdzU2V0dGluZxI+CgR0YWdzGAEgAygLMjAubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5UYWdzU2V0dGluZy5UYWdzRW50cnkaUwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRI1CgV2YWx1ZRgCIAEoCzImLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuVGFnTWV0YWRhdGE6AjgBGlEKC1RhZ01ldGFkYXRhEiwKEGJhY2tncm91bmRfY29sb3IYASABKAsyEi5nb29nbGUudHlwZS5Db2xvchIUCgxibHVyX2NvbnRlbnQYAiABKAgatwIKE05vdGlmaWNhdGlvblNldHRpbmcSSgoFZW1haWwYASABKAsyOy5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLk5vdGlmaWNhdGlvblNldHRpbmcuRW1haWxTZXR0aW5nGtMBCgxFbWFpbFNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIRCglzbXRwX2hvc3QYAiABKAkSEQoJc210cF9wb3J0GAMgASgFEhUKDXNtdHBfdXNlcm5hbWUYBCABKAkSGgoNc210cF9wYXNzd29yZBgFIAEoCUID4EEEEg8KB3VzZV90bHMYBiABKAgSDwoHdXNlX3NzbBgHIAEoCBISCgpmcm9tX2VtYWlsGAggASgJEhEKCWZyb21fbmFtZRgJIAEoCRIQCghyZXBseV90bxgKIAEoCRqSAQoJQUlTZXR0aW5nEj4KCXByb3ZpZGVycxgBIAMoCzIrLm1lbW9zLmFwaS5JbnN0YW5jZVNldHRpbmcuQUlQcm92aWRlckNvbmZpZxJFCg10cmFuc2NyaXB0aW9uGAIgASgLMi4ubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZy5UcmFuc2NyaXB0aW9uQ29uZmlnGsMBChBBSVByb3ZpZGVyQ29uZmlnEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEjcKBHR5cGUYAyABKA4yKS5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLkFJUHJvdmlkZXJUeXBlEhAKCGVuZHBvaW50GAQgASgJEhQKB2FwaV9rZXkYBSABKAlCA+BBBBIYCgthcGlfa2V5X3NldBgGIAEoCEID4EEDEhkKDGFwaV9rZXlfaGludBgHIAEoCUID4EEDGlsKE1RyYW5zY3JpcHRpb25Db25maWcSEwoLcHJvdmlkZXJfaWQYASABKAkSDQoFbW9kZWwYAiABKAkSEAoIbGFuZ3VhZ2UYAyABKAkSDgoGcHJvbXB0GAQgASgJGkMKDUFjY2Vzc1NldHRpbmcSMgoLYWNjZXNzX21vZGUYASABKA4yHS5tZW1vcy5hcGkuSW5zdGFuY2VBY2Nlc3NNb2RlInYKA0tleRITCg9LRVlfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESCwoHU1RPUkFHRRACEhAKDE1FTU9fUkVMQVRFRBADEggKBFRBR1MQBBIQCgxOT1RJRklDQVRJT04QBRIGCgJBSRAGEgoKBkFDQ0VTUxAHIkwKC1N0b3JhZ2VUeXBlEhwKGFNUT1JBR0VfVFlQRV9VTlNQRUNJRklFRBAAEgwKCERBVEFCQVNFEAESCQoFTE9DQUwQAhIGCgJTMxADIkoKDkFJUHJvdmlkZXJUeXBlEiAKHEFJX1BST1ZJREVSX1RZUEVfVU5TUEVDSUZJRUQQABIKCgZPUEVOQUkQARIKCgZHRU1JTkkQAjpe6kFbChltZW1vcy5hcGkvSW5zdGFuY2VTZXR0aW5nEhtpbnN0YW5jZS9zZXR0aW5ncy97c2V0dGluZ30qEGluc3RhbmNlU2V0dGluZ3MyD2luc3RhbmNlU2V0dGluZ0IHCgV2YWx1ZSJMChlHZXRJbnN0YW5jZVNldHRpbmdSZXF1ZXN0Ei8KBG5hbWUYASABKAlCIeBBAvpBGwoZbWVtb3MuYXBpL0luc3RhbmNlU2V0dGluZyJTCh9CYXRjaEdldEluc3RhbmNlU2V0dGluZ3NSZXF1ZXN0EjAKBW5hbWVzGAEgAygJQiHgQQL6QRsKGW1lbW9zLmFwaS9JbnN0YW5jZVNldHRpbmciWQogQmF0Y2hHZXRJbnN0YW5jZVNldHRpbmdzUmVzcG9uc2USNQoRaW5zdGFuY2Vfc2V0dGluZ3MYASADKAsyGi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nIo8BChxVcGRhdGVJbnN0YW5jZVNldHRpbmdSZXF1ZXN0EjkKEGluc3RhbmNlX3NldHRpbmcYASABKAsyGi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nQgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQEikAEKH1Rlc3RJbnN0YW5jZUVtYWlsU2V0dGluZ1JlcXVlc3QSTwoFZW1haWwYASABKAsyOy5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nLk5vdGlmaWNhdGlvblNldHRpbmcuRW1haWxTZXR0aW5nQgPgQQESHAoPcmVjaXBpZW50X2VtYWlsGAIgASgJQgPgQQEizwEKDUluc3RhbmNlU3RhdHMSOAoIZGF0YWJhc2UYASABKAsyJi5tZW1vcy5hcGkuSW5zdGFuY2VTdGF0cy5EYXRhYmFzZVN0YXRzEhsKE2xvY2FsX3N0b3JhZ2VfYnl0ZXMYAiABKAMSMgoOZ2VuZXJhdGVkX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wGjMKDURhdGFiYXNlU3RhdHMSDgoGZHJpdmVyGAEgASgJEhIKCnNpemVfYnl0ZXMYAiABKAMiGQoXR2V0SW5zdGFuY2VTdGF0c1JlcXVlc3QivAMKClVzYWdlTGltaXQSEQoEbmFtZRgBIAEoCUID4EEIEjQKBm1ldHJpYxgCIAEoDjIcLm1lbW9zLmFwaS5Vc2FnZUxpbWl0Lk1ldHJpY0IG4EEC4EEFEicKBHVzZXIYAyABKAlCGeBBAeBBBfpBEAoObWVtb3MuYXBpL1VzZXISEgoFdmFsdWUYBCABKANCA+BBAhI0CgtjcmVhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyJtCgZNZXRyaWMSFgoSTUVUUklDX1VOU1BFQ0lGSUVEEAASDgoKTUVNT19DT1VOVBABEhYKEk1FTU9fQ09OVEVOVF9CWVRFUxACEhEKDVNUT1JBR0VfQllURVMQAxIQCgxVUExPQURfQllURVMQBDpN6kFKChRtZW1vcy5hcGkvVXNhZ2VMaW1pdBIZdXNhZ2VMaW1pdHMve3VzYWdlX2xpbWl0fSoLdXNhZ2VMaW1pdHMyCnVzYWdlTGltaXQiXgoWTGlzdFVzYWdlTGltaXRzUmVxdWVzdBIWCglwYWdlX3NpemUYASABKAVCA+BBARIXCgpwYWdlX3Rva2VuGAIgASgJQgPgQQESEwoGZmlsdGVyGAMgASgJQgPgQQEiXwoXTGlzdFVzYWdlTGltaXRzUmVzcG9uc2USKwoMdXNhZ2VfbGltaXRzGAEgAygLMhUubWVtb3MuYXBpLlVzYWdlTGltaXQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIkIKFEdldFVzYWdlTGltaXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUbWVtb3MuYXBpL1VzYWdlTGltaXQiZwoXQ3JlYXRlVXNhZ2VMaW1pdFJlcXVlc3QSLwoLdXNhZ2VfbGltaXQYASABKAsyFS5tZW1vcy5hcGkuVXNhZ2VMaW1pdEID4EECEhsKDnVzYWdlX2xpbWl0X2lkGAIgASgJQgPgQQEigAEKF1VwZGF0ZVVzYWdlTGltaXRSZXF1ZXN0Ei8KC3VzYWdlX2xpbWl0GAEgASgLMhUubWVtb3MuYXBpLlVzYWdlTGltaXRCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASJFChdEZWxldGVVc2FnZUxpbWl0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFG1lbW9zLmFwaS9Vc2FnZUxpbWl0Kn0KEkluc3RhbmNlQWNjZXNzTW9kZRIkCiBJTlNUQU5DRV9BQ0NFU1NfTU9ERV9VTlNQRUNJRklFRBAAEiAKHElOU1RBTkNFX0FDQ0VTU19NT0RFX1BSSVZBVEUQARIfChtJTlNUQU5DRV9BQ0NFU1NfTU9ERV9QVUJMSUMQAjKiDAoPSW5zdGFuY2VTZXJ2aWNlEnUKEkdldEluc3RhbmNlUHJvZmlsZRIkLm1lbW9zLmFwaS5HZXRJbnN0YW5jZVByb2ZpbGVSZXF1ZXN0GhoubWVtb3MuYXBpLkluc3RhbmNlUHJvZmlsZSIdgtPkkwIXEhUvYXBpL2luc3RhbmNlL3Byb2ZpbGUShgEKEkdldEluc3RhbmNlU2V0dGluZxIkLm1lbW9zLmFwaS5HZXRJbnN0YW5jZVNldHRpbmdSZXF1ZXN0GhoubWVtb3MuYXBpLkluc3RhbmNlU2V0dGluZyIu2kEEbmFtZYLT5JMCIRIfL2FwaS97bmFtZT1pbnN0YW5jZS9zZXR0aW5ncy8qfRKfAQoYQmF0Y2hHZXRJbnN0YW5jZVNldHRpbmdzEioubWVtb3MuYXBpLkJhdGNoR2V0SW5zdGFuY2VTZXR0aW5nc1JlcXVlc3QaKy5tZW1vcy5hcGkuQmF0Y2hHZXRJbnN0YW5jZVNldHRpbmdzUmVzcG9uc2UiKoLT5JMCJDoBKiIfL2FwaS9pbnN0YW5jZS9zZXR0aW5nczpiYXRjaEdldBLHAQoVVXBkYXRlSW5zdGFuY2VTZXR0aW5nEicubWVtb3MuYXBpLlVwZGF0ZUluc3RhbmNlU2V0dGluZ1JlcXVlc3QaGi5tZW1vcy5hcGkuSW5zdGFuY2VTZXR0aW5nImnaQRxpbnN0YW5jZV9zZXR0aW5nLHVwZGF0ZV9tYXNrgtPkkwJEOhBpbnN0YW5jZV9zZXR0aW5nMjAvYXBpL3tpbnN0YW5jZV9zZXR0aW5nLm5hbWU9aW5zdGFuY2Uvc2V0dGluZ3MvKn0SmAEKGFRlc3RJbnN0YW5jZUVtYWlsU2V0dGluZxIqLm1lbW9zLmFwaS5UZXN0SW5zdGFuY2VFbWFpbFNldHRpbmdSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjiC0+STAjI6ASoiLS9hcGkvaW5zdGFuY2Uvc2V0dGluZ3Mvbm90aWZpY2F0aW9uOnRlc3RFbWFpbBJtChBHZXRJbnN0YW5jZVN0YXRzEiIubWVtb3MuYXBpLkdldEluc3RhbmNlU3RhdHNSZXF1ZXN0GhgubWVtb3MuYXBpLkluc3RhbmNlU3RhdHMiG4LT5JMCFRITL2FwaS9pbnN0YW5jZS9zdGF0cxJyCg9MaXN0VXNhZ2VMaW1pdHMSIS5tZW1vcy5hcGkuTGlzdFVzYWdlTGltaXRzUmVxdWVzdBoiLm1lbW9zLmFwaS5MaXN0VXNhZ2VMaW1pdHNSZXNwb25zZSIYgtPkkwISEhAvYXBpL3VzYWdlTGltaXRzEnEKDUdldFVzYWdlTGltaXQSHy5tZW1vcy5hcGkuR2V0VXNhZ2VMaW1pdFJlcXVlc3QaFS5tZW1vcy5hcGkuVXNhZ2VMaW1pdCIo2kEEbmFtZYLT5JMCGxIZL2FwaS97bmFtZT11c2FnZUxpbWl0cy8qfRKRAQoQQ3JlYXRlVXNhZ2VMaW1pdBIiLm1lbW9zLmFwaS5DcmVhdGVVc2FnZUxpbWl0UmVxdWVzdBoVLm1lbW9zLmFwaS5Vc2FnZUxpbWl0IkLaQRp1c2FnZV9saW1pdCx1c2FnZV9saW1pdF9pZILT5JMCHzoLdXNhZ2VfbGltaXQiEC9hcGkvdXNhZ2VMaW1pdHMSowEKEFVwZGF0ZVVzYWdlTGltaXQSIi5tZW1vcy5hcGkuVXBkYXRlVXNhZ2VMaW1pdFJlcXVlc3QaFS5tZW1vcy5hcGkuVXNhZ2VMaW1pdCJU2kEXdXNhZ2VfbGltaXQsdXBkYXRlX21hc2uC0+STAjQ6C3VzYWdlX2xpbWl0MiUvYXBpL3t1c2FnZV9saW1pdC5uYW1lPXVzYWdlTGltaXRzLyp9EngKEERlbGV0ZVVzYWdlTGltaXQSIi5tZW1vcy5hcGkuRGVsZXRlVXNhZ2VMaW1pdFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiKNpBBG5hbWWC0+STAhsqGS9hcGkve25hbWU9dXNhZ2VMaW1pdHMvKn1CkwEKDWNvbS5tZW1vcy5hcGlCFEluc3RhbmNlU2VydmljZVByb3RvUAFaJ2dpdGh1Yi5jb20vdXNlbWVtb3MvbWVtb3MvcHJvdG8vZ2VuL2FwaaICA01BWKoCCU1lbW9zLkFwacoCCU1lbW9zXEFwaeICFU1lbW9zXEFwaVxHUEJNZXRhZGF0YeoCCk1lbW9zOjpBcGliBnByb3RvMw", [file_api_user_service, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_color]);/*** InstanceProfile is the basic information about the instance.@@ -610,11 +610,11 @@ export const InstanceSetting_Storage_S3ConfigSchema: GenMessage<InstanceSetting_*/export type InstanceSetting_MemoRelatedSetting = Message<"memos.api.InstanceSetting.MemoRelatedSetting"> & {/**- * The maximum memo content length in bytes. Default and minimum is 8192.+ * Whether double-clicking a memo opens it for editing.*- * @generated from field: int32 content_length_limit = 1;+ * @generated from field: bool enable_double_click_edit = 1;*/- contentLengthLimit: number;+ enableDoubleClickEdit: boolean;/*** The reactions users can choose from. Defaults to a built-in emoji set when empty.@@ -622,13 +622,6 @@ export type InstanceSetting_MemoRelatedSetting = Message<"memos.api.InstanceSett* @generated from field: repeated string reactions = 2;*/reactions: string[];-- /**- * Whether double-clicking a memo opens it for editing.- *- * @generated from field: bool enable_double_click_edit = 3;- */- enableDoubleClickEdit: boolean;};/**@@ -1368,24 +1361,31 @@ export enum UsageLimit_Metric {* The number of memos the user created, including comments, archived* memos, and memos in Spaces.*- * @generated from enum value: MEMOS = 1;+ * @generated from enum value: MEMO_COUNT = 1;+ */+ MEMO_COUNT = 1,++ /**+ * The UTF-8 size in bytes of one memo's content.+ *+ * @generated from enum value: MEMO_CONTENT_BYTES = 2;*/- MEMOS = 1,+ MEMO_CONTENT_BYTES = 2,/*** The total size in bytes of the user's uploads, including uploads not* attached to a memo. External links do not count.*- * @generated from enum value: STORAGE_BYTES = 2;+ * @generated from enum value: STORAGE_BYTES = 3;*/- STORAGE_BYTES = 2,+ STORAGE_BYTES = 3,/*** The size in bytes of one uploaded file.*- * @generated from enum value: UPLOAD_BYTES = 3;+ * @generated from enum value: UPLOAD_BYTES = 4;*/- UPLOAD_BYTES = 3,+ UPLOAD_BYTES = 4,}/**diff --git a/web/src/types/proto/api/user_service_pb.ts b/web/src/types/proto/api/user_service_pb.tsindex c8081592f..50ae27b23 100644--- a/web/src/types/proto/api/user_service_pb.ts+++ b/web/src/types/proto/api/user_service_pb.ts@@ -24,7 +24,7 @@ import type { Message } from "@bufbuild/protobuf";* Describes the file api/user_service.proto.*/export const file_api_user_service: GenFile = /*@__PURE__*/- fileDesc("ChZhcGkvdXNlcl9zZXJ2aWNlLnByb3RvEgltZW1vcy5hcGkixwMKBFVzZXISEQoEbmFtZRgBIAEoCUID4EEIEhUKCHVzZXJuYW1lGAIgASgJQgPgQQISGQoMZGlzcGxheV9uYW1lGAMgASgJQgPgQQESEgoFZW1haWwYBCABKAlCA+BBARIXCgphdmF0YXJfdXJsGAUgASgJQgPgQQESGAoLZGVzY3JpcHRpb24YBiABKAlCA+BBARIVCghwYXNzd29yZBgHIAEoCUID4EEEEicKBHJvbGUYCCABKA4yFC5tZW1vcy5hcGkuVXNlci5Sb2xlQgPgQQISJAoFc3RhdGUYCSABKA4yEC5tZW1vcy5hcGkuU3RhdGVCA+BBAhI0CgtjcmVhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyIxCgRSb2xlEhQKEFJPTEVfVU5TUEVDSUZJRUQQABIJCgVBRE1JThACEggKBFVTRVIQAzou6kErCg5tZW1vcy5hcGkvVXNlchIMdXNlcnMve3VzZXJ9KgV1c2VyczIEdXNlciJzChBMaXN0VXNlcnNSZXF1ZXN0EhYKCXBhZ2Vfc2l6ZRgBIAEoBUID4EEBEhcKCnBhZ2VfdG9rZW4YAiABKAlCA+BBARITCgZmaWx0ZXIYAyABKAlCA+BBARIZCgxzaG93X2RlbGV0ZWQYBCABKAhCA+BBASJMChFMaXN0VXNlcnNSZXNwb25zZRIeCgV1c2VycxgBIAMoCzIPLm1lbW9zLmFwaS5Vc2VyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJqCg5HZXRVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEjIKCXJlYWRfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASI9ChRCYXRjaEdldFVzZXJzUmVxdWVzdBIlCgVuYW1lcxgBIAMoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciI3ChVCYXRjaEdldFVzZXJzUmVzcG9uc2USHgoFdXNlcnMYASADKAsyDy5tZW1vcy5hcGkuVXNlciKFAQoRQ3JlYXRlVXNlclJlcXVlc3QSJQoEdXNlchgBIAEoCzIPLm1lbW9zLmFwaS5Vc2VyQgbgQQLgQQQSFAoHdXNlcl9pZBgCIAEoCUID4EEBEhoKDXZhbGlkYXRlX29ubHkYAyABKAhCA+BBARIXCgpyZXF1ZXN0X2lkGAQgASgJQgPgQQEiiQEKEVVwZGF0ZVVzZXJSZXF1ZXN0EiIKBHVzZXIYASABKAsyDy5tZW1vcy5hcGkuVXNlckID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhoKDWFsbG93X21pc3NpbmcYAyABKAhCA+BBASJNChFEZWxldGVVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhIKBWZvcmNlGAIgASgIQgPgQQEiuwYKC1VzZXJTZXR0aW5nEhEKBG5hbWUYASABKAlCA+BBCBJACg9nZW5lcmFsX3NldHRpbmcYAiABKAsyJS5tZW1vcy5hcGkuVXNlclNldHRpbmcuR2VuZXJhbFNldHRpbmdIABJCChB3ZWJob29rc19zZXR0aW5nGAMgASgLMiYubWVtb3MuYXBpLlVzZXJTZXR0aW5nLldlYmhvb2tzU2V0dGluZ0gAEjoKDHRhZ3Nfc2V0dGluZxgEIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZ0gAGnkKDkdlbmVyYWxTZXR0aW5nEhMKBmxvY2FsZRgBIAEoCUID4EEBEhwKD21lbW9fdmlzaWJpbGl0eRgCIAEoCUID4EEBEhIKBXRoZW1lGAMgASgJQgPgQQESIAoTc2F2ZV9tZWRpYV9tZXRhZGF0YRgEIAEoCEID4EEBGjsKD1dlYmhvb2tzU2V0dGluZxIoCgh3ZWJob29rcxgBIAMoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vaxqfAQoLVGFnc1NldHRpbmcSPwoEdGFncxgBIAMoCzIsLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZy5UYWdzRW50cnlCA+BBARpPCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWVtb3MuYXBpLlVzZXJTZXR0aW5nLlRhZ01ldGFkYXRhOgI4ARpbCgtUYWdNZXRhZGF0YRIxChBiYWNrZ3JvdW5kX2NvbG9yGAEgASgLMhIuZ29vZ2xlLnR5cGUuQ29sb3JCA+BBARIZCgxibHVyX2NvbnRlbnQYAiABKAhCA+BBASI/CgNLZXkSEwoPS0VZX1VOU1BFQ0lGSUVEEAASCwoHR0VORVJBTBABEgwKCFdFQkhPT0tTEAQSCAoEVEFHUxAFOlbqQVMKFW1lbW9zLmFwaS9Vc2VyU2V0dGluZxIfdXNlcnMve3VzZXJ9L3NldHRpbmdzL3tzZXR0aW5nfSoMdXNlclNldHRpbmdzMgt1c2VyU2V0dGluZ0IHCgV2YWx1ZSJyChdMaXN0VXNlclNldHRpbmdzUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBImIKGExpc3RVc2VyU2V0dGluZ3NSZXNwb25zZRItCg11c2VyX3NldHRpbmdzGAEgAygLMhYubWVtb3MuYXBpLlVzZXJTZXR0aW5nEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJEChVHZXRVc2VyU2V0dGluZ1JlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkvVXNlclNldHRpbmcigwEKGFVwZGF0ZVVzZXJTZXR0aW5nUmVxdWVzdBIxCgx1c2VyX3NldHRpbmcYASABKAsyFi5tZW1vcy5hcGkuVXNlclNldHRpbmdCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAiLzBAoJVXNlclN0YXRzEhEKBG5hbWUYASABKAlCA+BBCBIYChB0b3RhbF9tZW1vX2NvdW50GAIgASgFEjsKD21lbW9fdHlwZV9zdGF0cxgDIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU3RhdHMuTWVtb1R5cGVTdGF0cxI3Cgp0YWdfY291bnRzGAQgAygLMiMubWVtb3MuYXBpLlVzZXJTdGF0cy5UYWdDb3VudHNFbnRyeRIpCgxwaW5uZWRfbWVtb3MYBSADKAlCE/pBEAoObWVtb3MuYXBpL01lbW8SOwoXbWVtb19jcmVhdGVkX3RpbWVzdGFtcHMYBiADKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjsKF21lbW9fdXBkYXRlZF90aW1lc3RhbXBzGAcgAygLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIqChhhdHRhY2htZW50X3N0b3JhZ2VfYnl0ZXMYCCABKANCA+BBA0gAiAEBGjAKDlRhZ0NvdW50c0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoBToCOAEaXwoNTWVtb1R5cGVTdGF0cxISCgpsaW5rX2NvdW50GAEgASgFEhIKCmNvZGVfY291bnQYAiABKAUSEgoKdG9kb19jb3VudBgDIAEoBRISCgp1bmRvX2NvdW50GAQgASgFOkLqQT8KE21lbW9zLmFwaS9Vc2VyU3RhdHMSEnVzZXJzL3t1c2VyfS9zdGF0cyoJdXNlclN0YXRzMgl1c2VyU3RhdHNCGwoZX2F0dGFjaG1lbnRfc3RvcmFnZV9ieXRlcyJ+ChRMaXN0VXNlclN0YXRzUmVxdWVzdBIrCgZwYXJlbnQYASABKAlCG+BBAvpBFRITbWVtb3MuYXBpL1VzZXJTdGF0cxITCgZmaWx0ZXIYAiABKAlCA+BBARIkCgVzdGF0ZRgDIAEoDjIQLm1lbW9zLmFwaS5TdGF0ZUID4EEBIkEKFUxpc3RVc2VyU3RhdHNSZXNwb25zZRIoCgp1c2VyX3N0YXRzGAEgAygLMhQubWVtb3MuYXBpLlVzZXJTdGF0cyJQChNHZXRVc2VyU3RhdHNSZXF1ZXN0EiQKBG5hbWUYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISEwoGZmlsdGVyGAIgASgJQgPgQQEinAMKCVVzZXJVc2FnZRIRCgRuYW1lGAEgASgJQgPgQQgSEgoKbWVtb19jb3VudBgCIAEoAxIVCg1zdG9yYWdlX2J5dGVzGAMgASgDEjgKC21lbW9zX2xpbWl0GAQgASgLMiMubWVtb3MuYXBpLlVzZXJVc2FnZS5FZmZlY3RpdmVMaW1pdBJAChNzdG9yYWdlX2J5dGVzX2xpbWl0GAUgASgLMiMubWVtb3MuYXBpLlVzZXJVc2FnZS5FZmZlY3RpdmVMaW1pdBI/ChJ1cGxvYWRfYnl0ZXNfbGltaXQYBiABKAsyIy5tZW1vcy5hcGkuVXNlclVzYWdlLkVmZmVjdGl2ZUxpbWl0Gk8KDkVmZmVjdGl2ZUxpbWl0Eg0KBXZhbHVlGAEgASgDEi4KC3VzYWdlX2xpbWl0GAIgASgJQhn6QRYKFG1lbW9zLmFwaS9Vc2FnZUxpbWl0OkPqQUAKE21lbW9zLmFwaS9Vc2VyVXNhZ2USEnVzZXJzL3t1c2VyfS91c2FnZSoKdXNlclVzYWdlczIJdXNlclVzYWdlIkAKE0dldFVzZXJVc2FnZVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNtZW1vcy5hcGkvVXNlclVzYWdlIvABCghNZW1vVmlldxIRCgRuYW1lGAEgASgJQgPgQQgSEgoFdGl0bGUYAiABKAlCA+BBAhITCgZmaWx0ZXIYAyABKAlCA+BBAhIrCgRpY29uGAQgASgLMhgubWVtb3MuYXBpLk1lbW9WaWV3Lkljb25CA+BBARoyCgRJY29uEg8KBWVtb2ppGAEgASgJSAASEAoGbHVjaWRlGAIgASgJSABCBwoFdmFsdWU6R+pBRAoSbWVtb3MuYXBpL01lbW9WaWV3Ehl1c2Vycy97dXNlcn0vdmlld3Mve3ZpZXd9KgltZW1vVmlld3MyCG1lbW9WaWV3IkIKFExpc3RNZW1vVmlld3NSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUEhJtZW1vcy5hcGkvTWVtb1ZpZXciQAoVTGlzdE1lbW9WaWV3c1Jlc3BvbnNlEicKCm1lbW9fdmlld3MYASADKAsyEy5tZW1vcy5hcGkuTWVtb1ZpZXciPgoSR2V0TWVtb1ZpZXdSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSbWVtb3MuYXBpL01lbW9WaWV3IowBChVDcmVhdGVNZW1vVmlld1JlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQSEm1lbW9zLmFwaS9NZW1vVmlldxIrCgltZW1vX3ZpZXcYAiABKAsyEy5tZW1vcy5hcGkuTWVtb1ZpZXdCA+BBAhIaCg12YWxpZGF0ZV9vbmx5GAMgASgIQgPgQQEiegoVVXBkYXRlTWVtb1ZpZXdSZXF1ZXN0EisKCW1lbW9fdmlldxgBIAEoCzITLm1lbW9zLmFwaS5NZW1vVmlld0ID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EEBIkEKFURlbGV0ZU1lbW9WaWV3UmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEm1lbW9zLmFwaS9NZW1vVmlldyKzCgoQVXNlck5vdGlmaWNhdGlvbhIUCgRuYW1lGAEgASgJQgbgQQPgQQgSJgoGc2VuZGVyGAIgASgJQhbgQQP6QRAKDm1lbW9zLmFwaS9Vc2VyEikKC3NlbmRlcl91c2VyGAMgASgLMg8ubWVtb3MuYXBpLlVzZXJCA+BBAxIzCgR0eXBlGAQgASgOMiAubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uVHlwZUID4EEDEksKDG1lbW9fY29tbWVudBgFIAEoCzIuLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLk1lbW9Db21tZW50UGF5bG9hZEID4EEDSAASSwoMbWVtb19tZW50aW9uGAYgASgLMi4ubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uTWVtb01lbnRpb25QYXlsb2FkQgPgQQNIABJTChBzcGFjZV9pbnZpdGF0aW9uGAcgASgLMjIubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uU3BhY2VJbnZpdGF0aW9uUGF5bG9hZEID4EEDSAASNwoGc3RhdHVzGAggASgOMiIubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uU3RhdHVzQgPgQQESNAoLY3JlYXRlX3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMabAoSTWVtb0NvbW1lbnRQYXlsb2FkEgwKBG1lbW8YASABKAkSFAoMcmVsYXRlZF9tZW1vGAIgASgJEhQKDG1lbW9fc25pcHBldBgDIAEoCRIcChRyZWxhdGVkX21lbW9fc25pcHBldBgEIAEoCRpsChJNZW1vTWVudGlvblBheWxvYWQSDAoEbWVtbxgBIAEoCRIUCgxyZWxhdGVkX21lbW8YAiABKAkSFAoMbWVtb19zbmlwcGV0GAMgASgJEhwKFHJlbGF0ZWRfbWVtb19zbmlwcGV0GAQgASgJGrYCChZTcGFjZUludml0YXRpb25QYXlsb2FkEjgKEHNwYWNlX2ludml0YXRpb24YASABKAlCHvpBGwoZbWVtb3MuYXBpL1NwYWNlSW52aXRhdGlvbhIfCgVzcGFjZRgCIAEoCzIQLm1lbW9zLmFwaS5TcGFjZRIpCgRyb2xlGAMgASgOMhsubWVtb3MuYXBpLlNwYWNlTWVtYmVyLlJvbGUSUQoFc3RhdGUYBCABKA4yQi5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5TcGFjZUludml0YXRpb25QYXlsb2FkLkludml0YXRpb25TdGF0ZSJDCg9JbnZpdGF0aW9uU3RhdGUSFQoRU1RBVEVfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESDAoIQUNDRVBURUQQAiI6CgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCgoGVU5SRUFEEAESDAoIQVJDSElWRUQQAiJWCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIQCgxNRU1PX0NPTU1FTlQQARIQCgxNRU1PX01FTlRJT04QAhIUChBTUEFDRV9JTlZJVEFUSU9OEAM6b+pBbAoabWVtb3MuYXBpL1VzZXJOb3RpZmljYXRpb24SKXVzZXJzL3t1c2VyfS9ub3RpZmljYXRpb25zL3tub3RpZmljYXRpb259KhF1c2VyTm90aWZpY2F0aW9uczIQdXNlck5vdGlmaWNhdGlvbkIJCgdwYXlsb2FkIowBChxMaXN0VXNlck5vdGlmaWNhdGlvbnNSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIWCglwYWdlX3NpemUYAiABKAVCA+BBARIXCgpwYWdlX3Rva2VuGAMgASgJQgPgQQESEwoGZmlsdGVyGAQgASgJQgPgQQEibAodTGlzdFVzZXJOb3RpZmljYXRpb25zUmVzcG9uc2USMgoNbm90aWZpY2F0aW9ucxgBIAMoCzIbLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKNAQodVXBkYXRlVXNlck5vdGlmaWNhdGlvblJlcXVlc3QSNgoMbm90aWZpY2F0aW9uGAEgASgLMhsubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb25CA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAiJRCh1EZWxldGVVc2VyTm90aWZpY2F0aW9uUmVxdWVzdBIwCgRuYW1lGAEgASgJQiLgQQL6QRwKGm1lbW9zLmFwaS9Vc2VyTm90aWZpY2F0aW9uIsUCCgtVc2VyV2ViaG9vaxIRCgRuYW1lGAEgASgJQgPgQQgSFAoMZGlzcGxheV9uYW1lGAIgASgJEgsKA3VybBgDIAEoCRIbCg5zaWduaW5nX3NlY3JldBgEIAEoCUID4EEEEh8KEnNpZ25pbmdfc2VjcmV0X3NldBgFIAEoCEID4EEDEjQKC2NyZWF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDOlbqQVMKFW1lbW9zLmFwaS9Vc2VyV2ViaG9vaxIfdXNlcnMve3VzZXJ9L3dlYmhvb2tzL3t3ZWJob29rfSoMdXNlcldlYmhvb2tzMgt1c2VyV2ViaG9vayJIChdMaXN0VXNlcldlYmhvb2tzUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFxIVbWVtb3MuYXBpL1VzZXJXZWJob29rIkQKGExpc3RVc2VyV2ViaG9va3NSZXNwb25zZRIoCgh3ZWJob29rcxgBIAMoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vayJ3ChhDcmVhdGVVc2VyV2ViaG9va1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcSFW1lbW9zLmFwaS9Vc2VyV2ViaG9vaxIsCgd3ZWJob29rGAIgASgLMhYubWVtb3MuYXBpLlVzZXJXZWJob29rQgPgQQIieQoYVXBkYXRlVXNlcldlYmhvb2tSZXF1ZXN0EiwKB3dlYmhvb2sYASABKAsyFi5tZW1vcy5hcGkuVXNlcldlYmhvb2tCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siRwoYRGVsZXRlVXNlcldlYmhvb2tSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVbWVtb3MuYXBpL1VzZXJXZWJob29rIlEKIkdldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldFJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkvVXNlcldlYmhvb2siPQojR2V0VXNlcldlYmhvb2tTaWduaW5nU2VjcmV0UmVzcG9uc2USFgoOc2lnbmluZ19zZWNyZXQYASABKAki7wEKDkxpbmtlZElkZW50aXR5EhEKBG5hbWUYASABKAlCA+BBCBI9ChFpZGVudGl0eV9wcm92aWRlchgCIAEoCUIi4EED+kEcChptZW1vcy5hcGkvSWRlbnRpdHlQcm92aWRlchIZCgxleHRlcm5hbF91aWQYAyABKAlCA+BBAzpw6kFtChhtZW1vcy5hcGkvTGlua2VkSWRlbnRpdHkSL3VzZXJzL3t1c2VyfS9saW5rZWRJZGVudGl0aWVzL3tsaW5rZWRfaWRlbnRpdHl9KhBsaW5rZWRJZGVudGl0aWVzMg5saW5rZWRJZGVudGl0eSJFChtMaXN0TGlua2VkSWRlbnRpdGllc1JlcXVlc3QSJgoGcGFyZW50GAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyIlQKHExpc3RMaW5rZWRJZGVudGl0aWVzUmVzcG9uc2USNAoRbGlua2VkX2lkZW50aXRpZXMYASADKAsyGS5tZW1vcy5hcGkuTGlua2VkSWRlbnRpdHkiSgoYR2V0TGlua2VkSWRlbnRpdHlSZXF1ZXN0Ei4KBG5hbWUYASABKAlCIOBBAvpBGgoYbWVtb3MuYXBpL0xpbmtlZElkZW50aXR5Is4BChtDcmVhdGVMaW5rZWRJZGVudGl0eVJlcXVlc3QSJgoGcGFyZW50GAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEj0KEWlkZW50aXR5X3Byb3ZpZGVyGAIgASgJQiLgQQL6QRwKGm1lbW9zLmFwaS9JZGVudGl0eVByb3ZpZGVyEhEKBGNvZGUYAyABKAlCA+BBAhIZCgxyZWRpcmVjdF91cmkYBCABKAlCA+BBAhIaCg1jb2RlX3ZlcmlmaWVyGAUgASgJQgPgQQEiTQobRGVsZXRlTGlua2VkSWRlbnRpdHlSZXF1ZXN0Ei4KBG5hbWUYASABKAlCIOBBAvpBGgoYbWVtb3MuYXBpL0xpbmtlZElkZW50aXR5IvICChNQZXJzb25hbEFjY2Vzc1Rva2VuEhEKBG5hbWUYASABKAlCA+BBCBIYCgtkZXNjcmlwdGlvbhgCIAEoCUID4EEBEjQKC2NyZWF0ZV90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC2V4cGlyZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEBEjYKDWxhc3RfdXNlX3RpbWUYBSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQM6iQHqQYUBCh1tZW1vcy5hcGkvUGVyc29uYWxBY2Nlc3NUb2tlbhI5dXNlcnMve3VzZXJ9L3BlcnNvbmFsQWNjZXNzVG9rZW5zL3twZXJzb25hbF9hY2Nlc3NfdG9rZW59KhRwZXJzb25hbEFjY2Vzc1Rva2VuczITcGVyc29uYWxBY2Nlc3NUb2tlbiJ6Ch9MaXN0UGVyc29uYWxBY2Nlc3NUb2tlbnNSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIWCglwYWdlX3NpemUYAiABKAVCA+BBARIXCgpwYWdlX3Rva2VuGAMgASgJQgPgQQEiewogTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zUmVzcG9uc2USPgoWcGVyc29uYWxfYWNjZXNzX3Rva2VucxgBIAMoCzIeLm1lbW9zLmFwaS5QZXJzb25hbEFjY2Vzc1Rva2VuEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKCAQogQ3JlYXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlcXVlc3QSJgoGcGFyZW50GAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhgKC2Rlc2NyaXB0aW9uGAIgASgJQgPgQQESHAoPZXhwaXJlc19pbl9kYXlzGAMgASgFQgPgQQEicQohQ3JlYXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlc3BvbnNlEj0KFXBlcnNvbmFsX2FjY2Vzc190b2tlbhgBIAEoCzIeLm1lbW9zLmFwaS5QZXJzb25hbEFjY2Vzc1Rva2VuEg0KBXRva2VuGAIgASgJIlcKIERlbGV0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodbWVtb3MuYXBpL1BlcnNvbmFsQWNjZXNzVG9rZW4iOgoSRXhwb3J0TWVtb3NSZXF1ZXN0EiQKBG5hbWUYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXIijwMKEkltcG9ydE1lbW9zUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEioKBHNwZWMYAiABKAsyGi5tZW1vcy5hcGkuSW1wb3J0TWVtb3NTcGVjSAASEwoJdXBsb2FkX2lkGAMgASgJSAASGQoMd3JpdGVfb2Zmc2V0GAQgASgDQgPgQQISEQoEZGF0YRgFIAEoDEID4EEBEhkKDGZpbmlzaF93cml0ZRgGIAEoCEID4EEBEkoKD2NvbmZsaWN0X3BvbGljeRgHIAEoDjIsLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1JlcXVlc3QuQ29uZmxpY3RQb2xpY3lCA+BBARIaCg12YWxpZGF0ZV9vbmx5GAggASgIQgPgQQEiVwoOQ29uZmxpY3RQb2xpY3kSHwobQ09ORkxJQ1RfUE9MSUNZX1VOU1BFQ0lGSUVEEAASCAoEU0tJUBABEgsKB1JFUExBQ0UQAhINCglEVVBMSUNBVEUQA0IICgZ1cGxvYWQivgEKE0ltcG9ydE1lbW9zUmVzcG9uc2USEQoJdXBsb2FkX2lkGAEgASgJEhYKDmNvbW1pdHRlZF9zaXplGAIgASgDEhYKDm1heF9jaHVua19zaXplGAMgASgFEioKBHBsYW4YBCABKAsyGi5tZW1vcy5hcGkuSW1wb3J0TWVtb3NQbGFuSAASLgoGcmVwb3J0GAUgASgLMhwubWVtb3MuYXBpLkltcG9ydE1lbW9zUmVwb3J0SABCCAoGcmVzdWx0IioKD0ltcG9ydE1lbW9zU3BlYxIXCgp0b3RhbF9zaXplGAEgASgDQgPgQQEi9AEKD0ltcG9ydE1lbW9zUGxhbhIvCgtleHBvcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEAoIZXhwb3J0ZXIYAiABKAkSEQoJZ2VuZXJhdG9yGAMgASgJEhIKCm1lbW9fY291bnQYBCABKAUSGAoQYXR0YWNobWVudF9jb3VudBgFIAEoBRILCgNuZXcYBiABKAUSEAoIZXhpc3RpbmcYByABKAUSDwoHcmVuYW1lZBgIIAEoBRItCgh3YXJuaW5ncxgJIAMoCzIbLm1lbW9zLmFwaS5JbXBvcnRNZW1vc0lzc3VlIrQBChFJbXBvcnRNZW1vc1JlcG9ydBIPCgdjcmVhdGVkGAEgASgFEg8KB3VwZGF0ZWQYAiABKAUSDwoHc2tpcHBlZBgDIAEoBRIOCgZmYWlsZWQYBCABKAUSLQoId2FybmluZ3MYBSADKAsyGy5tZW1vcy5hcGkuSW1wb3J0TWVtb3NJc3N1ZRItCghmYWlsdXJlcxgGIAMoCzIbLm1lbW9zLmFwaS5JbXBvcnRNZW1vc0lzc3VlIjUKEEltcG9ydE1lbW9zSXNzdWUSEAoIbWVtb191aWQYASABKAkSDwoHbWVzc2FnZRgCIAEoCTKKJQoLVXNlclNlcnZpY2USWgoJTGlzdFVzZXJzEhsubWVtb3MuYXBpLkxpc3RVc2Vyc1JlcXVlc3QaHC5tZW1vcy5hcGkuTGlzdFVzZXJzUmVzcG9uc2UiEoLT5JMCDBIKL2FwaS91c2VycxJZCgdHZXRVc2VyEhkubWVtb3MuYXBpLkdldFVzZXJSZXF1ZXN0Gg8ubWVtb3MuYXBpLlVzZXIiItpBBG5hbWWC0+STAhUSEy9hcGkve25hbWU9dXNlcnMvKn0ScgoNQmF0Y2hHZXRVc2VycxIfLm1lbW9zLmFwaS5CYXRjaEdldFVzZXJzUmVxdWVzdBogLm1lbW9zLmFwaS5CYXRjaEdldFVzZXJzUmVzcG9uc2UiHoLT5JMCGDoBKiITL2FwaS91c2VyczpiYXRjaEdldBJkCgpDcmVhdGVVc2VyEhwubWVtb3MuYXBpLkNyZWF0ZVVzZXJSZXF1ZXN0Gg8ubWVtb3MuYXBpLlVzZXIiJ9pBDHVzZXIsdXNlcl9pZILT5JMCEjoEdXNlciIKL2FwaS91c2VycxJ2CgpVcGRhdGVVc2VyEhwubWVtb3MuYXBpLlVwZGF0ZVVzZXJSZXF1ZXN0Gg8ubWVtb3MuYXBpLlVzZXIiOdpBEHVzZXIsdXBkYXRlX21hc2uC0+STAiA6BHVzZXIyGC9hcGkve3VzZXIubmFtZT11c2Vycy8qfRJmCgpEZWxldGVVc2VyEhwubWVtb3MuYXBpLkRlbGV0ZVVzZXJSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IiLaQQRuYW1lgtPkkwIVKhMvYXBpL3tuYW1lPXVzZXJzLyp9EowBChBMaXN0VXNlclNldHRpbmdzEiIubWVtb3MuYXBpLkxpc3RVc2VyU2V0dGluZ3NSZXF1ZXN0GiMubWVtb3MuYXBpLkxpc3RVc2VyU2V0dGluZ3NSZXNwb25zZSIv2kEGcGFyZW50gtPkkwIgEh4vYXBpL3twYXJlbnQ9dXNlcnMvKn0vc2V0dGluZ3MSeQoOR2V0VXNlclNldHRpbmcSIC5tZW1vcy5hcGkuR2V0VXNlclNldHRpbmdSZXF1ZXN0GhYubWVtb3MuYXBpLlVzZXJTZXR0aW5nIi3aQQRuYW1lgtPkkwIgEh4vYXBpL3tuYW1lPXVzZXJzLyovc2V0dGluZ3MvKn0SrgEKEVVwZGF0ZVVzZXJTZXR0aW5nEiMubWVtb3MuYXBpLlVwZGF0ZVVzZXJTZXR0aW5nUmVxdWVzdBoWLm1lbW9zLmFwaS5Vc2VyU2V0dGluZyJc2kEYdXNlcl9zZXR0aW5nLHVwZGF0ZV9tYXNrgtPkkwI7Ogx1c2VyX3NldHRpbmcyKy9hcGkve3VzZXJfc2V0dGluZy5uYW1lPXVzZXJzLyovc2V0dGluZ3MvKn0SgAEKDUxpc3RVc2VyU3RhdHMSHy5tZW1vcy5hcGkuTGlzdFVzZXJTdGF0c1JlcXVlc3QaIC5tZW1vcy5hcGkuTGlzdFVzZXJTdGF0c1Jlc3BvbnNlIizaQQZwYXJlbnSC0+STAh0SGy9hcGkve3BhcmVudD11c2Vycy8qfS9zdGF0cxJxCgxHZXRVc2VyU3RhdHMSHi5tZW1vcy5hcGkuR2V0VXNlclN0YXRzUmVxdWVzdBoULm1lbW9zLmFwaS5Vc2VyU3RhdHMiK9pBBG5hbWWC0+STAh4SHC9hcGkve25hbWU9dXNlcnMvKn06Z2V0U3RhdHMSbgoMR2V0VXNlclVzYWdlEh4ubWVtb3MuYXBpLkdldFVzZXJVc2FnZVJlcXVlc3QaFC5tZW1vcy5hcGkuVXNlclVzYWdlIijaQQRuYW1lgtPkkwIbEhkvYXBpL3tuYW1lPXVzZXJzLyovdXNhZ2V9EoABCg1MaXN0TWVtb1ZpZXdzEh8ubWVtb3MuYXBpLkxpc3RNZW1vVmlld3NSZXF1ZXN0GiAubWVtb3MuYXBpLkxpc3RNZW1vVmlld3NSZXNwb25zZSIs2kEGcGFyZW50gtPkkwIdEhsvYXBpL3twYXJlbnQ9dXNlcnMvKn0vdmlld3MSbQoLR2V0TWVtb1ZpZXcSHS5tZW1vcy5hcGkuR2V0TWVtb1ZpZXdSZXF1ZXN0GhMubWVtb3MuYXBpLk1lbW9WaWV3IiraQQRuYW1lgtPkkwIdEhsvYXBpL3tuYW1lPXVzZXJzLyovdmlld3MvKn0SigEKDkNyZWF0ZU1lbW9WaWV3EiAubWVtb3MuYXBpLkNyZWF0ZU1lbW9WaWV3UmVxdWVzdBoTLm1lbW9zLmFwaS5NZW1vVmlldyJB2kEQcGFyZW50LG1lbW9fdmlld4LT5JMCKDoJbWVtb192aWV3IhsvYXBpL3twYXJlbnQ9dXNlcnMvKn0vdmlld3MSmQEKDlVwZGF0ZU1lbW9WaWV3EiAubWVtb3MuYXBpLlVwZGF0ZU1lbW9WaWV3UmVxdWVzdBoTLm1lbW9zLmFwaS5NZW1vVmlldyJQ2kEVbWVtb192aWV3LHVwZGF0ZV9tYXNrgtPkkwIyOgltZW1vX3ZpZXcyJS9hcGkve21lbW9fdmlldy5uYW1lPXVzZXJzLyovdmlld3MvKn0SdgoORGVsZXRlTWVtb1ZpZXcSIC5tZW1vcy5hcGkuRGVsZXRlTWVtb1ZpZXdSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IiraQQRuYW1lgtPkkwIdKhsvYXBpL3tuYW1lPXVzZXJzLyovdmlld3MvKn0SoAEKFUxpc3RVc2VyTm90aWZpY2F0aW9ucxInLm1lbW9zLmFwaS5MaXN0VXNlck5vdGlmaWNhdGlvbnNSZXF1ZXN0GigubWVtb3MuYXBpLkxpc3RVc2VyTm90aWZpY2F0aW9uc1Jlc3BvbnNlIjTaQQZwYXJlbnSC0+STAiUSIy9hcGkve3BhcmVudD11c2Vycy8qfS9ub3RpZmljYXRpb25zEsIBChZVcGRhdGVVc2VyTm90aWZpY2F0aW9uEigubWVtb3MuYXBpLlVwZGF0ZVVzZXJOb3RpZmljYXRpb25SZXF1ZXN0GhsubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24iYdpBGG5vdGlmaWNhdGlvbix1cGRhdGVfbWFza4LT5JMCQDoMbm90aWZpY2F0aW9uMjAvYXBpL3tub3RpZmljYXRpb24ubmFtZT11c2Vycy8qL25vdGlmaWNhdGlvbnMvKn0SjgEKFkRlbGV0ZVVzZXJOb3RpZmljYXRpb24SKC5tZW1vcy5hcGkuRGVsZXRlVXNlck5vdGlmaWNhdGlvblJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiMtpBBG5hbWWC0+STAiUqIy9hcGkve25hbWU9dXNlcnMvKi9ub3RpZmljYXRpb25zLyp9EowBChBMaXN0VXNlcldlYmhvb2tzEiIubWVtb3MuYXBpLkxpc3RVc2VyV2ViaG9va3NSZXF1ZXN0GiMubWVtb3MuYXBpLkxpc3RVc2VyV2ViaG9va3NSZXNwb25zZSIv2kEGcGFyZW50gtPkkwIgEh4vYXBpL3twYXJlbnQ9dXNlcnMvKn0vd2ViaG9va3MSkgEKEUNyZWF0ZVVzZXJXZWJob29rEiMubWVtb3MuYXBpLkNyZWF0ZVVzZXJXZWJob29rUmVxdWVzdBoWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vayJA2kEOcGFyZW50LHdlYmhvb2uC0+STAik6B3dlYmhvb2siHi9hcGkve3BhcmVudD11c2Vycy8qfS93ZWJob29rcxKfAQoRVXBkYXRlVXNlcldlYmhvb2sSIy5tZW1vcy5hcGkuVXBkYXRlVXNlcldlYmhvb2tSZXF1ZXN0GhYubWVtb3MuYXBpLlVzZXJXZWJob29rIk3aQRN3ZWJob29rLHVwZGF0ZV9tYXNrgtPkkwIxOgd3ZWJob29rMiYvYXBpL3t3ZWJob29rLm5hbWU9dXNlcnMvKi93ZWJob29rcy8qfRJ/ChFEZWxldGVVc2VyV2ViaG9vaxIjLm1lbW9zLmFwaS5EZWxldGVVc2VyV2ViaG9va1JlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiLdpBBG5hbWWC0+STAiAqHi9hcGkve25hbWU9dXNlcnMvKi93ZWJob29rcy8qfRK8AQobR2V0VXNlcldlYmhvb2tTaWduaW5nU2VjcmV0Ei0ubWVtb3MuYXBpLkdldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldFJlcXVlc3QaLi5tZW1vcy5hcGkuR2V0VXNlcldlYmhvb2tTaWduaW5nU2VjcmV0UmVzcG9uc2UiPtpBBG5hbWWC0+STAjESLy9hcGkve25hbWU9dXNlcnMvKi93ZWJob29rcy8qfTpnZXRTaWduaW5nU2VjcmV0EqABChRMaXN0TGlua2VkSWRlbnRpdGllcxImLm1lbW9zLmFwaS5MaXN0TGlua2VkSWRlbnRpdGllc1JlcXVlc3QaJy5tZW1vcy5hcGkuTGlzdExpbmtlZElkZW50aXRpZXNSZXNwb25zZSI32kEGcGFyZW50gtPkkwIoEiYvYXBpL3twYXJlbnQ9dXNlcnMvKn0vbGlua2VkSWRlbnRpdGllcxKKAQoRR2V0TGlua2VkSWRlbnRpdHkSIy5tZW1vcy5hcGkuR2V0TGlua2VkSWRlbnRpdHlSZXF1ZXN0GhkubWVtb3MuYXBpLkxpbmtlZElkZW50aXR5IjXaQQRuYW1lgtPkkwIoEiYvYXBpL3tuYW1lPXVzZXJzLyovbGlua2VkSWRlbnRpdGllcy8qfRKnAQoUQ3JlYXRlTGlua2VkSWRlbnRpdHkSJi5tZW1vcy5hcGkuQ3JlYXRlTGlua2VkSWRlbnRpdHlSZXF1ZXN0GhkubWVtb3MuYXBpLkxpbmtlZElkZW50aXR5IkzaQRhwYXJlbnQsaWRlbnRpdHlfcHJvdmlkZXKC0+STAis6ASoiJi9hcGkve3BhcmVudD11c2Vycy8qfS9saW5rZWRJZGVudGl0aWVzEo0BChREZWxldGVMaW5rZWRJZGVudGl0eRImLm1lbW9zLmFwaS5EZWxldGVMaW5rZWRJZGVudGl0eVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiNdpBBG5hbWWC0+STAigqJi9hcGkve25hbWU9dXNlcnMvKi9saW5rZWRJZGVudGl0aWVzLyp9ErABChhMaXN0UGVyc29uYWxBY2Nlc3NUb2tlbnMSKi5tZW1vcy5hcGkuTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zUmVxdWVzdBorLm1lbW9zLmFwaS5MaXN0UGVyc29uYWxBY2Nlc3NUb2tlbnNSZXNwb25zZSI72kEGcGFyZW50gtPkkwIsEiovYXBpL3twYXJlbnQ9dXNlcnMvKn0vcGVyc29uYWxBY2Nlc3NUb2tlbnMSrQEKGUNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW4SKy5tZW1vcy5hcGkuQ3JlYXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlcXVlc3QaLC5tZW1vcy5hcGkuQ3JlYXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlc3BvbnNlIjWC0+STAi86ASoiKi9hcGkve3BhcmVudD11c2Vycy8qfS9wZXJzb25hbEFjY2Vzc1Rva2VucxKbAQoZRGVsZXRlUGVyc29uYWxBY2Nlc3NUb2tlbhIrLm1lbW9zLmFwaS5EZWxldGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI52kEEbmFtZYLT5JMCLCoqL2FwaS97bmFtZT11c2Vycy8qL3BlcnNvbmFsQWNjZXNzVG9rZW5zLyp9EnIKC0V4cG9ydE1lbW9zEh0ubWVtb3MuYXBpLkV4cG9ydE1lbW9zUmVxdWVzdBoULmdvb2dsZS5hcGkuSHR0cEJvZHkiLtpBBG5hbWWC0+STAiESHy9hcGkve25hbWU9dXNlcnMvKn06ZXhwb3J0TWVtb3MSeAoLSW1wb3J0TWVtb3MSHS5tZW1vcy5hcGkuSW1wb3J0TWVtb3NSZXF1ZXN0Gh4ubWVtb3MuYXBpLkltcG9ydE1lbW9zUmVzcG9uc2UiKoLT5JMCJDoBKiIfL2FwaS97bmFtZT11c2Vycy8qfTppbXBvcnRNZW1vc0KPAQoNY29tLm1lbW9zLmFwaUIQVXNlclNlcnZpY2VQcm90b1ABWidnaXRodWIuY29tL3VzZW1lbW9zL21lbW9zL3Byb3RvL2dlbi9hcGmiAgNNQViqAglNZW1vcy5BcGnKAglNZW1vc1xBcGniAhVNZW1vc1xBcGlcR1BCTWV0YWRhdGHqAgpNZW1vczo6QXBpYgZwcm90bzM", [file_api_common, file_api_space_service, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_httpbody, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_color]);+ fileDesc("ChZhcGkvdXNlcl9zZXJ2aWNlLnByb3RvEgltZW1vcy5hcGkixwMKBFVzZXISEQoEbmFtZRgBIAEoCUID4EEIEhUKCHVzZXJuYW1lGAIgASgJQgPgQQISGQoMZGlzcGxheV9uYW1lGAMgASgJQgPgQQESEgoFZW1haWwYBCABKAlCA+BBARIXCgphdmF0YXJfdXJsGAUgASgJQgPgQQESGAoLZGVzY3JpcHRpb24YBiABKAlCA+BBARIVCghwYXNzd29yZBgHIAEoCUID4EEEEicKBHJvbGUYCCABKA4yFC5tZW1vcy5hcGkuVXNlci5Sb2xlQgPgQQISJAoFc3RhdGUYCSABKA4yEC5tZW1vcy5hcGkuU3RhdGVCA+BBAhI0CgtjcmVhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyIxCgRSb2xlEhQKEFJPTEVfVU5TUEVDSUZJRUQQABIJCgVBRE1JThABEggKBFVTRVIQAjou6kErCg5tZW1vcy5hcGkvVXNlchIMdXNlcnMve3VzZXJ9KgV1c2VyczIEdXNlciJzChBMaXN0VXNlcnNSZXF1ZXN0EhYKCXBhZ2Vfc2l6ZRgBIAEoBUID4EEBEhcKCnBhZ2VfdG9rZW4YAiABKAlCA+BBARITCgZmaWx0ZXIYAyABKAlCA+BBARIZCgxzaG93X2RlbGV0ZWQYBCABKAhCA+BBASJMChFMaXN0VXNlcnNSZXNwb25zZRIeCgV1c2VycxgBIAMoCzIPLm1lbW9zLmFwaS5Vc2VyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJqCg5HZXRVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEjIKCXJlYWRfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASI9ChRCYXRjaEdldFVzZXJzUmVxdWVzdBIlCgVuYW1lcxgBIAMoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciI3ChVCYXRjaEdldFVzZXJzUmVzcG9uc2USHgoFdXNlcnMYASADKAsyDy5tZW1vcy5hcGkuVXNlciKFAQoRQ3JlYXRlVXNlclJlcXVlc3QSJQoEdXNlchgBIAEoCzIPLm1lbW9zLmFwaS5Vc2VyQgbgQQLgQQQSFAoHdXNlcl9pZBgCIAEoCUID4EEBEhoKDXZhbGlkYXRlX29ubHkYAyABKAhCA+BBARIXCgpyZXF1ZXN0X2lkGAQgASgJQgPgQQEiiQEKEVVwZGF0ZVVzZXJSZXF1ZXN0EiIKBHVzZXIYASABKAsyDy5tZW1vcy5hcGkuVXNlckID4EECEjQKC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhoKDWFsbG93X21pc3NpbmcYAyABKAhCA+BBASJNChFEZWxldGVVc2VyUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyEhIKBWZvcmNlGAIgASgIQgPgQQEiuwYKC1VzZXJTZXR0aW5nEhEKBG5hbWUYASABKAlCA+BBCBJACg9nZW5lcmFsX3NldHRpbmcYAiABKAsyJS5tZW1vcy5hcGkuVXNlclNldHRpbmcuR2VuZXJhbFNldHRpbmdIABJCChB3ZWJob29rc19zZXR0aW5nGAMgASgLMiYubWVtb3MuYXBpLlVzZXJTZXR0aW5nLldlYmhvb2tzU2V0dGluZ0gAEjoKDHRhZ3Nfc2V0dGluZxgEIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZ0gAGnkKDkdlbmVyYWxTZXR0aW5nEhMKBmxvY2FsZRgBIAEoCUID4EEBEhwKD21lbW9fdmlzaWJpbGl0eRgCIAEoCUID4EEBEhIKBXRoZW1lGAMgASgJQgPgQQESIAoTc2F2ZV9tZWRpYV9tZXRhZGF0YRgEIAEoCEID4EEBGjsKD1dlYmhvb2tzU2V0dGluZxIoCgh3ZWJob29rcxgBIAMoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vaxqfAQoLVGFnc1NldHRpbmcSPwoEdGFncxgBIAMoCzIsLm1lbW9zLmFwaS5Vc2VyU2V0dGluZy5UYWdzU2V0dGluZy5UYWdzRW50cnlCA+BBARpPCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWVtb3MuYXBpLlVzZXJTZXR0aW5nLlRhZ01ldGFkYXRhOgI4ARpbCgtUYWdNZXRhZGF0YRIxChBiYWNrZ3JvdW5kX2NvbG9yGAEgASgLMhIuZ29vZ2xlLnR5cGUuQ29sb3JCA+BBARIZCgxibHVyX2NvbnRlbnQYAiABKAhCA+BBASI/CgNLZXkSEwoPS0VZX1VOU1BFQ0lGSUVEEAASCwoHR0VORVJBTBABEgwKCFdFQkhPT0tTEAISCAoEVEFHUxADOlbqQVMKFW1lbW9zLmFwaS9Vc2VyU2V0dGluZxIfdXNlcnMve3VzZXJ9L3NldHRpbmdzL3tzZXR0aW5nfSoMdXNlclNldHRpbmdzMgt1c2VyU2V0dGluZ0IHCgV2YWx1ZSJyChdMaXN0VXNlclNldHRpbmdzUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBImIKGExpc3RVc2VyU2V0dGluZ3NSZXNwb25zZRItCg11c2VyX3NldHRpbmdzGAEgAygLMhYubWVtb3MuYXBpLlVzZXJTZXR0aW5nEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJEChVHZXRVc2VyU2V0dGluZ1JlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVtZW1vcy5hcGkvVXNlclNldHRpbmcigwEKGFVwZGF0ZVVzZXJTZXR0aW5nUmVxdWVzdBIxCgx1c2VyX3NldHRpbmcYASABKAsyFi5tZW1vcy5hcGkuVXNlclNldHRpbmdCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAiLzBAoJVXNlclN0YXRzEhEKBG5hbWUYASABKAlCA+BBCBIYChB0b3RhbF9tZW1vX2NvdW50GAIgASgFEjsKD21lbW9fdHlwZV9zdGF0cxgDIAEoCzIiLm1lbW9zLmFwaS5Vc2VyU3RhdHMuTWVtb1R5cGVTdGF0cxI3Cgp0YWdfY291bnRzGAQgAygLMiMubWVtb3MuYXBpLlVzZXJTdGF0cy5UYWdDb3VudHNFbnRyeRIpCgxwaW5uZWRfbWVtb3MYBSADKAlCE/pBEAoObWVtb3MuYXBpL01lbW8SOwoXbWVtb19jcmVhdGVkX3RpbWVzdGFtcHMYBiADKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjsKF21lbW9fdXBkYXRlZF90aW1lc3RhbXBzGAcgAygLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIqChhhdHRhY2htZW50X3N0b3JhZ2VfYnl0ZXMYCCABKANCA+BBA0gAiAEBGjAKDlRhZ0NvdW50c0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoBToCOAEaXwoNTWVtb1R5cGVTdGF0cxISCgpsaW5rX2NvdW50GAEgASgFEhIKCmNvZGVfY291bnQYAiABKAUSEgoKdG9kb19jb3VudBgDIAEoBRISCgp1bmRvX2NvdW50GAQgASgFOkLqQT8KE21lbW9zLmFwaS9Vc2VyU3RhdHMSEnVzZXJzL3t1c2VyfS9zdGF0cyoJdXNlclN0YXRzMgl1c2VyU3RhdHNCGwoZX2F0dGFjaG1lbnRfc3RvcmFnZV9ieXRlcyJ+ChRMaXN0VXNlclN0YXRzUmVxdWVzdBIrCgZwYXJlbnQYASABKAlCG+BBAvpBFRITbWVtb3MuYXBpL1VzZXJTdGF0cxITCgZmaWx0ZXIYAiABKAlCA+BBARIkCgVzdGF0ZRgDIAEoDjIQLm1lbW9zLmFwaS5TdGF0ZUID4EEBIkEKFUxpc3RVc2VyU3RhdHNSZXNwb25zZRIoCgp1c2VyX3N0YXRzGAEgAygLMhQubWVtb3MuYXBpLlVzZXJTdGF0cyJQChNHZXRVc2VyU3RhdHNSZXF1ZXN0EiQKBG5hbWUYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISEwoGZmlsdGVyGAIgASgJQgPgQQEi6AMKCVVzZXJVc2FnZRIRCgRuYW1lGAEgASgJQgPgQQgSEgoKbWVtb19jb3VudBgCIAEoAxIVCg1zdG9yYWdlX2J5dGVzGAMgASgDEj0KEG1lbW9fY291bnRfbGltaXQYBCABKAsyIy5tZW1vcy5hcGkuVXNlclVzYWdlLkVmZmVjdGl2ZUxpbWl0EkAKE3N0b3JhZ2VfYnl0ZXNfbGltaXQYBSABKAsyIy5tZW1vcy5hcGkuVXNlclVzYWdlLkVmZmVjdGl2ZUxpbWl0Ej8KEnVwbG9hZF9ieXRlc19saW1pdBgGIAEoCzIjLm1lbW9zLmFwaS5Vc2VyVXNhZ2UuRWZmZWN0aXZlTGltaXQSRQoYbWVtb19jb250ZW50X2J5dGVzX2xpbWl0GAcgASgLMiMubWVtb3MuYXBpLlVzZXJVc2FnZS5FZmZlY3RpdmVMaW1pdBpPCg5FZmZlY3RpdmVMaW1pdBINCgV2YWx1ZRgBIAEoAxIuCgt1c2FnZV9saW1pdBgCIAEoCUIZ+kEWChRtZW1vcy5hcGkvVXNhZ2VMaW1pdDpD6kFAChNtZW1vcy5hcGkvVXNlclVzYWdlEhJ1c2Vycy97dXNlcn0vdXNhZ2UqCnVzZXJVc2FnZXMyCXVzZXJVc2FnZSJAChNHZXRVc2VyVXNhZ2VSZXF1ZXN0EikKBG5hbWUYASABKAlCG+BBAvpBFQoTbWVtb3MuYXBpL1VzZXJVc2FnZSLwAQoITWVtb1ZpZXcSEQoEbmFtZRgBIAEoCUID4EEIEhIKBXRpdGxlGAIgASgJQgPgQQISEwoGZmlsdGVyGAMgASgJQgPgQQISKwoEaWNvbhgEIAEoCzIYLm1lbW9zLmFwaS5NZW1vVmlldy5JY29uQgPgQQEaMgoESWNvbhIPCgVlbW9qaRgBIAEoCUgAEhAKBmx1Y2lkZRgCIAEoCUgAQgcKBXZhbHVlOkfqQUQKEm1lbW9zLmFwaS9NZW1vVmlldxIZdXNlcnMve3VzZXJ9L3ZpZXdzL3t2aWV3fSoJbWVtb1ZpZXdzMghtZW1vVmlldyJCChRMaXN0TWVtb1ZpZXdzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFBISbWVtb3MuYXBpL01lbW9WaWV3IkAKFUxpc3RNZW1vVmlld3NSZXNwb25zZRInCgptZW1vX3ZpZXdzGAEgAygLMhMubWVtb3MuYXBpLk1lbW9WaWV3Ij4KEkdldE1lbW9WaWV3UmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEm1lbW9zLmFwaS9NZW1vVmlldyKMAQoVQ3JlYXRlTWVtb1ZpZXdSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUEhJtZW1vcy5hcGkvTWVtb1ZpZXcSKwoJbWVtb192aWV3GAIgASgLMhMubWVtb3MuYXBpLk1lbW9WaWV3QgPgQQISGgoNdmFsaWRhdGVfb25seRgDIAEoCEID4EEBInoKFVVwZGF0ZU1lbW9WaWV3UmVxdWVzdBIrCgltZW1vX3ZpZXcYASABKAsyEy5tZW1vcy5hcGkuTWVtb1ZpZXdCA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBASJBChVEZWxldGVNZW1vVmlld1JlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJtZW1vcy5hcGkvTWVtb1ZpZXciswoKEFVzZXJOb3RpZmljYXRpb24SFAoEbmFtZRgBIAEoCUIG4EED4EEIEiYKBnNlbmRlchgCIAEoCUIW4EED+kEQCg5tZW1vcy5hcGkvVXNlchIpCgtzZW5kZXJfdXNlchgDIAEoCzIPLm1lbW9zLmFwaS5Vc2VyQgPgQQMSMwoEdHlwZRgEIAEoDjIgLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlR5cGVCA+BBAxJLCgxtZW1vX2NvbW1lbnQYBSABKAsyLi5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbi5NZW1vQ29tbWVudFBheWxvYWRCA+BBA0gAEksKDG1lbW9fbWVudGlvbhgGIAEoCzIuLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLk1lbW9NZW50aW9uUGF5bG9hZEID4EEDSAASUwoQc3BhY2VfaW52aXRhdGlvbhgHIAEoCzIyLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlNwYWNlSW52aXRhdGlvblBheWxvYWRCA+BBA0gAEjcKBnN0YXR1cxgIIAEoDjIiLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uLlN0YXR1c0ID4EEBEjQKC2NyZWF0ZV90aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDGmwKEk1lbW9Db21tZW50UGF5bG9hZBIMCgRtZW1vGAEgASgJEhQKDHJlbGF0ZWRfbWVtbxgCIAEoCRIUCgxtZW1vX3NuaXBwZXQYAyABKAkSHAoUcmVsYXRlZF9tZW1vX3NuaXBwZXQYBCABKAkabAoSTWVtb01lbnRpb25QYXlsb2FkEgwKBG1lbW8YASABKAkSFAoMcmVsYXRlZF9tZW1vGAIgASgJEhQKDG1lbW9fc25pcHBldBgDIAEoCRIcChRyZWxhdGVkX21lbW9fc25pcHBldBgEIAEoCRq2AgoWU3BhY2VJbnZpdGF0aW9uUGF5bG9hZBI4ChBzcGFjZV9pbnZpdGF0aW9uGAEgASgJQh76QRsKGW1lbW9zLmFwaS9TcGFjZUludml0YXRpb24SHwoFc3BhY2UYAiABKAsyEC5tZW1vcy5hcGkuU3BhY2USKQoEcm9sZRgDIAEoDjIbLm1lbW9zLmFwaS5TcGFjZU1lbWJlci5Sb2xlElEKBXN0YXRlGAQgASgOMkIubWVtb3MuYXBpLlVzZXJOb3RpZmljYXRpb24uU3BhY2VJbnZpdGF0aW9uUGF5bG9hZC5JbnZpdGF0aW9uU3RhdGUiQwoPSW52aXRhdGlvblN0YXRlEhUKEVNUQVRFX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFDQ0VQVEVEEAIiOgoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgoKBlVOUkVBRBABEgwKCEFSQ0hJVkVEEAIiVgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEAoMTUVNT19DT01NRU5UEAESEAoMTUVNT19NRU5USU9OEAISFAoQU1BBQ0VfSU5WSVRBVElPThADOm/qQWwKGm1lbW9zLmFwaS9Vc2VyTm90aWZpY2F0aW9uEil1c2Vycy97dXNlcn0vbm90aWZpY2F0aW9ucy97bm90aWZpY2F0aW9ufSoRdXNlck5vdGlmaWNhdGlvbnMyEHVzZXJOb3RpZmljYXRpb25CCQoHcGF5bG9hZCKMAQocTGlzdFVzZXJOb3RpZmljYXRpb25zUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBEhMKBmZpbHRlchgEIAEoCUID4EEBImwKHUxpc3RVc2VyTm90aWZpY2F0aW9uc1Jlc3BvbnNlEjIKDW5vdGlmaWNhdGlvbnMYASADKAsyGy5tZW1vcy5hcGkuVXNlck5vdGlmaWNhdGlvbhIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkijQEKHVVwZGF0ZVVzZXJOb3RpZmljYXRpb25SZXF1ZXN0EjYKDG5vdGlmaWNhdGlvbhgBIAEoCzIbLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uQgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQIiUQodRGVsZXRlVXNlck5vdGlmaWNhdGlvblJlcXVlc3QSMAoEbmFtZRgBIAEoCUIi4EEC+kEcChptZW1vcy5hcGkvVXNlck5vdGlmaWNhdGlvbiLFAgoLVXNlcldlYmhvb2sSEQoEbmFtZRgBIAEoCUID4EEIEhQKDGRpc3BsYXlfbmFtZRgCIAEoCRILCgN1cmwYAyABKAkSGwoOc2lnbmluZ19zZWNyZXQYBCABKAlCA+BBBBIfChJzaWduaW5nX3NlY3JldF9zZXQYBSABKAhCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzpW6kFTChVtZW1vcy5hcGkvVXNlcldlYmhvb2sSH3VzZXJzL3t1c2VyfS93ZWJob29rcy97d2ViaG9va30qDHVzZXJXZWJob29rczILdXNlcldlYmhvb2siSAoXTGlzdFVzZXJXZWJob29rc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcSFW1lbW9zLmFwaS9Vc2VyV2ViaG9vayJEChhMaXN0VXNlcldlYmhvb2tzUmVzcG9uc2USKAoId2ViaG9va3MYASADKAsyFi5tZW1vcy5hcGkuVXNlcldlYmhvb2sidwoYQ3JlYXRlVXNlcldlYmhvb2tSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVtZW1vcy5hcGkvVXNlcldlYmhvb2sSLAoHd2ViaG9vaxgCIAEoCzIWLm1lbW9zLmFwaS5Vc2VyV2ViaG9va0ID4EECInkKGFVwZGF0ZVVzZXJXZWJob29rUmVxdWVzdBIsCgd3ZWJob29rGAEgASgLMhYubWVtb3MuYXBpLlVzZXJXZWJob29rQgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIkcKGERlbGV0ZVVzZXJXZWJob29rUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFW1lbW9zLmFwaS9Vc2VyV2ViaG9vayJRCiJHZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVbWVtb3MuYXBpL1VzZXJXZWJob29rIj0KI0dldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldFJlc3BvbnNlEhYKDnNpZ25pbmdfc2VjcmV0GAEgASgJIu8BCg5MaW5rZWRJZGVudGl0eRIRCgRuYW1lGAEgASgJQgPgQQgSPQoRaWRlbnRpdHlfcHJvdmlkZXIYAiABKAlCIuBBA/pBHAoabWVtb3MuYXBpL0lkZW50aXR5UHJvdmlkZXISGQoMZXh0ZXJuYWxfdWlkGAMgASgJQgPgQQM6cOpBbQoYbWVtb3MuYXBpL0xpbmtlZElkZW50aXR5Ei91c2Vycy97dXNlcn0vbGlua2VkSWRlbnRpdGllcy97bGlua2VkX2lkZW50aXR5fSoQbGlua2VkSWRlbnRpdGllczIObGlua2VkSWRlbnRpdHkiRQobTGlzdExpbmtlZElkZW50aXRpZXNSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlciJUChxMaXN0TGlua2VkSWRlbnRpdGllc1Jlc3BvbnNlEjQKEWxpbmtlZF9pZGVudGl0aWVzGAEgAygLMhkubWVtb3MuYXBpLkxpbmtlZElkZW50aXR5IkoKGEdldExpbmtlZElkZW50aXR5UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGG1lbW9zLmFwaS9MaW5rZWRJZGVudGl0eSLOAQobQ3JlYXRlTGlua2VkSWRlbnRpdHlSZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchI9ChFpZGVudGl0eV9wcm92aWRlchgCIAEoCUIi4EEC+kEcChptZW1vcy5hcGkvSWRlbnRpdHlQcm92aWRlchIRCgRjb2RlGAMgASgJQgPgQQISGQoMcmVkaXJlY3RfdXJpGAQgASgJQgPgQQISGgoNY29kZV92ZXJpZmllchgFIAEoCUID4EEBIk0KG0RlbGV0ZUxpbmtlZElkZW50aXR5UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGG1lbW9zLmFwaS9MaW5rZWRJZGVudGl0eSLyAgoTUGVyc29uYWxBY2Nlc3NUb2tlbhIRCgRuYW1lGAEgASgJQgPgQQgSGAoLZGVzY3JpcHRpb24YAiABKAlCA+BBARI0CgtjcmVhdGVfdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0CgtleHBpcmVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBARI2Cg1sYXN0X3VzZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDOokB6kGFAQodbWVtb3MuYXBpL1BlcnNvbmFsQWNjZXNzVG9rZW4SOXVzZXJzL3t1c2VyfS9wZXJzb25hbEFjY2Vzc1Rva2Vucy97cGVyc29uYWxfYWNjZXNzX3Rva2VufSoUcGVyc29uYWxBY2Nlc3NUb2tlbnMyE3BlcnNvbmFsQWNjZXNzVG9rZW4iegofTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zUmVxdWVzdBImCgZwYXJlbnQYASABKAlCFuBBAvpBEAoObWVtb3MuYXBpL1VzZXISFgoJcGFnZV9zaXplGAIgASgFQgPgQQESFwoKcGFnZV90b2tlbhgDIAEoCUID4EEBInsKIExpc3RQZXJzb25hbEFjY2Vzc1Rva2Vuc1Jlc3BvbnNlEj4KFnBlcnNvbmFsX2FjY2Vzc190b2tlbnMYASADKAsyHi5tZW1vcy5hcGkuUGVyc29uYWxBY2Nlc3NUb2tlbhIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiggEKIENyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXF1ZXN0EiYKBnBhcmVudBgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIYCgtkZXNjcmlwdGlvbhgCIAEoCUID4EEBEhwKD2V4cGlyZXNfaW5fZGF5cxgDIAEoBUID4EEBInEKIUNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXNwb25zZRI9ChVwZXJzb25hbF9hY2Nlc3NfdG9rZW4YASABKAsyHi5tZW1vcy5hcGkuUGVyc29uYWxBY2Nlc3NUb2tlbhINCgV0b2tlbhgCIAEoCSJXCiBEZWxldGVQZXJzb25hbEFjY2Vzc1Rva2VuUmVxdWVzdBIzCgRuYW1lGAEgASgJQiXgQQL6QR8KHW1lbW9zLmFwaS9QZXJzb25hbEFjY2Vzc1Rva2VuIjoKEkV4cG9ydE1lbW9zUmVxdWVzdBIkCgRuYW1lGAEgASgJQhbgQQL6QRAKDm1lbW9zLmFwaS9Vc2VyIo8DChJJbXBvcnRNZW1vc1JlcXVlc3QSJAoEbmFtZRgBIAEoCUIW4EEC+kEQCg5tZW1vcy5hcGkvVXNlchIqCgRzcGVjGAIgASgLMhoubWVtb3MuYXBpLkltcG9ydE1lbW9zU3BlY0gAEhMKCXVwbG9hZF9pZBgDIAEoCUgAEhkKDHdyaXRlX29mZnNldBgEIAEoA0ID4EECEhEKBGRhdGEYBSABKAxCA+BBARIZCgxmaW5pc2hfd3JpdGUYBiABKAhCA+BBARJKCg9jb25mbGljdF9wb2xpY3kYByABKA4yLC5tZW1vcy5hcGkuSW1wb3J0TWVtb3NSZXF1ZXN0LkNvbmZsaWN0UG9saWN5QgPgQQESGgoNdmFsaWRhdGVfb25seRgIIAEoCEID4EEBIlcKDkNvbmZsaWN0UG9saWN5Eh8KG0NPTkZMSUNUX1BPTElDWV9VTlNQRUNJRklFRBAAEggKBFNLSVAQARILCgdSRVBMQUNFEAISDQoJRFVQTElDQVRFEANCCAoGdXBsb2FkIr4BChNJbXBvcnRNZW1vc1Jlc3BvbnNlEhEKCXVwbG9hZF9pZBgBIAEoCRIWCg5jb21taXR0ZWRfc2l6ZRgCIAEoAxIWCg5tYXhfY2h1bmtfc2l6ZRgDIAEoBRIqCgRwbGFuGAQgASgLMhoubWVtb3MuYXBpLkltcG9ydE1lbW9zUGxhbkgAEi4KBnJlcG9ydBgFIAEoCzIcLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1JlcG9ydEgAQggKBnJlc3VsdCIqCg9JbXBvcnRNZW1vc1NwZWMSFwoKdG90YWxfc2l6ZRgBIAEoA0ID4EEBIvQBCg9JbXBvcnRNZW1vc1BsYW4SLwoLZXhwb3J0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhAKCGV4cG9ydGVyGAIgASgJEhEKCWdlbmVyYXRvchgDIAEoCRISCgptZW1vX2NvdW50GAQgASgFEhgKEGF0dGFjaG1lbnRfY291bnQYBSABKAUSCwoDbmV3GAYgASgFEhAKCGV4aXN0aW5nGAcgASgFEg8KB3JlbmFtZWQYCCABKAUSLQoId2FybmluZ3MYCSADKAsyGy5tZW1vcy5hcGkuSW1wb3J0TWVtb3NJc3N1ZSK0AQoRSW1wb3J0TWVtb3NSZXBvcnQSDwoHY3JlYXRlZBgBIAEoBRIPCgd1cGRhdGVkGAIgASgFEg8KB3NraXBwZWQYAyABKAUSDgoGZmFpbGVkGAQgASgFEi0KCHdhcm5pbmdzGAUgAygLMhsubWVtb3MuYXBpLkltcG9ydE1lbW9zSXNzdWUSLQoIZmFpbHVyZXMYBiADKAsyGy5tZW1vcy5hcGkuSW1wb3J0TWVtb3NJc3N1ZSI1ChBJbXBvcnRNZW1vc0lzc3VlEhAKCG1lbW9fdWlkGAEgASgJEg8KB21lc3NhZ2UYAiABKAkyiiUKC1VzZXJTZXJ2aWNlEloKCUxpc3RVc2VycxIbLm1lbW9zLmFwaS5MaXN0VXNlcnNSZXF1ZXN0GhwubWVtb3MuYXBpLkxpc3RVc2Vyc1Jlc3BvbnNlIhKC0+STAgwSCi9hcGkvdXNlcnMSWQoHR2V0VXNlchIZLm1lbW9zLmFwaS5HZXRVc2VyUmVxdWVzdBoPLm1lbW9zLmFwaS5Vc2VyIiLaQQRuYW1lgtPkkwIVEhMvYXBpL3tuYW1lPXVzZXJzLyp9EnIKDUJhdGNoR2V0VXNlcnMSHy5tZW1vcy5hcGkuQmF0Y2hHZXRVc2Vyc1JlcXVlc3QaIC5tZW1vcy5hcGkuQmF0Y2hHZXRVc2Vyc1Jlc3BvbnNlIh6C0+STAhg6ASoiEy9hcGkvdXNlcnM6YmF0Y2hHZXQSZAoKQ3JlYXRlVXNlchIcLm1lbW9zLmFwaS5DcmVhdGVVc2VyUmVxdWVzdBoPLm1lbW9zLmFwaS5Vc2VyIifaQQx1c2VyLHVzZXJfaWSC0+STAhI6BHVzZXIiCi9hcGkvdXNlcnMSdgoKVXBkYXRlVXNlchIcLm1lbW9zLmFwaS5VcGRhdGVVc2VyUmVxdWVzdBoPLm1lbW9zLmFwaS5Vc2VyIjnaQRB1c2VyLHVwZGF0ZV9tYXNrgtPkkwIgOgR1c2VyMhgvYXBpL3t1c2VyLm5hbWU9dXNlcnMvKn0SZgoKRGVsZXRlVXNlchIcLm1lbW9zLmFwaS5EZWxldGVVc2VyUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIi2kEEbmFtZYLT5JMCFSoTL2FwaS97bmFtZT11c2Vycy8qfRKMAQoQTGlzdFVzZXJTZXR0aW5ncxIiLm1lbW9zLmFwaS5MaXN0VXNlclNldHRpbmdzUmVxdWVzdBojLm1lbW9zLmFwaS5MaXN0VXNlclNldHRpbmdzUmVzcG9uc2UiL9pBBnBhcmVudILT5JMCIBIeL2FwaS97cGFyZW50PXVzZXJzLyp9L3NldHRpbmdzEnkKDkdldFVzZXJTZXR0aW5nEiAubWVtb3MuYXBpLkdldFVzZXJTZXR0aW5nUmVxdWVzdBoWLm1lbW9zLmFwaS5Vc2VyU2V0dGluZyIt2kEEbmFtZYLT5JMCIBIeL2FwaS97bmFtZT11c2Vycy8qL3NldHRpbmdzLyp9Eq4BChFVcGRhdGVVc2VyU2V0dGluZxIjLm1lbW9zLmFwaS5VcGRhdGVVc2VyU2V0dGluZ1JlcXVlc3QaFi5tZW1vcy5hcGkuVXNlclNldHRpbmciXNpBGHVzZXJfc2V0dGluZyx1cGRhdGVfbWFza4LT5JMCOzoMdXNlcl9zZXR0aW5nMisvYXBpL3t1c2VyX3NldHRpbmcubmFtZT11c2Vycy8qL3NldHRpbmdzLyp9EoABCg1MaXN0VXNlclN0YXRzEh8ubWVtb3MuYXBpLkxpc3RVc2VyU3RhdHNSZXF1ZXN0GiAubWVtb3MuYXBpLkxpc3RVc2VyU3RhdHNSZXNwb25zZSIs2kEGcGFyZW50gtPkkwIdEhsvYXBpL3twYXJlbnQ9dXNlcnMvKn0vc3RhdHMScQoMR2V0VXNlclN0YXRzEh4ubWVtb3MuYXBpLkdldFVzZXJTdGF0c1JlcXVlc3QaFC5tZW1vcy5hcGkuVXNlclN0YXRzIivaQQRuYW1lgtPkkwIeEhwvYXBpL3tuYW1lPXVzZXJzLyp9OmdldFN0YXRzEm4KDEdldFVzZXJVc2FnZRIeLm1lbW9zLmFwaS5HZXRVc2VyVXNhZ2VSZXF1ZXN0GhQubWVtb3MuYXBpLlVzZXJVc2FnZSIo2kEEbmFtZYLT5JMCGxIZL2FwaS97bmFtZT11c2Vycy8qL3VzYWdlfRKAAQoNTGlzdE1lbW9WaWV3cxIfLm1lbW9zLmFwaS5MaXN0TWVtb1ZpZXdzUmVxdWVzdBogLm1lbW9zLmFwaS5MaXN0TWVtb1ZpZXdzUmVzcG9uc2UiLNpBBnBhcmVudILT5JMCHRIbL2FwaS97cGFyZW50PXVzZXJzLyp9L3ZpZXdzEm0KC0dldE1lbW9WaWV3Eh0ubWVtb3MuYXBpLkdldE1lbW9WaWV3UmVxdWVzdBoTLm1lbW9zLmFwaS5NZW1vVmlldyIq2kEEbmFtZYLT5JMCHRIbL2FwaS97bmFtZT11c2Vycy8qL3ZpZXdzLyp9EooBCg5DcmVhdGVNZW1vVmlldxIgLm1lbW9zLmFwaS5DcmVhdGVNZW1vVmlld1JlcXVlc3QaEy5tZW1vcy5hcGkuTWVtb1ZpZXciQdpBEHBhcmVudCxtZW1vX3ZpZXeC0+STAig6CW1lbW9fdmlldyIbL2FwaS97cGFyZW50PXVzZXJzLyp9L3ZpZXdzEpkBCg5VcGRhdGVNZW1vVmlldxIgLm1lbW9zLmFwaS5VcGRhdGVNZW1vVmlld1JlcXVlc3QaEy5tZW1vcy5hcGkuTWVtb1ZpZXciUNpBFW1lbW9fdmlldyx1cGRhdGVfbWFza4LT5JMCMjoJbWVtb192aWV3MiUvYXBpL3ttZW1vX3ZpZXcubmFtZT11c2Vycy8qL3ZpZXdzLyp9EnYKDkRlbGV0ZU1lbW9WaWV3EiAubWVtb3MuYXBpLkRlbGV0ZU1lbW9WaWV3UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIq2kEEbmFtZYLT5JMCHSobL2FwaS97bmFtZT11c2Vycy8qL3ZpZXdzLyp9EqABChVMaXN0VXNlck5vdGlmaWNhdGlvbnMSJy5tZW1vcy5hcGkuTGlzdFVzZXJOb3RpZmljYXRpb25zUmVxdWVzdBooLm1lbW9zLmFwaS5MaXN0VXNlck5vdGlmaWNhdGlvbnNSZXNwb25zZSI02kEGcGFyZW50gtPkkwIlEiMvYXBpL3twYXJlbnQ9dXNlcnMvKn0vbm90aWZpY2F0aW9ucxLCAQoWVXBkYXRlVXNlck5vdGlmaWNhdGlvbhIoLm1lbW9zLmFwaS5VcGRhdGVVc2VyTm90aWZpY2F0aW9uUmVxdWVzdBobLm1lbW9zLmFwaS5Vc2VyTm90aWZpY2F0aW9uImHaQRhub3RpZmljYXRpb24sdXBkYXRlX21hc2uC0+STAkA6DG5vdGlmaWNhdGlvbjIwL2FwaS97bm90aWZpY2F0aW9uLm5hbWU9dXNlcnMvKi9ub3RpZmljYXRpb25zLyp9Eo4BChZEZWxldGVVc2VyTm90aWZpY2F0aW9uEigubWVtb3MuYXBpLkRlbGV0ZVVzZXJOb3RpZmljYXRpb25SZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjLaQQRuYW1lgtPkkwIlKiMvYXBpL3tuYW1lPXVzZXJzLyovbm90aWZpY2F0aW9ucy8qfRKMAQoQTGlzdFVzZXJXZWJob29rcxIiLm1lbW9zLmFwaS5MaXN0VXNlcldlYmhvb2tzUmVxdWVzdBojLm1lbW9zLmFwaS5MaXN0VXNlcldlYmhvb2tzUmVzcG9uc2UiL9pBBnBhcmVudILT5JMCIBIeL2FwaS97cGFyZW50PXVzZXJzLyp9L3dlYmhvb2tzEpIBChFDcmVhdGVVc2VyV2ViaG9vaxIjLm1lbW9zLmFwaS5DcmVhdGVVc2VyV2ViaG9va1JlcXVlc3QaFi5tZW1vcy5hcGkuVXNlcldlYmhvb2siQNpBDnBhcmVudCx3ZWJob29rgtPkkwIpOgd3ZWJob29rIh4vYXBpL3twYXJlbnQ9dXNlcnMvKn0vd2ViaG9va3MSnwEKEVVwZGF0ZVVzZXJXZWJob29rEiMubWVtb3MuYXBpLlVwZGF0ZVVzZXJXZWJob29rUmVxdWVzdBoWLm1lbW9zLmFwaS5Vc2VyV2ViaG9vayJN2kETd2ViaG9vayx1cGRhdGVfbWFza4LT5JMCMToHd2ViaG9vazImL2FwaS97d2ViaG9vay5uYW1lPXVzZXJzLyovd2ViaG9va3MvKn0SfwoRRGVsZXRlVXNlcldlYmhvb2sSIy5tZW1vcy5hcGkuRGVsZXRlVXNlcldlYmhvb2tSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ii3aQQRuYW1lgtPkkwIgKh4vYXBpL3tuYW1lPXVzZXJzLyovd2ViaG9va3MvKn0SvAEKG0dldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldBItLm1lbW9zLmFwaS5HZXRVc2VyV2ViaG9va1NpZ25pbmdTZWNyZXRSZXF1ZXN0Gi4ubWVtb3MuYXBpLkdldFVzZXJXZWJob29rU2lnbmluZ1NlY3JldFJlc3BvbnNlIj7aQQRuYW1lgtPkkwIxEi8vYXBpL3tuYW1lPXVzZXJzLyovd2ViaG9va3MvKn06Z2V0U2lnbmluZ1NlY3JldBKgAQoUTGlzdExpbmtlZElkZW50aXRpZXMSJi5tZW1vcy5hcGkuTGlzdExpbmtlZElkZW50aXRpZXNSZXF1ZXN0GicubWVtb3MuYXBpLkxpc3RMaW5rZWRJZGVudGl0aWVzUmVzcG9uc2UiN9pBBnBhcmVudILT5JMCKBImL2FwaS97cGFyZW50PXVzZXJzLyp9L2xpbmtlZElkZW50aXRpZXMSigEKEUdldExpbmtlZElkZW50aXR5EiMubWVtb3MuYXBpLkdldExpbmtlZElkZW50aXR5UmVxdWVzdBoZLm1lbW9zLmFwaS5MaW5rZWRJZGVudGl0eSI12kEEbmFtZYLT5JMCKBImL2FwaS97bmFtZT11c2Vycy8qL2xpbmtlZElkZW50aXRpZXMvKn0SpwEKFENyZWF0ZUxpbmtlZElkZW50aXR5EiYubWVtb3MuYXBpLkNyZWF0ZUxpbmtlZElkZW50aXR5UmVxdWVzdBoZLm1lbW9zLmFwaS5MaW5rZWRJZGVudGl0eSJM2kEYcGFyZW50LGlkZW50aXR5X3Byb3ZpZGVygtPkkwIrOgEqIiYvYXBpL3twYXJlbnQ9dXNlcnMvKn0vbGlua2VkSWRlbnRpdGllcxKNAQoURGVsZXRlTGlua2VkSWRlbnRpdHkSJi5tZW1vcy5hcGkuRGVsZXRlTGlua2VkSWRlbnRpdHlSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjXaQQRuYW1lgtPkkwIoKiYvYXBpL3tuYW1lPXVzZXJzLyovbGlua2VkSWRlbnRpdGllcy8qfRKwAQoYTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zEioubWVtb3MuYXBpLkxpc3RQZXJzb25hbEFjY2Vzc1Rva2Vuc1JlcXVlc3QaKy5tZW1vcy5hcGkuTGlzdFBlcnNvbmFsQWNjZXNzVG9rZW5zUmVzcG9uc2UiO9pBBnBhcmVudILT5JMCLBIqL2FwaS97cGFyZW50PXVzZXJzLyp9L3BlcnNvbmFsQWNjZXNzVG9rZW5zEq0BChlDcmVhdGVQZXJzb25hbEFjY2Vzc1Rva2VuEisubWVtb3MuYXBpLkNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXF1ZXN0GiwubWVtb3MuYXBpLkNyZWF0ZVBlcnNvbmFsQWNjZXNzVG9rZW5SZXNwb25zZSI1gtPkkwIvOgEqIiovYXBpL3twYXJlbnQ9dXNlcnMvKn0vcGVyc29uYWxBY2Nlc3NUb2tlbnMSmwEKGURlbGV0ZVBlcnNvbmFsQWNjZXNzVG9rZW4SKy5tZW1vcy5hcGkuRGVsZXRlUGVyc29uYWxBY2Nlc3NUb2tlblJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiOdpBBG5hbWWC0+STAiwqKi9hcGkve25hbWU9dXNlcnMvKi9wZXJzb25hbEFjY2Vzc1Rva2Vucy8qfRJyCgtFeHBvcnRNZW1vcxIdLm1lbW9zLmFwaS5FeHBvcnRNZW1vc1JlcXVlc3QaFC5nb29nbGUuYXBpLkh0dHBCb2R5Ii7aQQRuYW1lgtPkkwIhEh8vYXBpL3tuYW1lPXVzZXJzLyp9OmV4cG9ydE1lbW9zEngKC0ltcG9ydE1lbW9zEh0ubWVtb3MuYXBpLkltcG9ydE1lbW9zUmVxdWVzdBoeLm1lbW9zLmFwaS5JbXBvcnRNZW1vc1Jlc3BvbnNlIiqC0+STAiQ6ASoiHy9hcGkve25hbWU9dXNlcnMvKn06aW1wb3J0TWVtb3NCjwEKDWNvbS5tZW1vcy5hcGlCEFVzZXJTZXJ2aWNlUHJvdG9QAVonZ2l0aHViLmNvbS91c2VtZW1vcy9tZW1vcy9wcm90by9nZW4vYXBpogIDTUFYqgIJTWVtb3MuQXBpygIJTWVtb3NcQXBp4gIVTWVtb3NcQXBpXEdQQk1ldGFkYXRh6gIKTWVtb3M6OkFwaWIGcHJvdG8z", [file_api_common, file_api_space_service, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_httpbody, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_color]);/*** User is an account on the instance.@@ -136,16 +136,16 @@ export enum User_Role {/*** An administrator of the instance.*- * @generated from enum value: ADMIN = 2;+ * @generated from enum value: ADMIN = 1;*/- ADMIN = 2,+ ADMIN = 1,/*** A regular user.*- * @generated from enum value: USER = 3;+ * @generated from enum value: USER = 2;*/- USER = 3,+ USER = 2,}/**@@ -606,16 +606,16 @@ export enum UserSetting_Key {/*** The user's webhooks.*- * @generated from enum value: WEBHOOKS = 4;+ * @generated from enum value: WEBHOOKS = 2;*/- WEBHOOKS = 4,+ WEBHOOKS = 2,/*** Per-user tag metadata.*- * @generated from enum value: TAGS = 5;+ * @generated from enum value: TAGS = 3;*/- TAGS = 5,+ TAGS = 3,}/**@@ -984,9 +984,9 @@ export type UserUsage = Message<"memos.api.UserUsage"> & {/*** The limit on memo_count.*- * @generated from field: memos.api.UserUsage.EffectiveLimit memos_limit = 4;+ * @generated from field: memos.api.UserUsage.EffectiveLimit memo_count_limit = 4;*/- memosLimit?: UserUsage_EffectiveLimit | undefined;+ memoCountLimit?: UserUsage_EffectiveLimit | undefined;/*** The limit on storage_bytes.@@ -1001,6 +1001,13 @@ export type UserUsage = Message<"memos.api.UserUsage"> & {* @generated from field: memos.api.UserUsage.EffectiveLimit upload_bytes_limit = 6;*/uploadBytesLimit?: UserUsage_EffectiveLimit | undefined;++ /**+ * The limit on the UTF-8 size in bytes of one memo's content.+ *+ * @generated from field: memos.api.UserUsage.EffectiveLimit memo_content_bytes_limit = 7;+ */+ memoContentBytesLimit?: UserUsage_EffectiveLimit | undefined;};/**diff --git a/web/tests/invite-space-member-dialog.test.tsx b/web/tests/invite-space-member-dialog.test.tsxindex 85cf1e7d9..7a08c36fa 100644--- a/web/tests/invite-space-member-dialog.test.tsx+++ b/web/tests/invite-space-member-dialog.test.tsx@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import InviteSpaceMemberDialog from "@/components/Settings/InviteSpaceMemberDialog";import { State } from "@/types/proto/api/common_pb";import { type Space, SpaceMember_Role } from "@/types/proto/api/space_service_pb";-import type { User } from "@/types/proto/api/user_service_pb";+import { type User, User_Role } from "@/types/proto/api/user_service_pb";const state = vi.hoisted(() => ({candidate: undefined as User | undefined,@@ -90,7 +90,7 @@ const alice: User = {avatarUrl: "",description: "",password: "",- role: 3,+ role: User_Role.USER,state: State.NORMAL,};diff --git a/web/tests/memo-related-settings.test.tsx b/web/tests/memo-related-settings.test.tsxindex fee997133..0c654a46a 100644--- a/web/tests/memo-related-settings.test.tsx+++ b/web/tests/memo-related-settings.test.tsx@@ -29,10 +29,9 @@ vi.mock("react-hot-toast", () => ({},}));-describe("<MemoRelatedSettings> content length limit", () => {+describe("<MemoRelatedSettings>", () => {beforeEach(() => {mocks.instance.memoRelatedSetting = create(InstanceSetting_MemoRelatedSettingSchema, {- contentLengthLimit: 32_768,enableDoubleClickEdit: false,reactions: ["thumbs-up"],});@@ -42,45 +41,17 @@ describe("<MemoRelatedSettings> content length limit", () => {mocks.toastSuccess.mockReset();});- it.each([8_192, 16_384])("saves a valid %i-byte limit in the memo-related setting", async (contentLengthLimit) => {+ it("keeps editing behavior and reactions separate from content limits", async () => {render(<MemoRelatedSettings />);-- const input = screen.getByRole("spinbutton", { name: "setting.memo.content-length-limit" });- expect(input).toHaveAttribute("min", "8192");- expect(input).toHaveAttribute("max", "2147483647");- expect(input).toHaveAttribute("step", "1");- expect(screen.getByText("setting.memo.content-length-limit-minimum")).toBeVisible();-- fireEvent.change(input, { target: { value: String(contentLengthLimit) } });+ expect(screen.queryByRole("spinbutton")).not.toBeInTheDocument();+ fireEvent.click(screen.getByRole("switch"));fireEvent.click(screen.getByRole("button", { name: "common.save" }));-await waitFor(() => expect(mocks.instance.updateSetting).toHaveBeenCalledTimes(1));const setting = mocks.instance.updateSetting.mock.calls[0][0] as InstanceSetting;expect(setting.name).toBe("instance/settings/MEMO_RELATED");- expect(setting.value.case).toBe("memoRelatedSetting");- if (setting.value.case !== "memoRelatedSetting") {- throw new Error("Expected memo-related setting payload");- }- expect(setting.value.value.contentLengthLimit).toBe(contentLengthLimit);+ if (setting.value.case !== "memoRelatedSetting") throw new Error("Expected memo-related setting");+ expect(setting.value.value.enableDoubleClickEdit).toBe(true);expect(setting.value.value.reactions).toEqual(["thumbs-up"]);expect(mocks.instance.fetchSetting).toHaveBeenCalledWith(InstanceSetting_Key.MEMO_RELATED);- expect(mocks.toastError).not.toHaveBeenCalled();- });-- it.each([- ["an empty value", ""],- ["a value below the minimum", "8191"],- ["a fractional value", "8192.5"],- ["a value above int32", "2147483648"],- ])("blocks %s before calling the update API", (_scenario, value) => {- render(<MemoRelatedSettings />);-- const input = screen.getByRole("spinbutton", { name: "setting.memo.content-length-limit" });- fireEvent.change(input, { target: { value } });- fireEvent.click(screen.getByRole("button", { name: "common.save" }));-- expect(mocks.instance.updateSetting).not.toHaveBeenCalled();- expect(mocks.instance.fetchSetting).not.toHaveBeenCalled();- expect(mocks.toastError).toHaveBeenCalledWith("setting.memo.content-length-limit-error");});});diff --git a/web/tests/usage-limit-errors.test.ts b/web/tests/usage-limit-errors.test.tsindex 8193f354e..60f4d33cf 100644--- a/web/tests/usage-limit-errors.test.ts+++ b/web/tests/usage-limit-errors.test.ts@@ -21,7 +21,7 @@ function quotaError(metadata: Record<string, string>): ConnectError {describe("usage limit refusals", () => {it("names the memo limit", () => {- const error = quotaError({ metric: "MEMOS", limit: "1000", usage: "1000", usage_limit: "usageLimits/default-memos" });+ const error = quotaError({ metric: "MEMO_COUNT", limit: "1000", usage: "1000", usage_limit: "usageLimits/default-memos" });expect(getErrorMessage(error)).toBe("You have reached your limit of 1000 memos. Delete memos to create new ones.");});@@ -35,8 +35,15 @@ describe("usage limit refusals", () => {expect(getErrorMessage(error)).toBe("This file is larger than your limit of 10.0 MB per file.");});+ it("names the content limit and reaches the editor's error message", () => {+ const error = quotaError({ metric: "MEMO_CONTENT_BYTES", limit: "8192", usage: "8193" });+ const message = "This memo is larger than your limit of 8.0 KB per memo. Shorten the content to save it.";+ expect(getErrorMessage(error)).toBe(message);+ expect(errorService.getErrorMessage(error)).toBe(message);+ });+it("is not a rate limit, so it carries no wait", () => {- const error = quotaError({ metric: "MEMOS", limit: "1", usage: "1" });+ const error = quotaError({ metric: "MEMO_COUNT", limit: "1", usage: "1" });expect(getRetryAfterSeconds(error)).toBeUndefined();});diff --git a/web/tests/usage-limits-settings.test.tsx b/web/tests/usage-limits-settings.test.tsxindex 22ec21167..d9c497ad4 100644--- a/web/tests/usage-limits-settings.test.tsx+++ b/web/tests/usage-limits-settings.test.tsx@@ -68,7 +68,7 @@ describe("UsageSection", () => {mocks.getUserUsage.mockResolvedValue(create(UserUsageSchema, {memoCount: 5n,- memosLimit: effective(0n),+ memoCountLimit: effective(0n),storageBytesLimit: effective(0n),uploadBytesLimit: effective(0n),}),@@ -83,7 +83,7 @@ describe("UsageSection", () => {create(UserUsageSchema, {memoCount: 12n,storageBytes: 512n * MIB,- memosLimit: effective(1000n, "usageLimits/default-memos"),+ memoCountLimit: effective(1000n, "usageLimits/default-memos"),storageBytesLimit: effective(1024n * MIB, "usageLimits/alice-storage"),uploadBytesLimit: effective(0n),}),@@ -119,8 +119,9 @@ describe("UsageLimitsSection", () => {it("shows one table: all users first, then users with their own limits", async () => {mocks.listUsageLimits.mockResolvedValue({usageLimits: [- limit("default-memos", UsageLimit_Metric.MEMOS, 100n),- limit("bob-memos", UsageLimit_Metric.MEMOS, 0n, "users/bob"),+ limit("default-memos", UsageLimit_Metric.MEMO_COUNT, 100n),+ limit("default-content", UsageLimit_Metric.MEMO_CONTENT_BYTES, 8192n),+ limit("bob-memos", UsageLimit_Metric.MEMO_COUNT, 0n, "users/bob"),limit("bob-storage", UsageLimit_Metric.STORAGE_BYTES, 5n * 1024n * MIB, "users/bob"),],nextPageToken: "",@@ -134,8 +135,8 @@ describe("UsageLimitsSection", () => {.getAllByRole("cell").map((cell) => cell.textContent);expect(rows).toHaveLength(2);- expect(text(rows[0])).toEqual(["All usersEveryone, admins included", "100", "Unlimited", "Unlimited", ""]);- expect(text(rows[1])).toEqual(["bob@bob", "Unlimited", "5.0 GB", "Unlimited", ""]);+ expect(text(rows[0])).toEqual(["All usersEveryone, admins included", "100", "8.0 KB", "Unlimited", "Unlimited", ""]);+ expect(text(rows[1])).toEqual(["bob@bob", "Unlimited", "8.0 KB", "5.0 GB", "Unlimited", ""]);expect(bobCell.closest("tr")).toBe(rows[1]);// Users without their own limits get no row.expect(screen.queryByText("Alice")).not.toBeInTheDocument();@@ -144,7 +145,7 @@ describe("UsageLimitsSection", () => {it("removes all of a user's own limits", async () => {mocks.listUsageLimits.mockResolvedValue({usageLimits: [- limit("bob-memos", UsageLimit_Metric.MEMOS, 0n, "users/bob"),+ limit("bob-memos", UsageLimit_Metric.MEMO_COUNT, 0n, "users/bob"),limit("bob-storage", UsageLimit_Metric.STORAGE_BYTES, 5n * 1024n * MIB, "users/bob"),],nextPageToken: "",@@ -166,7 +167,8 @@ describe("UsageLimitDialog", () => {it("creates, updates and removes the limits for all users", async () => {mocks.listUsageLimits.mockResolvedValue({usageLimits: [- limit("default-memos", UsageLimit_Metric.MEMOS, 100n),+ limit("default-memos", UsageLimit_Metric.MEMO_COUNT, 100n),+ limit("default-content", UsageLimit_Metric.MEMO_CONTENT_BYTES, 8192n),limit("default-storage", UsageLimit_Metric.STORAGE_BYTES, 1024n * MIB),],nextPageToken: "",@@ -177,6 +179,9 @@ describe("UsageLimitDialog", () => {const memos = screen.getByRole("textbox", { name: "Memos" });await waitFor(() => expect(memos).toHaveValue("100"));expect(screen.getByRole("textbox", { name: "Storage (MiB)" })).toHaveValue("1024");+ const content = screen.getByRole("textbox", { name: "Memo content (KiB)" });+ expect(content).toHaveValue("8");+ fireEvent.change(content, { target: { value: "4" } });expect(screen.getByRole("textbox", { name: "Largest file (MiB)" })).toHaveAttribute("placeholder", "Unlimited");fireEvent.change(memos, { target: { value: "200" } });@@ -189,6 +194,9 @@ describe("UsageLimitDialog", () => {expect.objectContaining({ usageLimit: expect.objectContaining({ name: "usageLimits/default-memos", value: 200n }) }),);expect(mocks.deleteUsageLimit).toHaveBeenCalledWith({ name: "usageLimits/default-storage" });+ expect(mocks.updateUsageLimit).toHaveBeenCalledWith(+ expect.objectContaining({ usageLimit: expect.objectContaining({ name: "usageLimits/default-content", value: 4096n }) }),+ );expect(mocks.createUsageLimit).toHaveBeenCalledWith({usageLimit: expect.objectContaining({ metric: UsageLimit_Metric.UPLOAD_BYTES, user: "", value: 10n * MIB }),});@@ -197,7 +205,7 @@ describe("UsageLimitDialog", () => {it("edits a user's own limits, with the all-users limits as placeholders", async () => {mocks.listUsageLimits.mockResolvedValue({usageLimits: [- limit("default-memos", UsageLimit_Metric.MEMOS, 100n),+ limit("default-memos", UsageLimit_Metric.MEMO_COUNT, 100n),limit("bob-storage", UsageLimit_Metric.STORAGE_BYTES, 5n * 1024n * MIB, "users/bob"),limit("bob-file-size", UsageLimit_Metric.UPLOAD_BYTES, 0n, "users/bob"),],@@ -222,7 +230,7 @@ describe("UsageLimitDialog", () => {await waitFor(() => expect(mocks.deleteUsageLimit).toHaveBeenCalledWith({ name: "usageLimits/bob-storage" }));expect(mocks.createUsageLimit).toHaveBeenCalledWith({- usageLimit: expect.objectContaining({ metric: UsageLimit_Metric.MEMOS, user: "users/bob", value: 50n }),+ usageLimit: expect.objectContaining({ metric: UsageLimit_Metric.MEMO_COUNT, user: "users/bob", value: 50n }),});expect(mocks.updateUsageLimit).not.toHaveBeenCalled();});