Fixed some ineffective assignments (#12543)
Этот коммит содержится в:
коммит произвёл
Eli Yukelzon
родитель
eebe1fc290
Коммит
20ff7032a6
@@ -158,7 +158,7 @@ func GetInfoForBytes(name string, data []byte) (*FileInfo, *AppError) {
|
||||
if gifConfig, err := gif.DecodeAll(bytes.NewReader(data)); err != nil {
|
||||
// Still return the rest of the info even though it doesn't appear to be an actual gif
|
||||
info.HasPreviewImage = true
|
||||
err = NewAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, "name="+name, http.StatusBadRequest)
|
||||
return info, NewAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, "name="+name, http.StatusBadRequest)
|
||||
} else {
|
||||
info.HasPreviewImage = len(gifConfig.Image) == 1
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ func TestTriggerIdDecodeAndVerification(t *testing.T) {
|
||||
t.Run("should succeed decoding and validation", func(t *testing.T) {
|
||||
userId := NewId()
|
||||
clientTriggerId, triggerId, err := GenerateTriggerId(userId, key)
|
||||
require.Nil(t, err)
|
||||
decodedClientTriggerId, decodedUserId, err := DecodeAndVerifyTriggerId(triggerId, key)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, clientTriggerId, decodedClientTriggerId)
|
||||
@@ -35,6 +36,7 @@ func TestTriggerIdDecodeAndVerification(t *testing.T) {
|
||||
UserId: NewId(),
|
||||
}
|
||||
clientTriggerId, triggerId, err := actionReq.GenerateTriggerId(key)
|
||||
require.Nil(t, err)
|
||||
dialogReq := &OpenDialogRequest{TriggerId: triggerId}
|
||||
decodedClientTriggerId, decodedUserId, err := dialogReq.DecodeAndVerifyTriggerId(key)
|
||||
assert.Nil(t, err)
|
||||
|
||||
@@ -56,9 +56,7 @@ func firstNImages(images []*opengraph.Image, maxImages int) []*opengraph.Image {
|
||||
}
|
||||
numImages := len(images)
|
||||
if numImages > maxImages {
|
||||
subImages := make([]*opengraph.Image, maxImages)
|
||||
subImages = images[0:maxImages]
|
||||
return subImages
|
||||
return images[0:maxImages]
|
||||
}
|
||||
return images
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user