LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Revert "Reactions: consider failures as "fetched""

Browse source 
This reverts commit 84a2a74c8c.
This commit is contained in:
infinite-persistence 2021-07-18 10:54:01 +08:00
parent 0bf03c4a35
commit abe32e5f5c
No known key found for this signature in database
GPG key ID: B9C3252EDC3D0AA0
2 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ui/redux/actions/comments.js
View file

@ -221,13 +221,6 @@ export function doCommentReactList(commentIds: Array<string>) {
if (activeChannelClaim) { if (activeChannelClaim) {
const signatureData = await channelSignName(activeChannelClaim.claim_id, activeChannelClaim.name); const signatureData = await channelSignName(activeChannelClaim.claim_id, activeChannelClaim.name);
if (!signatureData) { if (!signatureData) {
dispatch({
type: ACTIONS.COMMENT_REACTION_LIST_FAILED,
data: {
channelId: activeChannelClaim ? activeChannelClaim.claim_id : undefined,
commentIds,
},
});
return dispatch(doToast({ isError: true, message: __('Unable to verify your channel. Please try again.') })); return dispatch(doToast({ isError: true, message: __('Unable to verify your channel. Please try again.') }));
} }
@ -243,10 +236,9 @@ export function doCommentReactList(commentIds: Array<string>) {
dispatch({ dispatch({
type: ACTIONS.COMMENT_REACTION_LIST_COMPLETED, type: ACTIONS.COMMENT_REACTION_LIST_COMPLETED,
data: { data: {
myReactions, myReactions: myReactions || {},
othersReactions, othersReactions,
channelId: activeChannelClaim ? activeChannelClaim.claim_id : undefined, channelId: activeChannelClaim ? activeChannelClaim.claim_id : undefined,
commentIds,
}, },
}); });
}) })
@ -254,10 +246,7 @@ export function doCommentReactList(commentIds: Array<string>) {
devToast(dispatch, `doCommentReactList: ${error.message}`); devToast(dispatch, `doCommentReactList: ${error.message}`);
dispatch({ dispatch({
type: ACTIONS.COMMENT_REACTION_LIST_FAILED, type: ACTIONS.COMMENT_REACTION_LIST_FAILED,
data: { data: error,
channelId: activeChannelClaim ? activeChannelClaim.claim_id : undefined,
commentIds,
},
}); });
}); });
}; };

38
ui/redux/reducers/comments.js
View file

@ -143,24 +143,10 @@ export default handleActions(
isFetchingReacts: true, isFetchingReacts: true,
}), }),
[ACTIONS.COMMENT_REACTION_LIST_FAILED]: (state: CommentsState, action: any) => { [ACTIONS.COMMENT_REACTION_LIST_FAILED]: (state: CommentsState, action: any) => ({
const { channelId, commentIds } = action.data;
const myReactsByCommentId = Object.assign({}, state.myReactsByCommentId);
const othersReactsByCommentId = Object.assign({}, state.othersReactsByCommentId);
commentIds.forEach((commentId) => {
const key = channelId ? `${commentId}:${channelId}` : commentId;
myReactsByCommentId[key] = [];
othersReactsByCommentId[key] = {};
});
return {
...state, ...state,
isFetchingReacts: false, isFetchingReacts: false,
myReactsByCommentId, }),
othersReactsByCommentId,
};
},
[ACTIONS.COMMENT_REACT_FAILED]: (state: CommentsState, action: any): CommentsState => { [ACTIONS.COMMENT_REACT_FAILED]: (state: CommentsState, action: any): CommentsState => {
const commentReaction = action.data; // String: reactionHash + type const commentReaction = action.data; // String: reactionHash + type
@ -196,24 +182,28 @@ export default handleActions(
}, },
[ACTIONS.COMMENT_REACTION_LIST_COMPLETED]: (state: CommentsState, action: any): CommentsState => { [ACTIONS.COMMENT_REACTION_LIST_COMPLETED]: (state: CommentsState, action: any): CommentsState => {
const { myReactions, othersReactions, channelId, commentIds } = action.data; const { myReactions, othersReactions, channelId } = action.data;
const myReacts = Object.assign({}, state.myReactsByCommentId); const myReacts = Object.assign({}, state.myReactsByCommentId);
const othersReacts = Object.assign({}, state.othersReactsByCommentId); const othersReacts = Object.assign({}, state.othersReactsByCommentId);
commentIds.forEach((commentId) => { if (myReactions) {
Object.entries(myReactions).forEach(([commentId, reactions]) => {
const key = channelId ? `${commentId}:${channelId}` : commentId; const key = channelId ? `${commentId}:${channelId}` : commentId;
const mine = myReactions ? myReactions[commentId] : {}; myReacts[key] = Object.entries(reactions).reduce((acc, [name, count]) => {
const others = othersReactions ? othersReactions[commentId] : {};
myReacts[key] = Object.entries(mine).reduce((acc, [name, count]) => {
if (count === 1) { if (count === 1) {
acc.push(name); acc.push(name);
} }
return acc; return acc;
}, []); }, []);
othersReacts[key] = others;
}); });
}
if (othersReactions) {
Object.entries(othersReactions).forEach(([commentId, reactions]) => {
const key = channelId ? `${commentId}:${channelId}` : commentId;
othersReacts[key] = reactions;
});
}
return { return {
...state, ...state,