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 = [
,
@@ -82,6 +82,11 @@ class TabsBar extends React.PureComponent {
+ { pinnedInfo &&
+
+ }
);
}
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