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

Reflect changes in dist code

Browse source
This commit is contained in:
Oleg Silkin 2020-01-09 21:29:54 -05:00
parent 1038ff16c8
commit ff9493f334
3 changed files with 145 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
dist/bundle.es.js vendored
View file

@ -134,6 +134,15 @@ const COMMENT_LIST_FAILED = 'COMMENT_LIST_FAILED';
const COMMENT_CREATE_STARTED = 'COMMENT_CREATE_STARTED';
const COMMENT_CREATE_COMPLETED = 'COMMENT_CREATE_COMPLETED';
const COMMENT_CREATE_FAILED = 'COMMENT_CREATE_FAILED';
const COMMENT_ABANDON_STARTED = 'COMMENT_ABANDON_STARTED';
const COMMENT_ABANDON_COMPLETED = 'COMMENT_ABANDON_COMPLETED';
const COMMENT_ABANDON_FAILED = 'COMMENT_ABANDON_FAILED';
const COMMENT_EDIT_STARTED = 'COMMENT_EDIT_STARTED';
const COMMENT_EDIT_COMPLETED = 'COMMENT_EDIT_COMPLETED';
const COMMENT_EDIT_FAILED = 'COMMENT_EDIT_FAILED';
const COMMENT_HIDE_STARTED = 'COMMENT_HIDE_STARTED';
const COMMENT_HIDE_COMPLETED = 'COMMENT_HIDE_COMPLETED';
const COMMENT_HIDE_FAILED = 'COMMENT_HIDE_FAILED';
// Files
const FILE_LIST_STARTED = 'FILE_LIST_STARTED';
@ -380,12 +389,12 @@ var action_types = /*#__PURE__*/Object.freeze({
COMMENT_ABANDON_STARTED: COMMENT_ABANDON_STARTED,
COMMENT_ABANDON_COMPLETED: COMMENT_ABANDON_COMPLETED,
COMMENT_ABANDON_FAILED: COMMENT_ABANDON_FAILED,
COMMENT_HIDE_STARTED: COMMENT_HIDE_STARTED,
COMMENT_HIDE_COMPLETED: COMMENT_HIDE_COMPLETED,
COMMENT_HIDE_FAILED: COMMENT_HIDE_FAILED,
COMMENT_EDIT_STARTED: COMMENT_EDIT_STARTED,
COMMENT_EDIT_COMPLETED: COMMENT_EDIT_COMPLETED,
COMMENT_EDIT_FAILED: COMMENT_EDIT_FAILED,
COMMENT_HIDE_STARTED: COMMENT_HIDE_STARTED,
COMMENT_HIDE_COMPLETED: COMMENT_HIDE_COMPLETED,
COMMENT_HIDE_FAILED: COMMENT_HIDE_FAILED,
FILE_LIST_STARTED: FILE_LIST_STARTED,
FILE_LIST_SUCCEEDED: FILE_LIST_SUCCEEDED,
FETCH_FILE_INFO_STARTED: FETCH_FILE_INFO_STARTED,
@ -925,6 +934,11 @@ const Lbry = {
// Comments
comment_list: (params = {}) => daemonCallWithResult('comment_list', params),
comment_create: (params = {}) => daemonCallWithResult('comment_create', params),
// todo: implement these in reducers
comment_hide: (params = {}) => daemonCallWithResult('comment_hide', params),
comment_abandon: (params = {}) => daemonCallWithResult('comment_abandon', params),
comment_edit: (params = {}) => daemonCallWithResult('comment_hide', params),
// Connect to the sdk
connect: () => {
if (Lbry.connectPromise === null) {
@ -1232,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."));
}
@ -4104,9 +4130,10 @@ function doCommentCreate(comment = '', claim_id = '', channel, parent_id) {
const namedChannelClaim = myChannels && myChannels.find(myChannel => myChannel.name === channel);
const channel_id = namedChannelClaim ? namedChannelClaim.claim_id : null;
return lbryProxy.comment_create({
comment,
claim_id,
channel_id
comment: comment,
claim_id: claim_id,
channel_id: channel_id,
parent_id: parent_id
}).then(result => {
dispatch({
type: COMMENT_CREATE_COMPLETED,
@ -4542,9 +4569,11 @@ const handleActions = (actionMap, defaultState) => (state = defaultState, action
var _extends$7 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
const defaultState$1 = {
byId: {},
commentsByUri: {},
isLoading: false
commentById: {}, // commentId -> Comment
byId: {}, // ClaimID -> list of comments
commentsByUri: {}, // URI -> claimId
isLoading: false,
myComments: undefined
};
const commentReducer = handleActions({
@ -4558,15 +4587,22 @@ const commentReducer = handleActions({
[COMMENT_CREATE_COMPLETED]: (state, action) => {
const { comment, claimId } = action.data;
const commentById = Object.assign({}, state.commentById);
const byId = Object.assign({}, state.byId);
const comments = byId[claimId];
const newComments = comments.slice();
const newCommentIds = comments.slice();
newComments.unshift(comment);
byId[claimId] = newComments;
// add the comment by its ID
commentById[comment.comment_id] = comment;
// push the comment_id to the top of ID list
newCommentIds.unshift(comment.comment_id);
byId[claimId] = newCommentIds;
return _extends$7({}, state, {
byId
commentById,
byId,
isLoading: false
});
},
@ -4574,15 +4610,25 @@ const commentReducer = handleActions({
[COMMENT_LIST_COMPLETED]: (state, action) => {
const { comments, claimId, uri } = action.data;
const commentById = Object.assign({}, state.commentById);
const byId = Object.assign({}, state.byId);
const commentsByUri = Object.assign({}, state.commentsByUri);
if (comments) {
byId[claimId] = comments;
const commentIds = Array(comments.length);
// map the comment_ids to the new comments
for (let i = 0; i < comments.length; i++) {
commentIds[i] = comments[i].comment_id;
commentById[commentIds[i]] = comments[i];
}
byId[claimId] = commentIds;
commentsByUri[uri] = claimId;
}
return _extends$7({}, state, {
byId,
commentById,
commentsByUri,
isLoading: false
});
@ -4590,6 +4636,33 @@ const commentReducer = handleActions({
[COMMENT_LIST_FAILED]: (state, action) => _extends$7({}, state, {
isLoading: false
}),
[COMMENT_ABANDON_STARTED]: (state, action) => _extends$7({}, state, {
isLoading: true
}),
[COMMENT_ABANDON_COMPLETED]: (state, action) => _extends$7({}, state, {
isLoading: false
}),
[COMMENT_ABANDON_FAILED]: (state, action) => _extends$7({}, state, {
isLoading: false
}),
[COMMENT_EDIT_STARTED]: (state, action) => _extends$7({}, state, {
isLoading: true
}),
[COMMENT_EDIT_COMPLETED]: (state, action) => _extends$7({}, state, {
isLoading: false
}),
[COMMENT_EDIT_FAILED]: (state, action) => _extends$7({}, state, {
isLoading: false
}),
[COMMENT_HIDE_STARTED]: (state, action) => _extends$7({}, state, {
isLoading: true
}),
[COMMENT_HIDE_COMPLETED]: (state, action) => _extends$7({}, state, {
isLoading: false
}),
[COMMENT_HIDE_FAILED]: (state, action) => _extends$7({}, state, {
isLoading: false
})
}, defaultState$1);
@ -5470,8 +5543,32 @@ const selectError = reselect.createSelector(selectState$7, state => {
const selectState$8 = state => state.comments || {};
const selectCommentsById = reselect.createSelector(selectState$8, state => state.byId || {});
const selectCommentsById = reselect.createSelector(selectState$8, state => state.commentById || {});
const selectCommentsByClaimId = reselect.createSelector(selectState$8, selectCommentsById, (state, byId) => {
const byClaimId = state.byId || {};
const comments = {};
// for every claimId -> commentId, put comments in the 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]];
}
});
return comments;
});
// previously this used a mapping from claimId -> Array<Comments>
/* export const selectCommentsById = createSelector(
selectState,
state => state.byId || {}
); */
const selectCommentsByUri = reselect.createSelector(selectState$8, state => {
const byUri = state.commentsByUri || {};
const comments = {};
@ -5483,12 +5580,13 @@ const selectCommentsByUri = reselect.createSelector(selectState$8, state => {
comments[uri] = claimId;
}
});
return comments;
});
const makeSelectCommentsForUri = uri => reselect.createSelector(selectCommentsById, selectCommentsByUri, (byId, byUri) => {
const makeSelectCommentsForUri = uri => reselect.createSelector(selectCommentsByClaimId, selectCommentsByUri, (byClaimId, byUri) => {
const claimId = byUri[uri];
return byId && byId[claimId];
return byClaimId && byClaimId[claimId];
});
//

32
dist/flow-typed/Comment.js vendored
View file

@ -1,19 +1,23 @@
declare type Comment = {
author?: string,
author_url?: string,
claim_index?: number,
comment_id?: number,
downvotes?: number,
message: string,
omitted?: number,
reply_count?: number,
time_posted?: number,
upvotes?: number,
parent_id?: number,
comment: string, // comment body
comment_id: string, // sha256 digest
claim_id: string, // id linking to the claim this comment
timestamp: number, // integer representing unix-time
is_hidden: boolean, // claim owner may enable/disable this
channel_id?: string, // claimId of channel signing this comment
channel_name?: string, // name of channel claim
channel_url?: string, // full lbry url to signing channel
signature?: string, // signature of comment by originating channel
signing_ts?: string, // timestamp used when signing this comment
is_channel_signature_valid?: boolean, // whether or not the signature could be validated
parent_id?: number, // comment_id of comment this is in reply to
};
// todo: relate individual comments to their commentId
declare type CommentsState = {
byId: {},
isLoading: boolean,
commentsByUri: { [string]: string },
}
byId: { [string]: Array<string> },
commentById: { [string]: Comment },
isLoading: boolean,
myComments: ?Set<string>,
};

12
dist/flow-typed/Lbry.js vendored
View file

@ -125,6 +125,8 @@ declare type ChannelUpdateResponse = GenericTxResponse & {
};
declare type CommentCreateResponse = Comment;
declare type CommentEditResponse = Comment;
declare type CommentListResponse = {
items: Array<Comment>,
page: number,
@ -133,6 +135,16 @@ declare type CommentListResponse = {
total_pages: number,
};
declare type CommentHideResponse = {
// keyed by the CommentIds entered
[string]: { hidden: boolean },
};
declare type CommentAbandonResponse = {
// keyed by the CommentId given
[string]: { abandoned: boolean },
};
declare type ChannelListResponse = {
items: Array<ChannelClaim>,
page: number,