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

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

@@ -72,4 +72,4 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
     );
   }
 
-};
+}

app/javascript/mastodon/features/compose/util/counter.js

@@ -6,4 +6,4 @@ export function countableText(inputText) {
   return inputText
     .replace(urlRegex, urlPlaceholder)
     .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3');
-};
+}

app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js

@@ -38,7 +38,7 @@ class ColumnSettings extends React.PureComponent {
     } else {
       return tags;
     }
-  };
+  }
 
   onSelect = mode => value => {
     const oldValue = this.tags(mode);
@@ -98,7 +98,7 @@ class ColumnSettings extends React.PureComponent {
     default:
       return '';
     }
-  };
+  }
 
   render () {
     const { settings, onChange } = this.props;

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

@@ -126,7 +126,7 @@ class ListTimeline extends React.PureComponent {
       onConfirm: () => {
         dispatch(deleteList(id));
 
-        if (!!columnId) {
+        if (columnId) {
           dispatch(removeColumn(columnId));
         } else {
           this.context.router.history.push('/lists');

app/javascript/mastodon/features/ui/components/disabled_account_banner.js

@@ -89,4 +89,4 @@ class DisabledAccountBanner extends React.PureComponent {
     );
   }
 
-};
+}

app/javascript/mastodon/features/ui/components/link_footer.js

@@ -91,4 +91,4 @@ class LinkFooter extends React.PureComponent {
     );
   }
 
-};
+}

app/javascript/mastodon/features/ui/util/react_router_helpers.js

@@ -46,7 +46,7 @@ export class WrappedRoute extends React.Component {
     return {
       hasError: true,
     };
-  };
+  }
 
   state = {
     hasError: false,