change cut preview, add nsfw filter

OnePlace-media · Apr 24, 2018 · 6f548a3 · 6f548a3
1 parent b024c28
commit 6f548a3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 33 deletions.
diff --git a/client/src/components/chains/feed/FeedArticle.vue b/client/src/components/chains/feed/FeedArticle.vue
@@ -6,6 +6,11 @@
       @click.prevent="show"
       v-if="post.image !== DEFAULT_IMAGE"
       :style="`background-image: url('${post.image}')`">
+      <div class="nsfw-image" 
+        v-if="post.nsfw && post.nsfw !== 'show'"
+        @click.stop.prevent="post.nsfw = 'show'">
+        {{$t('chains.imageIsHidden')}}
+      </div>
     </a>
     <div class="feed__post-content">
       <div class="feed__post-reposted" v-if="isRepost">
@@ -14,12 +19,12 @@
           class="feed__repost-avatar" 
           :style="`background-image: url('${post.reblog_avatars[0]}');`"
         ></span>
-        <router-link tag="a" :to="{name:'chain-account-view', params:{chain: chain, username:post.author}}" class="link link--op">
+        <router-link tag="a" :to="{name:'chain-account-view', params:{chain: chain, username:post.reblog_by[0]}}" class="link link--op">
           {{post.reblog_by[0]}}
         </router-link>
       </div>
 
-        <h3 class="feed__post-title h3" :class="{'lines-2x': lines2x, 'lines-1x': lines1x}">
+        <h3 class="feed__post-title h3">
           <a 
             :href="link"
             @click.prevent="show"
@@ -28,7 +33,7 @@
             {{post.title}}
           </a>
         </h3>
-        <p class="feed__post-text">
+        <p class="feed__post-text" :class="{'lines-2x': lines2x, 'lines-1x': lines1x}">
           <a 
             :href="link"
             @click.prevent="show"
@@ -103,11 +108,8 @@ export default {
     link() {
       return this.$helper.makePathForPost(this.post, this.chain)
     },
-    cutTitle() {
-      return parser.cutTitle(this.chain, this.post.title)
-    },
     cutPreview() {
-      return parser.cutPreview(this.chain, this.post.preview, this.isRepost)
+      return parser.cutPreview(this.post.preview)
     },
     isRepost() {
       return this.post.reblog_by.length > 0

diff --git a/client/src/components/chains/profile/ProfileBlogArticle.vue b/client/src/components/chains/profile/ProfileBlogArticle.vue
@@ -7,6 +7,11 @@
         v-if="post.image !== DEFAULT_IMAGE"
         class="feed__post-image" 
         :style="`background-image: url('${post.image}')`">
+        <div class="nsfw-image" 
+          v-if="post.nsfw && post.nsfw !== 'show'"
+          @click.stop.prevent="post.nsfw = 'show'">
+          {{$t('chains.imageIsHidden')}}
+        </div>
       </a>
       <div class="feed__post-content">
 
@@ -15,10 +20,12 @@
           <router-link tag="a" :to="{name:'chain-account-view', params:{chain: chain, username:post.author}}" class="link link--op">{{post.author}}</router-link>
         </div>
 
-        <h3 class="feed__post-title h3" :class="{'lines-2x': lines2x, 'lines-1x': lines1x}">
-          <a @click.prevent="show" :href="$helper.makePathForPost(post, chain)" class="link" :title="post.title">{{post.title}}</a>
+        <h3 class="feed__post-title h3">
+          <a @click.prevent="show" :href="$helper.makePathForPost(post, chain)" class="link" :title="post.title">
+            <span class="nsfw-warning" v-show="post.nsfw">nsfw</span>
+            {{post.title}}</a>
         </h3>
-        <p class="feed__post-text">
+        <p class="feed__post-text" :class="{'lines-2x': lines2x, 'lines-1x': lines1x}">
           <a @click.prevent="show" :href="$helper.makePathForPost(post, chain)" class="link">{{cutPreview}}</a>
         </p>
         <div class="feed__post-info" v-if="!$store.state.core.params[chain].processing">
@@ -80,11 +87,8 @@ export default {
     isRepost() {
       return this.account.name !== this.post.author
     },
-    cutTitle() {
-      return parser.cutTitle(this.chain, this.post.title)
-    },
     cutPreview() {
-      return parser.cutPreview(this.chain, this.post.preview, this.isRepost)
+      return parser.cutPreview(this.post.preview)
     }
   },
   methods: {

diff --git a/common/@oneplace/blockchains-api/parser.js b/common/@oneplace/blockchains-api/parser.js
@@ -374,25 +374,8 @@ class Parser {
     })
   }
 
-  static cutTitle(chain, title) {
-    const STR_LIMIT = chain === CONSTANTS.BLOCKCHAIN.SOURCE.GOLOS ? 70 : 80
-    if (title.length > STR_LIMIT) {
-      title =
-        title.substring(
-          0,
-          title
-            .substr(0, STR_LIMIT)
-            .split('')
-            .lastIndexOf(' ')
-        ) + '...'
-    }
-    return title
-  }
-
-  static cutPreview(chain, preview, isRepost) {
-    let STR_LIMIT = isRepost ? 50 : 110
-    if (chain === CONSTANTS.BLOCKCHAIN.SOURCE.GOLOS)
-      STR_LIMIT = isRepost ? 50 : 90
+  static cutPreview(preview) {
+    let STR_LIMIT = 200
 
     if (preview.length > STR_LIMIT) {
       preview =