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

Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index a813ac83c..5ac1f663c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -266,7 +266,7 @@ class User < ApplicationRecord
   end
 
   def inactive_message
-    !approved? ? :pending : super
+    approved? ? super : :pending
   end
 
   def approve!