Sync Glitch follow button with Mastodon #2957
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
That does sound worth fixing.
Diverging from upstream on this is on purpose as I don't think it makes sense from an UX perspective. The button label sometimes being an action, and sometimes being a state (furthermore, a state that is not explicit to people who are not familiar with that social media vocabulary) does not make sense to me. |
|
Sounds good, I'll remove the mutual part later today. |
Fixes the follow button saying "Follow back" when it actually will cancel the follow request (mastodon#31934). Intentionally omits the "Mutual" state.
wackbyte
force-pushed
the
sync-follow-button
branch
from
fefc119 to
7061a45
Compare
|
Fixed :) |
ClearlyClaire
approved these changes
Jan 27, 2025
bingxin666
added a commit
to BakaAC/mastodon
that referenced
this pull request
Jan 29, 2025
commit da674a0 Merge: c5a7789 b740b17 Author: Essem <[email protected]> Date: Tue Jan 28 21:30:13 2025 -0600 Merge remote-tracking branch 'upstream/main' commit b740b17 Author: wackbyte <[email protected]> Date: Tue Jan 28 20:22:19 2025 +0000 Sync Glitch follow button with Mastodon (glitch-soc#2957) Fixes the follow button saying "Follow back" when it actually will cancel the follow request (mastodon#31934). Intentionally omits the "Mutual" state. commit 6be5a8d Merge: 43e1a24 353e5f7 Author: Claire <[email protected]> Date: Tue Jan 28 21:22:02 2025 +0100 Merge pull request glitch-soc#2955 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 5b291fc commit 353e5f7 Merge: e736363 5b291fc Author: Claire <[email protected]> Date: Tue Jan 28 18:13:56 2025 +0100 Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream Conflicts: - `app/validators/poll_options_validator.rb`: Upstream split `PollValidator` in two, and glitch-soc had local changes to make the options configurable. Refactored as upstream did, keeping glitch-soc's configurable limits. commit 5b291fc Author: Claire <[email protected]> Date: Tue Jan 28 15:44:27 2025 +0100 Fix incorrect signature after HTTP redirect (mastodon#33757) commit 32aa83e Author: Claire <[email protected]> Date: Tue Jan 28 15:38:18 2025 +0100 Fix polls not being validated on edition (mastodon#33755) commit 80f72ee Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue Jan 28 10:40:50 2025 +0100 New Crowdin Translations (automated) (mastodon#33753) Co-authored-by: GitHub Actions <[email protected]> commit 0091459 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Jan 28 09:39:50 2025 +0100 Update RuboCop (non-major) to v1.71.0 (mastodon#33644) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 6646a0a Author: Claire <[email protected]> Date: Tue Jan 28 09:21:59 2025 +0100 Fix parameter validation in our custom devise strategies (mastodon#33754) commit 8a2d764 Author: Matt Jankowski <[email protected]> Date: Tue Jan 28 03:08:16 2025 -0500 Reduce factory creation across `controllers/admin` specs (mastodon#33752) commit e736363 Author: Claire <[email protected]> Date: Mon Jan 27 17:24:41 2025 +0100 [Glitch] Add hover cards to follow suggestions Port e973351 to glitch-soc Signed-off-by: Claire <[email protected]> commit 560eaff Author: Eugen Rochko <[email protected]> Date: Mon Jan 27 09:17:59 2025 +0100 [Glitch] Remove system tooltip for alt text in web UI Port 9568733 to glitch-soc Signed-off-by: Claire <[email protected]> commit a21f357 Author: Eugen Rochko <[email protected]> Date: Mon Jan 27 09:08:31 2025 +0100 [Glitch] Fix color of language indicator in light theme in web UI Port 81271a1 to glitch-soc Signed-off-by: Claire <[email protected]> commit 12bdf58 Author: Eugen Rochko <[email protected]> Date: Mon Jan 27 09:06:33 2025 +0100 [Glitch] Refactor `<LanguageDropdown>` into TypeScript Port 52a5c8a to glitch-soc Signed-off-by: Claire <[email protected]> commit 75e304d Author: Claire <[email protected]> Date: Fri Jan 24 17:11:23 2025 +0100 [Glitch] Convert `LanguageDropdownMenu` to functional component Port 9a0166c to glitch-soc Signed-off-by: Claire <[email protected]> commit 17af994 Author: Eugen Rochko <[email protected]> Date: Thu Jan 23 14:01:11 2025 +0100 [Glitch] Add information about alt text to alt text modal in web UI Port 0885c31 to glitch-soc Signed-off-by: Claire <[email protected]> commit c14c553 Author: Claire <[email protected]> Date: Thu Jan 23 13:54:23 2025 +0100 [Glitch] Convert `LanguageDropdown` to a functional component Port db14604 to glitch-soc Signed-off-by: Claire <[email protected]> commit fcc5262 Merge: 43e1a24 93f3c72 Author: Claire <[email protected]> Date: Mon Jan 27 18:19:09 2025 +0100 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test. commit 93f3c72 Author: Matt Jankowski <[email protected]> Date: Mon Jan 27 11:32:06 2025 -0500 Use `expect` in remaining controller locations (mastodon#33748) commit ea743d6 Author: Claire <[email protected]> Date: Mon Jan 27 17:30:18 2025 +0100 Fix error in `TwoFactorPamAuthenticatable` when handling invalid params (mastodon#33746) commit e973351 Author: Claire <[email protected]> Date: Mon Jan 27 17:24:41 2025 +0100 Add hover cards to follow suggestions (mastodon#33749) commit d3b637c Author: Matt Jankowski <[email protected]> Date: Mon Jan 27 09:29:25 2025 -0500 Use `expect` in `Admin::ExportControllerConcern` import params (mastodon#33745) commit 65d9171 Author: Matt Jankowski <[email protected]> Date: Mon Jan 27 09:05:16 2025 -0500 Use `expect` for `admin/` controllers (mastodon#33686) commit 5938428 Author: Renaud Chaput <[email protected]> Date: Mon Jan 27 13:52:30 2025 +0100 Add an optional metric exporter (mastodon#33734) commit b868e30 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Jan 27 12:47:23 2025 +0000 Update dependency @reduxjs/toolkit to v2.5.1 (mastodon#33739) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit df63470 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Jan 27 12:47:20 2025 +0000 Update dependency ox to v2.14.21 (mastodon#33740) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit f8f3182 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon Jan 27 13:46:11 2025 +0100 Update formatjs monorepo (mastodon#33656) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit b53bf23 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon Jan 27 09:39:56 2025 +0100 New Crowdin Translations (automated) (mastodon#33731) Co-authored-by: GitHub Actions <[email protected]> commit 2bfcda1 Author: Mikkel Ricky <[email protected]> Date: Mon Jan 27 09:23:53 2025 +0100 Fix documentation URL (mastodon#33728) commit 9568733 Author: Eugen Rochko <[email protected]> Date: Mon Jan 27 09:17:59 2025 +0100 Remove system tooltip for alt text in web UI (mastodon#33736) commit 81271a1 Author: Eugen Rochko <[email protected]> Date: Mon Jan 27 09:08:31 2025 +0100 Fix color of language indicator in light theme in web UI (mastodon#33724) commit 52a5c8a Author: Eugen Rochko <[email protected]> Date: Mon Jan 27 09:06:33 2025 +0100 Refactor `<LanguageDropdown>` into TypeScript (mastodon#33723) commit 2df86d6 Author: Eugen Rochko <[email protected]> Date: Fri Jan 24 23:20:05 2025 +0100 Fix wrong styles on rules and buttons in the sign-up form (mastodon#33725) commit 79cbb61 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Fri Jan 24 18:16:22 2025 +0100 Update dependency react-select to v5.10.0 (mastodon#33722) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit f73df1f Author: Matt Jankowski <[email protected]> Date: Fri Jan 24 11:57:55 2025 -0500 Fix `Style/HashSlice` cop violations (mastodon#33720) commit 469c8f8 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Fri Jan 24 17:49:48 2025 +0100 Update babel monorepo to v7.26.7 (mastodon#33721) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 9a0166c Author: Claire <[email protected]> Date: Fri Jan 24 17:11:23 2025 +0100 Convert `LanguageDropdownMenu` to functional component (mastodon#33704) commit a1d9c3f Author: Matt Jankowski <[email protected]> Date: Fri Jan 24 09:40:20 2025 -0500 Use `expect` params wrapper for more "auth" and "2FA" "controllers" (mastodon#33717) commit e44b784 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri Jan 24 10:06:25 2025 +0100 New Crowdin Translations (automated) (mastodon#33711) Co-authored-by: GitHub Actions <[email protected]> commit 5c50d89 Author: Christian Schmidt <[email protected]> Date: Fri Jan 24 09:18:46 2025 +0100 Store Bootsnap cache outside bind mounts (devcontainer only) (mastodon#33677) commit 7261951 Author: Claire <[email protected]> Date: Thu Jan 23 18:56:33 2025 +0100 Fix LDSignature tests (mastodon#33705) commit 4b4de02 Author: Claire <[email protected]> Date: Thu Jan 23 15:34:30 2025 +0100 Remove broken link to Terms of Service when none are defined (mastodon#33699) commit ffaf458 Author: Claire <[email protected]> Date: Thu Jan 23 15:09:33 2025 +0100 Change “Prohibited uses” section of ToS template according to feedback (mastodon#33703) commit 1b2c952 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu Jan 23 13:36:03 2025 +0000 New Crowdin Translations (automated) (mastodon#33697) Co-authored-by: GitHub Actions <[email protected]> commit 51ecc73 Author: Matt Jankowski <[email protected]> Date: Thu Jan 23 08:35:19 2025 -0500 Fix intermittent services/ap/process_status_update tags failure (mastodon#33695) commit 0885c31 Author: Eugen Rochko <[email protected]> Date: Thu Jan 23 14:01:11 2025 +0100 Add information about alt text to alt text modal in web UI (mastodon#33702) commit db14604 Author: Claire <[email protected]> Date: Thu Jan 23 13:54:23 2025 +0100 Convert `LanguageDropdown` to a functional component (mastodon#33701)
bingxin666
added a commit
to BakaAC/mastodon
that referenced
this pull request
Jan 29, 2025
* Convert `LanguageDropdown` to a functional component (mastodon#33701) * Add information about alt text to alt text modal in web UI (mastodon#33702) * Fix intermittent services/ap/process_status_update tags failure (mastodon#33695) * New Crowdin Translations (automated) (mastodon#33697) Co-authored-by: GitHub Actions <[email protected]> * Change “Prohibited uses” section of ToS template according to feedback (mastodon#33703) * Remove broken link to Terms of Service when none are defined (mastodon#33699) * Fix LDSignature tests (mastodon#33705) * Store Bootsnap cache outside bind mounts (devcontainer only) (mastodon#33677) * New Crowdin Translations (automated) (mastodon#33711) Co-authored-by: GitHub Actions <[email protected]> * Use `expect` params wrapper for more "auth" and "2FA" "controllers" (mastodon#33717) * Convert `LanguageDropdownMenu` to functional component (mastodon#33704) * Update babel monorepo to v7.26.7 (mastodon#33721) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix `Style/HashSlice` cop violations (mastodon#33720) * Update dependency react-select to v5.10.0 (mastodon#33722) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix wrong styles on rules and buttons in the sign-up form (mastodon#33725) * Refactor `<LanguageDropdown>` into TypeScript (mastodon#33723) * Fix color of language indicator in light theme in web UI (mastodon#33724) * Remove system tooltip for alt text in web UI (mastodon#33736) * Fix documentation URL (mastodon#33728) * New Crowdin Translations (automated) (mastodon#33731) Co-authored-by: GitHub Actions <[email protected]> * Update formatjs monorepo (mastodon#33656) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency ox to v2.14.21 (mastodon#33740) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency @reduxjs/toolkit to v2.5.1 (mastodon#33739) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add an optional metric exporter (mastodon#33734) * Use `expect` for `admin/` controllers (mastodon#33686) * Use `expect` in `Admin::ExportControllerConcern` import params (mastodon#33745) * Add hover cards to follow suggestions (mastodon#33749) * Fix error in `TwoFactorPamAuthenticatable` when handling invalid params (mastodon#33746) * Use `expect` in remaining controller locations (mastodon#33748) * [Glitch] Convert `LanguageDropdown` to a functional component Port db14604 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Add information about alt text to alt text modal in web UI Port 0885c31 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Convert `LanguageDropdownMenu` to functional component Port 9a0166c to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Refactor `<LanguageDropdown>` into TypeScript Port 52a5c8a to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Fix color of language indicator in light theme in web UI Port 81271a1 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Remove system tooltip for alt text in web UI Port 9568733 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Add hover cards to follow suggestions Port e973351 to glitch-soc Signed-off-by: Claire <[email protected]> * Reduce factory creation across `controllers/admin` specs (mastodon#33752) * Fix parameter validation in our custom devise strategies (mastodon#33754) * Update RuboCop (non-major) to v1.71.0 (mastodon#33644) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * New Crowdin Translations (automated) (mastodon#33753) Co-authored-by: GitHub Actions <[email protected]> * Fix polls not being validated on edition (mastodon#33755) * Fix incorrect signature after HTTP redirect (mastodon#33757) * Sync Glitch follow button with Mastodon (glitch-soc#2957) Fixes the follow button saying "Follow back" when it actually will cancel the follow request (mastodon#31934). Intentionally omits the "Mutual" state. --------- Signed-off-by: Claire <[email protected]> Co-authored-by: Claire <[email protected]> Co-authored-by: Eugen Rochko <[email protected]> Co-authored-by: Matt Jankowski <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Christian Schmidt <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mikkel Ricky <[email protected]> Co-authored-by: Renaud Chaput <[email protected]> Co-authored-by: wackbyte <[email protected]> Co-authored-by: Essem <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the follow button saying "Follow back" when it actually will cancel the follow request (mastodon#31934) and makes it say "Mutual" when you're mutuals.
I noticed this happen when someone was following me but my follow request was still pending, and I found the Glitch follow button was inconsistent with the Mastodon one. With this change, they should behave identically to one another.