Made line in info suggestions white instead of black

Changed the who's playing JSON file path.

Gemfile

@@ -7,15 +7,17 @@ gem 'jquery-rails'
 gem 'bcrypt' # To use ActiveModel's has_secure_password
 gem 'sanitize'
 gem 'strip_attributes'
-gem 'redcarpet', '~> 3.2.3'
+gem 'redcarpet'
 gem 'hirb' # pretty console output
 gem 'rb-readline'
 gem 'rest-client'
 gem 'activerecord-session_store'
 gem 'highlight_js-rails', github: 'RedstonerServer/highlight_js-rails'
 gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination
-gem 'jquery-textcomplete-rails', github: 'RedstonerServer/jquery-textcomplete-rails' # @mentions
+gem 'jquery-textcomplete-rails' # @mentions
 gem 'actionpack-action_caching', github: 'antulik/actionpack-action_caching', ref: '8c6e52c69315d67437f480da5dce4b7c8737fb32'
+gem 'mail-gpg', github: 'jomo/mail-gpg', ref: 'a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9'
+gem 'totp'
 
 # Gems used only for assets and not required
 # in production environments by default.

Gemfile.lock

@@ -5,15 +5,6 @@ GIT
     highlight_js-rails (8.4)
       rails (>= 3.1.1)
 
-GIT
-  remote: git://github.com/RedstonerServer/jquery-textcomplete-rails.git
-  revision: 8bf23af2d8fa1c5226c2b6889c7796adfe1f8772
-  specs:
-    jquery-textcomplete-rails (0.1.4)
-      coffee-rails (>= 3.2.0)
-      railties (>= 3.2.0)
-      sass-rails (>= 3.2.0)
-
 GIT
   remote: git://github.com/antulik/actionpack-action_caching.git
   revision: 8c6e52c69315d67437f480da5dce4b7c8737fb32
@@ -31,201 +22,235 @@ GIT
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
 
+GIT
+  remote: git://github.com/jomo/mail-gpg.git
+  revision: a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9
+  ref: a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9
+  specs:
+    mail-gpg (0.3.1)
+      gpgme (~> 2.0, >= 2.0.2)
+      mail (~> 2.5, >= 2.5.3)
+
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 2c8f567e53580872d8c6dfe61201e58793ca131e
+  revision: 3804d017333da16d76d9fc6633faf5635c7b03d7
   branch: 4-2-stable
   specs:
-    actionmailer (4.2.5.1)
+    actionmailer (4.2.10)
-      actionpack (= 4.2.5.1)
+      actionpack (= 4.2.10)
-      actionview (= 4.2.5.1)
+      actionview (= 4.2.10)
-      activejob (= 4.2.5.1)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
+    actionpack (4.2.10)
-      actionview (= 4.2.5.1)
+      actionview (= 4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
+    actionview (4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.5.1)
+    activejob (4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
+    activemodel (4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.5.1)
+    activerecord (4.2.10)
-      activemodel (= 4.2.5.1)
+      activemodel (= 4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    rails (4.2.5.1)
+    rails (4.2.10)
-      actionmailer (= 4.2.5.1)
+      actionmailer (= 4.2.10)
-      actionpack (= 4.2.5.1)
+      actionpack (= 4.2.10)
-      actionview (= 4.2.5.1)
+      actionview (= 4.2.10)
-      activejob (= 4.2.5.1)
+      activejob (= 4.2.10)
-      activemodel (= 4.2.5.1)
+      activemodel (= 4.2.10)
-      activerecord (= 4.2.5.1)
+      activerecord (= 4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
+      railties (= 4.2.10)
       sprockets-rails
-    railties (4.2.5.1)
+    railties (4.2.10)
-      actionpack (= 4.2.5.1)
+      actionpack (= 4.2.10)
-      activesupport (= 4.2.5.1)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activerecord-session_store (0.1.2)
+    activerecord-session_store (1.1.1)
-      actionpack (>= 4.0.0, < 5)
+      actionpack (>= 4.0)
-      activerecord (>= 4.0.0, < 5)
+      activerecord (>= 4.0)
-      railties (>= 4.0.0, < 5)
+      multi_json (~> 1.11, >= 1.11.2)
-    arel (6.0.3)
+      rack (>= 1.5.2, < 3)
-    bcrypt (3.1.10)
+      railties (>= 4.0)
-    better_errors (2.1.1)
+    airbrussh (1.3.0)
+      sshkit (>= 1.6.1, != 1.7.0)
+    arel (6.0.4)
+    base32 (0.3.2)
+    bcrypt (3.1.11)
+    better_errors (2.4.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    builder (3.2.2)
+    builder (3.2.3)
-    capistrano (3.4.0)
+    capistrano (3.10.1)
+      airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
-      sshkit (~> 1.3)
+      sshkit (>= 1.9.0)
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.1.6)
+    capistrano-rails (1.1.8)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.0.4)
+    capistrano-rbenv (2.1.3)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     choice (0.2.0)
-    coderay (1.1.0)
+    coderay (1.1.2)
-    coffee-rails (4.1.1)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.5)
-    crass (1.0.2)
+    crass (1.0.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
-    domain_name (0.5.25)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
+    erubi (1.7.1)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
-    globalid (0.3.6)
+    ffi (1.9.23)
-      activesupport (>= 4.1.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    gpgme (2.0.16)
+      mini_portile2 (~> 2.3)
     hirb (0.7.3)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
+    i18n (0.9.5)
-    jquery-rails (4.1.0)
+      concurrent-ruby (~> 1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    jquery-textcomplete-rails (0.1.5)
-    kgio (2.10.0)
+      coffee-rails (>= 3.2.0)
-    loofah (2.0.3)
+      railties (>= 3.2.0)
+      sass-rails (>= 3.2.0)
+    kgio (2.11.2)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
+    mail (2.7.0)
-      mime-types (>= 1.16, < 3)
+      mini_mime (>= 0.1.1)
-    mime-types (2.99)
+    mime-types (3.1)
-    mini_portile2 (2.0.0)
+      mime-types-data (~> 3.2015)
-    minitest (5.8.4)
+    mime-types-data (3.2016.0521)
-    mysql2 (0.4.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    mysql2 (0.4.10)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
+    net-ssh (4.2.0)
     netrc (0.11.0)
-    nokogiri (1.6.7.2)
+    nokogiri (1.8.2)
-      mini_portile2 (~> 2.0.0.rc2)
+      mini_portile2 (~> 2.3.0)
-    nokogumbo (1.4.7)
+    nokogumbo (1.5.0)
       nokogiri
-    rack (1.6.4)
+    rack (1.6.9)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-erd (1.4.5)
+    rails-erd (1.5.2)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.0.3)
+    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.0)
+      loofah (~> 2.2, >= 2.2.2)
-    raindrops (0.15.0)
+    raindrops (0.19.0)
-    rake (10.5.0)
+    rake (12.3.0)
-    rb-readline (0.5.3)
+    rb-fsevent (0.10.3)
-    redcarpet (3.2.3)
+    rb-inotify (0.9.10)
-    rest-client (1.8.0)
+      ffi (>= 0.5.0, < 2)
+    rb-readline (0.5.5)
+    redcarpet (3.4.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
+      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.7)
+      netrc (~> 0.8)
-    ruby-graphviz (1.2.2)
+    ruby-graphviz (1.2.3)
-    sanitize (4.0.1)
+    sanitize (4.6.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4.1)
+      nokogumbo (~> 1.4)
-    sass (3.4.21)
+    sass (3.5.5)
-    sass-rails (5.0.4)
+      sass-listen (~> 4.0.0)
-      railties (>= 4.0.0, < 5.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sprockets (3.5.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.13)
-    sshkit (1.8.1)
+    sshkit (1.16.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    strip_attributes (1.7.1)
+    strip_attributes (1.8.0)
-      activemodel (>= 3.0, < 5.0)
+      activemodel (>= 3.0, < 6.0)
-    thor (0.19.1)
+    thor (0.20.0)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
-    tilt (2.0.2)
+    tilt (2.0.8)
-    tzinfo (1.2.2)
+    totp (1.0.0)
+      base32
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
+    uglifier (4.1.8)
-      execjs (>= 0.3.0)
+      execjs (>= 0.3.0, < 3)
-      json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.5)
-    unicorn (5.0.1)
+    unicorn (5.4.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    webrick (1.3.1)
+    webrick (1.4.2)
 
 PLATFORMS
   ruby
@@ -242,22 +267,24 @@ DEPENDENCIES
   highlight_js-rails!
   hirb
   jquery-rails
-  jquery-textcomplete-rails!
+  jquery-textcomplete-rails
   kaminari!
+  mail-gpg!
   mysql2
   rails!
   rails-erd
   rb-readline
-  redcarpet (~> 3.2.3)
+  redcarpet
   rest-client
   sanitize
   sass-rails
   sqlite3
   strip_attributes
+  totp
   tzinfo-data
   uglifier
   unicorn
   webrick
 
 BUNDLED WITH
-   1.11.2
+   1.16.2

app/assets/stylesheets/dark.css.scss

@@ -103,3 +103,12 @@ textarea {
 .notice {
     color:white;
 }
+.info-suggestions {
+    a:not(:hover) {
+        color: gray;
+    }
+
+    a:first-child {
+        border-right: 1px solid white !important;
+    }
+}

app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :update_ip, :update_seen, :check_banned
+  before_filter :update_ip, :update_seen, :check_banned, :check_2fa
   # TODO: use SSL
 
 
@@ -41,6 +41,14 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def check_2fa
+    # Over complicated way of asking if the user is logged in as a mod without TOTP enabled while they are not on their login settings screen, logging out, or updating their login settings.
+    if current_user && current_user.mod? && !current_user.totp_enabled? && !(controller_name == "users" && action_name == "edit_login") && !(controller_name == "sessions" && action_name == "destroy") && !(controller_name == "users" && action_name == "update_login")
+      flash[:alert] = "Due to your staff rank, you are required to enable 2FA."
+      redirect_to :controller => "users", :action => "edit_login", :id => current_user.id
+    end
+  end
+
 
   #roles
   def disabled?

app/controllers/sessions_controller.rb

@@ -21,6 +21,10 @@ class SessionsController < ApplicationController
           flash[:alert] = "Your account has been disabled!"
         elsif user.banned?
           flash[:alert] = "You are banned!"
+        elsif user.totp_enabled && !TOTP.valid?(user.totp_secret, params[:totp_code].to_i)
+          flash[:alert] = "You're doing it wrong!"
+          render action: 'new'
+          return
         else
           session[:user_id] = user.id
           flash[:notice] = "Logged in!"

app/controllers/statics_controller.rb

@@ -17,8 +17,29 @@ class StaticsController < ApplicationController
   end
 
   def online
-    json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/JavaUtils/players.json"))
+    @players = []
-    @players = json["players"].collect!{ |p| User.find_by(uuid: p["UUID"].tr("-", "")) or User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true) }.sort_by!(&:role).reverse!
+    @count = 0
-    @count = json["amount"]
+    begin
+      json = JSON.parse(File.read("/etc/minecraft/info/players.json"))
+    rescue
+      flash.now[:alert] = "The server is currently offline."
+    else
+      case json["dataFormat"]
+      when "v1"
+        @players = json["players"].collect!{ |p| User.find_by(uuid: p["UUID"].tr("-", "")) or User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true) }
+        @count = json["amount"]
+      when "v2"
+        json["players"].reject{|p| !mod? && p["vanished"] == "true"}.each do |p|
+          @players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true))
+        end
+        @count = @players.count
+      else
+        flash.now[:alert] = "The server is using an incompatible data format. We are aware of this issue and are most likely already working on it."
+      end
+      @players.sort_by!(&:role).reverse!
+    end
+  end
+
+  def privacy
   end
 end

app/controllers/users_controller.rb

@@ -10,12 +10,18 @@ class UsersController < ApplicationController
     role = Role.find_by(name: params[:role])
     badge = Badge.find_by(name: params[:badge])
 
-    @users = User.search(params[:search], role, badge, params.include?(:staff))
+    @users = User.search(params[:search], role, badge, params.include?(:staff), params.include?(:donor))
     @count = @users.size
     @users = @users.page(params[:page]).per(100)
   end
 
   def show
+    begin
+      @ban_json = JSON.parse(File.read("/etc/minecraft/info/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid}
+    rescue
+      flash.now[:alert] = "An error occured while checking if this user is banned from the server!"
+      @ban_json = nil
+    end
   end
 
   # SIGNUP
@@ -81,6 +87,12 @@ class UsersController < ApplicationController
         @user.uuid = user_profile["id"]
         @user.ign  = user_profile["name"] # correct case
 
+        if User.find_by(uuid: @user.uuid)
+          flash[:alert] = "You already have a Redstoner account associated with this Minecraft account. Please log in instead."
+          redirect_to login_path
+          return
+        end
+
         if validate_token(@user.uuid, @user.email, params[:registration_token])
           destroy_token(params[:email])
           @user.last_ip = request.remote_ip # showing in mail
@@ -137,9 +149,14 @@ class UsersController < ApplicationController
   def update
     if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
       if mod?
-        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
+        userdata = user_params([:name, :skype, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
       else
-        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
+        userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
+      end
+      if User.find_by(name: userdata[:name]) && User.find_by(name: userdata[:name]) != @user
+        flash[:alert] = "You have entered a name that belongs to someone else. Please try another."
+        redirect_to edit_user_path(@user)
+        return
       end
       if userdata[:role]
         role = Role.get(userdata[:role])
@@ -218,6 +235,11 @@ class UsersController < ApplicationController
     unless @user.is?(current_user) || admin? && current_user.role > @user.role || superadmin?
       flash[:alert] = "You are not allowed to edit this user's login details!"
       redirect_to @user
+      return
+    end
+
+    if !@user.totp_enabled
+      @user.update(totp_secret: TOTP.secret)
     end
   end
 
@@ -240,6 +262,18 @@ class UsersController < ApplicationController
       @user.email_token = SecureRandom.hex(16) if mail_changed
       @user.confirmed   = !mail_changed
 
+      if params[:user][:totp_enabled] == "1" && !@user.totp_enabled
+        if TOTP.valid?(@user.totp_secret, params[:totp_code].to_i)
+          @user.totp_enabled = true
+        else
+          flash[:alert] = "Wrong TOTP code!"
+          render action: "edit_login"
+          return
+        end
+      elsif params[:user][:totp_enabled] == "0" && @user.totp_enabled
+        @user.totp_enabled = false
+      end
+
       # checking here for password so we can send back changes to the view
       if authenticated
         if @user.save
@@ -347,7 +381,7 @@ class UsersController < ApplicationController
   end
 
   def user_params(add = [])
-    a = [:ign, :email, :password, :password_confirmation, :mail_own_thread_reply, :mail_other_thread_reply, :mail_own_blogpost_comment, :mail_other_blogpost_comment, :mail_mention] + add
+    a = [:ign, :email, :password, :password_confirmation, :mail_own_thread_reply, :mail_other_thread_reply, :mail_own_blogpost_comment, :mail_other_blogpost_comment, :mail_mention, :public_key, :totp_code] + add
     params.require(:user).permit(a)
   end
 end

app/mailers/redstoner_mailer.rb

@@ -1,8 +1,8 @@
 class RedstonerMailer < ActionMailer::Base
 
   add_template_helper(ApplicationHelper)
-  default from: "info@redstoner.com"
+  default from: "\"Redstoner\" <noreply@redstoner.com>"
-  default reply_to: "redstonerserver+website@gmail.com"
+  default reply_to: "staff@redstoner.com"
 
   def register_mail(user, uses_mc_pass)
     @user = user
@@ -19,29 +19,49 @@ class RedstonerMailer < ActionMailer::Base
   def new_thread_mention_mail(user, thread)
     @user   = user
     @thread = thread
-    mail(to: @user.email, subject: "#{thread.author.name} mentioned you in '#{thread.title}' on Redstoner")
+    if @user.public_key?
+      mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
+    else
+      mail(to: @user.email, subject: "#{thread.author.name} mentioned you in '#{thread.title}' on Redstoner")
+    end
   end
 
   def new_thread_reply_mail(user, reply)
     @user  = user
     @reply = reply
-    mail(to: @user.email, subject: "#{reply.author.name} replied to '#{reply.thread.title}' on Redstoner")
+    if @user.public_key?
+      mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
+    else
+      mail(to: @user.email, subject: "#{reply.author.name} replied to '#{reply.thread.title}' on Redstoner")
+    end
   end
 
   def new_post_mention_mail(user, post)
     @user = user
     @post = post
-    mail(to: @user.email, subject: "#{post.author.name} mentioned you in '#{post.title}' on Redstoner")
+    if @user.public_key?
+      mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
+    else
+      mail(to: @user.email, subject: "#{post.author.name} mentioned you in '#{post.title}' on Redstoner")
+    end
   end
 
   def new_post_comment_mail(user, comment)
     @user    = user
     @comment = comment
-    mail(to: @user.email, subject: "#{comment.author.name} replied to '#{comment.blogpost.title}' on Redstoner")
+    if @user.public_key?
+      mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
+    else
+      mail(to: @user.email, subject: "#{comment.author.name} replied to '#{comment.blogpost.title}' on Redstoner")
+    end
   end
 
   def email_change_confirm_mail(user)
     @user = user
-    mail(to: @user.email, subject: "Email change on Redstoner.com")
+    if @user.public_key?
+      mail(to: @user.email, subject: "Encrypted Notification from Redstoner", gpg: {encrypt: true, keys: {@user.email => @user.public_key}})
+    else
+      mail(to: @user.email, subject: "Email change on Redstoner.com")
+    end
   end
 end

app/models/blogpost.rb

@@ -8,6 +8,8 @@ class Blogpost < ActiveRecord::Base
   belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"
   has_many :comments, :dependent => :destroy
   accepts_nested_attributes_for :comments
+  validates_length_of :title, in: 5..255
+  validates_length_of :content, in: 5..20000
 
   def author
     @author ||= if self.user_author.present?

app/models/forum.rb

@@ -4,6 +4,7 @@ class Forum < ActiveRecord::Base
   belongs_to :role_read, class_name: "Role", foreign_key: "role_read_id"
   belongs_to :role_write, class_name: "Role", foreign_key: "role_write_id"
   has_and_belongs_to_many :labels
+  validates_length_of :name, in: 4..30
 
   def to_s
     name

app/models/forumgroup.rb

@@ -7,7 +7,7 @@ class Forumgroup < ActiveRecord::Base
 
 
   validates_presence_of :name, :position
-  validates_length_of :name, in: 2..20
+  validates_length_of :name, in: 4..20
 
   def to_s
     name

app/models/forumthread.rb

@@ -11,6 +11,7 @@ class Forumthread < ActiveRecord::Base
 
   validates_presence_of :title, :author, :forum
   validates_presence_of :content
+  validates_length_of :title, in: 5..255
   validates_length_of :content, in: 5..20000
 
   accepts_nested_attributes_for :threadreplies

app/models/threadreply.rb

@@ -43,7 +43,7 @@ class Threadreply < ActiveRecord::Base
     unless old_content.present?
       posts.each do |post|
         # don't send mail to the author of this reply, don't send to banned/disabled users
-        if post.author != author && post.author.normal? && post.author.confirmed? # &&
+        if post.author != author && post.author.normal? && post.author.confirmed? && thread.can_read?(post.author)
           users << post.author if post.author.mail_other_thread_reply?
         end
       end

app/models/user.rb

@@ -22,6 +22,8 @@ class User < ActiveRecord::Base
   validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[(IPv6)?[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email address."}
   validates :ign, uniqueness: {case_sensitive: false}, format: {with: /\A[a-z\d_]+\z/i, message: "Username is invalid (a-z, 0-9, _)."}
 
+  validates :public_key, format: {with: /\A(-----BEGIN PGP PUBLIC KEY BLOCK-----((.|\n)*?)-----END PGP PUBLIC KEY BLOCK-----)?\z/i, message: "That doesn't look like a PGP formatted public key."}
+
   has_many :blogposts
   has_many :comments
 
@@ -175,12 +177,14 @@ class User < ActiveRecord::Base
     self.email_token ||= SecureRandom.hex(16)
   end
 
-  def self.search (search, role, badge, staff)
+  def self.search (search, role, badge, staff, donor)
     users = User.joins(:role)
     if role
       users = users.where(role: role)
     elsif staff
       users = users.where("roles.value >= ?", Role.get(:mod).to_i)
+    elsif donor
+      users = users.where("badge_id = ? OR badge_id = ?", Badge.get(:donor), Badge.get(:donorplus))
     end
     users = users.where(badge: badge) if badge
     if search

app/views/blogposts/edit.html.erb

@@ -1,10 +1,10 @@
-<% title "Edit News: #{@post.title}" %>
+<% title "Edit Post: #{@post.title}" %>
 
-<h1>Edit post</h1>
+<h1>Edit Post: #{@post.title}</h1>
 <%= form_for @post do |f|%>
   <%= f.text_field :title %>
   <%= render partial: "md_editor", locals: {name: "blogpost[content]", content: @post.content} %>
   <p><%= f.submit "Update Post", class: "btn blue left" %></p>
 <% end %>
-<p><%= button_to "Delete post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right" %></p>
+<p><%= button_to "Delete Post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right" %></p>
 <div class="clear"></div>

app/views/blogposts/index.html.erb

@@ -1,7 +1,7 @@
 <% title "News" %>
 
 <h1>News</h1>
-<%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %>
+<%= link_to 'New Post', new_blogpost_path, class: "btn blue" if mod? %>
 <div id="posts">
   <% @posts.each do |p| %>
     <div class="item-group with-avatar" id="post-<%= p.id %>">

app/views/comments/_new.html.erb

@@ -1,4 +1,4 @@
-<h3>New comment</h3>
+<h3>New Comment</h3>
 <%= form_for [@post, @comment] do |f| %>
   <%= render partial: "md_editor", locals: {name: "comment[content]", content: @comment.content} %>
   <p><%= f.submit class: "btn blue" %></p>

app/views/comments/edit.html.erb

@@ -1,10 +1,10 @@
 <% title "Edit Comment: #{@comment.blogpost.title}" %>
 
-<h1>Edit comment</h1>
+<h1>Edit Comment</h1>
 
 <%= form_for [@comment.blogpost, @comment] do |f| %>
   <%= render partial: "md_editor", locals: {name: "comment[content]", content: @comment.content} %>
   <p><%= f.submit "Update Comment", class: "btn blue left" %></p>
 <% end %>
-<p><%= button_to "Delete comment", [@comment.blogpost, @comment] , method: "delete", data: {confirm: "Delete comment forever?"}, class: "btn red right" %></p>
+<p><%= button_to "Delete Comment", [@comment.blogpost, @comment] , method: "delete", data: {confirm: "Delete comment forever?"}, class: "btn red right" %></p>
 <div class="clear"></div>

app/views/forumgroups/edit.html.erb

@@ -34,7 +34,7 @@
       <td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
     </tr>
   </table>
-  <p><%= f.submit "Update group", class: "btn blue left" %></p>
+  <p><%= f.submit "Update Group", class: "btn blue left" %></p>
 <% end %>
-<p><%= button_to "Delete group", @group, :method => "delete", data: {confirm: "Delete group?\nForums + Threads will not be accessible!"}, class: "btn red right" %></p>
+<p><%= button_to "Delete Group", @group, :method => "delete", data: {confirm: "Delete group?\nForums + Threads will not be accessible!"}, class: "btn red right" %></p>
 <div class="clear"></div>

app/views/forumgroups/new.html.erb

@@ -1,6 +1,6 @@
 <% title "New Forum: #{@group.name}" %>
 
-<h1>New forum group</h1>
+<h1>New Forum Group</h1>
 <% role_selection = Role.all_from_to(:normal, :admin).collect{|p|[p.name, p.id]} %>
 <%= form_for @group do |f|%>
   <table>
@@ -21,6 +21,6 @@
       <td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
     </tr>
   </table>
-  <p><%= f.submit "Create group", class: "btn blue left" %></p>
+  <p><%= f.submit "Create Group", class: "btn blue left" %></p>
   <div class="clear"></div>
 <% end %>

app/views/forums/edit.html.erb

@@ -26,7 +26,7 @@
       <td><%= f.number_field :necro_length, placeholder: "Warning Delay (leave blank for no warning)" %></td>
     </tr>
   </table>
-  <p><%= f.submit "Update forum", class: "btn blue left" %></p>
+  <p><%= f.submit "Update Forum", class: "btn blue left" %></p>
 <% end %>
-<p><%= button_to "Delete forum", @forum, method: "delete", data: {confirm: "Delete forum forever?\nThreads won't be accessible!"}, class: "btn red right" %></p>
+<p><%= button_to "Delete Forum", @forum, method: "delete", data: {confirm: "Delete forum forever?\nThreads won't be accessible!"}, class: "btn red right" %></p>
 <div class="clear"></div>

app/views/forums/index.html.erb

@@ -1,6 +1,6 @@
 <% title "Forums" %>
 
-<%= link_to "All threads", forumthreads_path, class: "btn blue right" %>
+<%= link_to "All Threads", forumthreads_path, class: "btn blue right" %>
 <br>
 <div id="forum_groups">
   <% @groups.each do |group| %>

app/views/forums/new.html.erb

@@ -27,6 +27,6 @@
     </tr>
   </table>
   <%= f.hidden_field :forumgroup_id %>
-  <p><%= f.submit "Create forum", class: "btn blue left" %></p>
+  <p><%= f.submit "Create Forum", class: "btn blue left" %></p>
   <div class="clear"></div>
 <% end %>

app/views/forums/show.atom.builder

@@ -0,0 +1,19 @@
+atom_feed do |feed|
+  feed.title @forum.name + "'s Latest Threads"
+  feed.updated Time.now
+
+  @threads.limit(10).each do |thread|
+    unless thread.sticky?
+      feed.entry thread do |entry|
+        entry.updated thread.updated_at
+        entry.author do |a|
+          a.name thread.author.name
+          a.uri user_url(thread.author)
+        end
+        entry.url forumthread_url(thread)
+        entry.title thread.title
+        entry.content render_md(thread.content).html_safe, :type => 'html'
+      end
+    end
+  end
+end

app/views/forums/show.html.erb

@@ -6,7 +6,7 @@
 </h1>
 <% if @forum.can_write?(current_user) %>
   <p>
-    <%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %>
+    <%= link_to "New Thread", new_forumthread_path(forum: @forum), class: "btn blue" %>
   </p>
 <% end %>
 

app/views/forumthreads/edit.html.erb

@@ -11,7 +11,7 @@
   end
 %>
 
-<h1>Edit thread</h1>
+<h1>Edit Thread</h1>
 <%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → <%= link_to @thread, @thread %> → Edit thread
 <%= form_for @thread do |f|%>
   <table>
@@ -35,7 +35,7 @@
     <%= f.text_field :title, placeholder: "Title" %>
   </div>
   <%= render partial: "md_editor", locals: {name: "forumthread[content]", content: @thread.content} %>
-  <p><%= f.submit "Update thread", class: "btn blue left" %></p>
+  <p><%= f.submit "Update Thread", class: "btn blue left" %></p>
 <% end %>
-<%= button_to "Delete thread", @thread, :method => "delete", data: {confirm: "Delete thread & comments forever?"}, class: "btn red right" %>
+<%= button_to "Delete Thread", @thread, :method => "delete", data: {confirm: "Delete thread & comments forever?"}, class: "btn red right" %>
 <div class="clear"></div>

app/views/forumthreads/index.html.erb

@@ -10,14 +10,14 @@
     if params[:forum]
       text = "forum '#{Forum.find(params[:forum]).name}'"
       if params_list.except(:forum).any?
-        text = "Search results in #{text} (#{@threads.total_count})"
+        text = "Search Results in #{text} (#{@threads.total_count})"
       else
         text = text.capitalize
       end
     elsif params_list.any?
-      text = "Search results (#{@threads.total_count})"
+      text = "Search Results (#{@threads.total_count})"
     else
-      text = "All threads"
+      text = "All Threads"
     end
   %>
   <%= title text %>

app/views/forumthreads/new.html.erb

@@ -8,7 +8,7 @@
 %>
 
 <%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → New thread
-<h1>New thread</h1>
+<h1>New Thread</h1>
 <%= form_for @thread do |f|%>
   <table>
     <% if mod? %>
@@ -30,6 +30,6 @@
   </div>
   <%= render partial: "md_editor", locals: {name: "forumthread[content]", content: @thread.content} %>
   <%= f.hidden_field :forum_id %>
-  <p><%= f.submit "Create thread", class: "btn blue left" %></p>
+  <p><%= f.submit "Create Thread", class: "btn blue left" %></p>
   <div class="clear"></div>
 <% end %>

app/views/layouts/_footer.html.erb

@@ -13,6 +13,12 @@
     <% end %> |
     <%= link_to "https://twitter.com/RedstonerServer", title: "Redstoner on Twitter" do %>
       Twitter <%= image_tag("twitter.png") %>
+    <% end %> |
+    <%= link_to "https://mstdn.io/@RedstonerServer", title: "Redstoner on Mastodon" do %>
+      Mastodon <%= image_tag("mastodon.png") %>
+    <% end %> |
+    <%= link_to "https://discord.gg/QjfcPEJ", title: "Redstoner's Official Discord" do %>
+      Discord <%= image_tag("discord.png") %>
     <% end %>
     <% if current_user %>
       | <%= link_to "/slack/?" + {mail: current_user.try(:email)}.to_param do %>

app/views/redstoner_mailer/email_change_confirm_mail.html.erb

@@ -13,7 +13,7 @@
       </div>
       <p></p>
 
-      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
+      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
       <p>Your Redstoner team</p>
 
     </div>
@@ -25,8 +25,8 @@
       <p>You can contact us via:
         <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
         <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
+        <%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+        <%= link_to "Email", "mailto:staff@redstoner.com", style: "text-decoration: none; color: #4096EE;" %>
       </p>
     </div>
   </div>

app/views/redstoner_mailer/new_post_comment_mail.html.erb

@@ -14,7 +14,7 @@
     %>
     <p><%= link_to "Click here", blogpost_url(@comment.blogpost, page: page) + "#comment-#{@comment.id}", style: "text-decoration: none; color: #4096EE;" %> to view the blog post.</p>
 
-    <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
+    <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
     <p>Your Redstoner team</p>
 
   </div>
@@ -24,8 +24,8 @@
       <p>You can contact us via:
         <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
         <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
+        <%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+        <%= link_to "Email", "mailto:staff@redstoner.com", style: "text-decoration: none; color: #4096EE;" %>
       </p>
     </div>
   </div>

app/views/redstoner_mailer/new_post_mention_mail.html.erb

@@ -10,7 +10,7 @@
 
     <p><%= link_to "Click here", blogpost_url(@post), style: "text-decoration: none; color: #4096EE;" %> to view the blog post.</p>
 
-      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
+      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
       <p>Your Redstoner team</p>
 
     </div>
@@ -21,8 +21,8 @@
       <p>You can contact us via:
         <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
         <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
+        <%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+        <%= link_to "Email", "mailto:staff@redstoner.com", style: "text-decoration: none; color: #4096EE;" %>
       </p>
     </div>
   </div>

app/views/redstoner_mailer/new_thread_mention_mail.html.erb

@@ -11,7 +11,7 @@
 
     <p><%= link_to "Click here", forumthread_url(@thread), style: "text-decoration: none; color: #4096EE;" %> to view the thread.</p>
 
-      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
+      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
       <p>Your Redstoner team</p>
 
     </div>
@@ -23,8 +23,8 @@
       <p>You can contact us via:
         <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
         <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
+        <%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+        <%= link_to "Email", "mailto:staff@redstoner.com", style: "text-decoration: none; color: #4096EE;" %>
       </p>
     </div>
   </div>

app/views/redstoner_mailer/new_thread_reply_mail.html.erb

@@ -15,7 +15,7 @@
     %>
     <p><%= link_to "Click here", forumthread_url(@reply.thread, page: page) + "#reply-#{@reply.id}", style: "text-decoration: none; color: #4096EE;" %> to view the thread.</p>
 
-    <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
+    <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
     <p>Your Redstoner team</p>
 
   </div>
@@ -26,8 +26,8 @@
     <p>You can contact us via:
       <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-      <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
+      <%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-      <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+      <%= link_to "Email", "mailto:staff@redstoner.com", style: "text-decoration: none; color: #4096EE;" %>
     </p>
   </div>
 </div>

app/views/redstoner_mailer/register_mail.html.erb

@@ -25,7 +25,7 @@
       </div>
       <p></p>
 
-      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
+      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(staff: ""), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
       <p>Your Redstoner team</p>
 
     </div>
@@ -37,8 +37,8 @@
       <p>You can contact us via:
         <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
         <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
+        <%= link_to "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+        <%= link_to "Email", "mailto:staff@redstoner.com", style: "text-decoration: none; color: #4096EE;" %>
       </p>
     </div>
   </div>

app/views/sessions/new.html.erb

@@ -1,6 +1,6 @@
-<% title "Log in" %>
+<% title "Log In" %>
 
-<h1>Log in</h1>
+<h1>Log In</h1>
 <p>Not a member? <%= link_to "Join us", signup_path %>!</p>
 <%= form_tag login_path do |f| %>
   <table>
@@ -16,6 +16,14 @@
       <td></td>
       <td><%= link_to "Lost your password?", lost_password_users_path %></td>
     </tr>
+    <tr>
+      <td><%= label_tag :totp_code %></td>
+      <td><%= text_field_tag :totp_code, nil, placeholder: "123456", required: false %></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>Leave this field blank if you do not have 2FA enabled.</td>
+    </tr>
   </table>
   <p><%= submit_tag "Log in", class: "btn blue" %></p>
 <% end %>

app/views/statics/donate.html.erb

@@ -1,3 +1,4 @@
+<% title "Donate" %>
 <h1>Donate</h1>
 
 <p>Running a server is really stressful and requires a lot of work.<br>
@@ -11,7 +12,7 @@
   <li>Donator+ ($20 or more)
 </ul>
 
-<p>We also have <%= link_to "list of users who donated", users_path(badge: "donor") %> already!</p>
+<p>We also have a <%= link_to "list of users who donated", users_path(donor: "") %> already!</p>
 
 <h3>Perks for you</h3>
 <p>For <i>Donator</i> and <i>Donator+</i></p>
@@ -25,11 +26,11 @@
 <div class="donations">
   <div class="donation">
     <div class="left">
-      <img src="<%= image_url("anonymous_skin.png") %>" alt="sponsor's skin" class="body">
+      <img src="https://crafatar.com/renders/body/97a4928198f045998e0e7a97eabae6ae?overlay=true&scale=3" alt="sponsor's skin" class="body">
     </div>
     <div>
       <h1>Donate to our server sponsor</h1>
-      <h4>They pay for our server, but prefer to stay anonymous</h4>
+      <h4>PotatoKek pays for the server hardware. You can help him by donating here.</h4>
       <form target="_blank" method="post" action="https://www.paypal.com/cgi-bin/webscr">
         <% if current_user %>
           <input name="custom" type="hidden" placeholder="Your Minecraft name" value="<%= current_user.ign %>">

app/views/statics/privacy.html.erb

@@ -0,0 +1,41 @@
+<% title "Privacy Policy" %>
+<h1>Privacy Policy</h1>
+<p>Please note that this privacy policy is not legally binding. It is simply a reference intended to inform you about what is done with your information. Also, this privacy policy only applies to the Redstoner website and forums. The Minecraft server will have its own privacy policy at some point.</p>
+<h2>How your information is stored and protected</h2>
+<p>Everything on the website is stored in a database, to which access is strictly limited. Only users of the administrator rank or former administrators who are well known and are trusted by the rest of the current administrators may access the database. Offsite backups of this data are made daily only to the network and servers of at least one current administrator via an encrypted SSH connection.</p>
+<p>Passwords are stored using the bcrypt algorithm. Plaintext passwords are never logged or stored anywhere.</p>
+<p>The website code is <%= link_to "open source", "https://github.com/RedstonerServer/redstoner.com" %> and undergoes heavy testing and review before it is deployed to ensure no exploitable bugs or backdoors make it onto the production server.</p>
+<p>All connections to our website are automatically forced to be made over HTTPS to ensure your data is protected while in transit. We maintain <%= link_to "good TLS paramters", "https://www.ssllabs.com/ssltest/analyze.html?d=redstoner.com" %> and also employ other techniques to ensure secure connections such as <%= link_to "being on the HSTS preload list", "https://hstspreload.org/?domain=redstoner.com" %> and OCSP stapling.</p>
+<h2>Information we collect</h2>
+<p>This information is needed in order for your account to be created:</p>
+<ul>
+  <li>Your Minecraft account's IGN and UUID.</li>
+  <li>Your email address.</li>
+  <li>A unique password.</li>
+</ul>
+<p>This information is optional and is obtained only if you provide it:</p>
+<ul>
+  <li>Your Skype username.</li>
+  <li>Your YouTube channel ID.</li>
+  <li>Your Twitter username.</li>
+</ul>
+<p>This information is also collected, however does not affect your Redstoner account directly:</p>
+<ul>
+  <li>Your IP address.</li>
+</ul>
+<h2>How your information is used and who it is visible to</h2>
+<ul>
+  <li><b>Minecraft account IGN and UUID</b> - This is used to link your Minecraft account with your Redstoner account. Anyone can see these.</li>
+  <li><b>Your email address</b> - This is used to send you email notifications about forums activity that you are involved in. These notifications can be disabled in your account settings. This is also used to perform a password reuse check, which is explained in more detail below. Only users of the moderator rank or higher can see your email address.</li>
+  <li><b>Your password</b> - This is used to authenticate you. This too is used to perform a password reuse check. The plaintext version is visible to no one, but the hashed version is visible only to users of the administrator rank or higher.</li>
+  <li><b>Your Skype username</b> - This is used to add a link to your profile that allows others to easily contact you over Skype. Anyone can see this.</li>
+  <li><b>Your YouTube channel</b> - This is used to add a link to your profile that allows others to easily find your YouTube channel. Anyone can see this.</li>
+  <li><b>Your Twitter username</b> - This is used to add a link to your profile that allows others to easily contact you over Twitter. Anyone can see this.</li>
+  <li><b>Your IP address</b> - This is used to help us identify and ban troublemakers from our forums. Only users of the moderator rank and above can see this.</li>
+</ul>
+<h2>Password reuse check</h2>
+<p>When you first sign up on our website, we use your email address and password to check if you are reusing your password with your Mojang account. This is done by attempting to log into Mojang's server using this information. If it succeeds, then your confirmation email will contain a note warning you not to reuse your password. <b>The information used to perform this check is never used to actually take over your Minecraft account. In fact, we can't because your password is hashed after the check and is totally unusable to us. If you get this warning not to reuse your password, it is still highly recommended that you change your password for your Mojang account and also use a password manager.</b></p>
+<h2>Who your information is shared with</h2>
+<p>We do not share your information with any third parties. The only time we will release information is if we are legally required to.</p>
+<hr>
+<p><sup>This privacy policy was last revised October 31, 2017.</sup></p>

app/views/threadreplies/edit.html.erb

@@ -1,4 +1,4 @@
-<% title "Edit Thread Reply: #{@reply.thread.title}" %>
+<% title "Edit Reply: #{@reply.thread.title}" %>
 
 <%
   position = @reply.thread.replies.order(:id).index(@reply)
@@ -6,10 +6,10 @@
 %>
 
 <%= link_to @reply.thread.forum.group, forumgroup_path(@reply.thread.forum.group) %> → <%= link_to @reply.thread.forum, @reply.thread.forum %> → <%= link_to @reply.thread, forumthread_path(@reply.thread, page: page) + "#reply-#{@reply.id}" %> → Edit reply
-<h1>Edit reply</h1>
+<h1>Edit Reply</h1>
 <%= form_for [@reply.thread, @reply] do |f| %>
   <%= render partial: "md_editor", locals: {name: "threadreply[content]", content: @reply.content} %>
   <p><%= f.submit "Reply", class: "btn blue left" %></p>
 <% end %>
-<p><%= button_to "Delete reply", [@reply.thread, @reply], method: "delete", data: {confirm: "Delete reply forever?"}, class: "btn red right" %></p>
+<p><%= button_to "Delete Reply", [@reply.thread, @reply], method: "delete", data: {confirm: "Delete reply forever?"}, class: "btn red right" %></p>
 <div class="clear"></div>

app/views/users/change_password.html.erb

@@ -1,6 +1,6 @@
 <% title "Change Password" %>
 
-<h1>Change password</h1>
+<h1>Change Password</h1>
 
 <%= form_for @user do |f| %>
   <%= f.text_field :current_password %>

app/views/users/edit.html.erb

@@ -7,7 +7,7 @@
 %>
 
 <%= link_to @user.name, @user %> → Edit
-<h1>Edit profile</h1>
+<h1>Edit Profile</h1>
 
 <%= form_for @user do |f| %>
   <table>
@@ -48,12 +48,6 @@
           <%= f.text_field :skype, placeholder: "Skype username", disabled: !can_edit? %>
         </td>
       </tr>
-      <tr>
-        <td>Show Skype to</td>
-        <td>
-          <%= f.select :skype_public, [["Staff only", false], ["All users", true]], {}, { disabled: !can_edit? } %>
-        </td>
-      </tr>
       <tr>
         <td>YouTube Channel ID</td>
         <td>
@@ -75,11 +69,11 @@
     </tbody>
   </table>
 
-<p><%= f.submit "Save profile", class: "btn variable-size left", disabled: (!@user.confirmed? && @user.is?(current_user)) %></p>
+<p><%= f.submit "Save Profile", class: "btn variable-size left", disabled: (!@user.confirmed? && @user.is?(current_user)) %></p>
 <p>
-  <%= link_to "Edit login details", edit_login_user_path(@user), class: "btn variable-size right" %>
+  <%= link_to "Login Settings", edit_login_user_path(@user), class: "btn variable-size right" %>
-  <%= link_to "Notification settings", edit_notifications_user_path(@user), class: "btn variable-size right" %>
+  <%= link_to "Notification Settings", edit_notifications_user_path(@user), class: "btn variable-size right" %>
-  <%= link_to "Website settings", edit_website_settings_user_path(@user), class: "btn variable-size right" %>
+  <%= link_to "Website Settings", edit_website_settings_user_path(@user), class: "btn variable-size right" %>
 </p>
 <div class="clear"></div>
 

app/views/users/edit_login.html.erb

@@ -1,7 +1,7 @@
 <% title "Edit Login Credentials: #{@user.name}" %>
 
-<%= link_to @user.name, @user %> → Edit Login credentials
+<%= link_to @user.name, @user %> → Edit Login settings
-<h1>Edit Login credentials</h1>
+<h1>Edit Login Settings</h1>
 
 
 <%= form_for @user, url: update_login_user_path(@user), method: :put do |f| %>
@@ -25,14 +25,51 @@
           <%= f.password_field :password_confirmation %>
         </td>
       </tr>
+    </tbody>
+  </table>
+  <hr>
+  <table>
+    <tbody>
+      <tr>
+        <td>2FA Enabled</td>
+        <td>
+          <%= f.check_box :totp_enabled %>
+        </td>
+      </tr>
+      <tr>
+        <td>TOTP Secret</td>
+        <td>
+          <% if !@user.totp_enabled? %>
+          <%= f.text_field :totp_secret, :readonly => true %>
+          <% else %>
+          <i>2FA is currently enabled. Disable 2FA to generate a new secret.</i>
+          <% end %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <hr>
+  <table>
+    <tbody>
       <tr>
         <td>Current password</td>
         <td>
           <%= password_field_tag :current_password, nil, disabled: !@user.is?(current_user) %>
         </td>
       </tr>
+      <% if !@user.totp_enabled? %>
+      <tr>
+        <td>TOTP Code</td>
+        <td>
+          <%= text_field_tag :totp_code, nil, disabled: !@user.is?(current_user) %>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><i>Leave this field blank if you are not enabling 2FA.</i></td>
+      <% end %>
     </tbody>
   </table>
-  <p><%= f.submit "Save changes", class: "btn blue left" %></p>
+  <p><%= f.submit "Save Changes", class: "btn blue left" %></p>
   <div class="clear"></div>
 <% end %>

app/views/users/edit_notifications.html.erb

@@ -45,6 +45,9 @@
       </tr>
     </tbody>
   </table>
-  <p><%= f.submit "Save changes", class: "btn blue left" %></p>
+  <h3>Public Key</h1>
+  <p>All notification emails will be encrypted with this key if you supply it.</p>
+  <%= f.text_area :public_key, placeholder: "-----BEGIN PGP PUBLIC KEY BLOCK-----" %>
+  <p><%= f.submit "Save Changes", class: "btn blue left" %></p>
   <div class="clear"></div>
 <% end %>

app/views/users/edit_website_settings.html.erb

@@ -8,7 +8,7 @@
   <table>
     <tbody>
       <tr>
-        <td>Header moves with scrolling (Experimental - do not report bugs)</td>
+        <td>Header moves with scrolling</td>
         <td>
           <%= f.check_box :header_scroll %>
         </td>
@@ -20,15 +20,13 @@
         </td>
       </tr>
       <tr>
-        <td>Dark theme*</td>
+        <td>Dark theme</td>
         <td>
           <%= f.check_box :dark %>
         </td>
       </tr>
     </tbody>
   </table>
-  <p><%= f.submit "Save changes", class: "btn blue left" %></p>
+  <p><%= f.submit "Save Changes", class: "btn blue left" %></p>
   <div class="clear"></div>
 <% end %>
-<br><br><br>
-*Warning: If as a result to enabling this style your eyes get infected with a severe case of eye cancer, we are not reliable for any damage. Please contact your doctor in advance to ensure that in case of infection you will be treated accordingly. Quality theme  brought to you by Redempt™.

app/views/users/index.html.erb

@@ -14,6 +14,8 @@
       text = "All '#{params[:role]}' and '#{params[:badge]}' users"
     elsif params.include?(:staff)
       text = "All staff"
+    elsif params.include?(:donor)
+      text = "All donors"
     else
       text = "All users"
     end

app/views/users/lost_password.html.erb

@@ -1,6 +1,6 @@
-<% title "Reset password" %>
+<% title "Reset Password" %>
 
-<h1>Reset password</h1>
+<h1>Reset Password</h1>
 <p>You lost your password? Don't do that!</p>
 <p>Luckily for you, you can reset your password. Please use the command <code>/gettoken &lt;your email address&gt;</code>, then fill in the form below:</p>
 <%= form_tag reset_password_users_path do |f| %>
@@ -22,5 +22,5 @@
       <td><%= password_field_tag :new_password, nil, placeholder: "secret", required: true, pattern: ".{8,}", title: "minimum 8 characters", "x-moz-errormessage" => "minimum 8 characters" %></td>
     </tr>
   </table>
-  <p><%= submit_tag "Reset password", class: "btn blue" %></p>
+  <p><%= submit_tag "Reset Password", class: "btn blue" %></p>
 <% end %>

app/views/users/new.html.erb

@@ -1,6 +1,6 @@
-<% title "Sign up" %>
+<% title "Sign Up" %>
 
-<h1>Sign up</h1>
+<h1>Sign Up</h1>
 
 <%= form_for @user do |f| %>
   <table>
@@ -38,7 +38,7 @@
     You can find more details in our info page about <a href="/info/15">tokens and website registration</a>.
   </p>
 
-  <%= f.submit "Sign up", class: "btn blue" %>
+  <%= f.submit "Sign Up", class: "btn blue" %>
 
   <p>Contact us ingame if you have problems signing up!</p>
 <% end %>

app/views/users/show.html.erb

@@ -15,11 +15,13 @@
   <h1><%= @user.name %></h1>
 
   <div class="clear"></div>
-
+  <% if @ban_json && (@ban_json["expires"] == "forever" || !(DateTime.parse(@ban_json["expires"]) <= DateTime.now)) %>
-  <% if @user.banned? %>
+    <span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
-    <span class="user-banned">This user is banned!</span>
   <% end %>
-
+  <% if @user.banned? %>
+      <span class="user-banned">This user is banned on the website!</span>
+  <% end %>
+  <br>
   <% if !@user.confirmed? %>
     <% if @user.is?(current_user) || mod? %>
       <span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
@@ -52,7 +54,7 @@
         <td><b>Role</b></td>
         <td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
       </tr>
-      <% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
+      <% if current_user && !@user.skype.blank? %>
       <tr>
         <td><b>Skype</b></td>
         <td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>

config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.4.0'
+lock '3.10.1'
 
 set :repo_url, 'https://github.com/RedstonerServer/redstoner.com'
 
@@ -13,9 +13,9 @@ set :default_environment, {
 
 set :keep_releases, 5
 
-set :deploy_to, -> { "/home/www-data/apps/#{fetch(:application)}" }
+set :deploy_to, -> { "/var/www/#{fetch(:application)}" }
 
-set :rbenv_ruby, '2.0.0-p648'
+set :rbenv_ruby, '2.5.0-dev'
 
 set :bundle_without, %w{development test}.join(' ')
 

config/environments/development.rb

@@ -37,12 +37,12 @@ Redstoner::Application.configure do
   }
 
   config.action_mailer.smtp_settings = {
-    address:        "smtp.gmail.com",
+    address:        ENV["SMTP_ADDRESS"],
-    port:           587,
+    port:           ENV["SMTP_PORT"],
-    domain:         "google.com",
+    domain:         "redstoner.com",
-    authentication: "plain",
+    authentication: ENV["SMTP_AUTH"],
-    user_name:      "redstonerserver@gmail.com",
+    user_name:      ENV["SMTP_USERNAME"],
-    password:       ENV["GMAIL_PASSWORD"],
+    password:       ENV["SMTP_PASSWORD"],
   }
 
 end

config/environments/production.rb

@@ -71,12 +71,12 @@ Redstoner::Application.configure do
   }
 
   config.action_mailer.smtp_settings = {
-    address:        "smtp.gmail.com",
+    address:        ENV["SMTP_ADDRESS"],
-    port:           587,
+    port:           ENV["SMTP_PORT"],
-    domain:         "google.com",
+    domain:         "redstoner.com",
-    authentication: "plain",
+    authentication: ENV["SMTP_AUTH"],
-    user_name:      "redstonerserver@gmail.com",
+    user_name:      ENV["SMTP_USERNAME"],
-    password:       ENV["GMAIL_PASSWORD"],
+    password:       ENV["SMTP_PASSWORD"],
   }
 
 end

config/routes.rb

@@ -9,6 +9,7 @@ Redstoner::Application.routes.draw do
       get 'donate'
       get 'home'
       get 'online'
+      get 'privacy'
       get 'index'
     end
   end

config/unicorn.rb

@@ -3,8 +3,8 @@ timeout 15
 preload_app true
 
 
-stderr_path "/home/www-data/apps/redstoner/shared/log/unicorn.stderr.log"
+stderr_path "/var/www/redstoner/shared/log/unicorn.stderr.log"
-stdout_path "/home/www-data/apps/redstoner/shared/log/unicorn.stdout.log"
+stdout_path "/var/www/redstoner/shared/log/unicorn.stdout.log"
 
 before_fork do |server, worker|
   Signal.trap 'TERM' do

db/migrate/20170708011014_remove_skype_visibility_from_users.rb

@@ -0,0 +1,6 @@
+class RemoveSkypeVisibilityFromUsers < ActiveRecord::Migration
+  def change
+    remove_column :users, :skype_public
+    User.update_all skype: nil
+  end
+end

db/migrate/20171013001146_add_public_key_to_users.rb

@@ -0,0 +1,5 @@
+class AddPublicKeyToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :public_key, :text
+  end
+end

db/migrate/20180606223258_add_totp_to_users.rb

@@ -0,0 +1,6 @@
+class AddTotpToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :totp_secret, :string
+    add_column :users, :totp_enabled, :boolean, default: false
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170703003647) do
+ActiveRecord::Schema.define(version: 20180606223258) do
 
   create_table "badges", force: :cascade do |t|
     t.string  "name",   limit: 191
@@ -135,7 +135,6 @@ ActiveRecord::Schema.define(version: 20170703003647) do
     t.text     "about",                       limit: 65535
     t.string   "last_ip",                     limit: 255
     t.string   "skype",                       limit: 255
-    t.boolean  "skype_public",                              default: false
     t.string   "youtube",                     limit: 255
     t.string   "youtube_channelname",         limit: 255
     t.string   "twitter",                     limit: 255
@@ -154,6 +153,9 @@ ActiveRecord::Schema.define(version: 20170703003647) do
     t.boolean  "utc_time",                                  default: false
     t.boolean  "header_scroll",                             default: false
     t.boolean  "dark",                                      default: false
+    t.text     "public_key",                  limit: 65535
+    t.string   "totp_secret",                   limit: 255
+    t.boolean  "totp_enabled",                              default: false
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree

db/seeds.rb

@@ -33,7 +33,6 @@ deleted_user = User.create!(
   role: Role.get(:disabled),
   badge: Badge.get(:none),
   skype: "echo123",
-  skype_public: true,
   last_ip: "0.0.0.0",
   confirmed: true,
   last_seen: Time.utc(0).to_datetime,