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

fix caption for attachments not displayed once sent #1874

Merged
merged 1 commit into from
Aug 20, 2021
Merged

fix caption for attachments not displayed once sent #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ts/models/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
screenshot,
thumbnail,
fileName,
caption,
} = attachment;

const isVoiceMessage =
Expand All @@ -696,6 +697,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
return {
id,
contentType,
caption,
size: size || 0,
width: width || 0,
height: height || 0,
Expand Down
1 change: 1 addition & 0 deletions ts/state/ducks/conversations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export type PropsForSearchResults = {
export type PropsForAttachment = {
id: number;
contentType: string;
caption?: string;
size: number;
width?: number;
height?: number;
Expand Down
1 change: 1 addition & 0 deletions ts/util/attachmentsUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export async function getFile(attachment: StagedAttachmentType, maxMeasurements?
const scaled = await autoScale(attachment, maxMeasurements);
const fileRead = await readFile(scaled);
return {
caption: attachment.caption,
...fileRead,
url: undefined,
flags: attachmentFlags || null,
Expand Down