1
mirror of https://github.com/jakejarvis/mastodon-utils.git synced 2025-04-26 09:05:21 -04:00

new homepage patches

This commit is contained in:
Jake Jarvis 2022-12-08 22:02:24 -05:00
parent 5be6b5488e
commit 18aa609716
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
4 changed files with 128 additions and 3 deletions

View File

@ -16,15 +16,17 @@ RAILS_ENV=production bundle exec rails assets:precompile
chown -R mastodon:mastodon /home/mastodon/{scripts,live}
systemctl restart mastodon-web
systemctl restart mastodon-*
```
## Patches
- [`hide-signup.patch`](patches/hide-signup.patch): Hide the "create account" button (for aesthetics, not security!)
- [`hide-contact-email.patch`](patches/hide-contact-email.patch): Hides the `mailto:` link on the About page
- [`hide-server-rules.patch`](patches/hide-server-rules.patch): Applies just to homepage, meant only for single-user instances
- [`hide-signup.patch`](patches/hide-signup.patch): Hide the "create account" button (for aesthetics, **not security!**)
- [`favicons.patch`](patches/favicons.patch): Use custom icon images instead of Mastodon logo
- [`robots.patch`](patches/robots.patch): Disallow search engines for all of Mastodon
- [`system-font.patch`](patches/favicons.patch): Use the system's default sans-serif font stack instead of Roboto
- [`system-font.patch`](patches/system-font.patch): Use the system's default sans-serif font stack instead of Roboto
## License

View File

@ -0,0 +1,38 @@
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
index 57f295ea9..0992ba767 100644
--- a/app/javascript/flavours/glitch/features/about/index.js
+++ b/app/javascript/flavours/glitch/features/about/index.js
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
</div>
-
- <hr className='about__meta__divider' />
-
- <div className='about__meta__column'>
- <h4><FormattedMessage id='about.contact' defaultMessage='Contact:' /></h4>
-
- {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
- </div>
</div>
<Section open title={intl.formatMessage(messages.title)}>
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
index e59f73738..0cb11216e 100644
--- a/app/javascript/mastodon/features/about/index.js
+++ b/app/javascript/mastodon/features/about/index.js
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
</div>
-
- <hr className='about__meta__divider' />
-
- <div className='about__meta__column'>
- <h4><FormattedMessage id='about.contact' defaultMessage='Contact:' /></h4>
-
- {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
- </div>
</div>
<Section open title={intl.formatMessage(messages.title)}>

View File

@ -0,0 +1,66 @@
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
index 57f295ea9..e27a30292 100644
--- a/app/javascript/flavours/glitch/features/about/index.js
+++ b/app/javascript/flavours/glitch/features/about/index.js
@@ -15,7 +15,6 @@ import Image from 'flavours/glitch/components/image';
const messages = defineMessages({
title: { id: 'column.about', defaultMessage: 'About' },
- rules: { id: 'about.rules', defaultMessage: 'Server rules' },
blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
@@ -158,20 +157,6 @@ class About extends React.PureComponent {
))}
</Section>
- <Section title={intl.formatMessage(messages.rules)}>
- {!isLoading && (server.get('rules').isEmpty() ? (
- <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
- ) : (
- <ol className='rules-list'>
- {server.get('rules').map(rule => (
- <li key={rule.get('id')}>
- <span className='rules-list__text'>{rule.get('text')}</span>
- </li>
- ))}
- </ol>
- ))}
- </Section>
-
<Section title={intl.formatMessage(messages.blocks)} onOpen={this.handleDomainBlocksOpen}>
{domainBlocks.get('isLoading') ? (
<>
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
index e59f73738..3468ad19e 100644
--- a/app/javascript/mastodon/features/about/index.js
+++ b/app/javascript/mastodon/features/about/index.js
@@ -15,7 +15,6 @@ import Image from 'mastodon/components/image';
const messages = defineMessages({
title: { id: 'column.about', defaultMessage: 'About' },
- rules: { id: 'about.rules', defaultMessage: 'Server rules' },
blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
@@ -158,20 +157,6 @@ class About extends React.PureComponent {
))}
</Section>
- <Section title={intl.formatMessage(messages.rules)}>
- {!isLoading && (server.get('rules').isEmpty() ? (
- <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
- ) : (
- <ol className='rules-list'>
- {server.get('rules').map(rule => (
- <li key={rule.get('id')}>
- <span className='rules-list__text'>{rule.get('text')}</span>
- </li>
- ))}
- </ol>
- ))}
- </Section>
-
<Section title={intl.formatMessage(messages.blocks)} onOpen={this.handleDomainBlocksOpen}>
{domainBlocks.get('isLoading') ? (
<>

View File

@ -70,3 +70,22 @@ index 8bd32edf9..f11ab1893 100644
</div>
);
};
diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml
index f078e2f7e..6e106cd92 100644
--- a/app/views/auth/shared/_links.html.haml
+++ b/app/views/auth/shared/_links.html.haml
@@ -5,14 +5,8 @@
- if controller_name != 'sessions'
%li= link_to_login t('auth.login')
- - if controller_name != 'registrations'
- %li= link_to t('auth.register'), available_sign_up_path
-
- if controller_name != 'passwords' && controller_name != 'registrations'
%li= link_to t('auth.forgot_password'), new_user_password_path
- - if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?)
- %li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
-
- if user_signed_in? && controller_name != 'setup'
%li= link_to t('auth.logout'), destroy_user_session_path, data: { method: :delete }