- {(showMetadataInputs || isUpdate) && (
+ {(showMetadataInputs || isUpdate) && (
+ { (this.props.license === 'Creative Commons') && (
+
+ )}
diff --git a/client/src/pages/EditPage/view.jsx b/client/src/pages/EditPage/view.jsx
index 60b07900..eab64176 100644
--- a/client/src/pages/EditPage/view.jsx
+++ b/client/src/pages/EditPage/view.jsx
@@ -9,7 +9,7 @@ class EditPage extends React.Component {
onHandleShowPageUri(match.params);
setUpdateTrue();
if (asset) {
- ['title', 'description', 'license', 'nsfw'].forEach(meta => updateMetadata(meta, asset.claimData[meta]));
+ ['title', 'description', 'license', 'licenseUrl', 'nsfw'].forEach(meta => updateMetadata(meta, asset.claimData[meta]));
}
setHasChanged(false);
}
diff --git a/client/src/reducers/publish.js b/client/src/reducers/publish.js
index 25171405..58a37aa4 100644
--- a/client/src/reducers/publish.js
+++ b/client/src/reducers/publish.js
@@ -19,40 +19,42 @@ if (siteConfig) {
// create initial state
const initialState = {
- disabled : disabledConfig,
- disabledMessage : disabledMessageConfig,
- publishInChannel : false,
- selectedChannel : LOGIN,
+ disabled: disabledConfig,
+ disabledMessage: disabledMessageConfig,
+ publishInChannel: false,
+ selectedChannel: LOGIN,
showMetadataInputs: false,
- status : {
- status : null,
+ status: {
+ status: null,
message: null,
},
error: {
- file : null,
- url : null,
+ file: null,
+ url: null,
channel: null,
},
- file : null,
- claim : '',
+ file: null,
+ claim: '',
metadata: {
- title : '',
+ title: '',
description: '',
- license : '',
- nsfw : false,
+ license: '',
+ licenseUrl: '',
+ nsfw: false,
},
- isUpdate : false,
+ isUpdate: false,
hasChanged: false,
- thumbnail : null,
+ thumbnail: null,
thumbnailChannel,
thumbnailChannelId,
};
-export default function (state = initialState, action) {
+export default function(state = initialState, action) {
switch (action.type) {
case actions.FILE_SELECTED:
- return Object.assign({}, state.isUpdate ? state : initialState, { // note: clears to initial state
- file : action.data,
+ return Object.assign({}, state.isUpdate ? state : initialState, {
+ // note: clears to initial state
+ file: action.data,
hasChanged: true,
});
case actions.FILE_CLEAR:
@@ -66,13 +68,13 @@ export default function (state = initialState, action) {
});
case actions.CLAIM_UPDATE:
return Object.assign({}, state, {
- claim : action.data,
+ claim: action.data,
hasChanged: true,
});
case actions.SET_PUBLISH_IN_CHANNEL:
return Object.assign({}, state, {
publishInChannel: action.channel,
- hasChanged : true,
+ hasChanged: true,
});
case actions.PUBLISH_STATUS_UPDATE:
return Object.assign({}, state, {
@@ -96,7 +98,7 @@ export default function (state = initialState, action) {
case actions.THUMBNAIL_NEW:
return {
...state,
- thumbnail : action.data,
+ thumbnail: action.data,
hasChanged: true,
};
case actions.SET_UPDATE_TRUE:
@@ -112,4 +114,4 @@ export default function (state = initialState, action) {
default:
return state;
}
-};
+}
diff --git a/client/src/utils/publish.js b/client/src/utils/publish.js
index 00ac2240..4de574cf 100644
--- a/client/src/utils/publish.js
+++ b/client/src/utils/publish.js
@@ -1,9 +1,16 @@
-export const createPublishMetadata = (claim, { type }, { title, description, license, nsfw }, publishInChannel, selectedChannel) => {
+export const createPublishMetadata = (
+ claim,
+ { type },
+ { title, description, license, licenseUrl, nsfw },
+ publishInChannel,
+ selectedChannel
+) => {
let metadata = {
name: claim,
title,
description,
license,
+ licenseUrl,
nsfw,
type,
};
diff --git a/server/chainquery/models/ClaimModel.js b/server/chainquery/models/ClaimModel.js
index 4fcc1af0..4157ab67 100644
--- a/server/chainquery/models/ClaimModel.js
+++ b/server/chainquery/models/ClaimModel.js
@@ -6,7 +6,7 @@ const {
const getterMethods = {
generated_extension() {
- logger.info('trying to generate extension', this.content_type);
+ logger.debug('trying to generate extension', this.content_type);
if (customFileExtensions.hasOwnProperty(this.content_type)) {
return customFileExtensions[this.content_type];
} else {
@@ -136,6 +136,14 @@ export default (sequelize, { BOOLEAN, DATE, DECIMAL, ENUM, INTEGER, STRING, TEXT
type: STRING,
set() {},
},
+ license: {
+ type: STRING,
+ set() {},
+ },
+ license_url: {
+ type: STRING,
+ set() {},
+ },
},
{
freezeTableName: true,
diff --git a/server/controllers/api/channel/claims/getChannelClaims.js b/server/controllers/api/channel/claims/getChannelClaims.js
index 921c1f2e..8b7eee60 100644
--- a/server/controllers/api/channel/claims/getChannelClaims.js
+++ b/server/controllers/api/channel/claims/getChannelClaims.js
@@ -1,8 +1,10 @@
const chainquery = require('chainquery').default;
+const logger = require('winston');
const getClaimData = require('server/utils/getClaimData');
const { returnPaginatedChannelClaims } = require('./channelPagination.js');
const getChannelClaims = async (channelName, channelLongId, page) => {
+ logger.debug(`getChannelClaims: ${channelName}, ${channelLongId}, ${page}`);
let channelShortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(
channelLongId,
channelName
diff --git a/server/controllers/api/claim/publish/createPublishParams.js b/server/controllers/api/claim/publish/createPublishParams.js
index 364e831a..0a51cba8 100644
--- a/server/controllers/api/claim/publish/createPublishParams.js
+++ b/server/controllers/api/claim/publish/createPublishParams.js
@@ -1,6 +1,17 @@
const logger = require('winston');
const { details, publishing } = require('@config/siteConfig');
-const createPublishParams = (filePath, name, title, description, license, nsfw, thumbnail, channelName, channelClaimId) => {
+const createPublishParams = (
+ filePath,
+ name,
+ title,
+ description,
+ license,
+ licenseUrl,
+ nsfw,
+ thumbnail,
+ channelName,
+ channelClaimId
+) => {
// provide defaults for title
if (title === null || title.trim() === '') {
title = name;
@@ -11,19 +22,24 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
}
// provide default for license
if (license === null || license.trim() === '') {
- license = ''; // default to empty string
+ license = ''; // default to empty string
+ }
+ // provide default for licenseUrl
+ if (licenseUrl === null || licenseUrl.trim() === '') {
+ licenseUrl = ''; // default to empty string
}
// create the basic publish params
const publishParams = {
name,
file_path: filePath,
- bid : publishing.fileClaimBidAmount,
- metadata : {
+ bid: publishing.fileClaimBidAmount,
+ metadata: {
description,
title,
- author : details.title,
+ author: details.title,
language: 'en',
license,
+ licenseUrl,
nsfw,
},
claim_address: publishing.primaryClaimAddress,
diff --git a/server/controllers/api/claim/publish/createThumbnailPublishParams.js b/server/controllers/api/claim/publish/createThumbnailPublishParams.js
index 576ddc73..a848aab5 100644
--- a/server/controllers/api/claim/publish/createThumbnailPublishParams.js
+++ b/server/controllers/api/claim/publish/createThumbnailPublishParams.js
@@ -1,27 +1,28 @@
const logger = require('winston');
const { details, publishing } = require('@config/siteConfig');
-const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, nsfw) => {
+const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, licenseUrl, nsfw) => {
if (!thumbnailFilePath) {
return;
}
logger.debug(`Creating Thumbnail Publish Parameters`);
// create the publish params
return {
- name : `${claimName}-thumb`,
+ name: `${claimName}-thumb`,
file_path: thumbnailFilePath,
- bid : publishing.fileClaimBidAmount,
- metadata : {
- title : `${claimName} thumbnail`,
+ bid: publishing.fileClaimBidAmount,
+ metadata: {
+ title: `${claimName} thumbnail`,
description: `a thumbnail for ${claimName}`,
- author : details.title,
- language : 'en',
+ author: details.title,
+ language: 'en',
license,
+ licenseUrl,
nsfw,
},
claim_address: publishing.primaryClaimAddress,
- channel_name : publishing.thumbnailChannel,
- channel_id : publishing.thumbnailChannelId,
+ channel_name: publishing.thumbnailChannel,
+ channel_id: publishing.thumbnailChannelId,
};
};
diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index b795bde0..f08bf76b 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -1,10 +1,15 @@
const logger = require('winston');
-const { details: { host }, publishing: { disabled, disabledMessage } } = require('@config/siteConfig');
+const {
+ details: { host },
+ publishing: { disabled, disabledMessage },
+} = require('@config/siteConfig');
-const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
+const { sendGATimingEvent } = require('server/utils/googleAnalytics.js');
const isApprovedChannel = require('@globalutils/isApprovedChannel');
-const { publishing: { publishOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+const {
+ publishing: { publishOnlyApproved, approvedChannels },
+} = require('@config/siteConfig');
const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
@@ -55,6 +60,7 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
fileType,
gaStartTime,
license,
+ licenseUrl,
name,
nsfw,
thumbnail,
@@ -69,18 +75,34 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
// validate the body and files of the request
try {
// validateApiPublishRequest(body, files);
- ({name, nsfw, license, title, description, thumbnail} = parsePublishApiRequestBody(body));
- ({fileName, filePath, fileExtension, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType} = parsePublishApiRequestFiles(files));
- ({channelName, channelId, channelPassword} = body);
+ ({
+ name,
+ nsfw,
+ license,
+ licenseUrl,
+ title,
+ description,
+ thumbnail,
+ } = parsePublishApiRequestBody(body));
+ ({
+ fileName,
+ filePath,
+ fileExtension,
+ fileType,
+ thumbnailFileName,
+ thumbnailFilePath,
+ thumbnailFileType,
+ } = parsePublishApiRequestFiles(files));
+ ({ channelName, channelId, channelPassword } = body);
} catch (error) {
- return res.status(400).json({success: false, message: error.message});
+ return res.status(400).json({ success: false, message: error.message });
}
// check channel authorization
authenticateUser(channelName, channelId, channelPassword, user)
.then(({ channelName, channelClaimId }) => {
if (publishOnlyApproved && !isApprovedChannel({ longId: channelClaimId }, approvedChannels)) {
const error = {
- name : UNAPPROVED_CHANNEL,
+ name: UNAPPROVED_CHANNEL,
message: 'This spee.ch instance only allows publishing to approved channels',
};
throw error;
@@ -88,14 +110,25 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
return Promise.all([
checkClaimAvailability(name),
- createPublishParams(filePath, name, title, description, license, nsfw, thumbnail, channelName, channelClaimId),
- createThumbnailPublishParams(thumbnailFilePath, name, license, nsfw),
+ createPublishParams(
+ filePath,
+ name,
+ title,
+ description,
+ license,
+ licenseUrl,
+ nsfw,
+ thumbnail,
+ channelName,
+ channelClaimId
+ ),
+ createThumbnailPublishParams(thumbnailFilePath, name, license, licenseUrl, nsfw),
]);
})
- .then(([ claimAvailable, publishParams, thumbnailPublishParams ]) => {
+ .then(([claimAvailable, publishParams, thumbnailPublishParams]) => {
if (!claimAvailable) {
const error = {
- name : CLAIM_TAKEN,
+ name: CLAIM_TAKEN,
message: 'That claim name is already taken',
};
throw error;
@@ -110,14 +143,20 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
.then(publishResults => {
logger.info('Publish success >', publishResults);
claimData = publishResults;
- ({claimId} = claimData);
+ ({ claimId } = claimData);
if (channelName) {
- return chainquery.claim.queries.getShortClaimIdFromLongClaimId(claimData.certificateId, channelName);
+ logger.info(`api/claim/publish: claimData.certificateId ${claimData.certificateId}`);
+ return chainquery.claim.queries.getShortClaimIdFromLongClaimId(
+ claimData.certificateId,
+ channelName
+ );
} else {
- return chainquery.claim.queries.getShortClaimIdFromLongClaimId(claimId, name, claimData).catch(() => {
- return claimId.slice(0, 1);
- });
+ return chainquery.claim.queries
+ .getShortClaimIdFromLongClaimId(claimId, name, claimData)
+ .catch(() => {
+ return claimId.slice(0, 1);
+ });
}
})
.then(shortId => {
@@ -131,13 +170,13 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
res.status(200).json({
success: true,
message: 'publish completed successfully',
- data : {
+ data: {
name,
claimId,
- url : `${host}${canonicalUrl}`, // for backwards compatability with app
- showUrl : `${host}${canonicalUrl}`,
+ url: `${host}${canonicalUrl}`, // for backwards compatability with app
+ showUrl: `${host}${canonicalUrl}`,
serveUrl: `${host}${canonicalUrl}${fileExtension}`,
- pushTo : canonicalUrl,
+ pushTo: canonicalUrl,
claimData,
},
});
diff --git a/server/controllers/api/claim/publish/parsePublishApiRequestBody.js b/server/controllers/api/claim/publish/parsePublishApiRequestBody.js
index e417e0a9..f98c3369 100644
--- a/server/controllers/api/claim/publish/parsePublishApiRequestBody.js
+++ b/server/controllers/api/claim/publish/parsePublishApiRequestBody.js
@@ -1,15 +1,26 @@
-const parsePublishApiRequestBody = ({name, nsfw, license, title, description, thumbnail}) => {
+const parsePublishApiRequestBody = ({
+ name,
+ nsfw,
+ license,
+ licenseUrl,
+ title,
+ description,
+ thumbnail,
+}) => {
// validate name
if (!name) {
throw new Error('no name field found in request');
}
const invalidNameCharacters = /[^A-Za-z0-9,-]/.exec(name);
if (invalidNameCharacters) {
- throw new Error('The claim name you provided is not allowed. Only the following characters are allowed: A-Z, a-z, 0-9, and "-"');
+ throw new Error(
+ 'The claim name you provided is not allowed. Only the following characters are allowed: A-Z, a-z, 0-9, and "-"'
+ );
}
// optional parameters
- nsfw = (nsfw === 'true');
+ nsfw = nsfw === 'true';
license = license || null;
+ licenseUrl = licenseUrl || null;
title = title || null;
description = description || null;
thumbnail = thumbnail || null;
@@ -18,6 +29,7 @@ const parsePublishApiRequestBody = ({name, nsfw, license, title, description, th
name,
nsfw,
license,
+ licenseUrl,
title,
description,
thumbnail,
diff --git a/server/controllers/api/claim/update/index.js b/server/controllers/api/claim/update/index.js
index 74ad8c9a..bca37d6d 100644
--- a/server/controllers/api/claim/update/index.js
+++ b/server/controllers/api/claim/update/index.js
@@ -19,10 +19,11 @@ const createCanonicalLink = require('@globalutils/createCanonicalLink');
route to update a claim through the daemon
*/
-const updateMetadata = ({ nsfw, license, title, description }) => {
+const updateMetadata = ({ nsfw, license, licenseUrl, title, description }) => {
const update = {};
if (nsfw) update['nsfw'] = nsfw;
if (license) update['license'] = license;
+ if (licenseUrl) update['license_url'] = licenseUrl;
if (title) update['title'] = title;
if (description) update['description'] = description;
return update;
@@ -65,6 +66,7 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
thumbnail,
fileExtension,
license,
+ licenseUrl,
name,
nsfw,
thumbnailFileName,
@@ -127,10 +129,11 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
description: claimRecord.description,
nsfw: claimRecord.nsfw,
license: claimRecord.license,
+ licenseUrl: claimRecord.license_url,
language: 'en',
author: details.title,
},
- updateMetadata({ title, description, nsfw, license })
+ updateMetadata({ title, description, nsfw, license, licenseUrl })
);
const publishParams = {
name,
diff --git a/server/controllers/assets/utils/serveFile.js b/server/controllers/assets/utils/serveFile.js
index dce89b83..13b647ee 100644
--- a/server/controllers/assets/utils/serveFile.js
+++ b/server/controllers/assets/utils/serveFile.js
@@ -1,10 +1,12 @@
const logger = require('winston');
const transformImage = require('./transformImage');
-const isValidQueryObject = require('../../../utils/isValidQueryObj');
+
+const isValidQueryObject = require('server/utils/isValidQueryObj');
const {
serving: { dynamicFileSizing },
} = require('@config/siteConfig');
const { enabled: dynamicEnabled } = dynamicFileSizing;
+
const serveFile = async ({ filePath, fileType }, res, originalUrl) => {
const queryObject = {};
// TODO: replace quick/dirty try catch with better practice
diff --git a/server/utils/getClaimData.js b/server/utils/getClaimData.js
index b95d0847..2a3837f5 100644
--- a/server/utils/getClaimData.js
+++ b/server/utils/getClaimData.js
@@ -59,5 +59,8 @@ module.exports = async (data, chName = null, chShortId = null) => {
host,
pending: Boolean(dataVals.height === 0),
blocked: blocked,
+ license: dataVals.license,
+ licenseUrl: dataVals.license_url,
+ transactionTime: dataVals.transaction_time,
};
};
diff --git a/utils/createModuleAliases.js b/utils/createModuleAliases.js
index eea3edb4..47560faa 100644
--- a/utils/createModuleAliases.js
+++ b/utils/createModuleAliases.js
@@ -39,6 +39,9 @@ module.exports = () => {
moduleAliases['@clientutils'] = resolve(`${DEFAULT_ROOT}/utils`);
// moduleAliases['@serverutils'] = resolve('server/utils');
+ // aliases for constants
+ moduleAliases['@clientConstants'] = resolve(`${DEFAULT_ROOT}/constants`);
+
// create specific aliases for locally defined components in the following folders
moduleAliases = addAliasesForCustomComponentFolder('containers', moduleAliases);
moduleAliases = addAliasesForCustomComponentFolder('components', moduleAliases);
@@ -53,7 +56,6 @@ module.exports = () => {
moduleAliases['@sagas'] = resolve(`${DEFAULT_ROOT}/sagas`);
moduleAliases['@app'] = resolve(`${DEFAULT_ROOT}/app.js`);
-
// return finished aliases
return moduleAliases;
};