Merge pull request #1856 from Bilb/fix-attachment-since-electron-upgrade
Fix attachment since electron upgradepull/1873/head
Audric Ackermann
4 years ago
committed by
GitHub
commit
a3edb99549
@ -0,0 +1,103 @@
|
|||||||
|
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
|
||||||
|
import _ from 'lodash';
|
||||||
|
import { StagedAttachmentType } from '../../components/session/conversation/SessionCompositionBox';
|
||||||
|
|
||||||
|
export type StagedAttachmentsStateType = {
|
||||||
|
stagedAttachments: { [conversationKey: string]: Array<StagedAttachmentType> };
|
||||||
|
};
|
||||||
|
|
||||||
|
// Reducer
|
||||||
|
|
||||||
|
export function getEmptyStagedAttachmentsState(): StagedAttachmentsStateType {
|
||||||
|
return {
|
||||||
|
stagedAttachments: {},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const stagedAttachmentsSlice = createSlice({
|
||||||
|
name: 'stagedAttachments',
|
||||||
|
initialState: getEmptyStagedAttachmentsState(),
|
||||||
|
reducers: {
|
||||||
|
addStagedAttachmentsInConversation(
|
||||||
|
state: StagedAttachmentsStateType,
|
||||||
|
action: PayloadAction<{
|
||||||
|
conversationKey: string;
|
||||||
|
newAttachments: Array<StagedAttachmentType>;
|
||||||
|
}>
|
||||||
|
) {
|
||||||
|
const { conversationKey, newAttachments } = action.payload;
|
||||||
|
if (newAttachments.length === 0) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
const currentStagedAttachments = state.stagedAttachments[conversationKey] || [];
|
||||||
|
|
||||||
|
if (newAttachments.some(a => a.isVoiceMessage) && currentStagedAttachments.length > 0) {
|
||||||
|
window?.log?.warn('A voice note cannot be sent with other attachments');
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
const allAttachments = _.concat(currentStagedAttachments, newAttachments);
|
||||||
|
const uniqAttachments = _.uniqBy(allAttachments, m => m.fileName);
|
||||||
|
|
||||||
|
state.stagedAttachments[conversationKey] = uniqAttachments;
|
||||||
|
return state;
|
||||||
|
},
|
||||||
|
removeAllStagedAttachmentsInConversation(
|
||||||
|
state: StagedAttachmentsStateType,
|
||||||
|
action: PayloadAction<{ conversationKey: string }>
|
||||||
|
) {
|
||||||
|
const { conversationKey } = action.payload;
|
||||||
|
|
||||||
|
const currentStagedAttachments = state.stagedAttachments[conversationKey];
|
||||||
|
if (!currentStagedAttachments || _.isEmpty(currentStagedAttachments)) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
currentStagedAttachments.forEach(attachment => {
|
||||||
|
if (attachment.url) {
|
||||||
|
URL.revokeObjectURL(attachment.url);
|
||||||
|
}
|
||||||
|
if (attachment.videoUrl) {
|
||||||
|
URL.revokeObjectURL(attachment.videoUrl);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
// tslint:disable-next-line: no-dynamic-delete
|
||||||
|
delete state.stagedAttachments[conversationKey];
|
||||||
|
return state;
|
||||||
|
},
|
||||||
|
removeStagedAttachmentInConversation(
|
||||||
|
state: StagedAttachmentsStateType,
|
||||||
|
action: PayloadAction<{ conversationKey: string; filename: string }>
|
||||||
|
) {
|
||||||
|
const { conversationKey, filename } = action.payload;
|
||||||
|
|
||||||
|
const currentStagedAttachments = state.stagedAttachments[conversationKey];
|
||||||
|
|
||||||
|
if (!currentStagedAttachments || _.isEmpty(currentStagedAttachments)) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
const attachmentToRemove = currentStagedAttachments.find(m => m.fileName === filename);
|
||||||
|
|
||||||
|
if (!attachmentToRemove) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (attachmentToRemove.url) {
|
||||||
|
URL.revokeObjectURL(attachmentToRemove.url);
|
||||||
|
}
|
||||||
|
if (attachmentToRemove.videoUrl) {
|
||||||
|
URL.revokeObjectURL(attachmentToRemove.videoUrl);
|
||||||
|
}
|
||||||
|
state.stagedAttachments[conversationKey] = state.stagedAttachments[conversationKey].filter(
|
||||||
|
a => a.fileName !== filename
|
||||||
|
);
|
||||||
|
return state;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export const { actions, reducer } = stagedAttachmentsSlice;
|
||||||
|
export const {
|
||||||
|
addStagedAttachmentsInConversation,
|
||||||
|
removeAllStagedAttachmentsInConversation,
|
||||||
|
removeStagedAttachmentInConversation,
|
||||||
|
} = actions;
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
import { createSelector } from 'reselect';
|
||||||
|
import { StagedAttachmentType } from '../../components/session/conversation/SessionCompositionBox';
|
||||||
|
import { StagedAttachmentsStateType } from '../ducks/stagedAttachments';
|
||||||
|
import { StateType } from '../reducer';
|
||||||
|
import { getSelectedConversationKey } from './conversations';
|
||||||
|
|
||||||
|
export const getStagedAttachmentsState = (state: StateType): StagedAttachmentsStateType =>
|
||||||
|
state.stagedAttachments;
|
||||||
|
|
||||||
|
const getStagedAttachmentsForConversation = (
|
||||||
|
state: StagedAttachmentsStateType,
|
||||||
|
conversationKey: string | undefined
|
||||||
|
) => {
|
||||||
|
if (!conversationKey) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
return state.stagedAttachments[conversationKey] || [];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getStagedAttachmentsForCurrentConversation = createSelector(
|
||||||
|
[getSelectedConversationKey, getStagedAttachmentsState],
|
||||||
|
(
|
||||||
|
selectedConversationKey: string | undefined,
|
||||||
|
state: StagedAttachmentsStateType
|
||||||
|
): Array<StagedAttachmentType> | undefined => {
|
||||||
|
return getStagedAttachmentsForConversation(state, selectedConversationKey);
|
||||||
|
}
|
||||||
|
);
|
||||||
Loading…
Reference in New Issue