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
chore: remove duplicated prefix from enums
Steven35df62a96cf7
diff --git a/proto/api/v1/activity_service.proto b/proto/api/v1/activity_service.protoindex 7b33936f8..25ded5c15 100644--- a/proto/api/v1/activity_service.proto+++ b/proto/api/v1/activity_service.proto@@ -60,9 +60,9 @@ message Activity {// Unspecified type.TYPE_UNSPECIFIED = 0;// Memo comment activity.- TYPE_MEMO_COMMENT = 1;+ MEMO_COMMENT = 1;// Version update activity.- TYPE_VERSION_UPDATE = 2;+ VERSION_UPDATE = 2;}// Activity levels.@@ -70,11 +70,11 @@ message Activity {// Unspecified level.LEVEL_UNSPECIFIED = 0;// Info level.- LEVEL_INFO = 1;+ INFO = 1;// Warn level.- LEVEL_WARN = 2;+ WARN = 2;// Error level.- LEVEL_ERROR = 3;+ ERROR = 3;}}diff --git a/proto/gen/api/v1/activity_service.pb.go b/proto/gen/api/v1/activity_service.pb.goindex df7bbee52..5634f8269 100644--- a/proto/gen/api/v1/activity_service.pb.go+++ b/proto/gen/api/v1/activity_service.pb.go@@ -30,22 +30,22 @@ const (// Unspecified type.Activity_TYPE_UNSPECIFIED Activity_Type = 0// Memo comment activity.- Activity_TYPE_MEMO_COMMENT Activity_Type = 1+ Activity_MEMO_COMMENT Activity_Type = 1// Version update activity.- Activity_TYPE_VERSION_UPDATE Activity_Type = 2+ Activity_VERSION_UPDATE Activity_Type = 2)// Enum value maps for Activity_Type.var (Activity_Type_name = map[int32]string{0: "TYPE_UNSPECIFIED",- 1: "TYPE_MEMO_COMMENT",- 2: "TYPE_VERSION_UPDATE",+ 1: "MEMO_COMMENT",+ 2: "VERSION_UPDATE",}Activity_Type_value = map[string]int32{- "TYPE_UNSPECIFIED": 0,- "TYPE_MEMO_COMMENT": 1,- "TYPE_VERSION_UPDATE": 2,+ "TYPE_UNSPECIFIED": 0,+ "MEMO_COMMENT": 1,+ "VERSION_UPDATE": 2,})@@ -83,26 +83,26 @@ const (// Unspecified level.Activity_LEVEL_UNSPECIFIED Activity_Level = 0// Info level.- Activity_LEVEL_INFO Activity_Level = 1+ Activity_INFO Activity_Level = 1// Warn level.- Activity_LEVEL_WARN Activity_Level = 2+ Activity_WARN Activity_Level = 2// Error level.- Activity_LEVEL_ERROR Activity_Level = 3+ Activity_ERROR Activity_Level = 3)// Enum value maps for Activity_Level.var (Activity_Level_name = map[int32]string{0: "LEVEL_UNSPECIFIED",- 1: "LEVEL_INFO",- 2: "LEVEL_WARN",- 3: "LEVEL_ERROR",+ 1: "INFO",+ 2: "WARN",+ 3: "ERROR",}Activity_Level_value = map[string]int32{"LEVEL_UNSPECIFIED": 0,- "LEVEL_INFO": 1,- "LEVEL_WARN": 2,- "LEVEL_ERROR": 3,+ "INFO": 1,+ "WARN": 2,+ "ERROR": 3,})@@ -513,7 +513,7 @@ var File_api_v1_activity_service_proto protoreflect.FileDescriptorconst file_api_v1_activity_service_proto_rawDesc = "" +"\n" +- "\x1dapi/v1/activity_service.proto\x12\fmemos.api.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa2\x04\n" ++ "\x1dapi/v1/activity_service.proto\x12\fmemos.api.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x86\x04\n" +"\bActivity\x12\x1a\n" +"\x04name\x18\x01 \x01(\tB\x06\xe0A\x03\xe0A\bR\x04name\x12\x1d\n" +"\acreator\x18\x02 \x01(\tB\x03\xe0A\x03R\acreator\x124\n" +@@ -521,18 +521,16 @@ const file_api_v1_activity_service_proto_rawDesc = "" +"\x05level\x18\x04 \x01(\x0e2\x1c.memos.api.v1.Activity.LevelB\x03\xe0A\x03R\x05level\x12@\n" +"\vcreate_time\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +"createTime\x12<\n" +- "\apayload\x18\x06 \x01(\v2\x1d.memos.api.v1.ActivityPayloadB\x03\xe0A\x03R\apayload\"L\n" ++ "\apayload\x18\x06 \x01(\v2\x1d.memos.api.v1.ActivityPayloadB\x03\xe0A\x03R\apayload\"B\n" +"\x04Type\x12\x14\n" +- "\x10TYPE_UNSPECIFIED\x10\x00\x12\x15\n" +- "\x11TYPE_MEMO_COMMENT\x10\x01\x12\x17\n" +- "\x13TYPE_VERSION_UPDATE\x10\x02\"O\n" ++ "\x10TYPE_UNSPECIFIED\x10\x00\x12\x10\n" ++ "\fMEMO_COMMENT\x10\x01\x12\x12\n" ++ "\x0eVERSION_UPDATE\x10\x02\"=\n" +"\x05Level\x12\x15\n" +- "\x11LEVEL_UNSPECIFIED\x10\x00\x12\x0e\n" +- "\n" +- "LEVEL_INFO\x10\x01\x12\x0e\n" +- "\n" +- "LEVEL_WARN\x10\x02\x12\x0f\n" +- "\vLEVEL_ERROR\x10\x03:M\xeaAJ\n" ++ "\x11LEVEL_UNSPECIFIED\x10\x00\x12\b\n" ++ "\x04INFO\x10\x01\x12\b\n" ++ "\x04WARN\x10\x02\x12\t\n" ++ "\x05ERROR\x10\x03:M\xeaAJ\n" +"\x15memos.api.v1/Activity\x12\x15activities/{activity}\x1a\x04name*\n" +"activities2\bactivity\"k\n" +"\x0fActivityPayload\x12M\n" +diff --git a/proto/gen/apidocs.swagger.yaml b/proto/gen/apidocs.swagger.yamlindex 6adb9325d..9dd5c61da 100644--- a/proto/gen/apidocs.swagger.yaml+++ b/proto/gen/apidocs.swagger.yaml@@ -2513,17 +2513,17 @@ definitions:type: stringenum:- LEVEL_UNSPECIFIED- - LEVEL_INFO- - LEVEL_WARN- - LEVEL_ERROR+ - INFO+ - WARN+ - ERRORdefault: LEVEL_UNSPECIFIEDdescription: |-Activity levels.- LEVEL_UNSPECIFIED: Unspecified level.- - LEVEL_INFO: Info level.- - LEVEL_WARN: Warn level.- - LEVEL_ERROR: Error level.+ - INFO: Info level.+ - WARN: Warn level.+ - ERROR: Error level.ListNodeKind:type: stringenum:@@ -3218,15 +3218,15 @@ definitions:type: stringenum:- TYPE_UNSPECIFIED- - TYPE_MEMO_COMMENT- - TYPE_VERSION_UPDATE+ - MEMO_COMMENT+ - VERSION_UPDATEdefault: TYPE_UNSPECIFIEDdescription: |-Activity types.- TYPE_UNSPECIFIED: Unspecified type.- - TYPE_MEMO_COMMENT: Memo comment activity.- - TYPE_VERSION_UPDATE: Version update activity.+ - MEMO_COMMENT: Memo comment activity.+ - VERSION_UPDATE: Version update activity.v1Attachment:type: objectproperties:diff --git a/server/router/api/v1/activity_service.go b/server/router/api/v1/activity_service.goindex 4734d93bb..1731cf272 100644--- a/server/router/api/v1/activity_service.go+++ b/server/router/api/v1/activity_service.go@@ -74,7 +74,7 @@ func (s *APIV1Service) convertActivityFromStore(ctx context.Context, activity *svar activityType v1pb.Activity_Typeswitch activity.Type {case store.ActivityTypeMemoComment:- activityType = v1pb.Activity_TYPE_MEMO_COMMENT+ activityType = v1pb.Activity_MEMO_COMMENTdefault:activityType = v1pb.Activity_TYPE_UNSPECIFIED}@@ -83,7 +83,7 @@ func (s *APIV1Service) convertActivityFromStore(ctx context.Context, activity *svar activityLevel v1pb.Activity_Levelswitch activity.Level {case store.ActivityLevelInfo:- activityLevel = v1pb.Activity_LEVEL_INFO+ activityLevel = v1pb.Activity_INFOdefault:activityLevel = v1pb.Activity_LEVEL_UNSPECIFIED}diff --git a/web/src/types/proto/api/v1/activity_service.ts b/web/src/types/proto/api/v1/activity_service.tsindex 09719e10b..56efe5163 100644--- a/web/src/types/proto/api/v1/activity_service.ts+++ b/web/src/types/proto/api/v1/activity_service.ts@@ -37,10 +37,10 @@ export interface Activity {export enum Activity_Type {/** TYPE_UNSPECIFIED - Unspecified type. */TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",- /** TYPE_MEMO_COMMENT - Memo comment activity. */- TYPE_MEMO_COMMENT = "TYPE_MEMO_COMMENT",- /** TYPE_VERSION_UPDATE - Version update activity. */- TYPE_VERSION_UPDATE = "TYPE_VERSION_UPDATE",+ /** MEMO_COMMENT - Memo comment activity. */+ MEMO_COMMENT = "MEMO_COMMENT",+ /** VERSION_UPDATE - Version update activity. */+ VERSION_UPDATE = "VERSION_UPDATE",UNRECOGNIZED = "UNRECOGNIZED",}@@ -50,11 +50,11 @@ export function activity_TypeFromJSON(object: any): Activity_Type {case "TYPE_UNSPECIFIED":return Activity_Type.TYPE_UNSPECIFIED;case 1:- case "TYPE_MEMO_COMMENT":- return Activity_Type.TYPE_MEMO_COMMENT;+ case "MEMO_COMMENT":+ return Activity_Type.MEMO_COMMENT;case 2:- case "TYPE_VERSION_UPDATE":- return Activity_Type.TYPE_VERSION_UPDATE;+ case "VERSION_UPDATE":+ return Activity_Type.VERSION_UPDATE;case -1:case "UNRECOGNIZED":default:@@ -66,9 +66,9 @@ export function activity_TypeToNumber(object: Activity_Type): number {switch (object) {case Activity_Type.TYPE_UNSPECIFIED:return 0;- case Activity_Type.TYPE_MEMO_COMMENT:+ case Activity_Type.MEMO_COMMENT:return 1;- case Activity_Type.TYPE_VERSION_UPDATE:+ case Activity_Type.VERSION_UPDATE:return 2;case Activity_Type.UNRECOGNIZED:default:@@ -80,12 +80,12 @@ export function activity_TypeToNumber(object: Activity_Type): number {export enum Activity_Level {/** LEVEL_UNSPECIFIED - Unspecified level. */LEVEL_UNSPECIFIED = "LEVEL_UNSPECIFIED",- /** LEVEL_INFO - Info level. */- LEVEL_INFO = "LEVEL_INFO",- /** LEVEL_WARN - Warn level. */- LEVEL_WARN = "LEVEL_WARN",- /** LEVEL_ERROR - Error level. */- LEVEL_ERROR = "LEVEL_ERROR",+ /** INFO - Info level. */+ INFO = "INFO",+ /** WARN - Warn level. */+ WARN = "WARN",+ /** ERROR - Error level. */+ ERROR = "ERROR",UNRECOGNIZED = "UNRECOGNIZED",}@@ -95,14 +95,14 @@ export function activity_LevelFromJSON(object: any): Activity_Level {case "LEVEL_UNSPECIFIED":return Activity_Level.LEVEL_UNSPECIFIED;case 1:- case "LEVEL_INFO":- return Activity_Level.LEVEL_INFO;+ case "INFO":+ return Activity_Level.INFO;case 2:- case "LEVEL_WARN":- return Activity_Level.LEVEL_WARN;+ case "WARN":+ return Activity_Level.WARN;case 3:- case "LEVEL_ERROR":- return Activity_Level.LEVEL_ERROR;+ case "ERROR":+ return Activity_Level.ERROR;case -1:case "UNRECOGNIZED":default:@@ -114,11 +114,11 @@ export function activity_LevelToNumber(object: Activity_Level): number {switch (object) {case Activity_Level.LEVEL_UNSPECIFIED:return 0;- case Activity_Level.LEVEL_INFO:+ case Activity_Level.INFO:return 1;- case Activity_Level.LEVEL_WARN:+ case Activity_Level.WARN:return 2;- case Activity_Level.LEVEL_ERROR:+ case Activity_Level.ERROR:return 3;case Activity_Level.UNRECOGNIZED:default: