Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remote following success page #4129

Merged
merged 4 commits into from Jul 10, 2017
Merged

Conversation

KScl
Copy link
Contributor

@KScl KScl commented Jul 10, 2017

Instead of immediately redirecting to web upon doing a remote follow, show an interstitial success page with links to web (the same redirect as before), and a link back to the remote user's profile, while also saying it's safe to close the page.

Personally, I keep my instance open in a pinned tab all the time but I prefer using the remote follow button to follow people over copying and pasting URLs around. Having remote follows automatically redirect to web was rather annoying since I would already have it open somewhere else.

Preview of how it looks:
rfconfirm

KScl added 2 commits July 9, 2017 17:15
Includes follow-through links to web (the old redirect target) and back to the remote user's profile
@@ -94,7 +94,7 @@
end

it 'follows account when found' do
target_account = double(id: '123')
target_account = Account.new
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use Fabricate(:account), please see other tests for examples.

@@ -218,6 +218,12 @@ en:
authorize_follow:
error: Unfortunately, there was an error looking up the remote account
follow: Follow
following_html: 'Success! You (<strong>%{self}</strong>) are now following:'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is probably not necessary to specify self in these two strings because the user just clicked from a page that already did that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to keep the two pages looking similar in style, but now that I think about it, you're probably right.

(and all HTML with it)
@ykzts ykzts added the ui Front-end, design label Jul 10, 2017
@Gargron Gargron merged commit 7a889a8 into mastodon:master Jul 10, 2017
@KScl KScl deleted the remote-follow-success branch July 12, 2017 04:14
Gargron pushed a commit that referenced this pull request Jul 12, 2017
* Add Japanese translations for #4163

* Add Japanese translations for #4129

* top page -> front page
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ui Front-end, design
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants