jake/mastodon-utils
1
Fork 0
mirror of https://github.com/jakejarvis/mastodon-utils.git synced 2025-04-26 09:05:21 -04:00
Code Issues Releases Wiki Activity

fix overzealous patch

Browse Source
This commit is contained in:
Jake Jarvis 2022-12-08 12:14:16 -05:00
parent 1fb34a86b4
commit 5be6b5488e
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/hide-signup.patch
View File

@ -1,21 +1,15 @@
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.js b/app/javascript/flavours/glitch/features/interaction_modal/index.js diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.js b/app/javascript/flavours/glitch/features/interaction_modal/index.js
index b71c041c9..02683c9d2 100644 index b71c041c9..b9bb32341 100644
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.js --- a/app/javascript/flavours/glitch/features/interaction_modal/index.js
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.js +++ b/app/javascript/flavours/glitch/features/interaction_modal/index.js
@@ -145,13 +145,6 @@ class InteractionModal extends React.PureComponent { @@ -145,7 +145,6 @@ class InteractionModal extends React.PureComponent {
<div className='interaction-modal__choices__choice'> <div className='interaction-modal__choices__choice'>
<h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3> <h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a> <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
- {signupButton} - {signupButton}
- </div>
-
- <div className='interaction-modal__choices__choice'>
- <h3><FormattedMessage id='interaction_modal.on_another_server' defaultMessage='On a different server' /></h3>
- <p><FormattedMessage id='interaction_modal.other_server_instructions' defaultMessage='Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.' /></p>
- <Copypaste value={url} />
</div> </div>
</div>
</div> <div className='interaction-modal__choices__choice'>
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js
index d9ad94961..9a1f31531 100644 index d9ad94961..9a1f31531 100644
--- a/app/javascript/flavours/glitch/features/ui/components/header.js --- a/app/javascript/flavours/glitch/features/ui/components/header.js
@ -41,23 +35,17 @@ index e8023803f..d8c332f08 100644
); );
}; };
diff --git a/app/javascript/mastodon/features/interaction_modal/index.js b/app/javascript/mastodon/features/interaction_modal/index.js diff --git a/app/javascript/mastodon/features/interaction_modal/index.js b/app/javascript/mastodon/features/interaction_modal/index.js
index d4535378f..3cd924bd2 100644 index d4535378f..153c50991 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.js --- a/app/javascript/mastodon/features/interaction_modal/index.js
+++ b/app/javascript/mastodon/features/interaction_modal/index.js +++ b/app/javascript/mastodon/features/interaction_modal/index.js
@@ -145,13 +145,6 @@ class InteractionModal extends React.PureComponent { @@ -145,7 +145,6 @@ class InteractionModal extends React.PureComponent {
<div className='interaction-modal__choices__choice'> <div className='interaction-modal__choices__choice'>
<h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3> <h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a> <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
- {signupButton} - {signupButton}
- </div>
-
- <div className='interaction-modal__choices__choice'>
- <h3><FormattedMessage id='interaction_modal.on_another_server' defaultMessage='On a different server' /></h3>
- <p><FormattedMessage id='interaction_modal.other_server_instructions' defaultMessage='Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.' /></p>
- <Copypaste value={url} />
</div> </div>
</div>
</div> <div className='interaction-modal__choices__choice'>
diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js
index 1384bebda..89becd19b 100644 index 1384bebda..89becd19b 100644
--- a/app/javascript/mastodon/features/ui/components/header.js --- a/app/javascript/mastodon/features/ui/components/header.js