Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
dfc0889a
Commit
dfc0889a
authored
May 05, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: tweak package name
parent
da535c8d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
13 deletions
+14
-13
html_meta.go
plugin/httpgetter/html_meta.go
+1
-1
html_meta_test.go
plugin/httpgetter/html_meta_test.go
+1
-1
http_getter.go
plugin/httpgetter/http_getter.go
+4
-0
image.go
plugin/httpgetter/image.go
+1
-1
util.go
plugin/httpgetter/util.go
+1
-1
s3.go
plugin/storage/s3/s3.go
+1
-5
markdown_service.go
server/router/api/v1/markdown_service.go
+2
-2
s3_object_presigner.go
server/service/s3_object_presigner/s3_object_presigner.go
+3
-2
No files found.
plugin/http
-
getter/html_meta.go
→
plugin/httpgetter/html_meta.go
View file @
dfc0889a
package
getter
package
http
getter
import
(
"errors"
...
...
plugin/http
-
getter/html_meta_test.go
→
plugin/httpgetter/html_meta_test.go
View file @
dfc0889a
package
getter
package
http
getter
import
(
"testing"
...
...
plugin/http
-
getter/http_getter.go
→
plugin/httpgetter/http_getter.go
View file @
dfc0889a
// Package getter is using to get resources from url.
// Package
http
getter is using to get resources from url.
// * Get metadata for website;
// * Get image blob to avoid CORS;
package
getter
package
http
getter
plugin/http
-
getter/image.go
→
plugin/httpgetter/image.go
View file @
dfc0889a
package
getter
package
http
getter
import
(
"errors"
...
...
plugin/http
-
getter/util.go
→
plugin/httpgetter/util.go
View file @
dfc0889a
package
getter
package
http
getter
import
(
"mime"
...
...
plugin/storage/s3/s3.go
View file @
dfc0889a
...
...
@@ -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
.
Client
Bucket
*
string
...
...
@@ -74,7 +70,7 @@ func (c *Client) PresignGetObject(ctx context.Context, key string) (string, erro
Bucket
:
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"
)
...
...
server/router/api/v1/markdown_service.go
View file @
dfc0889a
...
...
@@ -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/http
getter"
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
:=
http
getter
.
GetHTMLMeta
(
request
.
Link
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
server/service/s3_object_presigner/s3_object_presigner.go
View file @
dfc0889a
...
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment