From c2dc7566c115395e48e92be2f61fcc88a0b5625a Mon Sep 17 00:00:00 2001
From: Z <tdxdxoz@gmail.com>
Date: Tue, 5 Nov 2019 22:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E6=B6=88=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8DAPI=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=97=AD=E7=A4=BE=E6=A0=91=E5=9C=B0=E5=9D=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/features/ui/components/tabs_bar.js | 7 ++++++-
 app/javascript/mastodon/initial_state.js                   | 1 +
 app/serializers/initial_state_serializer.rb                | 3 ++-
 config/initializers/rack_attack.rb                         | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index e2bc34a2d..4bcccb82c 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -7,7 +7,7 @@ import { isUserTouching } from '../../../is_mobile';
 import Icon from 'mastodon/components/icon';
 import NotificationsCounterIcon from './notifications_counter_icon';
 
-import { treeRoot } from '../../../initial_state';
+import { treeRoot, pinnedInfo } from '../../../initial_state';
 
 export const links = [
   <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
@@ -82,6 +82,11 @@ class TabsBar extends React.PureComponent {
         </nav>
 
         <div id='tabs-bar__portal' />
+        { pinnedInfo &&
+          <div className="hero-widget__text pinned-info">
+            <p>{pinnedInfo}</p>
+          </div>
+        }
       </div>
     );
   }
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 84afb2c82..e11939c96 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -26,5 +26,6 @@ export const showTrends = getMeta('trends');
 export const title = getMeta('title');
 
 export const treeRoot = getMeta('tree_root');
+export const pinnedInfo = getMeta('pinned_info');
 
 export default initialState;
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index fdba2267b..9f6d41954 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -22,7 +22,8 @@ class InitialStateSerializer < ActiveModel::Serializer
       mascot: instance_presenter.mascot&.file&.url,
       profile_directory: Setting.profile_directory,
       trends: Setting.trends,
-      tree_root: Setting.site_description,
+      tree_root:  ENV['TREE_ADDRESS'], 
+      pinned_info: Setting.site_description,
     }
 
     if object.current_account
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index e8acbc27a..273cac9ca 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -53,11 +53,11 @@ class Rack::Attack
     req.remote_ip == '127.0.0.1' || req.remote_ip == '::1'
   end
 
-  throttle('throttle_authenticated_api', limit: 300, period: 2.minutes) do |req|
+  throttle('throttle_authenticated_api', limit: 300, period: 5.minutes) do |req|
     req.authenticated_user_id if req.api_request?
   end
 
-  throttle('throttle_unauthenticated_api', limit: 300, period: 2.minutes) do |req|
+  throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req|
     req.remote_ip if req.api_request? && req.unauthenticated?
   end