From a565f7c5dfb1274bb26fc6737ed4f1384a35c815 Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Wed, 29 Jul 2020 15:30:26 -0500
Subject: [PATCH] fix labeling and rename some strings

---
 ui/component/common/icon-custom.jsx           |  7 ++++
 .../{storyEditor => postEditor}/index.js      |  4 +--
 .../{storyEditor => postEditor}/view.jsx      | 10 +++---
 ui/component/publishDescription/index.js      |  4 +--
 ui/component/publishDescription/view.jsx      |  4 +--
 ui/component/publishFile/view.jsx             | 14 ++++----
 ui/component/publishForm/view.jsx             | 32 ++++++++-----------
 ui/constants/icons.js                         |  1 +
 ui/constants/publish_types.js                 |  2 +-
 9 files changed, 40 insertions(+), 38 deletions(-)
 rename ui/component/{storyEditor => postEditor}/index.js (83%)
 rename ui/component/{storyEditor => postEditor}/view.jsx (94%)

diff --git a/ui/component/common/icon-custom.jsx b/ui/component/common/icon-custom.jsx
index f161956de..8ed450411 100644
--- a/ui/component/common/icon-custom.jsx
+++ b/ui/component/common/icon-custom.jsx
@@ -707,4 +707,11 @@ export const icons = {
       <path d="M13.73 21a2 2 0 0 1-3.46 0" />
     </g>
   ),
+  [ICONS.POST]: buildIcon(
+    <g>
+      <path d="M20.24 12.24a6 6 0 0 0-8.49-8.49L5 10.5V19h8.5z" />
+      <line x1="16" y1="8" x2="2" y2="22" />
+      <line x1="17.5" y1="15" x2="9" y2="15" />
+    </g>
+  ),
 };
diff --git a/ui/component/storyEditor/index.js b/ui/component/postEditor/index.js
similarity index 83%
rename from ui/component/storyEditor/index.js
rename to ui/component/postEditor/index.js
index a09a8c695..c813676ad 100644
--- a/ui/component/storyEditor/index.js
+++ b/ui/component/postEditor/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { selectIsStillEditing, makeSelectPublishFormValue, doUpdatePublishForm } from 'lbry-redux';
-import StoryEditor from './view';
+import PostEditor from './view';
 
 const select = (state, props) => ({
   filePath: makeSelectPublishFormValue('filePath')(state),
@@ -12,4 +12,4 @@ const perform = dispatch => ({
   updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
 });
 
-export default connect(select, perform)(StoryEditor);
+export default connect(select, perform)(PostEditor);
diff --git a/ui/component/storyEditor/view.jsx b/ui/component/postEditor/view.jsx
similarity index 94%
rename from ui/component/storyEditor/view.jsx
rename to ui/component/postEditor/view.jsx
index 0001e4e79..bfe74543a 100644
--- a/ui/component/storyEditor/view.jsx
+++ b/ui/component/postEditor/view.jsx
@@ -19,7 +19,7 @@ type Props = {
   setCurrentFileType: string => void,
 };
 
-function StoryEditor(props: Props) {
+function PostEditor(props: Props) {
   const {
     uri,
     label,
@@ -37,7 +37,7 @@ function StoryEditor(props: Props) {
 
   const [ready, setReady] = React.useState(!editing);
   const [loading, setLoading] = React.useState(false);
-  const [advancedEditor, setAdvancedEditor] = usePersistedState('publish-form-story-mode', false);
+  const [advancedEditor, setAdvancedEditor] = usePersistedState('publish-form-post-mode', false);
   const { streamingUrl } = useFetchStreamingUrl(uri);
 
   function toggleMarkdown() {
@@ -101,9 +101,9 @@ function StoryEditor(props: Props) {
   return (
     <FormField
       type={!SIMPLE_SITE && advancedEditor ? 'markdown' : 'textarea'}
-      name="content_story"
+      name="content_post"
       label={label}
-      placeholder={__('My content for this story...')}
+      placeholder={__('My content for this post...')}
       value={ready ? fileText : __('Loading...')}
       disabled={!ready || disabled}
       onChange={value => updatePublishForm({ fileText: advancedEditor ? value : value.target.value })}
@@ -114,4 +114,4 @@ function StoryEditor(props: Props) {
   );
 }
 
-export default StoryEditor;
+export default PostEditor;
diff --git a/ui/component/publishDescription/index.js b/ui/component/publishDescription/index.js
index 33db541b8..96da26fd7 100644
--- a/ui/component/publishDescription/index.js
+++ b/ui/component/publishDescription/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { doUpdatePublishForm, makeSelectPublishFormValue } from 'lbry-redux';
-import PublishPage from './view';
+import PublishDescription from './view';
 
 const select = state => ({
   description: makeSelectPublishFormValue('description')(state),
@@ -10,4 +10,4 @@ const perform = dispatch => ({
   updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
 });
 
-export default connect(select, perform)(PublishPage);
+export default connect(select, perform)(PublishDescription);
diff --git a/ui/component/publishDescription/view.jsx b/ui/component/publishDescription/view.jsx
index 98f8700e0..5c9fafc52 100644
--- a/ui/component/publishDescription/view.jsx
+++ b/ui/component/publishDescription/view.jsx
@@ -12,7 +12,7 @@ type Props = {
   updatePublishForm: ({}) => void,
 };
 
-function PublishText(props: Props) {
+function PublishDescription(props: Props) {
   const { description, updatePublishForm, disabled } = props;
   const [advancedEditor, setAdvancedEditor] = usePersistedState('publish-form-description-mode', false);
   function toggleMarkdown() {
@@ -45,4 +45,4 @@ function PublishText(props: Props) {
   );
 }
 
-export default PublishText;
+export default PublishDescription;
diff --git a/ui/component/publishFile/view.jsx b/ui/component/publishFile/view.jsx
index cfc9c5232..0a6fbee63 100644
--- a/ui/component/publishFile/view.jsx
+++ b/ui/component/publishFile/view.jsx
@@ -2,7 +2,7 @@
 import * as ICONS from 'constants/icons';
 import React, { useState, useEffect } from 'react';
 import { regexInvalidURI } from 'lbry-redux';
-import StoryEditor from 'component/storyEditor';
+import PostEditor from 'component/postEditor';
 import FileSelector from 'component/common/file-selector';
 import Button from 'component/button';
 import Card from 'component/common/card';
@@ -80,7 +80,7 @@ function PublishFile(props: Props) {
 
   // Reset filePath if publish mode changed
   useEffect(() => {
-    if (mode === PUBLISH_MODES.STORY) {
+    if (mode === PUBLISH_MODES.POST) {
       if (currentFileType !== 'text/markdown' && !isStillEditing) {
         updatePublishForm({ filePath: '', name: '' });
       }
@@ -264,7 +264,7 @@ function PublishFile(props: Props) {
       reader.addEventListener('load', event => {
         const text = event.target.result;
         updatePublishForm({ fileText: text });
-        setPublishMode(PUBLISH_MODES.STORY);
+        setPublishMode(PUBLISH_MODES.POST);
       });
       // Read file contents
       reader.readAsText(file);
@@ -313,7 +313,7 @@ function PublishFile(props: Props) {
   }
 
   const isPublishFile = mode === PUBLISH_MODES.FILE;
-  const isPublishStory = mode === PUBLISH_MODES.STORY;
+  const isPublishPost = mode === PUBLISH_MODES.POST;
 
   return (
     <Card
@@ -340,9 +340,9 @@ function PublishFile(props: Props) {
           {isPublishFile && (
             <FileSelector disabled={disabled} currentPath={currentFile} onFileChosen={handleFileChange} />
           )}
-          {isPublishStory && (
-            <StoryEditor
-              label={__('Story content')}
+          {isPublishPost && (
+            <PostEditor
+              label={__('Post')}
               uri={uri}
               disabled={disabled}
               fileMimeType={fileMimeType}
diff --git a/ui/component/publishForm/view.jsx b/ui/component/publishForm/view.jsx
index 8f62d167c..337a18518 100644
--- a/ui/component/publishForm/view.jsx
+++ b/ui/component/publishForm/view.jsx
@@ -118,8 +118,8 @@ function PublishForm(props: Props) {
 
   const TAGS_LIMIT = 5;
   const fileFormDisabled = mode === PUBLISH_MODES.FILE && !filePath;
-  const emptyStoryError = mode === PUBLISH_MODES.STORY && (!fileText || fileText.trim() === '');
-  const formDisabled = (fileFormDisabled && !editingURI) || emptyStoryError || publishing;
+  const emptyPostError = mode === PUBLISH_MODES.POST && (!fileText || fileText.trim() === '');
+  const formDisabled = (fileFormDisabled && !editingURI) || emptyPostError || publishing;
   const isInProgress = filePath || editingURI || name || title;
   // Editing content info
   const uri = myClaimForUri ? myClaimForUri.permanent_url : undefined;
@@ -132,7 +132,7 @@ function PublishForm(props: Props) {
     title &&
     bid &&
     !bidError &&
-    !emptyStoryError &&
+    !emptyPostError &&
     !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
 
   const isOverwritingExistingClaim = !editingURI && myClaimForUri;
@@ -200,7 +200,7 @@ function PublishForm(props: Props) {
   // @if TARGET='web'
   function createWebFile() {
     if (fileText) {
-      const fileName = name || title || 'story';
+      const fileName = name || title;
       return new File([fileText], `${fileName}.md`, { type: 'text/markdown' });
     }
   }
@@ -212,7 +212,7 @@ function PublishForm(props: Props) {
     let output = filePath;
     if (!output || output === '') {
       // Generate a temporary file:
-      output = tempy.file({ name: 'story.md' });
+      output = tempy.file({ name: 'post.md' });
     }
     // Create a temporary file and save file changes
     if (typeof output === 'string') {
@@ -227,19 +227,13 @@ function PublishForm(props: Props) {
   }
   // @endif
 
-  function verifyStoryContent() {
-    const isEmpty = !fileText || fileText.length === 0 || fileText.trim() === '';
-    // TODO: Verify file size limit, and character size as well ?
-    return !isEmpty;
-  }
-
   async function handlePublish() {
-    // Publish story:
+    // Publish post:
     // If here is no file selected yet on desktop, show file dialog and let the
     // user choose a file path. On web a new File is created
-    const validStory = verifyStoryContent();
+    const validPost = !emptyPostError;
 
-    if (mode === PUBLISH_MODES.STORY) {
+    if (mode === PUBLISH_MODES.POST) {
       let outputFile = filePath;
       // If user modified content on the text editor:
       // Save changes and updat file path
@@ -253,11 +247,11 @@ function PublishForm(props: Props) {
         // @endif
 
         // New content stored locally and is not empty
-        if (outputFile && validStory) {
+        if (outputFile && validPost) {
           updatePublishForm({ filePath: outputFile });
           publish(outputFile);
         }
-      } else if (validStory && outputFile) {
+      } else if (validPost && outputFile) {
         publish(outputFile);
       }
     }
@@ -274,9 +268,9 @@ function PublishForm(props: Props) {
   // Update mode on editing
   useEffect(() => {
     if (autoSwitchMode && editingURI && myClaimForUri) {
-      // Change publish mode to "story" if editing content type is markdown
-      if (fileMimeType === 'text/markdown' && mode !== PUBLISH_MODES.STORY) {
-        setMode(PUBLISH_MODES.STORY);
+      // Change publish mode to "post" if editing content type is markdown
+      if (fileMimeType === 'text/markdown' && mode !== PUBLISH_MODES.POST) {
+        setMode(PUBLISH_MODES.POST);
         // Prevent forced mode
         setAutoSwitchMode(false);
       }
diff --git a/ui/constants/icons.js b/ui/constants/icons.js
index 0ece1294f..2d7331e5f 100644
--- a/ui/constants/icons.js
+++ b/ui/constants/icons.js
@@ -95,6 +95,7 @@ export const VIDEO = 'Video';
 export const VOLUME_MUTED = 'VolumeX';
 export const TEXT = 'FileText';
 export const DOWNLOADABLE = 'Downloadable';
+export const POST = 'Post';
 export const REPOST = 'Repeat';
 export const VALIDATED = 'Check';
 export const SLIDERS = 'Sliders';
diff --git a/ui/constants/publish_types.js b/ui/constants/publish_types.js
index 8d492ba32..c438709a8 100644
--- a/ui/constants/publish_types.js
+++ b/ui/constants/publish_types.js
@@ -1,2 +1,2 @@
 export const FILE = 'File';
-export const STORY = 'Story';
+export const POST = 'Post';