mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-14 13:22:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed some linter errors

Browse source 
Signed-off-by: Aleksandr Dubovikov <d.lexand@gmail.com>
This commit is contained in:
Aleksandr Dubovikov 2024-09-30 13:41:31 +02:00
parent 625bc3d02d
commit 016500b3f4
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mediaapi/routing/url_preview.go
View file

@ -96,7 +96,7 @@ func makeUrlPreviewHandler(
hash := getHashFromString(pUrl) hash := getHashFromString(pUrl)
// Check if we have a previously stored response // Check if we have a previously stored response
if urlPreviewCached, err := loadUrlPreviewResponse(req.Context(), cfg, db, hash, logger); err == nil { if urlPreviewCached, err := loadUrlPreviewResponse(req.Context(), cfg, db, hash); err == nil {
logger.Debug("Loaded url preview from the cache") logger.Debug("Loaded url preview from the cache")
// Put in into the cache for further usage // Put in into the cache for further usage
defer func() { defer func() {
@ -183,8 +183,8 @@ func makeUrlPreviewHandler(
if strings.HasPrefix(resp.Header.Get("Content-Type"), "text/html") { if strings.HasPrefix(resp.Header.Get("Content-Type"), "text/html") {
// The url is a webpage - get data from the meta tags // The url is a webpage - get data from the meta tags
result, err = getPreviewFromHTML(resp, pUrl) result = getPreviewFromHTML(resp, pUrl)
if err == nil && result.ImageUrl != "" { if result.ImageUrl != "" {
// The page has an og:image link // The page has an og:image link
if imgUrl, err2 = url.Parse(result.ImageUrl); err2 == nil { if imgUrl, err2 = url.Parse(result.ImageUrl); err2 == nil {
imgReader, err2 = downloadUrl(result.ImageUrl, time.Duration(cfg.UrlPreviewTimeout)*time.Second) imgReader, err2 = downloadUrl(result.ImageUrl, time.Duration(cfg.UrlPreviewTimeout)*time.Second)
@ -194,7 +194,7 @@ func makeUrlPreviewHandler(
} }
} }
// In case of any error in image download // In case of any error in image download
// we don't show the orginal URL as it is insecure for the room users // we don't show the original URL as it is insecure for the room users
if err2 != nil { if err2 != nil {
result.ImageUrl = "" result.ImageUrl = ""
} }
@ -257,7 +257,7 @@ func downloadUrl(url string, t time.Duration) (*http.Response, error) {
return resp, nil return resp, nil
} }
func getPreviewFromHTML(resp *http.Response, url string) (*types.UrlPreview, error) { func getPreviewFromHTML(resp *http.Response, url string) *types.UrlPreview {
fields := getMetaFieldsFromHTML(resp) fields := getMetaFieldsFromHTML(resp)
preview := &types.UrlPreview{ preview := &types.UrlPreview{
Title: fields["og:title"], Title: fields["og:title"],
@ -286,7 +286,7 @@ func getPreviewFromHTML(resp *http.Response, url string) (*types.UrlPreview, err
} }
} }
return preview, nil return preview
} }
func downloadAndStoreImage( func downloadAndStoreImage(
@ -337,11 +337,11 @@ func downloadAndStoreImage(
logger.WithField("mediaID", existingMetadata.MediaID).Debug("media already exists") logger.WithField("mediaID", existingMetadata.MediaID).Debug("media already exists")
// Here we have to read the image to get it's size // Here we have to read the image to get it's size
filename, err := fileutils.GetPathFromBase64Hash(existingMetadata.Base64Hash, cfg.AbsBasePath) filePath, err := fileutils.GetPathFromBase64Hash(existingMetadata.Base64Hash, cfg.AbsBasePath)
if err != nil { if err != nil {
return nil, width, height, err return nil, width, height, err
} }
img, err := thumbnailer.ReadFile(string(filename)) img, err := thumbnailer.ReadFile(string(filePath))
if err != nil { if err != nil {
return nil, width, height, err return nil, width, height, err
} }
@ -511,7 +511,7 @@ func storeUrlPreviewResponse(ctx context.Context, cfg *config.MediaAPI, db stora
return nil return nil
} }
func loadUrlPreviewResponse(ctx context.Context, cfg *config.MediaAPI, db storage.Database, hash types.Base64Hash, logger *log.Entry) (*types.UrlPreview, error) { func loadUrlPreviewResponse(ctx context.Context, cfg *config.MediaAPI, db storage.Database, hash types.Base64Hash) (*types.UrlPreview, error) {
if mediaMetadata, err := db.GetMediaMetadataByHash(ctx, hash, cfg.Matrix.ServerName); err == nil && mediaMetadata != nil { if mediaMetadata, err := db.GetMediaMetadataByHash(ctx, hash, cfg.Matrix.ServerName); err == nil && mediaMetadata != nil {
// Get the response file // Get the response file
filePath, err := fileutils.GetPathFromBase64Hash(mediaMetadata.Base64Hash, cfg.AbsBasePath) filePath, err := fileutils.GetPathFromBase64Hash(mediaMetadata.Base64Hash, cfg.AbsBasePath)