users: add Restricted user level.

Add a Restricted user level. Restricted users are level 10, below
Members. New users start out as Restricted if they sign up from a proxy
or an IP recently used by another user.

Restricted users can't update or edit any public content on the site
until they verify their email address, at which point they're promoted
to Member. Restricted users are only allowed to do personal actions
like keep favorites, keep favgroups and saved searches, mark dmails as
read or deleted, or mark forum posts as read.

The restricted state already existed before, the only change here is
that now it's an actual user level instead of a hidden state. Before it
was based on two hidden flags on the user, the `requires_verification`
flag (set when a user signs up from a proxy, etc), and the `is_verified`
flag (set after the user verifies their email). Making it a user level
means that now the Restricted status will be shown publicly.

Introducing a new level below Member means that we have to change every
`is_member?` check to `!is_anonymous` for every place where we used
`is_member?` to check that the current user is logged in.

app/controllers/emails_controller.rb

@@ -49,7 +49,7 @@ class EmailsController < ApplicationController
       redirect_to edit_user_email_path(@user)
     elsif params[:email_verification_key].present?
       authorize @email_address
-      @email_address.update!(is_verified: true)
+      @email_address.verify!
       flash[:notice] = "Email address verified"
       redirect_to @email_address.user
     else

app/controllers/favorites_controller.rb

@@ -11,7 +11,7 @@ class FavoritesController < ApplicationController
     elsif params[:user_id].present?
       user = User.find(params[:user_id])
       redirect_to posts_path(tags: "ordfav:#{user.name}", format: request.format.symbol)
-    elsif CurrentUser.is_member?
+    elsif !CurrentUser.is_anonymous?
       redirect_to posts_path(tags: "ordfav:#{CurrentUser.name}", format: request.format.symbol)
     else
       redirect_to posts_path(format: request.format.symbol)

app/controllers/users_controller.rb

@@ -48,7 +48,7 @@ class UsersController < ApplicationController
   def profile
     @user = authorize CurrentUser.user
 
-    if @user.is_member?
+    if !@user.is_anonymous?
       params[:action] = "show"
       respond_with(@user, methods: @user.full_attributes, template: "users/show")
     elsif request.format.html?
@@ -59,11 +59,12 @@ class UsersController < ApplicationController
   end
 
   def create
-    requires_verification = UserVerifier.new(CurrentUser.user, request).requires_verification?
+    user_verifier = UserVerifier.new(CurrentUser.user, request)
 
     @user = authorize User.new(
       last_ip_addr: CurrentUser.ip_addr,
-      requires_verification: requires_verification,
+      requires_verification: user_verifier.requires_verification?,
+      level: user_verifier.initial_level,
       name: params[:user][:name],
       password: params[:user][:password],
       password_confirmation: params[:user][:password_confirmation]

app/javascript/src/styles/base/040_colors.css

@@ -205,6 +205,7 @@
   --user-platinum-color: gray;
   --user-gold-color: #00F;
   --user-member-color: var(--link-color);
+  --user-restricted-color: var(--link-color);
   --user-banned-color: black;
 
   --user-verified-email-color: #0A0;
@@ -294,6 +295,7 @@ body[data-current-user-theme="dark"] {
   --collection-pool-hover-color: var(--general-tag-hover-color);
 
   --user-banned-color: var(--grey-1);
+  --user-restricted-color: var(--blue-1);
   --user-member-color: var(--blue-1);
   --user-gold-color: var(--yellow-1);
   --user-platinum-color: var(--grey-4);

app/javascript/src/styles/common/user_styles.scss

@@ -26,4 +26,8 @@ body[data-current-user-style-usernames="true"] {
   a.user-member {
     color: var(--user-member-color);
   }
+
+  a.user-restricted {
+    color: var(--user-restricted-color);
+  }
 }

app/javascript/src/styles/specific/user_tooltips.scss

@@ -36,6 +36,7 @@
         &.user-tooltip-badge-platinum { background-color: var(--user-platinum-color); }
         &.user-tooltip-badge-gold { background-color: var(--user-gold-color); }
         &.user-tooltip-badge-member { background-color: var(--user-member-color); }
+        &.user-tooltip-badge-restricted { background-color: var(--user-restricted-color); }
         &.user-tooltip-badge-banned { background-color: var(--user-banned-color); }
 
         &.user-tooltip-badge-positive-feedback {

app/logical/user_verifier.rb

@@ -1,6 +1,8 @@
 # Checks whether a new account seems suspicious and should require email verification.
 
 class UserVerifier
+  extend Memoist
+
   attr_reader :current_user, :request
 
   # current_user is the user creating the new account, not the new account itself.
@@ -16,6 +18,14 @@ class UserVerifier
     is_ip_banned? || is_logged_in? || is_recent_signup? || is_proxy?
   end
 
+  def initial_level
+    if requires_verification?
+      User::Levels::RESTRICTED
+    else
+      User::Levels::MEMBER
+    end
+  end
+
   private
 
   def ip_address
@@ -48,4 +58,6 @@ class UserVerifier
   def is_proxy?
     IpLookup.new(ip_address).is_proxy?
   end
+
+  memoize :is_ip_banned?, :is_proxy?, :is_recent_signup?
 end

app/models/comment_vote.rb

@@ -11,10 +11,10 @@ class CommentVote < ApplicationRecord
   def self.visible(user)
     if user.is_moderator?
       all
-    elsif user.is_member?
-      where(user: user)
-    else
+    elsif user.is_anonymous?
       none
+    else
+      where(user: user)
     end
   end
 

app/models/email_address.rb

@@ -5,7 +5,6 @@ class EmailAddress < ApplicationRecord
   validates :normalized_address, uniqueness: true
   validates :user_id, uniqueness: true
   validate :validate_deliverable, on: :deliverable
-  after_save :update_user
 
   def self.visible(user)
     if user.is_moderator?
@@ -60,8 +59,14 @@ class EmailAddress < ApplicationRecord
     end
   end
 
-  def update_user
-    user.update!(is_verified: is_verified? && !is_restricted?)
+  def verify!
+    transaction do
+      update!(is_verified: true)
+
+      if user.is_restricted? && !is_restricted?
+        user.update!(level: User::Levels::MEMBER, is_verified: is_verified?)
+      end
+    end
   end
 
   concerning :VerificationMethods do

app/models/upload.rb

@@ -93,10 +93,10 @@ class Upload < ApplicationRecord
   def self.visible(user)
     if user.is_admin?
       all
-    elsif user.is_member?
-      completed.or(where(uploader: user))
-    else
+    elsif user.is_anonymous?
       completed
+    else
+      completed.or(where(uploader: user))
     end
   end
 

app/models/user.rb

@@ -6,6 +6,7 @@ class User < ApplicationRecord
 
   module Levels
     ANONYMOUS = 0
+    RESTRICTED = 10
     MEMBER = 20
     GOLD = 30
     PLATINUM = 31
@@ -211,6 +212,7 @@ class User < ApplicationRecord
       def level_hash
         return {
           "Member" => Levels::MEMBER,
+          "Restricted" => Levels::RESTRICTED,
           "Gold" => Levels::GOLD,
           "Platinum" => Levels::PLATINUM,
           "Builder" => Levels::BUILDER,
@@ -225,6 +227,9 @@ class User < ApplicationRecord
         when Levels::ANONYMOUS
           "Anonymous"
 
+        when Levels::RESTRICTED
+          "Restricted"
+
         when Levels::MEMBER
           "Member"
 
@@ -278,14 +283,14 @@ class User < ApplicationRecord
       name.match?(/\Auser_[0-9]+~*\z/)
     end
 
-    def is_restricted?
-      requires_verification? && !is_verified?
-    end
-
     def is_anonymous?
       level == Levels::ANONYMOUS
     end
 
+    def is_restricted?
+      level == Levels::RESTRICTED
+    end
+
     def is_member?
       level >= Levels::MEMBER
     end

app/models/user_name_change_request.rb

@@ -11,10 +11,10 @@ class UserNameChangeRequest < ApplicationRecord
   def self.visible(user)
     if user.is_moderator?
       all
-    elsif user.is_member?
-      where(user: User.undeleted)
-    else
+    elsif user.is_anonymous?
       none
+    else
+      where(user: User.undeleted)
     end
   end
 

app/policies/application_policy.rb

@@ -39,11 +39,7 @@ class ApplicationPolicy
   end
 
   def unbanned?
-    user.is_member? && !user.is_banned? && verified?
-  end
-
-  def verified?
-    user.is_verified? || user.is_gold? || !user.requires_verification?
+    user.is_member? && !user.is_banned? && !user.is_restricted?
   end
 
   def policy(object)

app/policies/artist_policy.rb

@@ -12,7 +12,7 @@ class ArtistPolicy < ApplicationPolicy
   end
 
   def can_view_banned?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def permitted_attributes

app/policies/dmail_policy.rb

@@ -4,20 +4,20 @@ class DmailPolicy < ApplicationPolicy
   end
 
   def index?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def mark_all_as_read?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def update?
-    user.is_member? && record.owner_id == user.id
+    !user.is_anonymous? && record.owner_id == user.id
   end
 
   def show?
     return true if user.is_owner?
-    user.is_member? && (record.owner_id == user.id || record.valid_key?(request.params[:key]))
+    !user.is_anonymous? && (record.owner_id == user.id || record.valid_key?(request.params[:key]))
   end
 
   def reportable?

app/policies/favorite_group_policy.rb

@@ -4,7 +4,7 @@ class FavoriteGroupPolicy < ApplicationPolicy
   end
 
   def create?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def update?

app/policies/favorite_policy.rb

@@ -1,9 +1,9 @@
 class FavoritePolicy < ApplicationPolicy
   def create?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def destroy?
-    user.is_member?
+    !user.is_anonymous?
   end
 end

app/policies/forum_topic_policy.rb

@@ -20,7 +20,7 @@ class ForumTopicPolicy < ApplicationPolicy
   end
 
   def mark_all_as_read?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def reply?

app/policies/saved_search_policy.rb

@@ -1,10 +1,10 @@
 class SavedSearchPolicy < ApplicationPolicy
   def index?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def create?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def update?

app/policies/user_name_change_request_policy.rb

@@ -1,10 +1,10 @@
 class UserNameChangeRequestPolicy < ApplicationPolicy
   def index?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def show?
-    user.is_moderator? || (user.is_member? && !record.user.is_deleted?) || (record.user == user)
+    user.is_moderator? || (!user.is_anonymous? && !record.user.is_deleted?) || (record.user == user)
   end
 
   def permitted_attributes

app/policies/user_policy.rb

@@ -16,7 +16,7 @@ class UserPolicy < ApplicationPolicy
   end
 
   def upgrade?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def reportable?
@@ -24,7 +24,7 @@ class UserPolicy < ApplicationPolicy
   end
 
   def fix_counts?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def can_see_last_logged_in_at?

app/policies/user_upgrade_policy.rb

@@ -1,6 +1,6 @@
 class UserUpgradePolicy < ApplicationPolicy
   def create?
-    user.is_member?
+    !user.is_anonymous?
   end
 
   def new?

app/views/forum_topics/_secondary_links.html.erb

@@ -17,7 +17,7 @@
 
   <%= subnav_link_to "Search", search_forum_posts_path %>
   <%= subnav_link_to "Help", wiki_page_path("help:forum") %>
-  <% if CurrentUser.is_member? && @forum_topic && !@forum_topic.new_record? %>
+  <% if !CurrentUser.user.is_anonymous? && @forum_topic && !@forum_topic.new_record? %>
     <li>|</li>
     <%= subnav_link_to "Reply", new_forum_post_path(:topic_id => @forum_topic.id) %>
     <% if !@forum_topic.new_record? && policy(@forum_topic).update? %>

app/views/posts/partials/index/_posts.html.erb

@@ -19,7 +19,7 @@
     </div>
   <% end %>
 
-  <% if CurrentUser.user.is_member? && post_set.tag.present? && post_set.current_page == 1 %>
+  <% if !CurrentUser.user.is_anonymous? && post_set.tag.present? && post_set.current_page == 1 %>
     <% cache("tag-change-notice:#{post_set.tag.name}", expires_in: 4.hours) do %>
       <% if post_set.pending_bulk_update_requests.present? %>
         <div class="fineprint tag-change-notice">