Merge pull request #947 from lbryio/staging

cuts antimedia-staging from staging

README.md

@@ -47,6 +47,7 @@ For a closed, custom-hosted and branded example, check out https://lbry.theantim
     - `./lbrynet account_balance` gets your balance (initially 0.0)
     - `./lbrynet address_list` gets addresses you can use to recieve LBC
 - [FFmpeg](https://www.ffmpeg.org/download.html)
+- [ImageMagick](https://packages.ubuntu.com/xenial/graphics/imagemagick)
 - Spee.ch (below)
 - pm2 (optional) process manager such as pm2 to run speech server.js
 - http proxy server e.g. caddy, nginx, or traefik, to forward 80/443 to speech port 3000
@@ -118,7 +119,7 @@ Instructions are coming at [lbry-docker] to install your own chainquery instance
 ## Settings
 
 There are a number of settings available for customizing the behavior of your installation.  
-_INSERT LINK TO SETTINGS.MD_
+[Here](https://github.com/lbryio/spee.ch/blob/master/docs/settings.md) is some documentation on them.
 
 ## API
 
@@ -260,9 +261,11 @@ Spee.ch has a few types of URL formats that return different assets from the LBR
 - retrieve the controlling `LBRY` claim:
   - https://spee.ch/`claim`
   - https://spee.ch/`claim`.`ext` (serve)
+  - https://spee.ch/`claim`.`ext`&`querystring` (serve transformed)
 - retrieve a specific `LBRY` claim:
   - https://spee.ch/`claim_id`/`claim`
   - https://spee.ch/`claim_id`/`claim`.`ext` (serve)
+  - https://spee.ch/`claim_id`/`claim`.`ext`&`querystring` (serve transformed)
 - retrieve all contents for the controlling `LBRY` channel
   - https://spee.ch/`@channel`
 - a specific `LBRY` channel
@@ -270,9 +273,15 @@ Spee.ch has a few types of URL formats that return different assets from the LBR
 - retrieve a specific claim within the controlling `LBRY` channel
   - https://spee.ch/`@channel`/`claim`
   - https://spee.ch/`@channel`/`claim`.`ext` (serve)
+  - https://spee.ch/`@channel`/`claim`.`ext`&`querystring` (serve)
 - retrieve a specific claim within a specific `LBRY` channel
   - https://spee.ch/`@channel`:`channel_id`/`claim`
   - https://spee.ch/`@channel`:`channel_id`/`claim`.`ext` (serve)
+  - https://spee.ch/`@channel`:`channel_id`/`claim`.`ext`&`querystring` (serve)
+- `querystring` can include the following transformation values separated by `&`
+  - h=`number` (defines height)
+  - w=`number` (defines width)
+  - t=`crop` or `stretch` (defines transformation - missing implies constrained proportions)
 
 ### Dependencies
 

cli/defaults/siteConfig.json

@@ -46,12 +46,13 @@
       "customByContentType": {
         "application/octet-stream": 50000000
       }
-    },
+    }
-    "maxSizeImage": 10000000,
-    "maxSizeGif": 50000000,
-    "maxSizeVideo": 50000000
   },
   "serving": {
+    "dynamicFileSizing": {
+      "enabled": true,
+      "maxDimension": 2000
+    },
     "markdownSettings": {
       "skipHtmlMain": true,
       "escapeHtmlMain": true,
@@ -86,24 +87,21 @@
         "code",
         "html",
         "parsedHtml"
-      ],
+      ]
-      "disallowedTypesMain": [],
-      "disallowedTypesDescriptions": ["image", "html"],
-      "disallowedTypesExample": ["image", "html"]
     },
     "customFileExtensions": {
-      "application/x-troff-man": ".man",
+      "application/x-troff-man": "man",
-      "application/x-troff-me": ".me",
+      "application/x-troff-me": "me",
-      "application/x-mif": ".mif",
+      "application/x-mif": "mif",
-      "application/x-troff-ms": ".ms",
+      "application/x-troff-ms": "ms",
-      "application/x-troff": ".roff",
+      "application/x-troff": "roff",
-      "application/x-python-code": ".pyc",
+      "application/x-python-code": "pyc",
-      "text/x-python": ".py",
+      "text/x-python": "py",
-      "application/x-pn-realaudio": ".ram",
+      "application/x-pn-realaudio": "ram",
-      "application/x-sgml": ".sgm",
+      "application/x-sgml": "sgm",
-      "model/stl": ".stl",
+      "model/stl": "stl",
-      "image/pict": ".pct",
+      "image/pict": "pct",
-      "text/xul": ".xul",
+      "text/xul": "xul",
       "text/x-go": "go"
     }
   },

client/scss/_asset-preview.scss

@@ -8,7 +8,7 @@
   height: 280px;
   &:hover {
     border: 1px solid $highlight-border-color;
-    color: #000000;
+    color: $primary-color;
   }
 }
 

client/scss/_input.scss

@@ -8,6 +8,7 @@ input {
   border: 0;
   background-color: $background-color;
   display: inline-block;
+  color: $text-color
 }
 
 .input-slider {

client/scss/_link.scss

@@ -9,7 +9,6 @@ a, a:visited {
 
 .link--nav {
   color: $text-color;
-  border-bottom: 2px solid white;
   &:hover {
     color: $primary-color;
   }

client/scss/_nav-bar.scss

@@ -1,15 +1,24 @@
 .nav-bar {
   box-sizing: border-box;
   padding: $thin-padding $primary-padding;
-  background: $base-color;
+  background: $chrome-color;
   flex: 0 1 auto;
   width: 100%;
   border-bottom: $subtle-border;
+  color: $primary-color;
 
   @media (max-width: $break-point-mobile) {
     margin-left: 15px;
     margin-right: 15px;
   }
+  input {
+    background: $chrome-color;
+
+  }
+  select {
+    background: $chrome-color;
+    color: $text-color;
+  }
 }
 
 .nav-bar-link {

client/scss/_select.scss

@@ -1,6 +1,7 @@
 select {
   margin: 0;
   display: inline-block;
-  background: $base-color;
+  background: $background-color;
   border: 0;
+  color: $text-color;
 }

client/scss/_variables.scss

@@ -1,7 +1,7 @@
 //backgrounds
 $base-color: white; //default white
 $card-color: white; //default white
-$chrome-color: lightgray; //default white (navbar)
+$chrome-color: white; //default white (navbar)
 $blockquote-background: #EEEEFF;
 $background-color: $base-color;
 
@@ -19,7 +19,7 @@ $blockquote-text: $text-color;
 $grey: #9095A5;
 $help-color: $grey;
 $subtle-border-color: #DDD;
-$highlight-border-color: #333;
+$highlight-border-color: #777;
 $shadow-color: rgba(169, 173, 186, 0.2);
 $subtle-border: 1px dashed $subtle-border-color;
 $grey-border: $subtle-border-color; //factor this out for all customers

client/src/components/ChannelSelectDropdown/index.jsx

@@ -7,9 +7,6 @@ const ChannelSelectDropdown = ({ selectedChannel, handleSelection, loggedInChann
       id='channel-name-select'
       value={selectedChannel}
       onChange={handleSelection}>
-      { loggedInChannelName && (
-        <option value={loggedInChannelName} >{loggedInChannelName}</option>
-      )}
       <option value={LOGIN}>Existing</option>
       <option value={CREATE}>New</option>
     </select>

client/src/components/PublishLicenseInput/index.jsx

@@ -1,23 +1,28 @@
 import React from 'react';
 import RowLabeled from '@components/RowLabeled';
 import Label from '@components/Label';
+import { LICENSES } from '@clientConstants/publish_license_urls';
 
-const PublishLicenseInput = ({ handleSelect }) => {
+const PublishLicenseInput = ({ handleSelect, license }) => {
   return (
     <RowLabeled
       label={
-        <Label value={'License:'} />
+        <Label value={'License'} />
       }
       content={
         <select
           type='text'
           name='license'
           id='publish-license'
+          value={license}
           onChange={handleSelect}
         >
           <option value=''>Unspecified</option>
-          <option value='Public Domain'>Public Domain</option>
+          {
-          <option value='Creative Commons'>Creative Commons</option>
+            LICENSES.map(function(item, i){
+              return <option key={item + 'license key'} value={item}>{item}</option>;
+            })
+          }
         </select>
       }
     />

client/src/components/PublishLicenseUrlInput/index.jsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import RowLabeled from '@components/RowLabeled';
+import Label from '@components/Label';
+import { CC_LICENSES } from '@clientConstants/publish_license_urls';
+
+const PublishLicenseUrlInput = ({ handleSelect, licenseUrl }) => {
+  return (
+    <RowLabeled
+      label={
+        <Label value={'License Url'} />
+      }
+      content={
+        <select
+          type='text'
+          name='licenseUrl'
+          id='publish-license-url'
+          value={licenseUrl}
+          onChange={handleSelect}
+        >
+          <option value=''>Unspecified</option>
+          {
+            CC_LICENSES.map(function(item, i){
+              return <option key={item.url} value={item.url}>{item.value}</option>
+            })
+          }
+        </select>
+      }
+    />
+  );
+};
+
+export default PublishLicenseUrlInput;

client/src/constants/publish_license_urls.js

@@ -0,0 +1,33 @@
+export const CC_LICENSES = [
+  {
+    value: 'CC Attr. 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-ShareAlike 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-sa/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NoDerivatives 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nd/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NonComm 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nc/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NonComm-ShareAlike 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NonComm-NoDerivatives 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode',
+  },
+];
+
+export const LICENSES = ['Public Domain', 'Other', 'Copyright', 'Creative Commons'];
+
+export const PUBLIC_DOMAIN = 'Public Domain';
+export const OTHER = 'other';
+export const COPYRIGHT = 'copyright';
+export const CREATIVE_COMMONS = 'Creative Commons';

client/src/containers/AssetInfo/view.jsx

@@ -7,7 +7,7 @@ import AssetShareButtons from '@components/AssetShareButtons';
 import ClickToCopy from '@components/ClickToCopy';
 import siteConfig from '@config/siteConfig.json';
 import createCanonicalLink from '@globalutils/createCanonicalLink';
-import AssetInfoFooter from '../../components/AssetInfoFooter/index';
+import AssetInfoFooter from '@components/AssetInfoFooter/index';
 import { createPermanentURI } from '@clientutils/createPermanentURI';
 import ReactMarkdown from 'react-markdown';
 
@@ -18,7 +18,20 @@ class AssetInfo extends React.Component {
   render () {
     const { editable, asset } = this.props;
     const { claimViews, claimData } = asset;
-    const { channelName, claimId, channelShortId, description, name, fileExt, contentType, host, certificateId } = claimData;
+    const {
+      channelName,
+      claimId,
+      channelShortId,
+      description,
+      name,
+      fileExt,
+      contentType,
+      host,
+      certificateId,
+      license,
+      licenseUrl,
+      transactionTime
+    } = claimData;
 
     const canonicalUrl = createCanonicalLink({ asset: { ...claimData, shortId: asset.shortId }});
     const assetCanonicalUrl = `${host}${canonicalUrl}`;
@@ -55,7 +68,7 @@ class AssetInfo extends React.Component {
         {editable && (
           <RowLabeled
             label={<Label value={'Edit'} />}
-            content={<Link to={`/edit${canonicalUrl}`}>{name}</Link>}
+            content={<Link className='link--primary' to={`/edit${canonicalUrl}`}>{name}</Link>}
           />
         )}
         {channelName && (
@@ -71,6 +84,7 @@ class AssetInfo extends React.Component {
             }
           />
         )}
+        <SpaceBetween>
           {claimViews ? (
             <RowLabeled
               label={
@@ -83,7 +97,22 @@ class AssetInfo extends React.Component {
               }
             />
           ) : null}
-
+          {license && (
+            <RowLabeled
+              label={
+                <Label value={'License'} />
+              }
+              content={
+                <div className='text'>
+                  {licenseUrl ? (
+                    <a className={'link--primary'} href={licenseUrl} target={'_blank'}>{license}</a>
+                  ) : (
+                    <span>{license}</span> )}
+                </div>
+              }
+            />
+          )}
+        </SpaceBetween>
         <RowLabeled
           label={
             <Label value={'Share'} />
@@ -151,7 +180,7 @@ class AssetInfo extends React.Component {
           <a
             className={'link--primary'}
             href={`${assetCanonicalUrl}.${fileExt}`}
-            download={name}
+            download={`${name}.${fileExt}`}
           >
             Download
           </a>

client/src/containers/PublishMetadataInputs/index.js

@@ -7,6 +7,7 @@ const mapStateToProps = ({ publish }) => {
     showMetadataInputs: publish.showMetadataInputs,
     description: publish.metadata.description,
     license: publish.metadata.license,
+    licenseUrl: publish.metadata.licenseUrl,
     nsfw: publish.metadata.nsfw,
     isUpdate: publish.isUpdate,
   };
@@ -17,10 +18,13 @@ const mapDispatchToProps = dispatch => {
     onMetadataChange: (name, value) => {
       dispatch(updateMetadata(name, value));
     },
-    onToggleMetadataInputs: (value) => {
+    onToggleMetadataInputs: value => {
       dispatch(toggleMetadataInputs(value));
     },
   };
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(View);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(View);

client/src/containers/PublishMetadataInputs/view.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import PublishDescriptionInput from '@components/PublishDescriptionInput';
 import PublishLicenseInput from '@components/PublishLicenseInput';
+import PublishLicenseUrlInput from '@components/PublishLicenseUrlInput';
 import PublishNsfwInput from '@components/PublishNsfwInput';
 import ButtonSecondary from '@components/ButtonSecondary';
-import Row from '@components/Row';
 
 class PublishMetadataInputs extends React.Component {
   constructor (props) {
@@ -25,22 +25,32 @@ class PublishMetadataInputs extends React.Component {
     const name = event.target.name;
     const selectedOption = event.target.selectedOptions[0].value;
     this.props.onMetadataChange(name, selectedOption);
+    if (name === 'license' && selectedOption !== 'Creative Commons'){
+      this.props.onMetadataChange('licenseUrl', '');
+    }
   }
   render () {
-    const { showMetadataInputs, description, isUpdate, nsfw } = this.props;
+    const { showMetadataInputs, description, isUpdate, nsfw, license, licenseUrl } = this.props;
     return (
       <div>
         {(showMetadataInputs || isUpdate) && (
           <React.Fragment>
             <PublishDescriptionInput
-              description={this.props.description}
+              description={description}
               handleInput={this.handleInput}
             />
             <PublishLicenseInput
               handleSelect={this.handleSelect}
+              license={license}
             />
+            { (this.props.license === 'Creative Commons') && (
+              <PublishLicenseUrlInput
+                handleSelect={this.handleSelect}
+                licenseUrl={licenseUrl}
+              />
+            )}
             <PublishNsfwInput
-              nsfw={this.props.nsfw}
+              nsfw={nsfw}
               handleInput={this.handleInput}
             />
           </React.Fragment>

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);
   }

client/src/reducers/publish.js

@@ -39,6 +39,7 @@ const initialState = {
     title: '',
     description: '',
     license: '',
+    licenseUrl: '',
     nsfw: false,
   },
   isUpdate: false,
@@ -51,7 +52,8 @@ const initialState = {
 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
+      return Object.assign({}, state.isUpdate ? state : initialState, {
+        // note: clears to initial state
         file: action.data,
         hasChanged: true,
       });
@@ -112,4 +114,4 @@ export default function (state = initialState, action) {
     default:
       return state;
   }
-};
+}

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,
   };

docs/settings.md

@@ -26,7 +26,6 @@ PUBLISHING:
 
     "primaryClaimAddress": null, - generally supplied by your lbrynet sdk
     "uploadDirectory": "/home/lbry/Uploads", - lbrynet sdk will know your uploads are here
-    "lbrynetHome": "/home/lbry",
     "thumbnailChannel": null, - when publishing non-image content, thumbnails will go here.
     "thumbnailChannelId": null,
     "additionalClaimAddresses": [],
@@ -39,12 +38,24 @@ PUBLISHING:
     "publishingChannelWhitelist": [],
     "channelClaimBidAmount": "0.1", - When creating a channel, how much you deposit to control the name
     "fileClaimBidAmount": "0.01", - When publishing content, how much you deposit to control the name
-    "maxSizeImage": 10000000, - You may not want people uploading 50GB files. 1000000 = 1MB
+    "fileSizeLimits": {
-    "maxSizeGif": 50000000,
+      "image": 50000000,
-    "maxSizeVideo": 50000000
+      "video": 50000000,
+      "audio": 50000000,
+      "text": 10000000,
+      "model": 50000000,
+      "application": 500000000,
+      "customByContentType": {
+        "application/octet-stream": 50000000
+      }
+    }
 
 SERVING:
   
+ "dynamicFileSizing": {
+"enabled": false, - if you choose to allow your instance to serve transform images
+"maxDimension": 2000 - the maximum size you allow transform to scale
+},
 "markdownSettings": {
 "skipHtmlMain": true, - false: render html, in a somewhat unpredictable way~
 "escapeHtmlMain": true, - true: rather than render html, escape it and print it visibly
@@ -80,9 +91,6 @@ SERVING:
 "html", - potentially DANGEROUS, intended for `serveOnlyApproved = true` environments, includes iframes, divs.
 "parsedHtml"
 ],
-      "disallowedTypesMain": [], - not implemented
-      "disallowedTypesDescriptions": ["image", "html"], - not implemented
-      "disallowedTypesExample": ["image", "html"] - not implemented
 },
 "customFileExtensions": { - suggest a file extension for experimental content types you may be publishing
 "application/example-type": "example"

docs/ubuntuinstall.md

@@ -163,7 +163,7 @@ Log in as username@domainname or username@ip_address
 
   `mysql -u root -p` and then entering your_mysql_password should give you the mysql> shell
 
-# 5 Get Lbrynet Daemon
+# 5 Get Lbrynet SDK Daemon
 
 ## Start tmux
 
@@ -174,11 +174,34 @@ tmux allows you to run multiple things in different sessions. Useful for manuall
   * `tmux`, reenters tmux, then
     * `Ctrl+b`, `(` goes back to through sessions
 
-## Get the daemon
+## Get the SDK
   `wget -O ~/latest_daemon.zip https://lbry.io/get/lbrynet.linux.zip`
 
   `unzip -o -u ~/latest_daemon.zip`
 
+## Customize SDK settings
+
+  These settings will prevent you and your users from spending your server's LBC on paid content. Full documentation is [here](https://lbry.tech/resources/daemon-settings).
+  
+  ~$
+  `mkdir .lbrynet`
+  
+  `cd .lbrynet`
+  
+  `nano daemon_settings.yml`
+  
+   copy and paste in the following code (Ctrl+Shift V)
+
+  ```
+  run_reflector_server: false
+  disable_max_key_fee: false
+  max_key_fee: {amount: 0, currency: LBC}
+  use_upnp: false
+  auto_re_reflect_interval: 0
+ ```
+ 
+ `CONTROL+O` then `CONTROL+X` to save and exit
+ 
 ## Start the daemon
    `./lbrynet start`
 

package.json

@@ -46,6 +46,7 @@
     "express-http-context": "^1.2.0",
     "generate-password": "^1.4.1",
     "get-video-dimensions": "^1.0.0",
+    "gm": "^1.23.1",
     "helmet": "^3.15.0",
     "image-size": "^0.6.3",
     "inquirer": "^5.2.0",

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,

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

server/controllers/api/claim/get/index.js

@@ -1,11 +1,11 @@
-const { getClaim } = require('../../../../lbrynet');
+const { getClaim } = require('server/lbrynet');
-const { createFileRecordDataAfterGet } = require('../../../../models/utils/createFileRecordData.js');
+const { createFileRecordDataAfterGet } = require('server/models/utils/createFileRecordData.js');
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 const getClaimData = require('server/utils/getClaimData');
 const chainquery = require('chainquery').default;
-const db = require('../../../../models');
+const db = require('server/models');
-const waitOn = require('wait-on');
 const logger = require('winston');
+const awaitFileSize = require('server/utils/awaitFileSize');
 
 /*
 
@@ -36,11 +36,11 @@ const claimGet = async ({ ip, originalUrl, params }, res) => {
     if (!claimData) {
       throw new Error('claim/get: getClaimData failed to get file blobs');
     }
-    await waitOn({
+    const fileReady = await awaitFileSize(lbrynetResult.outpoint, 10000000, 250, 10000);
-      resources: [ lbrynetResult.download_path ],
+
-      timeout  : 10000, // 10 seconds
+    if (fileReady !== 'ready') {
-      window   : 500,
+      throw new Error('claim/get: failed to get file after 10 seconds');
-    });
+    }
     const fileData = await createFileRecordDataAfterGet(claimData, lbrynetResult);
     if (!fileData) {
       throw new Error('claim/get: createFileRecordDataAfterGet failed to create file in time');

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;
@@ -13,6 +24,10 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
   if (license === null || license.trim() === '') {
     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,
@@ -24,6 +39,7 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
       author: details.title,
       language: 'en',
       license,
+      licenseUrl,
       nsfw,
     },
     claim_address: publishing.primaryClaimAddress,

server/controllers/api/claim/publish/createThumbnailPublishParams.js

@@ -1,7 +1,7 @@
 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;
   }
@@ -17,6 +17,7 @@ const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, nsf
       author: details.title,
       language: 'en',
       license,
+      licenseUrl,
       nsfw,
     },
     claim_address: publishing.primaryClaimAddress,

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,8 +75,24 @@ 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));
+      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 });
@@ -88,8 +110,19 @@ 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),
+        createPublishParams(
-        createThumbnailPublishParams(thumbnailFilePath, name, license, nsfw),
+          filePath,
+          name,
+          title,
+          description,
+          license,
+          licenseUrl,
+          nsfw,
+          thumbnail,
+          channelName,
+          channelClaimId
+        ),
+        createThumbnailPublishParams(thumbnailFilePath, name, license, licenseUrl, nsfw),
       ]);
     })
     .then(([claimAvailable, publishParams, thumbnailPublishParams]) => {
@@ -113,9 +146,15 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       ({ 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 chainquery.claim.queries
+          .getShortClaimIdFromLongClaimId(claimId, name, claimData)
+          .catch(() => {
             return claimId.slice(0, 1);
           });
       }

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,

server/controllers/api/claim/update/index.js

@@ -1,6 +1,9 @@
 const logger = require('winston');
 const db = require('server/models');
-const { details, publishing: { disabled, disabledMessage, primaryClaimAddress } } = require('@config/siteConfig');
+const {
+  details,
+  publishing: { disabled, disabledMessage, primaryClaimAddress },
+} = require('@config/siteConfig');
 const { resolveUri } = require('server/lbrynet');
 const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
@@ -16,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['licenseUrl'] = licenseUrl;
   if (title) update['title'] = title;
   if (description) update['description'] = description;
   return update;
@@ -62,6 +66,7 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     thumbnail,
     fileExtension,
     license,
+    licenseUrl,
     name,
     nsfw,
     thumbnailFileName,
@@ -76,8 +81,24 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
   gaStartTime = Date.now();
 
   try {
-    ({name, nsfw, license, title, description, thumbnail} = parsePublishApiRequestBody(body));
+    ({
-    ({fileName, filePath, fileExtension, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType} = parsePublishApiRequestFiles(files, true));
+      name,
+      nsfw,
+      license,
+      licenseUrl,
+      title,
+      description,
+      thumbnail,
+    } = parsePublishApiRequestBody(body));
+    ({
+      fileName,
+      filePath,
+      fileExtension,
+      fileType,
+      thumbnailFileName,
+      thumbnailFilePath,
+      thumbnailFileType,
+    } = parsePublishApiRequestFiles(files, true));
     ({ channelName, channelId, channelPassword } = body);
   } catch (error) {
     return res.status(400).json({ success: false, message: error.message });
@@ -89,7 +110,9 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       if (!channelId) {
         channelId = channelClaimId;
       }
-      return chainquery.claim.queries.resolveClaimInChannel(name, channelClaimId).then(claim => claim.dataValues);
+      return chainquery.claim.queries
+        .resolveClaimInChannel(name, channelClaimId)
+        .then(claim => claim.dataValues);
     })
     .then(claim => {
       claimRecord = claim;
@@ -107,14 +130,19 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       return [null, null];
     })
     .then(([fileResult, resolution]) => {
-      metadata = Object.assign({}, {
+      metadata = Object.assign(
+        {},
+        {
           title: claimRecord.title,
           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,
         bid: '0.01',
@@ -128,19 +156,24 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
         if (thumbnailUpdate) {
           // publish new thumbnail
           const newThumbnailName = `${name}-${rando()}`;
-          const newThumbnailParams = createThumbnailPublishParams(filePath, newThumbnailName, license, nsfw);
+          const newThumbnailParams = createThumbnailPublishParams(
+            filePath,
+            newThumbnailName,
+            license,
+            nsfw
+          );
           newThumbnailParams['file_path'] = filePath;
           publish(newThumbnailParams, fileName, fileType);
 
-          publishParams['sources'] = resolution.claim.value.stream.source;
+          publishParams['thumbnail'] = `${details.host}/${newThumbnailParams.channel_name}:${
-          publishParams['thumbnail'] = `${details.host}/${newThumbnailParams.channel_name}:${newThumbnailParams.channel_id}/${newThumbnailName}-thumb.jpg`;
+            newThumbnailParams.channel_id
+          }/${newThumbnailName}-thumb.jpg`;
         } else {
           publishParams['file_path'] = filePath;
         }
       } else {
         fileName = fileResult.fileName;
         fileType = fileResult.fileType;
-        publishParams['sources'] = resolution.claim.value.stream.source;
         publishParams['thumbnail'] = claimRecord.thumbnail_url;
       }
 
@@ -151,9 +184,14 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       publishResult = result;
 
       if (channelName) {
-        return chainquery.claim.queries.getShortClaimIdFromLongClaimId(result.certificateId, channelName);
+        return chainquery.claim.queries.getShortClaimIdFromLongClaimId(
+          result.certificateId,
+          channelName
+        );
       } else {
-        return chainquery.claim.queries.getShortClaimIdFromLongClaimId(result.claimId, name, result).catch(() => {
+        return chainquery.claim.queries
+          .getShortClaimIdFromLongClaimId(result.claimId, name, result)
+          .catch(() => {
             return result.claimId.slice(0, 1);
           });
       }
@@ -161,7 +199,9 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     .then(shortId => {
       let canonicalUrl;
       if (channelName) {
-        canonicalUrl = createCanonicalLink({ asset: { ...publishResult, channelShortId: shortId } });
+        canonicalUrl = createCanonicalLink({
+          asset: { ...publishResult, channelShortId: shortId },
+        });
       } else {
         canonicalUrl = createCanonicalLink({ asset: { ...publishResult, shortId } });
       }

server/controllers/assets/utils/getClaimIdAndServeAsset.js

@@ -15,9 +15,20 @@ const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
 const NO_FILE = 'NO_FILE';
 const CONTENT_UNAVAILABLE = 'CONTENT_UNAVAILABLE';
 
-const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+const {
+  publishing: { serveOnlyApproved, approvedChannels },
+} = require('@config/siteConfig');
 
-const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId, originalUrl, ip, res, headers) => {
+const getClaimIdAndServeAsset = (
+  channelName,
+  channelClaimId,
+  claimName,
+  claimId,
+  originalUrl,
+  ip,
+  res,
+  headers
+) => {
   getClaimId(channelName, channelClaimId, claimName, claimId)
     .then(fullClaimId => {
       claimId = fullClaimId;
@@ -39,11 +50,19 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
     .then(claim => {
       let claimDataValues = claim.dataValues;
 
-      if (serveOnlyApproved && !isApprovedChannel({ longId: claimDataValues.publisher_id || claimDataValues.certificateId }, approvedChannels)) {
+      if (
+        serveOnlyApproved &&
+        !isApprovedChannel(
+          { longId: claimDataValues.publisher_id || claimDataValues.certificateId },
+          approvedChannels
+        )
+      ) {
         throw new Error(CONTENT_UNAVAILABLE);
       }
 
-      let outpoint = claimDataValues.outpoint || `${claimDataValues.transaction_hash_id}:${claimDataValues.vout}`;
+      let outpoint =
+        claimDataValues.outpoint ||
+        `${claimDataValues.transaction_hash_id}:${claimDataValues.vout}`;
       logger.debug('Outpoint:', outpoint);
       return db.Blocked.isNotBlocked(outpoint).then(() => {
         // If content was found, is approved, and not blocked - log a view.
@@ -70,7 +89,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
       if (!fileRecord) {
         throw NO_FILE;
       }
-      serveFile(fileRecord.dataValues, res);
+      serveFile(fileRecord.dataValues, res, originalUrl);
     })
     .catch(error => {
       if (error === NO_CLAIM) {
@@ -98,7 +117,8 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
         logger.debug('claim was blocked');
         return res.status(451).json({
           success: false,
-          message: 'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications. For more details, see https://lbry.io/faq/dmca',
+          message:
+            'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications. For more details, see https://lbry.io/faq/dmca',
         });
       }
       if (error === NO_FILE) {

server/controllers/assets/utils/serveFile.js

@@ -1,9 +1,38 @@
 const logger = require('winston');
+const transformImage = require('./transformImage');
+
+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
+  try {
+    originalUrl
+      .split('?')[1]
+      .split('&')
+      .map(pair => {
+        if (pair.includes('=')) {
+          let parr = pair.split('=');
+          queryObject[parr[0]] = parr[1];
+        } else queryObject[pair] = true;
+      });
+  } catch (e) {}
 
-const serveFile = ({ filePath, fileType }, res) => {
   if (!fileType) {
     logger.error(`no fileType provided for ${filePath}`);
   }
+
+  let mediaType = fileType ? fileType.substr(0, fileType.indexOf('/')) : '';
+  const transform =
+    mediaType === 'image' &&
+    queryObject.hasOwnProperty('h') &&
+    queryObject.hasOwnProperty('w') &&
+    dynamicEnabled;
+
   const sendFileOptions = {
     headers: {
       'X-Content-Type-Options': 'nosniff',
@@ -13,7 +42,27 @@ const serveFile = ({ filePath, fileType }, res) => {
     },
   };
   logger.debug(`fileOptions for ${filePath}:`, sendFileOptions);
+  try {
+    if (transform) {
+      if (!isValidQueryObject(queryObject)) {
+        logger.debug(`Unacceptable querystring`, { queryObject });
+        res.status(400).json({
+          success: false,
+          message: 'Querystring may not have dimensions greater than 2000',
+        });
+        res.end();
+      }
+      logger.debug(`transforming and sending file`);
+
+      let xformed = await transformImage(filePath, queryObject);
+      res.status(200).set(sendFileOptions.headers);
+      res.end(xformed, 'binary');
+    } else {
       res.status(200).sendFile(filePath, sendFileOptions);
+    }
+  } catch (e) {
+    logger.debug(e);
+  }
 };
 
 module.exports = serveFile;

server/controllers/assets/utils/transformImage.js

@@ -0,0 +1,76 @@
+const gm = require('gm');
+const logger = require('winston');
+const imageMagick = gm.subClass({ imageMagick: true });
+const { getImageHeightAndWidth } = require('../../../utils/imageProcessing');
+
+module.exports = function transformImage(path, queryObj) {
+  return new Promise((resolve, reject) => {
+    let { h: cHeight = null } = queryObj;
+    let { w: cWidth = null } = queryObj;
+    let { t: transform = null } = queryObj;
+    let { x: xOrigin = null } = queryObj;
+    let { y: yOrigin = null } = queryObj;
+    let oHeight,
+      oWidth = null;
+    try {
+      getImageHeightAndWidth(path).then(hwarr => {
+        oHeight = hwarr[0];
+        oWidth = hwarr[1];
+        // conditional logic here
+        if (transform === 'crop') {
+          resolve(_cropCenter(path, cWidth, cHeight, oWidth, oHeight));
+        } else if (transform === 'stretch') {
+          imageMagick(path)
+            .resize(cWidth, cHeight, '!')
+            .toBuffer(null, (err, buf) => {
+              resolve(buf);
+            });
+        } else {
+          // resize scaled
+          imageMagick(path)
+            .resize(cWidth, cHeight)
+            .toBuffer(null, (err, buf) => {
+              resolve(buf);
+            });
+        }
+      });
+    } catch (e) {
+      logger.error(e);
+      reject(e);
+    }
+  });
+};
+
+function _cropCenter(path, cropWidth, cropHeight, originalWidth, originalHeight) {
+  let oAspect = originalWidth / originalHeight;
+  let cAspect = cropWidth / cropHeight;
+  let resizeX,
+    resizeY,
+    xpoint,
+    ypoint = null;
+
+  if (oAspect >= cAspect) {
+    // if crop is narrower aspect than original
+    resizeY = cropHeight;
+    xpoint = (oAspect * cropHeight) / 2 - cropWidth / 2;
+    ypoint = 0;
+  } else {
+    // if crop is wider aspect than original
+    resizeX = cropWidth;
+    xpoint = 0;
+    ypoint = cropWidth / oAspect / 2 - cropHeight / 2;
+  }
+  return new Promise((resolve, reject) => {
+    try {
+      imageMagick(path)
+        .resize(resizeX, resizeY)
+        .crop(cropWidth, cropHeight, xpoint, ypoint)
+        .toBuffer(null, (err, buf) => {
+          resolve(buf);
+        });
+    } catch (e) {
+      logger.error(e);
+      reject(e);
+    }
+  });
+}

server/lbrynet/index.js

@@ -53,6 +53,26 @@ module.exports = {
         });
     });
   },
+  getFileListFileByOutpoint(outpoint) {
+    logger.debug(`lbryApi >> Getting File_List for "${outpoint}"`);
+    const gaStartTime = Date.now();
+    return new Promise((resolve, reject) => {
+      axios
+        .post(lbrynetUri, {
+          method: 'file_list',
+          params: {
+            outpoint,
+          },
+        })
+        .then(response => {
+          sendGATimingEvent('lbrynet', 'getFileList', 'FILE_LIST', gaStartTime, Date.now());
+          handleLbrynetResponse(response, resolve, reject);
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
+  },
   async abandonClaim({ claimId }) {
     logger.debug(`lbryApi >> Abandon claim "${claimId}"`);
     const gaStartTime = Date.now();
@@ -93,7 +113,7 @@ module.exports = {
       axios
         .post(lbrynetUri, {
           method: 'resolve',
-          params: { uri },
+          params: { urls: uri },
         })
         .then(({ data }) => {
           sendGATimingEvent('lbrynet', 'resolveUri', 'RESOLVE', gaStartTime, Date.now());

server/utils/awaitFileSize.js

@@ -0,0 +1,30 @@
+const { getFileListFileByOutpoint } = require('server/lbrynet');
+const logger = require('winston');
+
+function delay(t) {
+  return new Promise(function(resolve) {
+    setTimeout(resolve, t);
+  });
+}
+
+const awaitFileSize = (outpoint, size, interval, timeout) => {
+  logger.debug('awaitFileSize');
+  let start = Date.now();
+  function checkFileList() {
+    logger.debug('checkFileList');
+    return getFileListFileByOutpoint(outpoint).then(result => {
+      logger.debug('File List Result', result);
+      if (result[0]['completed'] === true || result[0]['written_bytes'] > size) {
+        logger.debug('FILE READY');
+        return 'ready';
+      } else if (timeout !== 0 && Date.now() - start > timeout) {
+        throw new Error('Timeout on awaitFileSize');
+      } else {
+        return delay(interval).then(checkFileList);
+      }
+    });
+  }
+  return checkFileList();
+};
+
+module.exports = awaitFileSize;

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,
   };
 };

server/utils/isValidQueryObj.js

@@ -0,0 +1,24 @@
+const {
+  serving: { dynamicFileSizing },
+} = require('@config/siteConfig');
+const { maxDimension } = dynamicFileSizing;
+
+const isValidQueryObj = queryObj => {
+  let {
+    h: cHeight = null,
+    w: cWidth = null,
+    t: transform = null,
+    x: xOrigin = null,
+    y: yOrigin = null,
+  } = queryObj;
+
+  return (
+    ((cHeight <= maxDimension && cHeight > 0) || cHeight === null) &&
+    ((cWidth <= maxDimension && cWidth > 0) || cWidth === null) &&
+    (transform === null || transform === 'crop' || transform === 'stretch') &&
+    ((xOrigin <= maxDimension && xOrigin >= 0) || xOrigin === null) &&
+    ((yOrigin <= maxDimension && yOrigin >= 0) || yOrigin === null)
+  );
+};
+
+module.exports = isValidQueryObj;

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;
 };