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

Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.

1 files changed, 0 insertions, 26 deletions

diff --git a/app/lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb
deleted file mode 100644
index ab555b1be..000000000
--- a/app/lib/sidekiq_error_handler.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class SidekiqErrorHandler
-  BACKTRACE_LIMIT = 3
-
-  def call(*)
-    yield
-  rescue Mastodon::HostValidationError
-    # Do not retry
-  rescue => e
-    limit_backtrace_and_raise(e)
-  ensure
-    socket = Thread.current[:statsd_socket]
-    socket&.close
-    Thread.current[:statsd_socket] = nil
-  end
-
-  private
-
-  # rubocop:disable Naming/MethodParameterName
-  def limit_backtrace_and_raise(e)
-    e.set_backtrace(e.backtrace.first(BACKTRACE_LIMIT))
-    raise e
-  end
-  # rubocop:enable Naming/MethodParameterName
-end