Merge pull request steemit#2705 from kirkins/filter

filter non-string tags
prcolaco · Apr 12, 2018 · 7fa0663 · 7fa0663
2 parents 9b1b32d + 20f31c3
commit 7fa0663
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/app/components/elements/TagList.jsx b/src/app/components/elements/TagList.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router';
+import { filterTags } from 'app/utils/StateFunctions';
 import DropdownMenu from 'app/components/elements/DropdownMenu';
 
 export default ({ post, horizontal, single }) => {
@@ -32,10 +33,7 @@ export default ({ post, horizontal, single }) => {
     // Category should always be first.
     tags.unshift(post.category);
 
-    // Uniqueness filter.
-    tags = tags.filter(
-        (value, index, self) => value && self.indexOf(value) === index
-    );
+    tags = filterTags(tags);
 
     if (horizontal) {
         // show it as a dropdown in Preview

diff --git a/src/app/components/pages/TagsIndex.jsx b/src/app/components/pages/TagsIndex.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router';
 import { connect } from 'react-redux';
 import { browserHistory } from 'react-router';
-import { numberWithCommas } from 'app/utils/StateFunctions';
+import { filterTags, numberWithCommas } from 'app/utils/StateFunctions';
 import tt from 'counterpart';
 
 export default class TagsIndex extends React.Component {
@@ -54,7 +54,7 @@ export default class TagsIndex extends React.Component {
         const { tagsAll } = this.props;
         //console.log('-- TagsIndex.render -->', tagsAll.toJS());
         const { order } = this.state;
-        let tags = tagsAll;
+        let tags = filterTags(tagsAll);
 
         const rows = tags
             .filter(

diff --git a/src/app/utils/StateFunctions.js b/src/app/utils/StateFunctions.js
@@ -175,6 +175,7 @@ export function contentStats(content) {
         tags = [];
     }
     tags.push(content.get('category'));
+    tags = filterTags(tags);
     const isNsfw = tags.filter(tag => tag && tag.match(/^nsfw$/i)).length > 0;
 
     return {
@@ -189,3 +190,9 @@ export function contentStats(content) {
         hasPendingPayout,
     };
 }
+
+export function filterTags(tags) {
+    return tags
+        .filter(tag => typeof tag === 'string')
+        .filter((value, index, self) => value && self.indexOf(value) === index);
+}