Merge branch 'main' into glitch-soc/merge-upstream

app/javascript/mastodon/components/hashtag.js

@@ -56,7 +56,6 @@ export const ImmutableHashtag = ({ hashtag }) => (
     href={hashtag.get('url')}
     to={`/tags/${hashtag.get('name')}`}
     people={hashtag.getIn(['history', 0, 'accounts']) * 1 + hashtag.getIn(['history', 1, 'accounts']) * 1}
-    uses={hashtag.getIn(['history', 0, 'uses']) * 1 + hashtag.getIn(['history', 1, 'uses']) * 1}
     history={hashtag.get('history').reverse().map((day) => day.get('uses')).toArray()}
   />
 );

app/javascript/mastodon/features/closed_registrations_modal/index.js

@@ -6,7 +6,7 @@ import { domain } from 'mastodon/initial_state';
 import { fetchServer } from 'mastodon/actions/server';
 
 const mapStateToProps = state => ({
-  closed_registrations_message: state.getIn(['server', 'server', 'registrations', 'closed_registrations_message']),
+  message: state.getIn(['server', 'server', 'registrations', 'message']),
 });
 
 export default @connect(mapStateToProps)
@@ -20,11 +20,11 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
   render () {
     let closedRegistrationsMessage;
 
-    if (this.props.closed_registrations_message) {
+    if (this.props.message) {
       closedRegistrationsMessage = (
         <p
           className='prose'
-          dangerouslySetInnerHTML={{ __html: this.props.closed_registrations_message }}
+          dangerouslySetInnerHTML={{ __html: this.props.message }}
         />
       );
     } else {