]> cat aescling's git repositories - mastodon.git/commitdiff
Add “account timeline” filter category (#12918)
authorThibG <thib@sitedethib.com>
Thu, 23 Jan 2020 20:32:00 +0000 (21:32 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 23 Jan 2020 20:32:00 +0000 (21:32 +0100)
* Add “account timeline” filter category

Previously, no filter category applied to account timelines.

* Rename “Account timelines” into “Profiles”

app/javascript/mastodon/features/account_timeline/index.js
app/javascript/mastodon/selectors/index.js
app/models/custom_filter.rb
config/locales/en.yml

index 8d0cbe5a197b1f8331a85af1bd60191199932848..37622d4c0b8b05391ce91ba6cfccd0360adcac4b 100644 (file)
@@ -115,6 +115,7 @@ class AccountTimeline extends ImmutablePureComponent {
           shouldUpdateScroll={shouldUpdateScroll}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
+          timelineId='account'
         />
       </Column>
     );
index 6f1ce9602a4986beee09fa21bbc5c5ad60f8771f..6a48f3b3f4d9355394d96a95a931bfb1d5ec452e 100644 (file)
@@ -26,6 +26,7 @@ const toServerSideType = columnType => {
   case 'notifications':
   case 'public':
   case 'thread':
+  case 'account':
     return columnType;
   default:
     if (columnType.indexOf('list:') > -1) {
index 382562fb843a36fba848f8a365cd0b9afb1062c8..8df8a4fbf3bd1833a197657424c6229dd7ea9040 100644 (file)
@@ -20,6 +20,7 @@ class CustomFilter < ApplicationRecord
     notifications
     public
     thread
+    account
   ).freeze
 
   include Expireable
index 8a86f8c7aba47e135b4d068481d89cd13f6cbf2f..2bd84c2643ac80ee08ef5542b5136132b8b7e5a8 100644 (file)
@@ -733,6 +733,7 @@ en:
     hint_html: "<strong>What are featured hashtags?</strong> They are displayed prominently on your public profile and allow people to browse your public posts specifically under those hashtags. They are a great tool for keeping track of creative works or long-term projects."
   filters:
     contexts:
+      account: Profiles
       home: Home timeline
       notifications: Notifications
       public: Public timelines