From f4512b441185368ea11c6b8546ee9e78ade6e7c5 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Fri, 8 Jan 2021 21:46:03 -0500
Subject: [PATCH] Added/removed some functionality to better handle
 requests/load

- Removed status counting in dashboard for admins
- Added limit to notifications to only 7 days ago
- Removed ability for non-logged in users to view group, group-collection timelines
- Limited account realtime search on compose, list, chat actions
- Removed fetching of user suggestions
- Removed fetching of shortcuts
- Removed featured groups, user suggestions timeline injections
- Removed group featured panel from explore layout for non logged in users
- Removed media gallery panel from profile layout
- Removed lists, suggestions, groups panel from home page
- Removed user suggestions to list page
- Updated pro_timelie in status.rb to find only from 1 hour ago
- Updated home timeline to not include groups and to find only latest from 5 days ago
- Removed search for non logged in users
---
 app/controllers/admin/dashboard_controller.rb            | 2 +-
 app/controllers/api/v1/notifications_controller.rb       | 2 +-
 app/controllers/api/v1/search_controller.rb              | 4 +++-
 .../api/v1/timelines/group_collection_controller.rb      | 2 +-
 app/controllers/api/v1/timelines/group_controller.rb     | 3 ++-
 app/controllers/api/v1/timelines/list_controller.rb      | 2 +-
 app/javascript/gabsocial/actions/chats.js                | 3 ++-
 app/javascript/gabsocial/actions/compose.js              | 2 ++
 app/javascript/gabsocial/actions/lists.js                | 2 ++
 .../gabsocial/components/panel/user_suggestions_panel.js | 5 +++--
 .../gabsocial/components/sidebar/default_sidebar.js      | 2 +-
 .../timeline_injections/timeline_injection_root.js       | 2 ++
 app/javascript/gabsocial/features/shortcuts.js           | 4 +++-
 app/javascript/gabsocial/layouts/explore_layout.js       | 4 ++--
 app/javascript/gabsocial/layouts/profile_layout.js       | 2 +-
 app/javascript/gabsocial/pages/home_page.js              | 6 +++---
 app/javascript/gabsocial/pages/list_page.js              | 2 +-
 app/models/notification.rb                               | 1 +
 app/models/status.rb                                     | 9 ++-------
 app/services/search_service.rb                           | 2 +-
 20 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 44b3ce02..02358900 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -5,7 +5,7 @@ module Admin
   class DashboardController < BaseController
     def index
       @users_count           = User.count
-      @statuses_count        = Status.count
+      @statuses_count        = "." #Status.count
       @pro_accounts_count    = Account.where(is_pro: true).count
       @donor_accounts_count  = Account.where(is_donor: true).count
       @registrations_week    = Redis.current.get("activity:accounts:local:#{current_week}") || 0
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index f2e01cf5..e8ef7f86 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -36,7 +36,7 @@ class Api::V1::NotificationsController < Api::BaseController
   end
 
   def paginated_notifications
-    browserable_account_notifications.paginate_by_id(
+    browserable_account_notifications.latest.paginate_by_id(
       limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
diff --git a/app/controllers/api/v1/search_controller.rb b/app/controllers/api/v1/search_controller.rb
index bb81ed9f..901c6ab3 100644
--- a/app/controllers/api/v1/search_controller.rb
+++ b/app/controllers/api/v1/search_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class Api::V1::SearchController < EmptyController
+class Api::V1::SearchController <  Api::BaseController
+  before_action :require_user!
+  
   RESULTS_LIMIT = 25
 
   def index
diff --git a/app/controllers/api/v1/timelines/group_collection_controller.rb b/app/controllers/api/v1/timelines/group_collection_controller.rb
index 86597e55..c52e261f 100644
--- a/app/controllers/api/v1/timelines/group_collection_controller.rb
+++ b/app/controllers/api/v1/timelines/group_collection_controller.rb
@@ -13,7 +13,7 @@ class Api::V1::Timelines::GroupCollectionController < Api::BaseController
         each_serializer: REST::StatusSerializer,
         relationships: StatusRelationshipsPresenter.new(@statuses, current_account.id)
     else
-      render json: @statuses, each_serializer: REST::StatusSerializer
+      render json: [], each_serializer: REST::StatusSerializer
     end
   end
 
diff --git a/app/controllers/api/v1/timelines/group_controller.rb b/app/controllers/api/v1/timelines/group_controller.rb
index 7b2f49df..defb7bf3 100644
--- a/app/controllers/api/v1/timelines/group_controller.rb
+++ b/app/controllers/api/v1/timelines/group_controller.rb
@@ -54,7 +54,8 @@ class Api::V1::Timelines::GroupController < Api::BaseController
         FeedManager.instance.filter?(:home, status, current_account.id)
       }
     else
-      SortingQueryBuilder.new.call(@sort_type, @group, params[:page])
+      return []
+      # SortingQueryBuilder.new.call(@sort_type, @group, params[:page])
     end
 
   end
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index 1447817f..20960d13 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -9,7 +9,7 @@ class Api::V1::Timelines::ListController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
   def show
-    render json: @statuses,
+    render json: [],
            each_serializer: REST::StatusSerializer,
            relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
   end
diff --git a/app/javascript/gabsocial/actions/chats.js b/app/javascript/gabsocial/actions/chats.js
index b9773618..1b1b92d1 100644
--- a/app/javascript/gabsocial/actions/chats.js
+++ b/app/javascript/gabsocial/actions/chats.js
@@ -21,7 +21,8 @@ export const fetchChatConversationAccountSuggestions = (query) => (dispatch, get
 
 export const debouncedFetchChatConversationAccountSuggestions = debounce((query, dispatch, getState) => {
   if (!query) return
-  
+  return false
+
   api(getState).get('/api/v1/accounts/search', {
     params: {
       q: query,
diff --git a/app/javascript/gabsocial/actions/compose.js b/app/javascript/gabsocial/actions/compose.js
index b455a3be..bcccc8ba 100644
--- a/app/javascript/gabsocial/actions/compose.js
+++ b/app/javascript/gabsocial/actions/compose.js
@@ -537,6 +537,8 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) =>
     cancelFetchComposeSuggestionsAccounts()
   }
 
+  return false
+
   api(getState).get('/api/v1/accounts/search', {
     cancelToken: new CancelToken(cancel => {
       cancelFetchComposeSuggestionsAccounts = cancel
diff --git a/app/javascript/gabsocial/actions/lists.js b/app/javascript/gabsocial/actions/lists.js
index f943c5cf..858a137f 100644
--- a/app/javascript/gabsocial/actions/lists.js
+++ b/app/javascript/gabsocial/actions/lists.js
@@ -289,6 +289,8 @@ export const fetchListAccountsFail = (id, error) => ({
 export const fetchListSuggestions = (q) => (dispatch, getState) => {
   if (!me) return
 
+  return false
+
   const params = {
     q,
     resolve: false,
diff --git a/app/javascript/gabsocial/components/panel/user_suggestions_panel.js b/app/javascript/gabsocial/components/panel/user_suggestions_panel.js
index dcabd0c1..96d3da85 100644
--- a/app/javascript/gabsocial/components/panel/user_suggestions_panel.js
+++ b/app/javascript/gabsocial/components/panel/user_suggestions_panel.js
@@ -34,13 +34,13 @@ class UserSuggestionsPanel extends ImmutablePureComponent {
 
   componentDidUpdate(prevProps, prevState) {
     if (!prevState.fetched && this.state.fetched) {
-      this.handleFetch()
+      // this.handleFetch()
     }
   }
 
   componentDidMount() {
     if (!this.props.isLazy) {
-      this.handleFetch()
+      // this.handleFetch()
     }
   }
 
@@ -60,6 +60,7 @@ class UserSuggestionsPanel extends ImmutablePureComponent {
       suggestionType,
     } = this.props
 
+    return null
     if (suggestions.isEmpty()) return null
 
     const Child = isLoading ? AccountPlaceholder : Account
diff --git a/app/javascript/gabsocial/components/sidebar/default_sidebar.js b/app/javascript/gabsocial/components/sidebar/default_sidebar.js
index 21883c31..3f140377 100644
--- a/app/javascript/gabsocial/components/sidebar/default_sidebar.js
+++ b/app/javascript/gabsocial/components/sidebar/default_sidebar.js
@@ -21,7 +21,7 @@ class DefaultSidebar extends ImmutablePureComponent {
   }
 
   componentDidMount() {
-    this.props.onFetchShortcuts()
+    // this.props.onFetchShortcuts()
   }
 
   handleOpenSidebarMorePopover = () => {
diff --git a/app/javascript/gabsocial/components/timeline_injections/timeline_injection_root.js b/app/javascript/gabsocial/components/timeline_injections/timeline_injection_root.js
index 05d8d27a..fbab3349 100644
--- a/app/javascript/gabsocial/components/timeline_injections/timeline_injection_root.js
+++ b/app/javascript/gabsocial/components/timeline_injections/timeline_injection_root.js
@@ -54,6 +54,8 @@ class TimelineInjectionRoot extends React.PureComponent {
     //If is not XS and popover is pwa, dont show
     //Since not on mobile this should not be visible
     if (!isXS && type === TIMELINE_INJECTION_PWA) return <div />
+    
+    if (type === TIMELINE_INJECTION_FEATURED_GROUPS || type === TIMELINE_INJECTION_USER_SUGGESTIONS) return <div />
 
     return (
       <div>
diff --git a/app/javascript/gabsocial/features/shortcuts.js b/app/javascript/gabsocial/features/shortcuts.js
index 5cbce16c..52af9e9f 100644
--- a/app/javascript/gabsocial/features/shortcuts.js
+++ b/app/javascript/gabsocial/features/shortcuts.js
@@ -10,7 +10,7 @@ import List from '../components/list'
 class Shortcuts extends ImmutablePureComponent {
 
   componentDidMount() {
-    this.props.onFetchShortcuts()
+    // this.props.onFetchShortcuts()
   }
 
   render() {
@@ -20,6 +20,8 @@ class Shortcuts extends ImmutablePureComponent {
       shortcuts,
     } = this.props
 
+    return null
+
     if (isError) {
       return <ColumnIndicator type='error' message='Error fetching shortcuts' />
     }
diff --git a/app/javascript/gabsocial/layouts/explore_layout.js b/app/javascript/gabsocial/layouts/explore_layout.js
index 63240f42..d7813e5d 100644
--- a/app/javascript/gabsocial/layouts/explore_layout.js
+++ b/app/javascript/gabsocial/layouts/explore_layout.js
@@ -65,10 +65,10 @@ class ExploreLayout extends ImmutablePureComponent {
 
     const layout = [
       SignUpLogInPanel,
-      <WrappedBundle component={GroupsPanel} componentParams={{ groupType: 'featured' }} />,
     ]
     if (!!me) {
-      layout.push(<WrappedBundle component={UserSuggestionsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded, suggestionType: 'verified' }} />)
+      layout.push(<WrappedBundle component={GroupsPanel} componentParams={{ groupType: 'featured' }} />)
+      // layout.push(<WrappedBundle component={UserSuggestionsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded, suggestionType: 'verified' }} />)
     }
     layout.push(<WrappedBundle component={TrendsBreakingPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }} />)
 
diff --git a/app/javascript/gabsocial/layouts/profile_layout.js b/app/javascript/gabsocial/layouts/profile_layout.js
index 04dc2d88..4fa0925c 100644
--- a/app/javascript/gabsocial/layouts/profile_layout.js
+++ b/app/javascript/gabsocial/layouts/profile_layout.js
@@ -157,7 +157,7 @@ class ProfileLayout extends ImmutablePureComponent {
                           <div className={[_s.d, _s.w340PX].join(' ')}>
                             <WrappedBundle component={ProfileStatsPanel} componentParams={{ account }} />
                             <WrappedBundle component={ProfileInfoPanel} componentParams={{ account }} />
-                            { !unavailable && <WrappedBundle component={MediaGalleryPanel} componentParams={{ account, isLazy: true, shouldLoad: lazyLoaded }} />}
+                            { /*  !unavailable && <WrappedBundle component={MediaGalleryPanel} componentParams={{ account, isLazy: true, shouldLoad: lazyLoaded }} /> */ }
                             { !me && <WrappedBundle component={SignUpPanel} /> }
                             <WrappedBundle component={LinkFooter} />
                           </div>
diff --git a/app/javascript/gabsocial/pages/home_page.js b/app/javascript/gabsocial/pages/home_page.js
index 167a78b5..6dc87514 100644
--- a/app/javascript/gabsocial/pages/home_page.js
+++ b/app/javascript/gabsocial/pages/home_page.js
@@ -101,9 +101,9 @@ class HomePage extends React.PureComponent {
           <WrappedBundle component={ProPanel} componentParams={{ isPro: isPro }} />,
           <WrappedBundle component={TrendsBreakingPanel} />,
           <WrappedBundle component={ShopPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }}  />,
-          <WrappedBundle component={ListsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }}  />,
-          <WrappedBundle component={UserSuggestionsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }}  />,
-          <WrappedBundle component={GroupsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded, groupType: 'member' }}  />,
+          // <WrappedBundle component={ListsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }}  />,
+          // <WrappedBundle component={UserSuggestionsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }}  />,
+          // <WrappedBundle component={GroupsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded, groupType: 'member' }}  />,
           LinkFooter,
         ]}
       >
diff --git a/app/javascript/gabsocial/pages/list_page.js b/app/javascript/gabsocial/pages/list_page.js
index cac14314..b1421994 100644
--- a/app/javascript/gabsocial/pages/list_page.js
+++ b/app/javascript/gabsocial/pages/list_page.js
@@ -54,7 +54,7 @@ class ListPage extends ImmutablePureComponent {
         layout={[
           <WrappedBundle component={ListDetailsPanel} componentParams={{ list: list, onEdit: this.handleOnOpenListEditModal }} />,
           TrendsBreakingPanel,
-          UserSuggestionsPanel,
+          // UserSuggestionsPanel,
           LinkFooter,
         ]}
       >
diff --git a/app/models/notification.rb b/app/models/notification.rb
index e22d0a7b..3b7615c1 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -42,6 +42,7 @@ class Notification < ApplicationRecord
   validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] }
   validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values }
 
+  scope :latest, -> { where('created_at < ?', 7.days.ago) }
   scope :browserable, ->(exclude_types = [], account_id = nil, only_verified = false, only_following = false) {
     types = TYPE_CLASS_MAP.values - activity_types_from_types(exclude_types + [:follow_request])
 
diff --git a/app/models/status.rb b/app/models/status.rb
index d47de0b0..86e1693a 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -290,12 +290,7 @@ class Status < ApplicationRecord
     end
 
     def as_home_timeline(account)
-      query = where('created_at > ?', 21.days.ago)
-      query.where(visibility: [:public, :unlisted]).or(
-          where(visibility: [:private]).where('group is null')
-      ).or(
-          where(visibility: [:private]).where(group: account.groups)
-      )
+      query = where('created_at > ?', 5.days.ago)
       query.where(account: [account] + account.following).without_replies
     end
 
@@ -309,7 +304,7 @@ class Status < ApplicationRecord
     end
 
     def as_pro_timeline(account = nil)
-      query = timeline_scope.without_replies.popular_accounts.where('statuses.updated_at > ?', 2.hours.ago)
+      query = timeline_scope.without_replies.popular_accounts.where('statuses.updated_at > ?', 1.hours.ago)
       apply_timeline_filters(query, account)
     end
 
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index ffc95022..457cc6de 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -15,7 +15,7 @@ class SearchService < BaseService
 
       if @query.present?
         results[:accounts] = perform_accounts_search! if account_searchable?
-        results[:statuses] = perform_statuses_search! if full_text_searchable? && !account.nil?
+        results[:statuses] = [] # perform_statuses_search! if full_text_searchable? && !account.nil?
         results[:links] = [] # perform_links_search! if !account.nil?
         results[:groups] = perform_groups_search!
       end