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: tweak package name
Stevendfc0889a4f2e
diff --git a/plugin/http-getter/http_getter.go b/plugin/http-getter/http_getter.godeleted file mode 100644index aaaaa7cd0..000000000--- a/plugin/http-getter/http_getter.go+++ /dev/null@@ -1,4 +0,0 @@-// Package getter is using to get resources from url.-// * Get metadata for website;-// * Get image blob to avoid CORS;-package getterdiff --git a/plugin/http-getter/html_meta.go b/plugin/httpgetter/html_meta.gosimilarity index 99%rename from plugin/http-getter/html_meta.gorename to plugin/httpgetter/html_meta.goindex a4c24ef29..f69bad618 100644--- a/plugin/http-getter/html_meta.go+++ b/plugin/httpgetter/html_meta.go@@ -1,4 +1,4 @@-package getter+package httpgetterimport ("errors"diff --git a/plugin/http-getter/html_meta_test.go b/plugin/httpgetter/html_meta_test.gosimilarity index 94%rename from plugin/http-getter/html_meta_test.gorename to plugin/httpgetter/html_meta_test.goindex 310e64e4e..45345d307 100644--- a/plugin/http-getter/html_meta_test.go+++ b/plugin/httpgetter/html_meta_test.go@@ -1,4 +1,4 @@-package getter+package httpgetterimport ("testing"diff --git a/plugin/httpgetter/http_getter.go b/plugin/httpgetter/http_getter.gonew file mode 100644index 000000000..c545baf68--- /dev/null+++ b/plugin/httpgetter/http_getter.go@@ -0,0 +1,4 @@+// Package httpgetter is using to get resources from url.+// * Get metadata for website;+// * Get image blob to avoid CORS;+package httpgetterdiff --git a/plugin/http-getter/image.go b/plugin/httpgetter/image.gosimilarity index 97%rename from plugin/http-getter/image.gorename to plugin/httpgetter/image.goindex 056783069..2d6a163f2 100644--- a/plugin/http-getter/image.go+++ b/plugin/httpgetter/image.go@@ -1,4 +1,4 @@-package getter+package httpgetterimport ("errors"diff --git a/plugin/http-getter/util.go b/plugin/httpgetter/util.gosimilarity index 93%rename from plugin/http-getter/util.gorename to plugin/httpgetter/util.goindex c9125ee82..d83f5efb2 100644--- a/plugin/http-getter/util.go+++ b/plugin/httpgetter/util.go@@ -1,4 +1,4 @@-package getter+package httpgetterimport ("mime"diff --git a/plugin/storage/s3/s3.go b/plugin/storage/s3/s3.goindex cc6f587db..a8c6a3b5c 100644--- a/plugin/storage/s3/s3.go+++ b/plugin/storage/s3/s3.go@@ -15,10 +15,6 @@ import (storepb "github.com/usememos/memos/proto/gen/store")-// presignLifetimeSecs is the lifetime of a presigned URL in seconds.-// The presigned URL is valid for 7 days.-const presignLifetimeSecs = 7 * 24 * 60 * 60-type Client struct {Client *s3.ClientBucket *string@@ -74,7 +70,7 @@ func (c *Client) PresignGetObject(ctx context.Context, key string) (string, erroBucket: aws.String(*c.Bucket),Key: aws.String(key),}, func(opts *s3.PresignOptions) {- opts.Expires = time.Duration(presignLifetimeSecs * int64(time.Second))+ opts.Expires = time.Duration(7 * 24 * time.Hour)})if err != nil {return "", errors.Wrap(err, "failed to presign put object")diff --git a/server/router/api/v1/markdown_service.go b/server/router/api/v1/markdown_service.goindex 2b6bfc27b..14e9f8170 100644--- a/server/router/api/v1/markdown_service.go+++ b/server/router/api/v1/markdown_service.go@@ -9,7 +9,7 @@ import ("github.com/yourselfhosted/gomark/parser/tokenizer""github.com/yourselfhosted/gomark/restore"- getter "github.com/usememos/memos/plugin/http-getter"+ "github.com/usememos/memos/plugin/httpgetter"v1pb "github.com/usememos/memos/proto/gen/api/v1")@@ -33,7 +33,7 @@ func (*APIV1Service) RestoreMarkdown(_ context.Context, request *v1pb.RestoreMar}func (*APIV1Service) GetLinkMetadata(_ context.Context, request *v1pb.GetLinkMetadataRequest) (*v1pb.LinkMetadata, error) {- htmlMeta, err := getter.GetHTMLMeta(request.Link)+ htmlMeta, err := httpgetter.GetHTMLMeta(request.Link)if err != nil {return nil, err}diff --git a/server/service/s3_object_presigner/s3_object_presigner.go b/server/service/s3_object_presigner/s3_object_presigner.goindex 76ae2b42d..2363355a8 100644--- a/server/service/s3_object_presigner/s3_object_presigner.go+++ b/server/service/s3_object_presigner/s3_object_presigner.go@@ -53,8 +53,9 @@ func (p *S3ObjectPresigner) CheckAndPresign(ctx context.Context) {}if s3ObjectPayload.LastPresignedTime != nil {- // Skip if the presigned URL is still valid.- if time.Now().Before(s3ObjectPayload.LastPresignedTime.AsTime().Add(24 * time.Hour)) {+ // Skip if the presigned URL is still valid for the next 6 days.+ // The default expiration time is 7 days.+ if time.Now().Before(s3ObjectPayload.LastPresignedTime.AsTime().Add(6 * 24 * time.Hour)) {continue}}