Change: Not require follow to add list

atsu1125 · Sep 5, 2022 · 9fba65a · 9fba65a
1 parent 4100baa
commit 9fba65a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/app/javascript/flavours/glitch/actions/lists.js b/app/javascript/flavours/glitch/actions/lists.js
@@ -238,7 +238,6 @@ export const fetchListSuggestions = q => (dispatch, getState) => {
     q,
     resolve: false,
     limit: 4,
-    following: true,
   };
 
   api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
@@ -369,4 +368,3 @@ export const addToListAdder = listId => (dispatch, getState) => {
 export const removeFromListAdder = listId => (dispatch, getState) => {
   dispatch(removeFromList(listId, getState().getIn(['listAdder', 'accountId'])));
 };
-
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js
@@ -212,7 +212,6 @@ class Header extends ImmutablePureComponent {
         }
 
         menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
-        menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
         menu.push(null);
       }
 
@@ -229,6 +228,7 @@ class Header extends ImmutablePureComponent {
       }
 
       menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
+      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
     }
 
     if (account.get('acct') !== account.get('username')) {
@@ -318,7 +318,7 @@ class Header extends ImmutablePureComponent {
                     {fields.map((pair, i) => (
                       <dl key={i}>
                         <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} />
-   
+
                         <dd className={pair.get('verified_at') && 'verified'} title={pair.get('value_plain')}>
                           {pair.get('verified_at') && <span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(pair.get('verified_at'), dateFormatOptions) })}><Icon id='check' className='verified__mark' /></span>} <span dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} className='translate' />
                         </dd>

diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js
@@ -238,7 +238,6 @@ export const fetchListSuggestions = q => (dispatch, getState) => {
     q,
     resolve: false,
     limit: 4,
-    following: true,
   };
 
   api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
@@ -369,4 +368,3 @@ export const addToListAdder = listId => (dispatch, getState) => {
 export const removeFromListAdder = listId => (dispatch, getState) => {
   dispatch(removeFromList(listId, getState().getIn(['listAdder', 'accountId'])));
 };
-
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
@@ -209,7 +209,6 @@ class Header extends ImmutablePureComponent {
         }
 
         menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
-        menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
         menu.push(null);
       }
 
@@ -226,6 +225,7 @@ class Header extends ImmutablePureComponent {
       }
 
       menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
+      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
     }
 
     if (account.get('acct') !== account.get('username')) {

diff --git a/app/models/list_account.rb b/app/models/list_account.rb
@@ -12,15 +12,9 @@
 class ListAccount < ApplicationRecord
   belongs_to :list
   belongs_to :account
-  belongs_to :follow, optional: true
 
   validates :account_id, uniqueness: { scope: :list_id }
 
-  before_validation :set_follow
-
   private
 
-  def set_follow
-    self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id) unless list.account_id == account.id
-  end
 end