mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-03-21 00:54:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

linters

Browse source
This commit is contained in:
Aleksandr Dubovikov 2024-10-01 16:07:27 +02:00
parent ff87ec33a7
commit c860640a9b
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
mediaapi/routing/url_preview.go
View file

@ -95,8 +95,8 @@ func makeUrlPreviewHandler(
} }
} }
urlParsed, err := url.Parse(pUrl) urlParsed, perr := url.Parse(pUrl)
if err != nil { if perr != nil {
return util.ErrorResponse(ErrorMissingUrl) return util.ErrorResponse(ErrorMissingUrl)
} }
@ -175,7 +175,6 @@ func makeUrlPreviewHandler(
var result *types.UrlPreview var result *types.UrlPreview
var err error var err error
var imgReader *http.Response
var mediaData *types.MediaMetadata var mediaData *types.MediaMetadata
var width, height int var width, height int
@ -184,7 +183,7 @@ func makeUrlPreviewHandler(
result = getPreviewFromHTML(resp, urlParsed) result = getPreviewFromHTML(resp, urlParsed)
if result.ImageUrl != "" { if result.ImageUrl != "" {
// In case of an image in the preview we download it // In case of an image in the preview we download it
if imgReader, err = downloadUrl(result.ImageUrl, time.Duration(cfg.UrlPreviewTimeout)*time.Second); err == nil { if imgReader, err := downloadUrl(result.ImageUrl, time.Duration(cfg.UrlPreviewTimeout)*time.Second); err == nil {
mediaData, width, height, _ = downloadAndStoreImage("url_preview", req.Context(), imgReader, cfg, device, db, activeThumbnailGeneration, logger) mediaData, width, height, _ = downloadAndStoreImage("url_preview", req.Context(), imgReader, cfg, device, db, activeThumbnailGeneration, logger)
} }
// We don't show the original image in the preview // We don't show the original image in the preview
@ -344,12 +343,12 @@ func downloadAndStoreImage(
if cfg.MaxFileSizeBytes > 0 { if cfg.MaxFileSizeBytes > 0 {
reqReader = io.LimitReader(reqReader, int64(cfg.MaxFileSizeBytes)+1) reqReader = io.LimitReader(reqReader, int64(cfg.MaxFileSizeBytes)+1)
} }
hash, bytesWritten, tmpDir, err := fileutils.WriteTempFile(ctx, reqReader, cfg.AbsBasePath) hash, bytesWritten, tmpDir, fileErr := fileutils.WriteTempFile(ctx, reqReader, cfg.AbsBasePath)
if err != nil { if fileErr != nil {
logger.WithError(err).WithFields(log.Fields{ logger.WithError(fileErr).WithFields(log.Fields{
"MaxFileSizeBytes": cfg.MaxFileSizeBytes, "MaxFileSizeBytes": cfg.MaxFileSizeBytes,
}).Warn("Error while transferring file") }).Warn("Error while transferring file")
return nil, width, height, err return nil, width, height, fileErr
} }
defer fileutils.RemoveDir(tmpDir, logger) defer fileutils.RemoveDir(tmpDir, logger)
@ -362,7 +361,6 @@ func downloadAndStoreImage(
existingMetadata, err := db.GetMediaMetadataByHash( existingMetadata, err := db.GetMediaMetadataByHash(
ctx, hash, cfg.Matrix.ServerName, ctx, hash, cfg.Matrix.ServerName,
) )
if err != nil { if err != nil {
logger.WithError(err).Error("unable to get media metadata by hash") logger.WithError(err).Error("unable to get media metadata by hash")
return nil, width, height, err return nil, width, height, err
@ -376,7 +374,7 @@ func downloadAndStoreImage(
if err != nil { if err != nil {
return nil, width, height, err return nil, width, height, err
} }
width, height, err := thumbnailer.GetImageSize(string(filePath)) width, height, err = thumbnailer.GetImageSize(string(filePath))
if err != nil { if err != nil {
return nil, width, height, err return nil, width, height, err
} }
@ -384,10 +382,10 @@ func downloadAndStoreImage(
} }
tmpFileName := filepath.Join(string(tmpDir), "content") tmpFileName := filepath.Join(string(tmpDir), "content")
fileType, err := detectFileType(tmpFileName, logger) fileType, typeErr := detectFileType(tmpFileName, logger)
if err != nil { if typeErr != nil {
logger.WithError(err).Error("unable to detect file type") logger.WithError(err).Error("unable to detect file type")
return nil, width, height, err return nil, width, height, typeErr
} }
logger.WithField("contentType", fileType).Debug("uploaded file is an image") logger.WithField("contentType", fileType).Debug("uploaded file is an image")
@ -418,10 +416,10 @@ func downloadAndStoreImage(
} }
thumbnailFileInfo, err := os.Stat(thumbnailPath) thumbnailFileInfo, statErr := os.Stat(thumbnailPath)
if err != nil { if statErr != nil {
logger.WithError(err).Error("unable to get thumbnail file info") logger.WithError(statErr).Error("unable to get thumbnail file info")
return nil, width, height, err return nil, width, height, statErr
} }
r := &uploadRequest{ r := &uploadRequest{
@ -432,10 +430,10 @@ func downloadAndStoreImage(
} }
// Move the thumbnail to the media store // Move the thumbnail to the media store
mediaID, err := r.generateMediaID(ctx, db) mediaID, mediaErr := r.generateMediaID(ctx, db)
if err != nil { if mediaErr != nil {
logger.WithError(err).Error("unable to generate media ID") logger.WithError(mediaErr).Error("unable to generate media ID")
return nil, width, height, err return nil, width, height, mediaErr
} }
mediaMetaData := &types.MediaMetadata{ mediaMetaData := &types.MediaMetadata{
MediaID: mediaID, MediaID: mediaID,
@ -448,10 +446,10 @@ func downloadAndStoreImage(
UserID: userid, UserID: userid,
} }
finalPath, err := fileutils.GetPathFromBase64Hash(mediaMetaData.Base64Hash, cfg.AbsBasePath) finalPath, pathErr := fileutils.GetPathFromBase64Hash(mediaMetaData.Base64Hash, cfg.AbsBasePath)
if err != nil { if pathErr != nil {
logger.WithError(err).Error("unable to get path from base64 hash") logger.WithError(pathErr).Error("unable to get path from base64 hash")
return nil, width, height, err return nil, width, height, pathErr
} }
err = fileutils.MoveFile(types.Path(thumbnailPath), types.Path(finalPath)) err = fileutils.MoveFile(types.Path(thumbnailPath), types.Path(finalPath))
if err != nil { if err != nil {