LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

Cleanup

Browse source
This commit is contained in:
Oleg Silkin 2020-01-19 21:27:36 -05:00
parent c30a8ec66c
commit fd0d097c91
4 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dist/bundle.es.js vendored
View file

@ -1246,6 +1246,18 @@ function buildURI(UrlObj, includeProto = true, protoDefault = 'lbry://') {
deprecatedParts = _objectWithoutProperties(UrlObj, ['streamName', 'streamClaimId', 'channelName', 'channelClaimId', 'primaryClaimSequence', 'primaryBidPosition', 'secondaryClaimSequence', 'secondaryBidPosition']);
const { claimId, claimName, contentName } = deprecatedParts;
{
if (claimId) {
console.error(__("'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead"));
}
if (claimName) {
console.error(__("'claimName' should no longer be used. Use 'streamClaimName' or 'channelClaimName' instead"));
}
if (contentName) {
console.error(__("'contentName' should no longer be used. Use 'streamName' instead"));
}
}
if (!claimName && !channelName && !streamName) {
console.error(__("'claimName', 'channelName', and 'streamName' are all empty. One must be present to build a url."));
}
@ -4166,7 +4178,7 @@ function doCommentHide(comment_id) {
data: error
});
dispatch(doToast({
message: `SDK Errored when trying to hide Comment with comment_id: "${comment_id}"`,
message: 'There was an error hiding this comment. Please try again later.',
isError: true
}));
});
@ -4194,7 +4206,7 @@ function doCommentAbandon(comment_id) {
data: error
});
dispatch(doToast({
message: `SDK Errored during abandon on Comment w/ ID = "${comment_id}"`,
message: 'There was an error hiding this comment. Please try again later.',
isError: true
}));
});
@ -4223,7 +4235,7 @@ function doCommentUpdate(comment_id, comment) {
}).catch(error => {
dispatch({ type: COMMENT_UPDATE_FAILED, data: error });
dispatch(doToast({
message: `SDK Errored during update on Comment w/ ID = ${comment_id}`,
message: 'There was an error hiding this comment. Please try again later.',
isError: true
}));
});
@ -4732,11 +4744,7 @@ const commentReducer = handleActions({
const commentIds = byId[comment.claim_id];
byId[comment.claim_id] = commentIds.filter(commentId => commentId !== comment_id);
Object.keys(commentById).forEach(commentId => {
if (commentId === comment_id) {
delete commentById[commentId];
}
});
delete commentById[comment_id];
}
return _extends$7({}, state, {
commentById,
@ -5668,12 +5676,10 @@ const selectCommentsByClaimId = reselect.createSelector(selectState$8, selectCom
const byClaimId = state.byId || {};
const comments = {};
// for every claimId -> commentId, put comments in the object
// replace every comment_id in the list with the actual comment object
Object.keys(byClaimId).forEach(claimId => {
// get all the commentIds that commented on this ClaimId
const commentIds = byClaimId[claimId];
// map a new array of comments by the claimId
comments[claimId] = Array(commentIds === null ? 0 : commentIds.length);
for (let i = 0; i < commentIds.length; i++) {
comments[claimId][i] = byId[commentIds[i]];
@ -5708,6 +5714,9 @@ const makeSelectCommentsForUri = uri => reselect.createSelector(selectCommentsBy
return byClaimId && byClaimId[claimId];
});
// todo: allow SDK to retrieve user comments through comment_list
// todo: implement selectors for selecting comments owned by user
//
const selectState$9 = state => state.tags || {};

6
src/redux/actions/comments.js
View file

@ -105,7 +105,7 @@ export function doCommentHide(comment_id: string) {
});
dispatch(
doToast({
message: `SDK Errored when trying to hide Comment with comment_id: "${comment_id}"`,
message: 'There was an error hiding this comment. Please try again later.',
isError: true,
})
);
@ -137,7 +137,7 @@ export function doCommentAbandon(comment_id: string) {
});
dispatch(
doToast({
message: `SDK Errored during abandon on Comment w/ ID = "${comment_id}"`,
message: 'There was an error hiding this comment. Please try again later.',
isError: true,
})
);
@ -170,7 +170,7 @@ export function doCommentUpdate(comment_id: string, comment: string) {
dispatch({ type: ACTIONS.COMMENT_UPDATE_FAILED, data: error });
dispatch(
doToast({
message: `SDK Errored during update on Comment w/ ID = ${comment_id}`,
message: 'There was an error hiding this comment. Please try again later.',
isError: true,
})
);

6
src/redux/reducers/comments.js
View file

@ -97,11 +97,7 @@ export const commentReducer = handleActions(
const commentIds = byId[comment.claim_id];
byId[comment.claim_id] = commentIds.filter(commentId => commentId !== comment_id);
Object.keys(commentById).forEach(commentId => {
if (commentId === comment_id) {
delete commentById[commentId];
}
});
delete commentById[comment_id];
}
return {
...state,

4
src/redux/selectors/comments.js
View file

@ -15,12 +15,10 @@ export const selectCommentsByClaimId = createSelector(
const byClaimId = state.byId || {};
const comments = {};
// for every claimId -> commentId, put comments in the object
// replace every comment_id in the list with the actual comment object
Object.keys(byClaimId).forEach(claimId => {
// get all the commentIds that commented on this ClaimId
const commentIds = byClaimId[claimId];
// map a new array of comments by the claimId
comments[claimId] = Array(commentIds === null ? 0 : commentIds.length);
for (let i = 0; i < commentIds.length; i++) {
comments[claimId][i] = byId[commentIds[i]];