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

Fix timestamp if channel has the same name as URL (#263)

Browse source 
Fix timestamp if channel has the same name as URL
This commit is contained in:
Sean Yesmunt 2020-01-21 12:16:15 -05:00 • committed by GitHub
commit 24c6dc1177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dist/bundle.es.js vendored
View file

@ -3748,6 +3748,8 @@ const doPublish = (success, fail) => (dispatch, getState) => {
tags, tags,
locations locations
} = publishData; } = publishData;
// Handle scenario where we have a claim that has the same name as a channel we are publishing with.
const myClaimForUriEditing = myClaimForUri.name === name ? myClaimForUri : null;
let publishingLicense; let publishingLicense;
switch (licenseType) { switch (licenseType) {
@ -3791,10 +3793,10 @@ const doPublish = (success, fail) => (dispatch, getState) => {
} }
// Set release time to curret date. On edits, keep original release/transaction time as release_time // Set release time to curret date. On edits, keep original release/transaction time as release_time
if (myClaimForUri && myClaimForUri.value.release_time) { if (myClaimForUriEditing && myClaimForUriEditing.value.release_time) {
publishPayload.release_time = Number(myClaimForUri.value.release_time); publishPayload.release_time = Number(myClaimForUri.value.release_time);
} else if (myClaimForUri && myClaimForUri.timestamp) { } else if (myClaimForUriEditing && myClaimForUriEditing.timestamp) {
publishPayload.release_time = Number(myClaimForUri.timestamp); publishPayload.release_time = Number(myClaimForUriEditing.timestamp);
} else { } else {
publishPayload.release_time = Number(Math.round(Date.now() / 1000)); publishPayload.release_time = Number(Math.round(Date.now() / 1000));
} }
@ -3803,8 +3805,8 @@ const doPublish = (success, fail) => (dispatch, getState) => {
publishPayload.channel_id = channelId; publishPayload.channel_id = channelId;
} }
if (myClaimForUri && myClaimForUri.value && myClaimForUri.value.locations) { if (myClaimForUriEditing && myClaimForUriEditing.value && myClaimForUriEditing.value.locations) {
publishPayload.locations = myClaimForUri.value.locations; publishPayload.locations = myClaimForUriEditing.value.locations;
} }
if (!contentIsFree && fee && fee.currency && Number(fee.amount) > 0) { if (!contentIsFree && fee && fee.currency && Number(fee.amount) > 0) {

12
src/redux/actions/publish.js
View file

@ -265,6 +265,8 @@ export const doPublish = (success: Function, fail: Function) => (
tags, tags,
locations, locations,
} = publishData; } = publishData;
// Handle scenario where we have a claim that has the same name as a channel we are publishing with.
const myClaimForUriEditing = myClaimForUri.name === name ? myClaimForUri : null;
let publishingLicense; let publishingLicense;
switch (licenseType) { switch (licenseType) {
@ -327,10 +329,10 @@ export const doPublish = (success: Function, fail: Function) => (
} }
// Set release time to curret date. On edits, keep original release/transaction time as release_time // Set release time to curret date. On edits, keep original release/transaction time as release_time
if (myClaimForUri && myClaimForUri.value.release_time) { if (myClaimForUriEditing && myClaimForUriEditing.value.release_time) {
publishPayload.release_time = Number(myClaimForUri.value.release_time); publishPayload.release_time = Number(myClaimForUri.value.release_time);
} else if (myClaimForUri && myClaimForUri.timestamp) { } else if (myClaimForUriEditing && myClaimForUriEditing.timestamp) {
publishPayload.release_time = Number(myClaimForUri.timestamp); publishPayload.release_time = Number(myClaimForUriEditing.timestamp);
} else { } else {
publishPayload.release_time = Number(Math.round(Date.now() / 1000)); publishPayload.release_time = Number(Math.round(Date.now() / 1000));
} }
@ -339,8 +341,8 @@ export const doPublish = (success: Function, fail: Function) => (
publishPayload.channel_id = channelId; publishPayload.channel_id = channelId;
} }
if (myClaimForUri && myClaimForUri.value && myClaimForUri.value.locations) { if (myClaimForUriEditing && myClaimForUriEditing.value && myClaimForUriEditing.value.locations) {
publishPayload.locations = myClaimForUri.value.locations; publishPayload.locations = myClaimForUriEditing.value.locations;
} }
if (!contentIsFree && fee && (fee.currency && Number(fee.amount) > 0)) { if (!contentIsFree && fee && (fee.currency && Number(fee.amount) > 0)) {