diff --git a/proto/api/v1/instance_service.proto b/proto/api/v1/instance_service.proto index 1101c9a62..0b97bb827 100644 --- a/proto/api/v1/instance_service.proto +++ b/proto/api/v1/instance_service.proto @@ -159,8 +159,6 @@ message InstanceSetting { int32 content_length_limit = 3; // enable_double_click_edit enables editing on double click. bool enable_double_click_edit = 4; - // enable_link_preview enables links preview. - bool enable_link_preview = 5; // reactions is the list of reactions. repeated string reactions = 7; // enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW). diff --git a/proto/gen/api/v1/instance_service.pb.go b/proto/gen/api/v1/instance_service.pb.go index 014e88bd2..248d18be2 100644 --- a/proto/gen/api/v1/instance_service.pb.go +++ b/proto/gen/api/v1/instance_service.pb.go @@ -663,8 +663,6 @@ type InstanceSetting_MemoRelatedSetting struct { 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"` - // enable_link_preview enables links preview. - EnableLinkPreview bool `protobuf:"varint,5,opt,name=enable_link_preview,json=enableLinkPreview,proto3" json:"enable_link_preview,omitempty"` // reactions is the list of reactions. Reactions []string `protobuf:"bytes,7,rep,name=reactions,proto3" json:"reactions,omitempty"` // enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW). @@ -733,13 +731,6 @@ func (x *InstanceSetting_MemoRelatedSetting) GetEnableDoubleClickEdit() bool { return false } -func (x *InstanceSetting_MemoRelatedSetting) GetEnableLinkPreview() bool { - if x != nil { - return x.EnableLinkPreview - } - return false -} - func (x *InstanceSetting_MemoRelatedSetting) GetReactions() []string { if x != nil { return x.Reactions @@ -926,7 +917,7 @@ const file_api_v1_instance_service_proto_rawDesc = "" + "\aversion\x18\x02 \x01(\tR\aversion\x12\x12\n" + "\x04mode\x18\x03 \x01(\tR\x04mode\x12!\n" + "\finstance_url\x18\x06 \x01(\tR\vinstanceUrl\"\x1b\n" + - "\x19GetInstanceProfileRequest\"\xcd\x10\n" + + "\x19GetInstanceProfileRequest\"\x9d\x10\n" + "\x0fInstanceSetting\x12\x17\n" + "\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12W\n" + "\x0fgeneral_setting\x18\x02 \x01(\v2,.memos.api.v1.InstanceSetting.GeneralSettingH\x00R\x0egeneralSetting\x12W\n" + @@ -963,13 +954,12 @@ const file_api_v1_instance_service_proto_rawDesc = "" + "\x18STORAGE_TYPE_UNSPECIFIED\x10\x00\x12\f\n" + "\bDATABASE\x10\x01\x12\t\n" + "\x05LOCAL\x10\x02\x12\x06\n" + - "\x02S3\x10\x03\x1a\x9a\x03\n" + + "\x02S3\x10\x03\x1a\xea\x02\n" + "\x12MemoRelatedSetting\x12<\n" + "\x1adisallow_public_visibility\x18\x01 \x01(\bR\x18disallowPublicVisibility\x127\n" + "\x18display_with_update_time\x18\x02 \x01(\bR\x15displayWithUpdateTime\x120\n" + "\x14content_length_limit\x18\x03 \x01(\x05R\x12contentLengthLimit\x127\n" + - "\x18enable_double_click_edit\x18\x04 \x01(\bR\x15enableDoubleClickEdit\x12.\n" + - "\x13enable_link_preview\x18\x05 \x01(\bR\x11enableLinkPreview\x12\x1c\n" + + "\x18enable_double_click_edit\x18\x04 \x01(\bR\x15enableDoubleClickEdit\x12\x1c\n" + "\treactions\x18\a \x03(\tR\treactions\x127\n" + "\x18enable_blur_nsfw_content\x18\t \x01(\bR\x15enableBlurNsfwContent\x12\x1b\n" + "\tnsfw_tags\x18\n" + diff --git a/proto/gen/openapi.yaml b/proto/gen/openapi.yaml index 9927c8ccf..c8bcbc4bd 100644 --- a/proto/gen/openapi.yaml +++ b/proto/gen/openapi.yaml @@ -2336,9 +2336,6 @@ components: enableDoubleClickEdit: type: boolean description: enable_double_click_edit enables editing on double click. - enableLinkPreview: - type: boolean - description: enable_link_preview enables links preview. reactions: type: array items: diff --git a/proto/gen/store/instance_setting.pb.go b/proto/gen/store/instance_setting.pb.go index 7146b04d1..e01305834 100644 --- a/proto/gen/store/instance_setting.pb.go +++ b/proto/gen/store/instance_setting.pb.go @@ -667,8 +667,6 @@ type InstanceMemoRelatedSetting struct { 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"` - // enable_link_preview enables links preview. - EnableLinkPreview bool `protobuf:"varint,5,opt,name=enable_link_preview,json=enableLinkPreview,proto3" json:"enable_link_preview,omitempty"` // reactions is the list of reactions. Reactions []string `protobuf:"bytes,7,rep,name=reactions,proto3" json:"reactions,omitempty"` // enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW). @@ -737,13 +735,6 @@ func (x *InstanceMemoRelatedSetting) GetEnableDoubleClickEdit() bool { return false } -func (x *InstanceMemoRelatedSetting) GetEnableLinkPreview() bool { - if x != nil { - return x.EnableLinkPreview - } - return false -} - func (x *InstanceMemoRelatedSetting) GetReactions() []string { if x != nil { return x.Reactions @@ -812,13 +803,12 @@ const file_store_instance_setting_proto_rawDesc = "" + "\bendpoint\x18\x03 \x01(\tR\bendpoint\x12\x16\n" + "\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\"\xa2\x03\n" + + "\x0euse_path_style\x18\x06 \x01(\bR\fusePathStyle\"\xf2\x02\n" + "\x1aInstanceMemoRelatedSetting\x12<\n" + "\x1adisallow_public_visibility\x18\x01 \x01(\bR\x18disallowPublicVisibility\x127\n" + "\x18display_with_update_time\x18\x02 \x01(\bR\x15displayWithUpdateTime\x120\n" + "\x14content_length_limit\x18\x03 \x01(\x05R\x12contentLengthLimit\x127\n" + - "\x18enable_double_click_edit\x18\x04 \x01(\bR\x15enableDoubleClickEdit\x12.\n" + - "\x13enable_link_preview\x18\x05 \x01(\bR\x11enableLinkPreview\x12\x1c\n" + + "\x18enable_double_click_edit\x18\x04 \x01(\bR\x15enableDoubleClickEdit\x12\x1c\n" + "\treactions\x18\a \x03(\tR\treactions\x127\n" + "\x18enable_blur_nsfw_content\x18\t \x01(\bR\x15enableBlurNsfwContent\x12\x1b\n" + "\tnsfw_tags\x18\n" + diff --git a/proto/store/instance_setting.proto b/proto/store/instance_setting.proto index a9ea9c1c1..40ffa296f 100644 --- a/proto/store/instance_setting.proto +++ b/proto/store/instance_setting.proto @@ -104,8 +104,6 @@ message InstanceMemoRelatedSetting { int32 content_length_limit = 3; // enable_double_click_edit enables editing on double click. bool enable_double_click_edit = 4; - // enable_link_preview enables links preview. - bool enable_link_preview = 5; // reactions is the list of reactions. repeated string reactions = 7; // enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW). diff --git a/server/router/api/v1/instance_service.go b/server/router/api/v1/instance_service.go index b40f845ea..18d9461ba 100644 --- a/server/router/api/v1/instance_service.go +++ b/server/router/api/v1/instance_service.go @@ -259,7 +259,6 @@ func convertInstanceMemoRelatedSettingFromStore(setting *storepb.InstanceMemoRel DisplayWithUpdateTime: setting.DisplayWithUpdateTime, ContentLengthLimit: setting.ContentLengthLimit, EnableDoubleClickEdit: setting.EnableDoubleClickEdit, - EnableLinkPreview: setting.EnableLinkPreview, Reactions: setting.Reactions, EnableBlurNsfwContent: setting.EnableBlurNsfwContent, NsfwTags: setting.NsfwTags, @@ -275,7 +274,6 @@ func convertInstanceMemoRelatedSettingToStore(setting *v1pb.InstanceSetting_Memo DisplayWithUpdateTime: setting.DisplayWithUpdateTime, ContentLengthLimit: setting.ContentLengthLimit, EnableDoubleClickEdit: setting.EnableDoubleClickEdit, - EnableLinkPreview: setting.EnableLinkPreview, Reactions: setting.Reactions, EnableBlurNsfwContent: setting.EnableBlurNsfwContent, NsfwTags: setting.NsfwTags, diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsx index 65dcaf7c1..aaa7940c9 100644 --- a/web/src/components/Settings/MemoRelatedSettings.tsx +++ b/web/src/components/Settings/MemoRelatedSettings.tsx @@ -84,13 +84,6 @@ const MemoRelatedSettings = observer(() => { /> - - updatePartialSetting({ enableLinkPreview: checked })} - /> - - e) || []; message.enableBlurNsfwContent = object.enableBlurNsfwContent ?? false; message.nsfwTags = object.nsfwTags?.map((e) => e) || [];