Merge branch 'main' into HEAD

app/javascript/flavours/glitch/features/community_timeline/index.js

@@ -13,7 +13,7 @@ import { Helmet } from 'react-helmet';
 import { title } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
-  title: { id: 'column.community', defaultMessage: 'Local timeline' },
+  title: { id: 'column.community', defaultMessage: 'The Tavern' },
 });
 
 const mapStateToProps = (state, { columnId }) => {

app/javascript/flavours/glitch/features/compose/components/header.js

@@ -16,7 +16,7 @@ import { signOutLink } from 'flavours/glitch/utils/backend_links';
 //  Messages.
 const messages = defineMessages({
   community: {
-    defaultMessage: 'Local timeline',
+    defaultMessage: 'The Tavern',
     id: 'navigation_bar.community_timeline',
   },
   home_timeline: {

app/javascript/flavours/glitch/features/getting_started/index.js

@@ -25,7 +25,7 @@ const messages = defineMessages({
   public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
-  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'The Tavern' },
   explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },

app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js

@@ -17,7 +17,7 @@ const noop = () => { };
 const messages = defineMessages({
   home_title: { id: 'column.home', defaultMessage: 'Home' },
   notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' },
-  local_title: { id: 'column.community', defaultMessage: 'Local timeline' },
+  local_title: { id: 'column.community', defaultMessage: 'The Tavern' },
   federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' },
 });
 
@@ -114,7 +114,7 @@ const PageFour = ({ domain, intl }) => (
         </div>
       </div>
 
-      <p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p>
+      <p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The Tavern shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p>
     </div>
   </div>
 );

app/javascript/mastodon/locales/defaultMessages.json

@@ -1148,11 +1148,11 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Local timeline",
+        "defaultMessage": "The Tavern",
         "id": "column.community"
       },
       {
-        "defaultMessage": "The local timeline is empty. Write something publicly to get the ball rolling!",
+        "defaultMessage": "The Tavern is empty. Write something publicly to get the ball rolling!",
         "id": "empty_column.community"
       }
     ],
@@ -1615,7 +1615,7 @@
         "id": "navigation_bar.public_timeline"
       },
       {
-        "defaultMessage": "Local timeline",
+        "defaultMessage": "The Tavern",
         "id": "navigation_bar.community_timeline"
       },
       {
@@ -2160,7 +2160,7 @@
         "id": "column_subheading.settings"
       },
       {
-        "defaultMessage": "Local timeline",
+        "defaultMessage": "The Tavern",
         "id": "navigation_bar.community_timeline"
       },
       {
@@ -2253,7 +2253,7 @@
         "id": "hashtag.column_settings.tag_toggle"
       },
       {
-        "defaultMessage": "Local only",
+        "defaultMessage": "Tavern only",
         "id": "community.column_settings.local_only"
       }
     ],
@@ -2425,7 +2425,7 @@
         "id": "keyboard_shortcuts.notifications"
       },
       {
-        "defaultMessage": "to open local timeline",
+        "defaultMessage": "to open the Tavern",
         "id": "keyboard_shortcuts.local"
       },
       {
@@ -3817,7 +3817,7 @@
         "id": "explore.title"
       },
       {
-        "defaultMessage": "Local",
+        "defaultMessage": "The Tavern",
         "id": "tabs_bar.local_timeline"
       },
       {
@@ -3892,7 +3892,7 @@
         "id": "tabs_bar.notifications"
       },
       {
-        "defaultMessage": "Local",
+        "defaultMessage": "The Tavern",
         "id": "tabs_bar.local_timeline"
       },
       {
@@ -3986,4 +3986,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
+]

app/javascript/mastodon/locales/en.json

@@ -71,7 +71,7 @@
   "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
-  "column.community": "Local timeline",
+  "column.community": "The Tavern",
   "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
@@ -95,7 +95,7 @@
   "column_subheading.lists": "Lists",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Tavern only",
   "community.column_settings.media_only": "Media Only",
   "community.column_settings.remote_only": "Remote only",
   "compose.language.change": "Change language",
@@ -174,7 +174,7 @@
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.community": "The Tavern is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
@@ -268,7 +268,7 @@
   "keyboard_shortcuts.home": "Open home timeline",
   "keyboard_shortcuts.hotkey": "Hotkey",
   "keyboard_shortcuts.legend": "Display this legend",
-  "keyboard_shortcuts.local": "Open local timeline",
+  "keyboard_shortcuts.local": "Enter the Tavern",
   "keyboard_shortcuts.mention": "Mention author",
   "keyboard_shortcuts.muted": "Open muted users list",
   "keyboard_shortcuts.my_profile": "Open your profile",
@@ -317,7 +317,7 @@
   "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.community_timeline": "The Tavern",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
@@ -541,7 +541,7 @@
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.local_timeline": "The Tavern",
   "tabs_bar.notifications": "Notifications",
   "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",

config/initializers/rack_attack.rb

@@ -77,7 +77,8 @@ class Rack::Attack
   API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog/.freeze
   API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.freeze
 
-  throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
+  #throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
+  throttle('throttle_api_delete', limit: 300, period: 5.minutes) do |req| # deletion rate limit patch
     req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
   end