Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Failure to upload video message content will cause the SDK to crash #480

Merged
merged 9 commits into from
Jan 5, 2024
Merged

fix: Failure to upload video message content will cause the SDK to crash #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5891b4
feat: support conversation input status and wasm websocket message re…
withchao Jan 2, 2024
f73b878
fix: kicked user invited again into group,the group info do not chang…
FGadvancer Jan 2, 2024
d05c73a
fix: wasm parse data. (#465)
FGadvancer Jan 2, 2024
55aa722
Update .goreleaser.yaml (#466)
cubxxw Jan 2, 2024
5e648e6
fix: conversation and message's sender info change when notification …
FGadvancer Jan 3, 2024
01c5f8b
Release v3.5 conversation's info update (#471)
FGadvancer Jan 3, 2024
1408f1c
feat: support conversation input status and wasm websocket message re…
withchao Jan 4, 2024
e53e06f
Fix #475 (#476)
zhaolibo1989 Jan 5, 2024
4fe736c
Merge remote-tracking branch 'upstream/release-v3.5' into release-v3.5
withchao Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion internal/conversation_msg/sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,9 @@ func (c *Conversation) SendMessage(ctx context.Context, s *sdk_struct.MsgStruct,
c.updateMsgStatusAndTriggerConversation(ctx, s.ClientMsgID, "", s.CreateTime, constant.MsgStatusSendFailed, s, lc)
putErrs = err
}
s.VideoElem.VideoURL = res.URL
if res != nil {
s.VideoElem.VideoURL = res.URL
}
}()
wg.Wait()
if err := putErrs; err != nil {
Expand Down
15 changes: 9 additions & 6 deletions internal/file/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,17 +435,20 @@ func (f *File) getUpload(ctx context.Context, req *third.InitiateMultipartUpload
} else {
bitmap = ParseBitmap(bitmapBytes, partNum)
}
tUpInfo := &third.UploadInfo{
PartSize: req.PartSize,
Sign: &third.AuthSignParts{},
}
if dbUpload != nil {
tUpInfo.UploadID = dbUpload.UploadID
tUpInfo.ExpireTime = dbUpload.ExpireTime
}
return &UploadInfo{
PartNum: partNum,
Bitmap: bitmap,
DBInfo: dbUpload,
Resp: &third.InitiateMultipartUploadResp{
Upload: &third.UploadInfo{
UploadID: dbUpload.UploadID,
PartSize: req.PartSize,
ExpireTime: dbUpload.ExpireTime,
Sign: &third.AuthSignParts{},
},
Upload: tUpInfo,
},
BatchSignNum: req.MaxParts,
f: f,
Expand Down