1075: Fetch list of my channels that have commented on a claim

This commit is contained in:
infinite-persistence 2022-04-28 15:08:26 +08:00 committed by Thomas Zarebczan
parent d9b1cf6d54
commit 29a68eb992
7 changed files with 112 additions and 1 deletions

View file

@ -81,6 +81,7 @@ declare type CommentsState = {
settingsByChannelId: { [string]: PerChannelSettings }, // ChannelID -> settings settingsByChannelId: { [string]: PerChannelSettings }, // ChannelID -> settings
fetchingSettings: boolean, fetchingSettings: boolean,
fetchingBlockedWords: boolean, fetchingBlockedWords: boolean,
myCommentedChannelIdsById: { [string]: Array<string> }, // [content-claim-id] -> array of own channels IDs that have commented before.
}; };
// Authorization parameters for calls requiring user authentication // Authorization parameters for calls requiring user authentication

View file

@ -4,6 +4,7 @@ import {
selectClaimIsMine, selectClaimIsMine,
selectFetchingMyChannels, selectFetchingMyChannels,
selectClaimsByUri, selectClaimsByUri,
selectMyChannelClaimIds,
} from 'redux/selectors/claims'; } from 'redux/selectors/claims';
import { import {
selectTopLevelCommentsForUri, selectTopLevelCommentsForUri,
@ -17,8 +18,15 @@ import {
selectCommentIdsForUri, selectCommentIdsForUri,
selectSettingsByChannelId, selectSettingsByChannelId,
selectPinnedCommentsForUri, selectPinnedCommentsForUri,
selectMyCommentedChannelIdsForId,
} from 'redux/selectors/comments'; } from 'redux/selectors/comments';
import { doCommentReset, doCommentList, doCommentById, doCommentReactList } from 'redux/actions/comments'; import {
doCommentReset,
doCommentList,
doCommentById,
doCommentReactList,
doFetchMyCommentedChannels,
} from 'redux/actions/comments';
import { selectActiveChannelClaim } from 'redux/selectors/app'; import { selectActiveChannelClaim } from 'redux/selectors/app';
import { getChannelIdFromClaim } from 'util/claim'; import { getChannelIdFromClaim } from 'util/claim';
import { doFetchUserMemberships } from 'redux/actions/user'; import { doFetchUserMemberships } from 'redux/actions/user';
@ -48,6 +56,8 @@ const select = (state, props) => {
othersReactsById: selectOthersReacts(state), othersReactsById: selectOthersReacts(state),
activeChannelId: activeChannelClaim && activeChannelClaim.claim_id, activeChannelId: activeChannelClaim && activeChannelClaim.claim_id,
claimsByUri: selectClaimsByUri(state), claimsByUri: selectClaimsByUri(state),
myChannelClaimIds: selectMyChannelClaimIds(state),
myCommentedChannelIds: selectMyCommentedChannelIdsForId(state, claim?.claim_id),
}; };
}; };
@ -57,6 +67,7 @@ const perform = {
fetchReacts: doCommentReactList, fetchReacts: doCommentReactList,
resetComments: doCommentReset, resetComments: doCommentReset,
doFetchUserMemberships, doFetchUserMemberships,
doFetchMyCommentedChannels,
}; };
export default connect(select, perform)(CommentsList); export default connect(select, perform)(CommentsList);

View file

@ -52,7 +52,10 @@ type Props = {
fetchReacts: (commentIds: Array<string>) => Promise<any>, fetchReacts: (commentIds: Array<string>) => Promise<any>,
resetComments: (claimId: string) => void, resetComments: (claimId: string) => void,
claimsByUri: { [string]: any }, claimsByUri: { [string]: any },
myChannelClaimIds: ?Array<string>,
myCommentedChannelIds: ?Array<string>,
doFetchUserMemberships: (claimIdCsv: string) => void, doFetchUserMemberships: (claimIdCsv: string) => void,
doFetchMyCommentedChannels: (claimId: ?string) => void,
}; };
export default function CommentList(props: Props) { export default function CommentList(props: Props) {
@ -80,7 +83,10 @@ export default function CommentList(props: Props) {
fetchReacts, fetchReacts,
resetComments, resetComments,
claimsByUri, claimsByUri,
myChannelClaimIds,
myCommentedChannelIds,
doFetchUserMemberships, doFetchUserMemberships,
doFetchMyCommentedChannels,
} = props; } = props;
const isMobile = useIsMobile(); const isMobile = useIsMobile();
@ -262,6 +268,13 @@ export default function CommentList(props: Props) {
topLevelTotalPages, topLevelTotalPages,
]); ]);
// Determine my channels that have commented
useEffect(() => {
if (myCommentedChannelIds === undefined && claimId && myChannelClaimIds) {
doFetchMyCommentedChannels(claimId);
}
}, [claimId, myCommentedChannelIds, myChannelClaimIds]);
const commentProps = { isTopLevel: true, threadDepth: 3, uri, claimIsMine, linkedCommentId }; const commentProps = { isTopLevel: true, threadDepth: 3, uri, claimIsMine, linkedCommentId };
const actionButtonsProps = { const actionButtonsProps = {
totalComments, totalComments,

View file

@ -432,6 +432,7 @@ export const COMMENT_RECEIVED = 'COMMENT_RECEIVED';
export const COMMENT_SUPER_CHAT_LIST_STARTED = 'COMMENT_SUPER_CHAT_LIST_STARTED'; export const COMMENT_SUPER_CHAT_LIST_STARTED = 'COMMENT_SUPER_CHAT_LIST_STARTED';
export const COMMENT_SUPER_CHAT_LIST_COMPLETED = 'COMMENT_SUPER_CHAT_LIST_COMPLETED'; export const COMMENT_SUPER_CHAT_LIST_COMPLETED = 'COMMENT_SUPER_CHAT_LIST_COMPLETED';
export const COMMENT_SUPER_CHAT_LIST_FAILED = 'COMMENT_SUPER_CHAT_LIST_FAILED'; export const COMMENT_SUPER_CHAT_LIST_FAILED = 'COMMENT_SUPER_CHAT_LIST_FAILED';
export const COMMENT_FETCH_MY_COMMENTED_CHANNELS_COMPLETE = 'COMMENT_FETCH_MY_COMMENTED_CHANNELS_COMPLETE';
// Blocked channels // Blocked channels
export const TOGGLE_BLOCK_CHANNEL = 'TOGGLE_BLOCK_CHANNEL'; export const TOGGLE_BLOCK_CHANNEL = 'TOGGLE_BLOCK_CHANNEL';

View file

@ -251,6 +251,56 @@ export function doCommentById(commentId: string, toastIfNotFound: boolean = true
}; };
} }
export function doFetchMyCommentedChannels(claimId: ?string) {
return (dispatch: Dispatch, getState: GetState) => {
const state = getState();
const myChannelClaims = selectMyChannelClaims(state);
const contentClaimId = claimId;
if (!contentClaimId || !myChannelClaims) {
return;
}
return Promise.all(myChannelClaims.map((x) => channelSignName(x.claim_id, x.name))).then((signatures) => {
const params = [];
const commentedChannelIds = [];
signatures.forEach((signature, i) => {
if (signature !== undefined && signature !== null) {
params.push({
page: 1,
page_size: 1,
claim_id: contentClaimId,
author_claim_id: myChannelClaims[i].claim_id,
requestor_channel_name: myChannelClaims[i].name,
requestor_channel_id: myChannelClaims[i].claim_id,
signature: signature.signature,
signing_ts: signature.signing_ts,
});
}
});
// $FlowFixMe
return Promise.allSettled(params.map((p) => Comments.comment_list(p)))
.then((response) => {
response.forEach((res, i) => {
if (res.status === 'fulfilled' && res.value.total_items > 0) {
commentedChannelIds.push(params[i].author_claim_id);
}
});
dispatch({
type: ACTIONS.COMMENT_FETCH_MY_COMMENTED_CHANNELS_COMPLETE,
data: { contentClaimId, commentedChannelIds },
});
})
.catch((err) => {
console.log({ err });
});
});
};
}
export function doCommentReset(claimId: string) { export function doCommentReset(claimId: string) {
return (dispatch: Dispatch) => { return (dispatch: Dispatch) => {
if (!claimId) { if (!claimId) {

View file

@ -49,6 +49,7 @@ const defaultState: CommentsState = {
settingsByChannelId: {}, settingsByChannelId: {},
fetchingSettings: false, fetchingSettings: false,
fetchingBlockedWords: false, fetchingBlockedWords: false,
myCommentedChannelIdsById: {},
}; };
// **************************************************************************** // ****************************************************************************
@ -146,6 +147,16 @@ export default handleActions(
} }
} }
let myCommentedChannelIdsById;
const commentedChannelIds = (state.myCommentedChannelIdsById[claimId] || []).slice();
if (!commentedChannelIds.includes(comment.channel_id)) {
commentedChannelIds.push(comment.channel_id);
myCommentedChannelIdsById = {
...state.myCommentedChannelIdsById,
[claimId]: commentedChannelIds,
};
}
return { return {
...state, ...state,
topLevelCommentsById, topLevelCommentsById,
@ -156,6 +167,7 @@ export default handleActions(
commentsByUri, commentsByUri,
isLoading: false, isLoading: false,
isCommenting: false, isCommenting: false,
myCommentedChannelIdsById: myCommentedChannelIdsById || state.myCommentedChannelIdsById,
}; };
}, },
@ -415,6 +427,18 @@ export default handleActions(
}; };
}, },
[ACTIONS.COMMENT_FETCH_MY_COMMENTED_CHANNELS_COMPLETE]: (state: CommentsState, action: any) => {
const { contentClaimId, commentedChannelIds } = action.data;
return {
...state,
myCommentedChannelIdsById: {
...state.myCommentedChannelIdsById,
[contentClaimId]: commentedChannelIds,
},
};
},
[ACTIONS.COMMENT_SUPER_CHAT_LIST_FAILED]: (state: CommentsState, action: any) => ({ [ACTIONS.COMMENT_SUPER_CHAT_LIST_FAILED]: (state: CommentsState, action: any) => ({
...state, ...state,
isLoading: false, isLoading: false,

View file

@ -472,3 +472,14 @@ export const selectChannelMentionData = createCachedSelector(
}; };
} }
)((state, uri, maxCount) => `${String(uri)}:${maxCount}`); )((state, uri, maxCount) => `${String(uri)}:${maxCount}`);
/**
* Returns the list of your channel IDs that have commented on the given claim.
*
* @param state
* @param claimId
* @returns {null | undefined | Array<string>} 'undefined' = "not fetched"; 'null' = "no claim";
*/
export const selectMyCommentedChannelIdsForId = (state: State, claimId: string) => {
return claimId ? selectState(state).myCommentedChannelIdsById[claimId] : null;
};