Merge branch 'filtering-app-posts' into remove-sbd-refs

ksheni56 · Sep 24, 2018 · 5c30d4c · 5c30d4c
2 parents 29dabb3 + 86d8b7c
commit 5c30d4c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/src/app/components/cards/PostsList.jsx b/src/app/components/cards/PostsList.jsx
@@ -10,6 +10,7 @@ import LoadingIndicator from 'app/components/elements/LoadingIndicator';
 import debounce from 'lodash.debounce';
 import CloseButton from 'app/components/elements/CloseButton';
 import { findParent } from 'app/utils/DomUtils';
+import { shouldDisplayPost } from 'app/utils/StateFunctions';
 import Icon from 'app/components/elements/Icon';
 import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
 
@@ -165,7 +166,8 @@ class PostsList extends React.Component {
             const ignore =
                 ignore_result && ignore_result.has(cont.get('author'));
             const hide = cont.getIn(['stats', 'hide']);
-            if (!(ignore || hide) || showSpam)
+            var show = shouldDisplayPost(this.props, item);
+            if (show && (!(ignore || hide) || showSpam))
                 // rephide
                 postsInfo.push({ item, ignore });
         });

diff --git a/src/app/components/elements/ReplyEditor.jsx b/src/app/components/elements/ReplyEditor.jsx
@@ -901,7 +901,7 @@ export default formId =>
                 if (rtags.links.size) meta.links = rtags.links;
                 else delete meta.links;
 
-                meta.app = 'steemit/0.1';
+                meta.app = 'touchit-social/0.1';
                 if (isStory) {
                     meta.format = isHtml ? 'html' : 'markdown';
                 }
@@ -929,6 +929,8 @@ export default formId =>
                     return;
                 }
 
+                meta.tags.push('touchit-social');
+
                 startLoadingIndicator();
 
                 const originalBody = isEdit ? originalPost.body : null;

diff --git a/src/app/components/pages/PostsIndex.jsx b/src/app/components/pages/PostsIndex.jsx
@@ -9,7 +9,10 @@ import { actions as fetchDataSagaActions } from 'app/redux/FetchDataSaga';
 import constants from 'app/redux/constants';
 import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
 import PostsList from 'app/components/cards/PostsList';
-import { isFetchingOrRecentlyUpdated } from 'app/utils/StateFunctions';
+import {
+    isFetchingOrRecentlyUpdated,
+    shouldDisplayPost,
+} from 'app/utils/StateFunctions';
 import Callout from 'app/components/elements/Callout';
 // import SidebarStats from 'app/components/elements/SidebarStats';
 import SidebarLinks from 'app/components/elements/SidebarLinks';
@@ -22,6 +25,7 @@ class PostsIndex extends React.Component {
     static propTypes = {
         discussions: PropTypes.object,
         accounts: PropTypes.object,
+        content: PropTypes.object,
         status: PropTypes.object,
         routeParams: PropTypes.object,
         requestData: PropTypes.func,
@@ -133,6 +137,13 @@ class PostsIndex extends React.Component {
             }
         } else {
             posts = this.getPosts(order, category);
+
+            if (posts) {
+                posts = posts.filter(post => {
+                    return shouldDisplayPost(this.props, post);
+                });
+            }
+
             if (posts && posts.size === 0) {
                 emptyText = (
                     <div>
@@ -192,6 +203,7 @@ class PostsIndex extends React.Component {
         const layoutClass = this.props.blogmode
             ? ' layout-block'
             : ' layout-list';
+
         return (
             <div
                 className={
@@ -289,6 +301,7 @@ module.exports = {
                 status: state.global.get('status'),
                 loading: state.app.get('loading'),
                 accounts: state.global.get('accounts'),
+                content: state.global.get('content'),
                 username:
                     state.user.getIn(['current', 'username']) ||
                     state.offchain.get('account'),
@@ -297,6 +310,9 @@ module.exports = {
                 topic: ownProps.params.category,
                 categories: state.global
                     .getIn(['tag_idx', 'trending'])
+                    .filter(e => {
+                        return ['touch-tube', 'touchit-social'].indexOf(e) < 0;
+                    })
                     .take(50),
                 maybeLoggedIn: state.user.get('maybeLoggedIn'),
                 isBrowser: process.env.BROWSER,

diff --git a/src/app/utils/StateFunctions.js b/src/app/utils/StateFunctions.js
@@ -196,3 +196,14 @@ export function filterTags(tags) {
         .filter(tag => typeof tag === 'string')
         .filter((value, index, self) => value && self.indexOf(value) === index);
 }
+
+export function shouldDisplayPost(state, post) {
+    try {
+        let json_metadata = JSON.parse(
+            state.content.get(post).get('json_metadata')
+        );
+        return json_metadata.tags.includes('touchit-social');
+    } catch (e) {
+        return false;
+    }
+}