just making this so I don't lose work when I switch branches

Gemfile

@@ -15,7 +15,6 @@ 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 'actionpack-action_caching', github: 'antulik/actionpack-action_caching', ref: '8c6e52c69315d67437f480da5dce4b7c8737fb32'
 
 # Gems used only for assets and not required
 # in production environments by default.

Gemfile.lock

@@ -14,14 +14,6 @@ GIT
       railties (>= 3.2.0)
       sass-rails (>= 3.2.0)
 
-GIT
-  remote: git://github.com/antulik/actionpack-action_caching.git
-  revision: 8c6e52c69315d67437f480da5dce4b7c8737fb32
-  ref: 8c6e52c69315d67437f480da5dce4b7c8737fb32
-  specs:
-    actionpack-action_caching (1.2.0)
-      actionpack (>= 4.0.0, < 6)
-
 GIT
   remote: git://github.com/jomo/kaminari.git
   revision: e49066e94d77a6abb03a0819f3c4b0cc6923cb70
@@ -231,7 +223,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack-action_caching!
   activerecord-session_store
   bcrypt
   better_errors

app/assets/stylesheets/dark.css.scss

@@ -1,105 +0,0 @@
-body {
-    background-color:rgb(50, 50, 50);
-    text-shadow:none !important;
-    color:rgb(190, 190, 190) !important;
-}
-::selection {
-    background-color:rgb(100, 150, 255);
-}
-a {
-    color:rgb(203, 75, 22);
-    border-color:black !important;
-}
-a:hover {
-    color:rgb(215, 100, 40);
-}
-#main-content {
-    border-color:black !important;
-    padding:30px 100px;
-    box-shadow:none;
-}
-#main-content-scroll {
-    padding: 131px 100px;
-    border: 1px solid #000;
-  box-shadow: 0 0 5px #000;
-}
-hr {
-    background-color:black !important;
-    border-color:black !important;
-}
-code {
-    background-color:rgb(30, 30, 30) !important;
-    border-color:black !important;
-    color:white !important;
-}
-#head_top {
-    width:100%;
-    z-index:100;
-}
-#head_scroll {
-  @extend #head_top;
-  position: fixed;
-  width: 100%;
-  z-index: 1;
-}
-div#userbar {
-    background-color:rgb(90, 90, 90) !important;
-    border-color:black !important;
-    color:white !important;
-    text-shadow:none !important;
-}
-#head a {
-    text-shadow:none !important;
-    color:white !important;
-}
-#head a:hover {
-    color:rgb(190, 190, 190) !important;
-}
-.header {
-    background-color:rgb(0, 0, 0);
-    border:none !important;
-}
-input[type="email"], input[type="text"], input[type="password"] {
-    background-color:rgb(110, 110, 110) !important;
-    color:white !important;
-}
-::placeholder {
-    color:lightgray;
-}
-.item {
-    background-color:rgb(40, 40, 40) !important;
-    border-color:black !important;
-}
-.item-group {
-    border-color:black !important;
-}
-div.header {
-    background-color:rgb(20, 20, 20) !important;
-}
-.avatar {
-    border-color:black !important;
-}
-.items {
-    border-color:black !important;
-}
-.markdown-help {
-    background-color:rgb(90, 90, 90);
-    color:white;
-    border-color:black;
-}
-textarea {
-    background-color:rgb(100, 100, 100);
-    color:white;
-}
-.headline {
-    border-color:black !important;
-}
-.role {
-    opacity:0.7 !important;
-}
-.label {
-    opacity:0.7 !important;
-}
-.notice {
-    color:white;
-}

app/assets/stylesheets/mobi.css.scss

@@ -4,12 +4,12 @@
 
   th, td {
     // force tables into line-mode
-    // it''s a bit ugly, but probably the best
+    // it's a bit ugly, but probably the best
     // solution for small screens
     display: block;
   }
 
-  #head_top {
+  #head {
     #menu {
       #logo {
         display: none;
@@ -17,19 +17,10 @@
     }
   }
 
-  #head_scroll {
-    @extend #head_top;
-    position: fixed;
-}
-
   #main-content {
     padding: 30px 5px;
   }
 
-  #main-content-scroll {
-    padding: 181px 5px;
-  }
-
   .front-page {
     h1 {
       font-size: 2em !important;

app/assets/stylesheets/style.css.scss

@@ -80,7 +80,7 @@ a {
   }
 }
 
-#head_top {
+#head {
   background: #3f3f3f;
 
   #menu {
@@ -181,13 +181,6 @@ a {
   }
 }
 
-#head_scroll {
-  @extend #head_top;
-  position: fixed;
-  width: 100%;
-  z-index: 1;
-}
-
 .front-page {
   margin: auto;
   text-align: center;
@@ -267,11 +260,6 @@ span.no-about {
   }
 }
 
-#main-content-scroll {
-  @extend #main-content;
-  padding: 131px 100px;
-}
-
 #user-info {
   .user-avatar {
     margin-bottom: 30px;
@@ -449,14 +437,18 @@ blockquote p {
       color: #ddd !important;
     }
   }
+
+  .donor {
+    color: #fff;
+    background: #f60 !important;
+    margin-left: 2px !important;
+  }
+
   .ign {
     display: block;
     color: #000;
     font-style: italic;
   }
-  .badge {
-    margin-left: 2px !important;
-  }
 }
 
 #online-users {
@@ -466,7 +458,6 @@ blockquote p {
 }
 
 .md_editor {
-
   .field_container {
     position: relative;
 
@@ -474,7 +465,7 @@ blockquote p {
       position: absolute;
       top: 1em;
       left: 1em;
-      z-index: 0;
+      z-index: 10;
     }
 
     .editor_field {
@@ -659,6 +650,7 @@ tr.spacer {
 }
 
 .profile-action {
+  font-size: 0;
   float: right;
 }
 
@@ -688,13 +680,6 @@ tr.spacer {
     color: #ddd;
   }
 
-  &.variable-size {
-    background: #4096ee;
-    @media only screen and (max-width: 500px) {
-      font-size: 9px;
-    }
-  }
-
   &.blue {
     background: #4096ee;
 
@@ -1047,19 +1032,3 @@ nav.pagination {
   border-radius: 0.2em;
   text-shadow: none;
 }
-
-.searchfield {
-  height:40px;
-  display: inline-block;
-  &.field {
-    width: 300px;
-  }
-  &.btn {
-    margin: 4px 1px 0 0;
-    cursor: default;
-    color: #fff;
-    font-size: 12px;
-    background: #4096ee;
-    width: 40px;
-  }
-}

app/controllers/blogposts_controller.rb

@@ -4,7 +4,7 @@ class BlogpostsController < ApplicationController
   before_filter :auth, except: [:index, :show]
 
   def index
-    @posts = Blogpost.order(id: :desc).page(params[:page]).per(10)
+    @posts = Blogpost.order("created_at desc").page(params[:page]).per(10)
   end
 
   def show

app/controllers/forumgroups_controller.rb

@@ -19,19 +19,6 @@ class ForumgroupsController < ApplicationController
   def update
     if admin?
       @group = Forumgroup.find(params[:id])
-      group_badges = Badgeassociation.where(forumgroup: @group)
-      ["read-", "write-"].each_with_index do |p,i|
-        current_badges = group_badges.where(permission: i+1).pluck(:badge_id)
-        params.select{|k,v| k.start_with? p}.each do |k,v|
-          name = k.gsub(p, "")
-          if current_badges.include? (bid = Badge.find_by(name: name).id)
-            current_badges.delete bid
-          else
-            Badgeassociation.create!(badge: Badge.find_by(name: name), forumgroup: @group, permission: i+1)
-          end
-        end
-        current_badges.each {|b| Badgeassociation.find_by(badge_id: b, forumgroup: @group, permission: i+1).delete}
-      end
       if @group.update_attributes(group_params)
         flash[:notice] = "Forum group updated"
         redirect_to @group
@@ -56,11 +43,6 @@ class ForumgroupsController < ApplicationController
   def create
     if admin?
       @group = Forumgroup.new(group_params)
-      ["read-", "write-"].each_with_index do |p,i|
-        params.select{|k,v| k.start_with? p}.each do |k,v|
-          Badgeassociation.create!(badge: Badge.find_by(name: k.gsub(p, "")), forumgroup: @group, permission: i+1)
-        end
-      end
       if @group.save
         flash[:notice] = "Forum group created."
         redirect_to @group

app/controllers/forums_controller.rb

@@ -1,5 +1,4 @@
 class ForumsController < ApplicationController
-
   before_filter :check_permission, only: [:show, :edit, :update, :destroy]
 
   def index
@@ -11,7 +10,7 @@ class ForumsController < ApplicationController
     @threads = @forum.forumthreads.select {|f| f.can_read?(current_user) }.to_a
     @threads.sort_by! do |t|
       # sticky goes first, then sort by last activity (new replies)
-      [t.sticky ? 0 : 1, -(t.replies.order(:id).last.try(:created_at) || t.created_at).to_i]
+      [t.sticky ? 0 : 1, -(t.replies.last.try(:created_at) || t.created_at).to_i]
     end
     @threads = Kaminari.paginate_array(@threads).page(params[:page])
   end
@@ -35,19 +34,6 @@ class ForumsController < ApplicationController
 
   def update
     if admin?
-      forum_badges = Badgeassociation.where(forum: @forum)
-      ["read-", "write-"].each_with_index do |p,i|
-        current_badges = forum_badges.where(permission: i+1).pluck(:badge_id)
-        params.select{|k,v| k.start_with? p}.each do |k,v|
-          name = k.gsub(p, "")
-          if current_badges.include? (bid = Badge.find_by(name: name).id)
-            current_badges.delete bid
-          else
-            Badgeassociation.create!(badge: Badge.find_by(name: name), forum: @forum, permission: i+1)
-          end
-        end
-        current_badges.each {|b| Badgeassociation.find_by(badge_id: b, forum: @forum, permission: i+1).delete}
-      end
       if @forum.update_attributes(forum_params)
         flash[:notice] = "Forum updated"
         redirect_to @forum
@@ -63,11 +49,6 @@ class ForumsController < ApplicationController
   def create
     if admin?
       @forum = Forum.new(forum_params([:forumgroup_id]))
-      ["read-", "write-"].each_with_index do |p,i|
-        params.select{|k,v| k.start_with? p}.each do |k,v|
-          Badgeassociation.create!(badge: Badge.find_by(name: k.gsub(p, "")), forum: @forum, permission: i+1)
-        end
-      end
       if @forum.save
         flash[:notice] = "Forum created."
         redirect_to @forum
@@ -96,6 +77,7 @@ class ForumsController < ApplicationController
     redirect_to forums_path
   end
 
+
   private
 
   def check_permission
@@ -107,7 +89,7 @@ class ForumsController < ApplicationController
   end
 
   def forum_params(add = [])
-    a = [:name, :position, :role_read_id, :role_write_id, :necro_length] + add
+    a = [:name, :position, :role_read_id, :role_write_id] + add
     params.require(:forum).permit(a)
   end
 end

app/controllers/forumthreads_controller.rb

@@ -3,19 +3,11 @@ class ForumthreadsController < ApplicationController
   before_filter :check_permission, only: [:show, :edit, :update, :destroy]
 
   def index
-    params[:forum] = nil if params[:forum] && !Forum.find_by(id: params[:forum])
+    redirect_to forum_path(@thread.forum.forumgroup, f)
-
-    params.delete_if{|k,v| v.blank?}
-
-    @threads = Forumthread.filter(current_user, params[:title].try(:slice, 0..255), params[:content].try(:slice, 0..255), params[:reply].try(:slice, 0..255), params[:label], User.find_by(ign: params[:author].to_s.strip) || params[:author], params[:query].try(:slice, 0..255), Forum.find_by(id: params[:forum]))
-    .page(params[:page]).per(30)
   end
+
   def show
-    if params[:reverse] == "true"
+    @replies = @thread.replies.page(params[:page])
-      @replies = @thread.replies.order(id: :desc).page(params[:page])
-    else
-      @replies = @thread.replies.order(:id).page(params[:page])
-    end
   end
 
   def edit
@@ -84,9 +76,6 @@ class ForumthreadsController < ApplicationController
     redirect_to @thread.forum
   end
 
-  def search
-  end
-
   private
 
   def check_permission

app/controllers/messagereplies_controller.rb

@@ -0,0 +1,77 @@
+class MessagerepliesController < ApplicationController
+
+  def edit
+    @reply = Messagereply.find(params[:id])
+    if mod? || @reply.author.is?(current_user)
+    else
+      flash[:alert] = "You are not allowed to edit this reply"
+      redirect_to @reply.message
+    end
+  end
+
+  def create
+    message = Message.find(params[:message_id])
+    if [message.user_sender, message.user_target].include? current_user
+      @reply = Messagereply.new(reply_params)
+      @reply.user_author = current_user
+      @reply.message = message
+      if @reply.save
+        if false
+          @reply.send_new_message_reply_mail
+        end
+        Message.find(params[:message_id]).update_attributes(user_hidden: nil, user_unread_id: current_user.id)
+        position = message.replies.count - 1
+        page     = position / Kaminari.config.default_per_page + 1
+        redirect_to message_path(@reply.message, page: page) + "#reply-#{@reply.id}", notice: 'Reply created!'
+      else
+        flash[:alert] = "Could not create reply."
+        redirect_to Message.find(params[:message_id])
+      end
+    else
+      flash[:alert] = "You are not allowed to create replies."
+      redirect_to Message.find(params[:message_id])
+    end
+  end
+
+  def update
+    @reply = Messagereply.find(params[:id])
+    if mod? || @reply.author.is?(current_user)
+      old_content = @reply.text_was
+      if @reply.update_attributes(reply_params)
+        if false
+          @reply.send_new_reply_mail(old_content)
+        end
+        flash[:notice] = "Reply updated!"
+        position = @reply.message.replies.index(@reply)
+        page     = position / Kaminari.config.default_per_page + 1
+        redirect_to message_path(@reply.message, page: page) + "#reply-#{@reply.id}"
+      else
+        flash[:alert] = "There was a problem while updating your reply"
+        render action: "edit"
+      end
+    else
+      flash[:alert] = "You are not allowed to edit this reply"
+      redirect_to @reply.message
+    end
+  end
+
+  def destroy
+    @reply = Messagereply.find(params[:id])
+    if mod? || @reply.author.is?(current_user)
+      if @reply.destroy
+        flash[:notice] = "Reply deleted!"
+      else
+        flash[:alert] = "There was a problem while deleting this reply"
+      end
+    else
+      flash[:alert] = "You are not allowed to delete this reply"
+    end
+    redirect_to @reply.message
+  end
+
+  private
+
+  def reply_params
+    params.require(:messagereply).permit(:text)
+  end
+end

app/controllers/messages_controller.rb

@@ -0,0 +1,128 @@
+class MessagesController < ApplicationController
+
+  before_filter :set_current
+  def set_current
+    User.current = current_user
+  end
+
+  before_filter :check_permission, only: [:show, :edit, :update, :destroy]
+
+  def index
+    if current_user
+      @messages = Message.where("(user_sender_id = ? OR user_target_id = ?) AND (user_hidden_id != ? OR user_hidden_id IS NULL)", current_user.id, current_user.id, current_user.id).page(params[:page])
+    else
+      flash[:alert] = "Please log in to see your private messages."
+      redirect_to blogposts_path
+    end
+  end
+
+  def show
+    Message.find(@message.id).update_attributes(user_unread: nil) unless @message.user_unread == current_user
+    @replies = @message.replies.page(params[:page])
+  end
+
+  def edit
+    unless mod? || @message.author.is?(current_user)
+      flash[:alert] = "You are not allowed to edit this message!"
+      redirect_to @message
+    end
+  end
+
+  def new
+    if current_user
+      @message = Message.new
+    else
+      flash[:alert] = "Please log in to send a private message."
+      redirect_to blogposts_path
+    end
+  end
+
+  def create
+    unless message_params[:user_target_id]
+      flash[:alert] = "Please enter a valid IGN before sending."
+      redirect_to new_message_path
+      return
+    end
+    if message_params[:subject].blank?
+      flash[:alert] = "Please write a subject before sending."
+      redirect_to new_message_path
+      return
+    elsif message_params[:text].blank?
+      flash[:alert] = "Please write a message before sending."
+      redirect_to new_message_path
+      return
+    end
+    @message = Message.new(message_params)
+    @message.user_target = User.find(@message.user_target_id)
+    @message.user_unread = User.find(@message.user_unread_id) if @message.user_unread_id
+    if @message.save
+      @message.send_new_message_mail
+      flash[:notice] = "Message sent!"
+      redirect_to messages_path
+    else
+      flash[:alert] = "Something went wrong while creating your message."
+      render action: "new"
+    end
+  end
+
+  def update
+    if mod? || @message.user_sender.is?(current_user)
+      @message.user_editor_id = current_user.id
+      @message.attributes = message_params
+      if @message.save
+        redirect_to @message, notice: 'Message has been updated.'
+      else
+        flash[:alert] = "There was a problem while updating the message."
+        render action: "edit"
+      end
+    else
+      flash[:alert] = "You are not allowed to edit this message!"
+      redirect_to @message
+    end
+  end
+
+  def destroy
+    if [@message.user_target, @message.user_sender].include?(current_user)
+      if @message.destroy
+        flash[:notice] = "Message deleted!"
+      else
+        unless @message.user_hidden
+          flash[:alert] = "There was a problem while deleting this message."
+        else
+          Message.find(@message.id).update_attributes(user_hidden: current_user)
+        end
+      end
+    else
+      flash[:alert] = "You are not allowed to delete this message."
+    end
+    redirect_to messages_path
+  end
+
+  def destroy_all
+    Message.destroy_all(user_target_id: current_user.id)
+    if Message.where(user_target_id: current_user.id).empty?
+      flash[:notice] = "Your messages have been deleted!"
+    else
+      flash[:alert] = "There was a problem while deleting your messages."
+    end
+    redirect_to messages_path
+  end
+
+  def message_params(add = [])
+    params[:message][:user_target_id] = User.find_by(ign: params[:message][:user_target].strip).try(:id)
+    params[:message][:user_sender_id] = User.find_by(ign: params[:message][:user_sender]).id
+    params[:message][:user_hidden_id] = User.find_by(ign: params[:message][:user_hidden]).try(:id)
+    params[:message][:user_unread_id] = User.find_by(ign: params[:message][:user_unread]).try(:id)
+params.require(:message).permit([:subject, :text, :user_target_id, :user_sender_id, :user_hidden_id, :user_unread_id])
+  end
+
+  private
+
+  def check_permission
+    @message = Message.find(params[:id])
+    unless [@message.user_target, @message.user_sender].include? current_user
+      flash[:alert] = "You are not allowed to view this message"
+      redirect_to home_statics_path
+    end
+  end
+end

app/controllers/statics_controller.rb

@@ -1,7 +1,5 @@
 class StaticsController < ApplicationController
 
-  caches_action :online, expires_in: 10.seconds, layout: false
-
   def index
     if current_user
       redirect_to blogposts_path
@@ -16,9 +14,4 @@ class StaticsController < ApplicationController
   def donate
   end
 
-  def online
-    json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/JavaUtils/players.json"))
-    @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 = json["amount"]
-  end
 end

app/controllers/threadreplies_controller.rb

@@ -37,7 +37,7 @@ class ThreadrepliesController < ApplicationController
       if @reply.update_attributes(reply_params)
         @reply.send_new_reply_mail(old_content)
         flash[:notice] = "Reply updated!"
-        position = @reply.thread.replies.order(:id).index(@reply)
+        position = @reply.thread.replies.index(@reply)
         page     = position / Kaminari.config.default_per_page + 1
         redirect_to forumthread_path(@reply.thread, page: page) + "#reply-#{@reply.id}"
       else

app/controllers/users_controller.rb

@@ -7,10 +7,24 @@ class UsersController < ApplicationController
   before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions]
 
   def index
-    role = Role.find_by(name: params[:role])
+    if params[:role]
-    badge = Badge.find_by(name: params[:badge])
+      if params[:role].downcase == "staff"
-
+        @users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
-    @users = User.search(params[:search], role, badge, params.include?(:staff))
+      elsif params[:role].downcase == "donor"
+        @users = User.joins(:role).where(donor: true)
+      else
+        if role = Role.get(params[:role])
+          @users = User.joins(:role).where(role: role)
+        else
+          flash[:alert] = "role '#{params[:role]}' does not exist!"
+          redirect_to users_path
+          return
+        end
+      end
+    else
+      @users = User.joins(:role).where.not(id: User.first.id) #Remove first user
+    end
+    @users = @users.order("roles.value desc", "confirmed desc", :name)
     @count = @users.size
     @users = @users.page(params[:page]).per(100)
   end
@@ -137,9 +151,9 @@ 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, :skype_public, :youtube, :twitter, :about, :role, :confirmed, :donor])
       else
-        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
+        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about])
       end
       if userdata[:role]
         role = Role.get(userdata[:role])
@@ -150,9 +164,6 @@ class UsersController < ApplicationController
           userdata.delete(:role)
         end
       end
-      if userdata[:badge]
-        userdata[:badge] = Badge.get(userdata[:badge])
-      end
       if @user.youtube != userdata[:youtube]
         youtube = get_youtube(userdata[:youtube])
         userdata[:youtube] = youtube[:channel]
@@ -221,13 +232,6 @@ class UsersController < ApplicationController
     end
   end
 
-  def edit_website_settings
-    unless @user.is?(current_user) || admin? && current_user.role > @user.role || superadmin?
-      flash[:alert] = "You are not allowed to edit this user's website settings!"
-      redirect_to @user
-    end
-  end
-
   def update_login
     if @user.is?(current_user) || admin? && current_user.role > @user.role || superadmin?
       authenticated = !@user.is?(current_user) || @user.authenticate(params[:current_password])

app/helpers/application_helper.rb

@@ -11,12 +11,10 @@ module ApplicationHelper
   end
 
   def ago(tm)
-    if tm && current_user.try(:utc_time) != true
+    if tm
       content_tag :time, title: tm.strftime("%e %b %Y, %H:%M %Z"), datetime: tm.to_datetime.rfc3339 do
         tm.strftime("%e %b %Y, %H:%M")
       end
-    else
-      tm
     end
   end
 

app/mailers/redstoner_mailer.rb

@@ -44,4 +44,10 @@ class RedstonerMailer < ActionMailer::Base
     @user = user
     mail(to: @user.email, subject: "Email change on Redstoner.com")
   end
+
+  def new_message_mail(user, message)
+    @user = user
+    @message = message
+    mail(to: @user.email, subject: "#{message.user_sender.name} sent you a new message")
+  end
 end

app/models/badge.rb

@@ -1,19 +0,0 @@
-class Badge < ActiveRecord::Base
-  include Comparable
-  has_many :users
-  has_and_belongs_to_many :forums
-
-  def self.get (input)
-    if input.is_a?(String) || input.is_a?(Symbol)
-      Badge.find_by(name: input)
-    elsif input.is_a?(Fixnum)
-      Badge.find_by(id: input)
-    elsif input.is_a?(Badge)
-      return input
-    end
-  end
-
-  def to_s
-    self.name
-  end
-end

app/models/badgeassociation.rb

@@ -1,7 +0,0 @@
-class Badgeassociation < ActiveRecord::Base
-
-  belongs_to :badge
-  belongs_to :forum
-  belongs_to :forumgroup
-
-end

app/models/forum.rb

@@ -1,10 +1,6 @@
 class Forum < ActiveRecord::Base
   belongs_to :forumgroup
   has_many :forumthreads
-
-  has_many :badgeassociations
-  has_many :badges, through: :badgeassociations
-
   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
@@ -22,11 +18,11 @@ class Forum < ActiveRecord::Base
   end
 
   def can_read?(user)
-    group && group.can_read?(user) && (role_read.nil? || (!user.nil? && user.role >= role_read) || Badgeassociation.find_by(badge: user.badge, forum: self, permission: 1))
+    group && group.can_read?(user) && (role_read.nil? || (!user.nil? && user.role >= role_read))
   end
 
   def can_write?(user)
-    group.can_write?(user) && (role_write.nil? || (!user.nil? && user.role >= role_write || Badgeassociation.find_by(badge: user.badge, forum: self, permission: 2)))
+    group.can_write?(user) && (role_write.nil? || (!user.nil? && user.role >= role_write))
   end
 
   def can_view?(user)

app/models/forumgroup.rb

@@ -4,8 +4,7 @@ class Forumgroup < ActiveRecord::Base
   belongs_to :role_write, class_name: "Role", foreign_key: "role_write_id"
   accepts_nested_attributes_for :forums
 
-  has_many :badgeassociations
+
-  has_many :badges, through: :badgeassociations
 
   validates_presence_of :name, :position
   validates_length_of :name, in: 2..20
@@ -15,11 +14,11 @@ class Forumgroup < ActiveRecord::Base
   end
 
   def can_read?(user)
-    role_read.nil? || (!user.nil? && user.role >= role_read) || Badgeassociation.find_by(badge: user.badge, forumgroup: self, permission: 1)
+    role_read.nil? || (!user.nil? && user.role >= role_read)
   end
 
   def can_write?(user)
-    !user.nil? && user.confirmed? && (role_write.nil? || user.role >= role_write) || Badgeassociation.find_by(badge: user.badge, forumgroup: self, permission: 2)
+    !user.nil? && user.confirmed? && (role_write.nil? || user.role >= role_write)
   end
 
   def can_view?(user)

app/models/forumthread.rb

@@ -65,49 +65,4 @@ class Forumthread < ActiveRecord::Base
   def to_param
     [id, to_s.parameterize].join("-")
   end
-
-  def self.filter (user, title, content, reply, label, author, query, forum)
-    order_phrase = query || [title, content, reply].select(&:present?).join(" ")
-    user_id = user.try(:id).to_i
-    role_value = user.try(:role).to_i
-    can_read = "COALESCE(forum_role_read.value, 0) <= ? AND COALESCE(forumgroup_role_read.value, 0) <= ?"
-    # A user can view sticky threads in write-only forums without read permissions.
-    sticky_can_write = "sticky = true AND (COALESCE(forum_role_write.value, 0) <= ? AND COALESCE(forumgroup_role_write.value, 0) <= ?)"
-    match = ["MATCH (title, forumthreads.content) AGAINST (#{Forumthread.sanitize(order_phrase)})", "MATCH (threadreplies.content) AGAINST (#{Forumthread.sanitize(order_phrase)})", "MATCH (title, forumthreads.content) AGAINST (?) OR MATCH (threadreplies.content) AGAINST (?)", "MATCH (title) AGAINST (?)", "MATCH (forumthreads.content) AGAINST (?)", "MATCH (threadreplies.content) AGAINST (?)"]
-
-    threads = forum.try(:forumthreads) || Forumthread
-
-    threads = threads.select("forumthreads.*", "#{match[0]} AS relevance", "#{match[1]} AS reply_rel")
-
-    threads = threads.joins(forum: :forumgroup)
-    .joins("LEFT JOIN threadreplies ON forumthreads.id = threadreplies.forumthread_id")
-    .joins("LEFT JOIN roles as forum_role_read ON forums.role_read_id = forum_role_read.id")
-    .joins("LEFT JOIN roles as forum_role_write ON forums.role_write_id = forum_role_write.id")
-    .joins("LEFT JOIN roles as forumgroup_role_read ON forumgroups.role_read_id = forumgroup_role_read.id")
-    .joins("LEFT JOIN roles as forumgroup_role_write ON forumgroups.role_write_id = forumgroup_role_write.id")
-
-    threads = threads.where("forumthreads.user_author_id = ? OR (#{can_read}) OR (#{sticky_can_write}) OR (?)", user_id, role_value, role_value, role_value, role_value, Forum.find(forum).can_read?(user))
-    if query
-      threads = threads.where("#{match[2]}", query[0..99], query[0..99])
-    elsif [title, content, reply].any?
-      threads = threads.where("#{match[3]}", title[0..99]) if title
-      threads = threads.where("#{match[4]}", content[0..99]) if content
-      threads = threads.where("#{match[5]}", reply[0..99]) if reply
-    end
-    if label.try(:downcase) == "no label"
-      threads = threads.where(label: nil)
-    elsif label && l = Label.find_by(name: label)
-      threads = threads.where(label: l)
-    end
-    threads = threads.where(user_author: author) if author
-
-    threads = threads.group("forumthreads.id")
-
-    if order_phrase.present?
-      threads = threads.order("GREATEST(relevance, reply_rel) DESC")
-    else
-      threads = threads.order("sticky DESC", "threadreplies.id DESC", "forumthreads.id DESC")
-    end
-    threads
-  end
 end

app/models/message.rb

@@ -0,0 +1,75 @@
+class Message < ActiveRecord::Base
+
+  include MailerHelper
+
+  belongs_to :user_sender, class_name: "User", foreign_key: "user_sender_id"
+  belongs_to :user_target, class_name: "User", foreign_key: "user_target_id"
+  belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"
+  belongs_to :user_hidden, class_name: "User", foreign_key: "user_hidden_id"
+  belongs_to :user_unread, class_name: "User", foreign_key: "user_unread_id"
+
+
+  validates_presence_of :user_sender, :user_target, :text, :subject
+
+  validates_length_of :text, in: 1..8000
+  validates_length_of :subject, in: 1..2000
+
+  has_many :messagereplies
+
+  accepts_nested_attributes_for :messagereplies
+
+  before_destroy :do_destroy?
+
+  def do_destroy?
+    if user_hidden || user_sender == user_target
+      return true
+    else
+      update_attributes(user_hidden: User.current)
+      return false
+    end
+  end
+
+  def to_s
+    subject
+  end
+
+  def sender
+    @sender ||= if self.user_sender.present?
+      user_sender
+    else
+      User.first
+    end
+  end
+
+  def target
+    @target ||= if self.user_target.present?
+      user_target
+    else
+      User.first
+    end
+  end
+
+  def editor
+    @editor ||= (self.user_editor || User.first)
+  end
+
+  def edited?
+    !!user_editor_id
+  end
+
+  def replies
+    messagereplies
+  end
+
+  def send_new_message_mail
+    begin
+      mail = RedstonerMailer.new_message_mail(user_target, self)
+    rescue => e
+      Rails.logger.error "---"
+      Rails.logger.error "WARNING: Failed to create new_message_mail (view) for message#: #{@message.id}, user: #{@user.name}, #{@user.email}"
+      Rails.logger.error e.message
+      Rails.logger.error "---"
+    end
+    background_mailer([mail])
+  end
+end

app/models/messagereply.rb

@@ -0,0 +1,67 @@
+class Messagereply < ActiveRecord::Base
+
+  include MailerHelper
+  include UsersHelper
+
+  belongs_to :message
+  belongs_to :user_author, class_name: "User", foreign_key: "user_author_id"
+  belongs_to :user_editor, class_name: "User", foreign_key: "user_editor_id"
+
+
+
+  validates_presence_of :text
+  validates_length_of :text, in: 1..8000
+
+  def get_message
+    message
+  end
+
+  def author
+    @author ||= if self.user_author.present?
+      user_author
+    else
+      User.first
+    end
+  end
+
+  def editor
+    # can be nil
+    @editor ||= user_editor
+  end
+
+  def edited?
+    !!user_editor_id
+  end
+
+  def send_new_reply_mail(old_content = "")
+    users = mentions(content) - mentions(old_content)
+
+    # thread + replies
+    posts = message.replies.to_a
+    posts << message if message.author.mail_own_message_reply?
+    # only send "reply" mail when reply is new
+    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? # &&
+          users << post.author if post.author.mail_other_thread_reply?
+        end
+      end
+    end
+    # making sure we don't send multiple mails to the same user
+    users.uniq!
+
+    mails = []
+    users.each do |usr|
+      begin
+        mails << RedstonerMailer.new_thread_reply_mail(usr, self)
+      rescue => e
+        Rails.logger.error "---"
+        Rails.logger.error "WARNING: Failed to create new_thread_reply_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"
+        Rails.logger.error e.message
+        Rails.logger.error "---"
+      end
+    end
+    background_mailer(mails)
+  end
+end

app/models/role.rb

@@ -14,14 +14,14 @@ class Role < ActiveRecord::Base
   end
 
   def is? (name)
-    !!(Role.find_by(name: name) == self)
+    !!(Role.find_by_name(name) == self)
   end
 
   def self.get (input)
     if input.is_a?(String) || input.is_a?(Symbol)
-      Role.find_by(name: input)
+      Role.find_by_name(input)
     elsif input.is_a?(Fixnum)
-      Role.find_by(id: input)
+      Role.find_by_id(input)
     elsif input.is_a?(Role)
       return input
     end
@@ -31,7 +31,7 @@ class Role < ActiveRecord::Base
     if role.is_a?(Role)
       self.value - role.value
     elsif role.is_a?(Symbol)
-      self <=> Role.find_by(name: role)
+      self <=> Role.find_by_name(role)
     else
       self.to_i <=> role
     end

app/models/user.rb

@@ -5,11 +5,10 @@ class User < ActiveRecord::Base
   strip_attributes
 
   belongs_to :role
-  belongs_to :badge
 
   has_secure_password
 
-  before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, :set_role, :set_badge
+  before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, :set_role
 
   validates_presence_of :password, :password_confirmation, :email_token, on: :create
   validates_presence_of :name, :email, :ign
@@ -25,11 +24,17 @@ class User < ActiveRecord::Base
   has_many :blogposts
   has_many :comments
 
+  cattr_accessor :current
+
   # foo.bar.is?(current_user)
   def is? (user)
     self == user
   end
 
+  def donor?
+    !!self.donor
+  end
+
   def confirmed?
     !!self.confirmed
   end
@@ -147,10 +152,6 @@ class User < ActiveRecord::Base
     self.role ||= Role.get(:normal)
   end
 
-  def set_badge
-    self.badge ||= Badge.get(:none)
-  end
-
   def set_uuid
     if !self.uuid.present?
       # idk
@@ -174,21 +175,4 @@ class User < ActiveRecord::Base
   def set_email_token
     self.email_token ||= SecureRandom.hex(16)
   end
-
-  def self.search (search, role, badge, staff)
-    users = User.joins(:role)
-    if role
-      users = users.where(role: role)
-    elsif staff
-      users = users.where("roles.value >= ?", Role.get(:mod).to_i)
-    end
-    users = users.where(badge: badge) if badge
-    if search
-      search_san = User.send(:sanitize_sql_like, search.to_s)
-      users = users.where("users.name like ? OR ign like ?", "%#{search_san}%", "%#{search_san}%")
-    end
-    users = users.where.not(id: User.first.id) unless [search, role, badge].any?
-    users = users.order("roles.value desc", "confirmed desc", :name)
-    users
-  end
 end

app/views/blogposts/index.html.erb

@@ -1,5 +1,4 @@
 <% title "News" %>
-
 <h1>News</h1>
 <%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %>
 <div id="posts">

app/views/forumgroups/edit.html.erb

@@ -29,26 +29,10 @@
       <td><%= f.label :role_read_id, "Min. read role" %></td>
       <td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
     </tr>
-    <tr>
-      <td><b>Badges with read permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "read-#{b}", nil, Badgeassociation.find_by(badge: b, forumgroup: @group, permission: 1) %>
-        <% end %>
-      </td>
-    </tr>
     <tr>
       <td><%= f.label :role_write_id, "Min. write role" %></td>
       <td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
     </tr>
-    <tr>
-      <td><b>Badges with write permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "write-#{b}", nil, Badgeassociation.find_by(badge: b, forumgroup: @group, permission: 2) %>
-        <% end %>
-      </td>
-    </tr>
   </table>
   <p><%= f.submit "Update group", class: "btn blue left" %></p>
 <% end %>

app/views/forumgroups/new.html.erb

@@ -16,26 +16,10 @@
       <td><%= f.label :role_read_id, "Min. read role" %></td>
       <td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
     </tr>
-    <tr>
-      <td><b>Badges with read permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "read-#{b}" %>
-        <% end %>
-      </td>
-    </tr>
     <tr>
       <td><%= f.label :role_write_id, "Min. write role" %></td>
       <td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
     </tr>
-    <tr>
-      <td><b>Badges with write permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "write-#{b}" %>
-        <% end %>
-      </td>
-    </tr>
   </table>
   <p><%= f.submit "Create group", class: "btn blue left" %></p>
   <div class="clear"></div>

app/views/forums/edit.html.erb

@@ -17,30 +17,10 @@
       <td><%= f.label :role_read_id, "Min. read role" %></td>
       <td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
     </tr>
-    <tr>
-      <td><b>Badges with read permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "read-#{b}", nil, Badgeassociation.find_by(badge: b, forum: @forum, permission: 1) %>
-        <% end %>
-      </td>
-    </tr>
     <tr>
       <td><%= f.label :role_write_id, "Min. write role" %></td>
       <td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
     </tr>
-    <tr>
-      <td><b>Badges with write permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "write-#{b}", nil, Badgeassociation.find_by(badge: b, forum: @forum, permission: 2) %>
-        <% end %>
-      </td>
-    </tr>
-    <tr>
-      <td><%= f.label :necro_length, "Necropost warning delay (in days)" %></td>
-      <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>
 <% end %>

app/views/forums/index.html.erb

@@ -1,7 +1,5 @@
 <% title "Forums" %>
 
-<%= link_to "All threads", forumthreads_path, class: "btn blue right" %>
-<br>
 <div id="forum_groups">
   <% @groups.each do |group| %>
     <div class="item-group" id="group-<%= group.id %>">
@@ -18,7 +16,7 @@
               <%= link_to f.name, f, id: "forum-#{f.id}"%>
               <div class="item-info">
                 <% if last_thread = f.threads.last %>
-                  <% last_reply = Threadreply.where(forumthread: f.threads).order(:id).last %>
+                  <% last_reply = Threadreply.where(forumthread: f.threads).order(:created_at).last %>
                   <% if last_reply && last_reply.created_at > last_thread.created_at %>
                     <% if last_reply.thread.can_read?(current_user) %>
                       <%= last_reply.author.name %>

app/views/forums/new.html.erb

@@ -17,30 +17,10 @@
       <td><%= f.label :role_read_id, "Min. read role" %></td>
       <td><%= f.select :role_read_id, role_selection, include_blank: "None" %></td>
     </tr>
-    <tr>
-      <td><b>Badges with read permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "read-#{b}" %>
-        <% end %>
-      </td>
-    </tr>
     <tr>
       <td><%= f.label :role_write_id, "Min. write role" %></td>
       <td><%= f.select :role_write_id, role_selection, include_blank: false %></td>
     </tr>
-    <tr>
-      <td><b>Badges with write permission</b></td>
-      <td>
-        <% Badge.where("name != 'none'").each do |b| %>
-          <%=b%><%= check_box_tag "write-#{b}" %>
-        <% end %>
-      </td>
-    </tr>
-    <tr>
-      <td><%= f.label :necro_length, "Necropost warning delay (in days)" %></td>
-      <td><%= f.number_field :necro_length, placeholder: "Warning Delay (leave blank for no warning)" %></td>
-    </tr>
   </table>
   <%= f.hidden_field :forumgroup_id %>
   <p><%= f.submit "Create forum", class: "btn blue left" %></p>

app/views/forums/show.html.erb

@@ -1,13 +1,8 @@
 <%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= @forum %>
 
-<h1>
+<h1><%= title @forum %></h1>
-  <%= title @forum %>
-  <%= link_to "Search Threads", forumthreads_path(forum: @forum.id), class: "btn blue right" %>
-</h1>
 <% if @forum.can_write?(current_user) %>
-  <p>
+  <p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
-    <%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %>
-  </p>
 <% end %>
 
 <% if @forum.role_read && @forum.role_write && @forum.role_write < @forum.role_read %>
@@ -38,7 +33,7 @@
         <div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>">
           <%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %>
           <div class="item-info">
-            <% if rpl = thread.replies.order(:id).last %>
+            <% if rpl = thread.replies.last %>
               <%= rpl.author.name %>
               <%
                 position = thread.replies.count - 1

app/views/forumthreads/index.html.erb

@@ -1,85 +0,0 @@
-<%= link_to "Forums", forums_path %> →
-<% params_list = params.slice(:query, :title, :content, :author, :label, :reply) %>
-<% if params_list.any? %>
-  <%= link_to "All Threads", forumthreads_path %> → Search Results
-<% else %>
-  <%= "All Threads" %>
-<% end %>
-<h1>
-  <%
-    if params[:forum]
-      text = "forum '#{Forum.find(params[:forum]).name}'"
-      if params_list.except(:forum).any?
-        text = "Search results in #{text} (#{@threads.total_count})"
-      else
-        text = text.capitalize
-      end
-    elsif params_list.any?
-      text = "Search results (#{@threads.total_count})"
-    else
-      text = "All threads"
-    end
-  %>
-  <%= title text %>
-</h1>
-<br>
-<%= form_tag(forumthreads_path, method: :get) do %>
-  <%= text_field_tag "query", params[:query], placeholder: "Search...", class: "searchfield field" %>
-  <%= submit_tag "Go", class: "searchfield btn" %>
-  <%= link_to "Advanced Search", search_forumthreads_path(params_list), class: "btn right blue" %>
-  <% if params_list.any? %>
-    <% if params[:forum] %>
-      <%= link_to "Show All Threads", forumthreads_path(params_list.except("forum")), class: "btn right blue" %>
-    <% elsif params_list.except(:controller, :action).any? %>
-      <%= link_to "Show All Threads", forumthreads_path, class: "btn right blue" %>
-    <% end %>
-  <% end %>
-  <% if params[:forum] %>
-    <%= link_to "Go to Forum", forum_path(params[:forum]), class: "btn right blue" %>
-  <% end %>
-  <% params.slice(:forum, :title, :content, :reply, :label, :author).each do |key, value| %>
-    <%= hidden_field_tag key, params[key] %>
-  <% end %>
-<% end %>
-
-<div id="forum_groups">
-  <% @threads.each do |thread| %>
-    <div class="item-group with-avatar" id="thread-<%= thread.id %>">
-      <div class="header">
-        <%= link_to(thread.author.avatar(64), thread.author, title: thread.author.ign) %>
-        <%= render partial: "users/username", locals: { user: thread.author } %>
-        <%= link_to thread do %>
-            <%= ago thread.created_at %>
-        <% end %>
-        <span class="comment-counter">
-          <%= link_to pluralize(thread.replies.count, "Reply"), thread %>
-        </span>
-        <div class="clear-right"></div>
-      </div>
-      <div class="items bold">
-        <div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>">
-          <%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %>
-          <div class="item-info">
-            <% if rpl = thread.replies.order(:id).last %>
-              <%= rpl.author.name %>
-              <%
-                position = thread.replies.count - 1
-                page     = position / Kaminari.config.default_per_page + 1
-              %>
-              <%= link_to "replied", forumthread_path(thread, page: page) + "#reply-#{rpl.id}" %>
-              <%= ago rpl.created_at %>.
-            <% else %>
-              No replies yet.
-            <% end %>
-          </div>
-          <div class="clear"></div>
-        </div>
-      </div>
-    </div>
-  <% end %>
-  <% if @threads.empty? %>
-    <br>
-    <h3>No results found</h3>
-  <% end %>
-  <%= paginate @threads %>
-</div>

app/views/forumthreads/search.html.erb

@@ -1,54 +0,0 @@
-<% title "Thread Search" %>
-<h1>Thread Search</h1>
-<h3>Leave a field blank to ignore that search aspect.</h3>
-<% label = Label.where(name: params[:label]).first %>
-<table>
-  <tbody>
-<%= form_tag(forumthreads_path, method: :get) do %>
-  <%
-    forums = []
-    Forum.select{|f| f.can_read?(current_user)}.sort_by{ |f| f.forumgroup && f.forumgroup.position || 0 }.each do |f|
-      forums << ["#{f.forumgroup.name} → #{f.name}", f.id] if f.forumgroup
-    end
-  %>
-  <% label_list = Label.pluck(:name).prepend("No Label") %>
-  <tr>
-    <td>Forum</td>
-    <td><%= select_tag "forum", options_for_select(forums, params[:forum]), include_blank: "Search All Threads" %></td>
-  </tr>
-  <tr>
-    <td>Label</td>
-    <td>
-      <%= select_tag "label", options_for_select(label_list, params[:label]), include_blank: "Label" %>
-    </td>
-  </tr>
-  <tr>
-    <td>Title</td>
-    <td>
-      <%= text_field_tag "title", params[:title], placeholder: "Search Titles" %>
-    </td>
-  </tr>
-  <tr>
-    <td>Content</td>
-    <td>
-      <%= text_field_tag "content", params[:content], placeholder: "Search Contents" %>
-    </td>
-  <tr>
-    <td>Author</td>
-    <td>
-      <%= render partial: "md_editor_user", locals: {name: "author", content: params[:author]} %>
-    </td>
-  </tr>
-    <td>Replies</td>
-    <td>
-      <%= text_field_tag "reply", params[:reply], placeholder: "Search Replies" %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= submit_tag "Go", class: "btn blue", style: "width:50px", name: nil %>
-    </td>
-  </tr>
-<% end %>
-  </tbody>
-</table>

app/views/forumthreads/show.html.erb

@@ -1,8 +1,6 @@
 <%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → <%=truncate(@thread.title, length: 60, omission: " …") %>
-<h1>
+<h1><%= render partial: "labels/label", locals: {label: @thread.label} %><%= title @thread.title %></h1>
-  <%= render partial: "labels/label", locals: {label: @thread.label} %><%= title @thread.title %>
+
-  <%= link_to "Reverse Replies", forumthread_path(@thread, reverse: params[:reverse] != "true"), class: "btn right blue" %>
-</h1>
 <div class="item-group thread with-avatar" id="thread-<%= @thread.id %>">
   <div class="header">
     <%= link_to(@thread.author.avatar(64), @thread.author, title: @thread.author.ign) %>

app/views/layouts/_head.html.erb

@@ -1,9 +1,4 @@
-<% head = "head_top" %>
+<div id="head">
-<% if current_user != nil && current_user.header_scroll == true %>
-  <% head = "head_scroll" %>
-<% end %>
-
-<div id="<%= head %>">
   <div id="menu">
     <%= link_to "", root_path, id: "logo" %>
     <ul>
@@ -31,9 +26,6 @@
       <li>
         <%= link_to "Donate", donate_statics_path, class: ("active" if con == "statics" && params[:action] == "donate") %>
       </li>
-      <li>
-        <%= link_to "Who's Playing?", online_statics_path, class: ("active" if con == "statics" && params[:action] == "online") %>
-      </li>
     </ul>
   </div>
   <div id="userbar">

app/views/layouts/application.html.erb

@@ -5,9 +5,6 @@
   <meta name="viewport" content="initial-scale=1,maximum-scale=1">
   <meta name="description" content="Redstoner is a creative minecraft server made for redstoners">
   <%= stylesheet_link_tag "application", :media => "all" %>
-  <% if current_user.try(:dark) == true %>
-    <%= stylesheet_link_tag "dark", :media => "all" %>
-  <% end %>
   <%= csrf_meta_tags %>
   <%= favicon_link_tag "favicon.ico" %>
   <%= javascript_include_tag "https://cdn.rawgit.com/jomo/ago.js/v0.0.1/ago.min.js", crossorigin: :anonymous, integrity: "sha256-xw0JUUdbuZQCVO+QScoxrlEsD4nZGCjMRh9PP8GLhcY=" %>
@@ -17,11 +14,7 @@
 </head>
 <body>
   <%= render partial: "/layouts/head" %>
-  <% content = "main-content" %>
+  <div id="main-content" class="<%= yield(:main_class) %>">
-  <% if current_user.try(:header_scroll) == true %>
-    <% content = "main-content-scroll" %>
-  <% end %>
-  <div id="<%=content%>" class="<%=yield(:main_class) %>">
     <% if alert %>
       <div class='flash alert'><%= alert %></div>
     <% end %>

app/views/messagereplies/_new.html.erb

@@ -0,0 +1,5 @@
+<%= form_for [reply.get_message, reply] do |f| %>
+  <%= render partial: "md_editor", locals: {name: "messagereply[text]", content: reply.text} %>
+  <p><%= f.submit "Reply", class: "btn blue" %></p>
+<% end %>
+

app/views/messagereplies/_reply.html.erb

@@ -0,0 +1,17 @@
+<div class="item-group thread-reply with-avatar" id="reply-<%= reply.id %>">
+  <div class="header">
+    <%= link_to(reply.author.avatar(64), reply.author, title: reply.author.ign) %>
+    <%= render partial: "users/username", locals: { user: reply.author } %>
+    <%= link_to "#reply-#{reply.id}" do %>
+      <%= ago reply.created_at %>
+    <% end %>
+
+    <%= link_to "edit", edit_message_messagereply_path(reply.message, reply), class: "editlink" if mod? || reply.author.is?(current_user) %>
+    <div class="clear-right"></div>
+  </div>
+  <div class="items">
+    <div class="item content">
+      <%= render_md(reply.text).html_safe %>
+    </div>
+  </div>
+</div>

app/views/messagereplies/edit.html.erb

@@ -0,0 +1,15 @@
+<% title "Edit Message Reply: #{@reply.message.subject}" %>
+
+<%
+  position = @reply.message.replies.index(@reply)
+  page     = position / Kaminari.config.default_per_page + 1
+%>
+
+<%= link_to "Messages", messages_path %> → <%= link_to @reply.message, message_path(@reply.message, page: page) + "#reply-#{@reply.id}" %> → Edit reply
+<h1>Edit reply</h1>
+<%= form_for [@reply.message, @reply] do |f| %>
+  <%= render partial: "md_editor", locals: {name: "messagereply[text]", content: @reply.text} %>
+  <p><%= f.submit "Reply", class: "btn blue left" %></p>
+<% end %>
+<p><%= button_to "Delete reply", [@reply.message, @reply], method: "delete", data: {confirm: "Delete reply forever?"}, class: "btn red right" %></p>
+<div class="clear"></div>

app/views/messages/edit.html.erb

@@ -0,0 +1,17 @@
+<% title "Edit Thread: #{@message}" %>
+
+<h1>Edit thread</h1>
+<%= link_to "Messages", messages_path %> → <%= link_to @message, @message %> → Edit Message
+<%= form_for @message do |f|%>
+  <div class="table-cell full-width">
+    <%= f.text_field :subject, placeholder: "Subject" %>
+  </div>
+  <br>
+  <%= render partial: "md_editor", locals: {name: "message[text]", content: @message.text} %>
+  <p><%= f.submit "Update message", class: "btn blue left" %></p>
+  <%= f.hidden_field :user_sender, value: @message.user_sender %>
+  <%= f.hidden_field :user_target, value: @message.user_target %>
+<% end %>
+<%= button_to "Delete ", @message, :method => "delete", data: {confirm: "Delete message & comments forever?"}, class: "btn red right" %>
+<div class="clear"></div>
+

app/views/messages/index.html.erb

@@ -0,0 +1,60 @@
+<% if @messages.any? %>
+  <%= link_to "delete all messages", destroy_all_messages_path, method: "post", class: "btn blue right", data: {confirm: "Delete all of your messages forever?"} %>
+<% end %>
+<%= link_to "create new message", new_message_path, class: "btn blue right" %>
+<br>
+<h2>
+  <% if Message.where("(user_target_id = ? OR user_sender_id = ?) AND user_hidden_id != ?", current_user.id, current_user.id, current_user.id).any? %>
+    Your private messages:
+  <% else %>
+    You have no private messages.
+  <% end %>
+</h2>
+
+<div id="forum_groups">
+  <% @messages.each do |message| %>
+    <div class="item-group with-avatar">
+      <div class="header">
+        <%
+          if current_user == message.user_sender
+            user = message.user_target
+          else
+            user = message.user_sender
+          end
+        %>
+        <%= link_to(user.avatar(64), user, title: user.ign) %>
+        <%= render partial: "users/username", locals: { user: user } %>
+        <span style="font-size:16px">
+          &nbsp;
+          <span class="<%= "bold" if message.user_unread_id && message.user_unread != current_user %>"><%= link_to message.subject, message %></span>
+          &nbsp; | &nbsp;
+        </span>
+        <%= ago message.created_at %>
+        <div class="right">
+          <%= link_to "Delete message", message, :method => "delete", class: "editlink", data: {confirm: "Delete this message forever?"} %>
+        </div>
+        <div class="clear-right"></div>
+      </div>
+      <div class="items">
+        <div class="item">
+          <%= truncate message.text, length: 20, omission: "..." %>
+          <div class="item-info items bold">
+            <% if rpl = message.replies.last %>
+              <%= rpl.author.name %>
+              <%
+                position = message.replies.count - 1
+                page     = position / Kaminari.config.default_per_page + 1
+              %>
+              <%= link_to "replied", message_path(message, page: page) + "#reply-#{rpl.id}" %>
+              <%= ago rpl.created_at %>.
+            <% else %>
+              No replies yet.
+            <% end %>
+          </div>
+          <div class="clear"></div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+  <%= paginate @messages %>
+</div>

app/views/messages/new.html.erb

@@ -0,0 +1,26 @@
+<h1>New Message</h1>
+<%= form_for @message do |f| %>
+  </table>
+    <tr>
+      <td>
+        <%= render partial: "md_editor_user", locals: {name: "message[user_target]", content: params[:user_target]} %>
+      </td>
+    </tr>
+    <br>
+    <tr>
+      <td>
+        <%= f.text_field :subject, placeholder: "Subject" %>
+      </td>
+    </tr>
+    <br><br>
+    <tr>
+      <td>
+        <%= render partial: "md_editor", locals: {name: "message[text]", content: params[:text]} %>
+      </td>
+    </tr>
+  </table>
+  <%= f.hidden_field :user_sender, value: current_user %>
+  <%= f.hidden_field :user_unread, value: current_user %>
+  <br>
+<p><%= f.submit "Send Message", class: "btn blue left" %></p>
+<% end %>

app/views/messages/show.html.erb

@@ -0,0 +1,33 @@
+<%= link_to "Messages", messages_path %>
+<h1><%= title @message.subject %></h1>
+<div class="item-group thread with-avatar" id="message-<%= @message.id %>">
+  <div class="header">
+    <%= link_to(@message.sender.avatar(64), @message.sender, title: @message.sender.ign) %>
+    <%= render partial: "users/username", locals: { user: @message.sender } %>
+    <%= link_to p do %>
+      <%= ago @message.created_at %>
+    <% end %>
+    <%= link_to "edit", edit_message_path(@message), class: "editlink" if mod? || @message.sender.is?(current_user) %>
+    <div class="clear-right"></div>
+  </div>
+  <div class="items">
+    <% if @message.edited? %>
+      <div class="item edited">
+        Last edited <%= ago @message.updated_at %> by <%= link_to @message.editor.name, @message.editor %>.
+      </div>
+    <% end %>
+    <div class="item content">
+      <%= render_md(@message.text).html_safe %>
+    </div>
+  </div>
+</div>
+<div id="replies">
+  <h3><%= "#{pluralize(@message.replies.size, 'reply')}." %></h3>
+  <% @replies.each do |reply| %>
+    <%= render partial: "messagereplies/reply", locals: {reply: reply} %>
+  <% end %>
+
+  <%= paginate @replies %>
+
+  <%= render partial: "messagereplies/new", locals: {reply: Messagereply.new(message: @message)} %>
+</div>

app/views/redstoner_mailer/new_message_mail.html.erb

@@ -0,0 +1,28 @@
+<div style="font-family: 'Oswald','Calibri','Arial','DejaVu Sans','Open Sans','Lucida Sans','Lucida Grande','Lucida Sans Unicode',sans-serif; background: #F2F2F2">
+  <div style="color: #3f3f3f; width: 600px; max-width: 100%; padding: 2em 0; margin: auto;">
+    Hi <%= @user.name %>!
+
+    <p><%= link_to @message.user_sender.name, user_url(@message.user_sender), style: "text-decoration: none; color: #4096EE;" %> has sent you a new message!</p>
+
+    <blockquote>
+      <%= render_md(@message.text).html_safe %>
+    </blockquote>
+
+    <p><%= link_to "Click here", messages_url, style: "text-decoration: none; color: #4096EE;" %> to view your current messages.</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>Your Redstoner team</p>
+
+  </div>
+  <div style="background: #444; width: 100%; color: #fff; margin: auto; text-align: center; display: inline-block;">
+    <div style="margin: 2em;">
+      <p><i>Too much spam? Change <%= link_to "your notification settings", edit_notifications_user_url(@user), style: "text-decoration: none; color: #4096EE;" %>!</i></p>
+      <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 "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
+      </p>
+    </div>
+  </div>
+</div>

app/views/statics/donate.html.erb

@@ -11,7 +11,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 <%= link_to "list of users who donated", users_path(role: "donor") %> already!</p>
 
 <h3>Perks for you</h3>
 <p>For <i>Donator</i> and <i>Donator+</i></p>
@@ -19,7 +19,6 @@
   <li>The warm feeling of donating for a good thing, plus a huge "<b>thank you</b>"!
   <li>You can have a nickname. See <%= link_to "our nickname guidelines", info_path("12-nickname-guidelines") %>
   <li>A "$" next to your name <i>(Including website)</i>
-  <li><i>Donator+</i> has access to the in-game command <code>/lol id</code></li>
 </ul>
 <hr>
 <div class="donations">

app/views/statics/online.html.erb

@@ -1,18 +0,0 @@
-<% title "Who's Playing?" %>
-<h1>These players are currently playing on Redstoner (<%= @count %>):</h1>
-<div id="userlist">
-  <% @players.each do |u| %>
-    <div class="list-user">
-      <%= link_to(u.avatar(64), u) %>
-      <div class="detail">
-        <%= render partial: "users/username", locals: { user: u } %><br>
-        <% if u.id %>
-          <i><%= u.ign %></i>
-        <% else %>
-          <i>(Not signed up)</i>
-        <% end %>
-      </div>
-    </div>
-  <% end %>
-</div>
-

app/views/threadreplies/_new.html.erb

@@ -1,19 +1,4 @@
 <%= form_for [reply.thread, reply] do |f| %>
   <%= render partial: "md_editor", locals: {name: "threadreply[content]", content: reply.content} %>
-  <% nec_msg = "" %>
+  <p><%= f.submit "Reply#{ ' (Locked)' if reply.thread.locked? }", class: "btn blue" %></p>
-  <% forum = Forum.find(reply.thread.forum_id) %>
-  <% if forum.necro_length %>
-    <% if reply.thread.label.try(:name).try(:downcase) == "closed" %>
-        <% nec_msg = "This thread is closed. Are you sure you want to make this reply? If so, press 'Ok'" %>
-    <% elsif Threadreply.where(forumthread: reply.thread).any? %>
-      <% prevAgo = Threadreply.where(forumthread: reply.thread).order(:id).last.created_at  %>
-      <% if prevAgo <= forum.necro_length.days.ago.utc %>
-        <% nec_msg = "You may be necroposting, as the last reply was made at least #{forum.necro_length} days ago. If you still wish to make this reply, press 'Ok'." %>
-      <% end %>
-    <% elsif reply.thread.created_at <= forum.necro_length.days.ago.utc %>
-      <% nec_msg = "You may be necroposting, as this thread was posted at least #{forum.necro_length} days ago. If you still wish to make this reply, press 'Ok'." %>
-    <% end %>
-  <% end %>
-  <p><%= f.submit "Reply#{ ' (Locked)' if reply.thread.locked? }", class: "btn blue", data: { confirm: nec_msg } %></p>
-  <% nec_msg = "" %>
 <% end %>

app/views/threadreplies/edit.html.erb

@@ -1,7 +1,7 @@
 <% title "Edit Thread Reply: #{@reply.thread.title}" %>
 
 <%
-  position = @reply.thread.replies.order(:id).index(@reply)
+  position = @reply.thread.replies.index(@reply)
   page     = position / Kaminari.config.default_per_page + 1
 %>
 

app/views/users/_username.html.erb

@@ -1,6 +1,4 @@
 <div class="user">
   <%= link_to user.name, user, class: "role #{user.role.name} #{"banned" if user.banned?} #{"disabled" if user.disabled?} #{"unconfirmed" unless user.confirmed?}", title: "#{user.ign} – #{user.role}", style: "color: #{fcolor(user.role.color)}; background-color: #{user.role.color}" %>
-  <% if user.badge %>
+  <%= link_to "$", donate_statics_path, class: "role donor", title: "Donator" if user.donor? %>
-    <%= link_to user.badge.symbol, users_path(badge: user.badge.name), class: "role badge", title: user.badge.name, style: "color: #{fcolor(user.badge.color)}; background-color: #{user.badge.color}" unless user.badge.symbol.blank? %>
-  <% end %>
 </div>

app/views/users/edit.html.erb

@@ -27,20 +27,18 @@
             <% end %>
           </td>
         </tr>
-        <tr>
-          <td>Badge</td>
-          <td>
-            <% if current_user.role >= Role.get(:mod) %>
-              <%= f.select :badge, Badge.all %>
-            <% end %>
-          </td>
-        </tr>
         <tr>
           <td>Confirmed email address</td>
           <td>
             <%= f.select :confirmed, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %>
           </td>
         </tr>
+        <tr>
+          <td>Donator</td>
+          <td>
+            <%= f.select :donor, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %>
+          </td>
+        </tr>
       <% end %>
       <tr>
         <td>Skype username</td>
@@ -75,11 +73,10 @@
     </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 blue 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 "Edit login details", edit_login_user_path(@user), class: "btn blue 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 blue 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_website_settings.html.erb

@@ -1,34 +0,0 @@
-<% title "Edit Website Settings: #{@user.name}" %>
-
-<%= link_to @user.name, @user %> → Edit Website Settings
-<h1>Edit Website Settings</h1>
-
-
-<%= form_for @user do |f| %>
-  <table>
-    <tbody>
-      <tr>
-        <td>Header moves with scrolling (Experimental - do not report bugs)</td>
-        <td>
-          <%= f.check_box :header_scroll %>
-        </td>
-      </tr>
-      <tr>
-        <td>Show exact UTC times</td>
-        <td>
-          <%= f.check_box :utc_time %>
-        </td>
-      </tr>
-      <tr>
-        <td>Dark theme*</td>
-        <td>
-          <%= f.check_box :dark %>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <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

@@ -1,32 +1,12 @@
-<%= form_tag(users_path, method: :get) do %>
-  <%= text_field_tag "search", params[:search], placeholder: "Search for a user", class: "searchfield field" %>
-  <%= submit_tag "Go", class: "searchfield btn", name: nil %>
-  <%= hidden_field_tag "role", params[:role] if params[:role] %>
-  <%= hidden_field_tag "badge", params[:badge] if params[:badge]%>
-<% end %>
 <h1>
-  <%
+  <% if params[:role] %>
-    if params[:role] && !params[:badge]
+    <%= title "All '#{params[:role]}' users" %>
-      text = "All '#{params[:role]}' users"
-    elsif params[:badge] && !params[:role]
-      text = "All '#{params[:badge]}' users"
-    elsif params[:role] && params[:badge]
-      text = "All '#{params[:role]}' and '#{params[:badge]}' users"
-    elsif params.include?(:staff)
-      text = "All staff"
-    else
-      text = "All users"
-    end
-    text += " that contain '#{params[:search]}'" if params[:search]
-  %>
-  <%= title text %>
-  <% if params[:search] %>
-    (<%= @users.total_count %>)
   <% else %>
-    (<%= @count %>)
+    <%= title "All Users" %>
   <% end %>
+  (<%= @count %>)
 </h1>
-<%= link_to "show all", users_path if params[:role] || params[:badge] %>
+<%= link_to "show all", users_path if params[:role] %>
 
 <div id="userlist">
   <% @users.each do |u| %>

app/views/users/new.html.erb

@@ -40,5 +40,5 @@
 
   <%= f.submit "Sign up", class: "btn blue" %>
 
-  <p>Contact us ingame if you have problems signing up!</p>
+  <p>Contact us ingame if you have problems singing up!</p>
 <% end %>

app/views/users/show.html.erb

@@ -1,14 +1,19 @@
 <% title @user.name %>
 
 <div id="user-info">
-  <% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %>
+  <div class="profile-action">
-    <div class="profile-action" ><%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %></div>
+    <% if session[:original_user_id] %>
-  <% end %>
-  <div class="profile-action" >
-    <% if !session[:original_user_id] && admin? %>
-      <%= link_to "become this user", become_path(user: @user), :class => "btn blue" %>
-    <% elsif session[:original_user_id] %>
       <%= link_to "revert", revert_path, :class => "btn blue" %>
+    <% elsif admin? %>
+      <%= link_to "become this user", become_path(user: @user), :class => "btn blue" %>
+    <% end %>
+    <% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %>
+      <%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %>
+    <% end %>
+    <% if @user.is?(current_user) %>
+      <%= link_to "private messages (#{Message.where.not(user_unread: current_user).count})", messages_path, :class => "btn blue" %>
+    <% elsif current_user %>
+      <%= link_to "Send this user a message", new_message_path(user_target: @user.ign), :class => "btn blue" %>
     <% end %>
   </div>
 

config/environments/development.rb

@@ -6,8 +6,6 @@ Redstoner::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  config.action_controller.perform_caching = true
-
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 

config/initializers/assets.rb

@@ -1 +0,0 @@
-Rails.application.config.assets.precompile += %w( dark.css )

config/routes.rb

@@ -4,11 +4,10 @@ Redstoner::Application.routes.draw do
     resources :comments
   end
 
-  resources :statics, only: [:home, :donate, :online], path: '/' do
+  resources :statics, only: [:home, :donate], path: '/' do
     collection do
       get 'donate'
       get 'home'
-      get 'online'
       get 'index'
     end
   end
@@ -22,7 +21,6 @@ Redstoner::Application.routes.draw do
       post 'resend_mail'
       get 'edit_notifications'
       put 'update_login'
-      get 'edit_website_settings'
     end
     collection do
       get  'lost_password'
@@ -32,13 +30,10 @@ Redstoner::Application.routes.draw do
   end
 
   resources :forumgroups,  path: '/forums/groups'
+  resources :forums,       path: '/forums'
   resources :forumthreads, path: '/forums/threads' do
     resources :threadreplies, path: 'replies'
-    collection do
-      get 'search'
-    end
   end
-  resources :forums,       path: '/forums'
 
   resources :tools do
     collection do
@@ -46,6 +41,13 @@ Redstoner::Application.routes.draw do
     end
   end
 
+  resources :messages do
+    resources :messagereplies, path: 'replies'
+    collection do
+      post 'destroy_all'
+    end
+  end
+
   # get '/status' => 'status#show'
 
   get  'login'  => 'sessions#new'

db/migrate/20170319193517_add_badge_id_to_users.rb

@@ -1,17 +0,0 @@
-class AddBadgeIdToUsers < ActiveRecord::Migration
-  def change
-
-    create_table "badges", force: :cascade do |t|
-      t.string  "name"
-      t.string  "symbol"
-      t.string  "color"
-    end
-
-    Badge.create!({name: "none", symbol: "", color: "#000"})
-    dbadge = Badge.create!({name: "donor", symbol: "$", color: "#f60"})
-
-    add_column :users, :badge_id, :integer, default: 1
-    User.where(donor: true).update_all(badge_id: dbadge.id)
-    remove_column :users, :donor
-  end
-end

db/migrate/20170320195301_add_utc_time_to_users.rb

@@ -1,5 +0,0 @@
-class AddUtcTimeToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :utc_time, :boolean, default: false
-  end
-end

db/migrate/20170328100851_add_header_scroll_to_users.rb

@@ -1,5 +0,0 @@
-class AddHeaderScrollToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :header_scroll, :boolean, default: false
-  end
-end

db/migrate/20170409135858_add_necro_length_to_forums.rb

@@ -1,5 +0,0 @@
-class AddNecroLengthToForums < ActiveRecord::Migration
-  def change
-    add_column :forums, :necro_length, :integer
-  end
-end

db/migrate/20170515200733_add_dark_to_users.rb

@@ -1,5 +0,0 @@
-class AddDarkToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :dark, :boolean, default: false
-  end
-end

db/migrate/20170522210610_add_search_indexes.rb

@@ -1,8 +0,0 @@
-class AddSearchIndexes < ActiveRecord::Migration
-  def change
-    add_index :forumthreads, [:title, :content], type: :fulltext
-    add_index :forumthreads, :title, type: :fulltext
-    add_index :forumthreads, :content, type: :fulltext    
-    add_index :threadreplies, :content, type: :fulltext
-  end
-end

db/migrate/20170524181458_create_messages.rb

@@ -0,0 +1,14 @@
+class CreateMessages < ActiveRecord::Migration
+  def change
+    create_table :messages do |t|
+      t.text :message
+      t.references :user_sender
+      t.references :user_target
+      t.references :user_editor
+      t.references :user_hidden
+      t.references :user_unread
+
+      t.timestamps null: true
+    end
+  end
+end

db/migrate/20170525184355_change_message_to_text.rb

@@ -0,0 +1,5 @@
+class ChangeMessageToText < ActiveRecord::Migration
+  def change
+    rename_column :messages, :message, :text
+  end
+end

db/migrate/20170613003234_add_subject_to_messages.rb

@@ -0,0 +1,5 @@
+class AddSubjectToMessages < ActiveRecord::Migration
+  def change
+    add_column :messages, :subject, :string
+  end
+end

db/migrate/20170613021450_create_messagereplies.rb

@@ -0,0 +1,13 @@
+class CreateMessagereplies < ActiveRecord::Migration
+  def change
+    create_table :messagereplies do |t|
+      t.text       :text
+
+      t.references :user_author
+      t.references :user_editor
+      t.references :message
+
+      t.timestamps null: true
+    end
+  end
+end

db/migrate/20170703003647_add_index_forumthread_id_on_threadreplies.rb

@@ -1,5 +0,0 @@
-class AddIndexForumthreadIdOnThreadreplies < ActiveRecord::Migration
-  def change
-    add_index :threadreplies, :forumthread_id
-  end
-end

db/migrate/20170710141543_create_badgeassociations.rb

@@ -1,10 +0,0 @@
-class CreateBadgeassociations < ActiveRecord::Migration
-  def change
-    create_table :badgeassociations do |t|
-      t.references :badge
-      t.references :forum
-      t.references :forumgroup
-      t.integer :permission #1 = read, 2 = write
-    end
-  end
-end

db/schema.rb

@@ -11,18 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170703003647) do
+ActiveRecord::Schema.define(version: 20170613021450) do
-
-  create_table "badges", force: :cascade do |t|
-    t.string  "name",   limit: 191
-    t.string  "symbol", limit: 191
-    t.string  "color",  limit: 191
-    t.integer "value",  limit: 4
-  end
 
   create_table "blogposts", force: :cascade do |t|
-    t.string   "title",          limit: 255
+    t.string   "title",          limit: 191
-    t.text     "content",        limit: 16777215
+    t.text     "content",        limit: 65535
     t.integer  "user_author_id", limit: 4
     t.integer  "user_editor_id", limit: 4
     t.datetime "created_at"
@@ -30,7 +23,7 @@ ActiveRecord::Schema.define(version: 20170703003647) do
   end
 
   create_table "comments", force: :cascade do |t|
-    t.text     "content",        limit: 16777215
+    t.text     "content",        limit: 65535
     t.integer  "user_author_id", limit: 4
     t.integer  "user_editor_id", limit: 4
     t.integer  "blogpost_id",    limit: 4
@@ -39,19 +32,18 @@ ActiveRecord::Schema.define(version: 20170703003647) do
   end
 
   create_table "forumgroups", force: :cascade do |t|
-    t.string  "name",          limit: 255
+    t.string  "name",          limit: 191
     t.integer "position",      limit: 4
     t.integer "role_read_id",  limit: 4
     t.integer "role_write_id", limit: 4
   end
 
   create_table "forums", force: :cascade do |t|
-    t.string  "name",          limit: 255
+    t.string  "name",          limit: 191
     t.integer "position",      limit: 4
     t.integer "role_read_id",  limit: 4
     t.integer "role_write_id", limit: 4
     t.integer "forumgroup_id", limit: 4
-    t.integer "necro_length",  limit: 4
   end
 
   create_table "forums_labels", id: false, force: :cascade do |t|
@@ -60,10 +52,10 @@ ActiveRecord::Schema.define(version: 20170703003647) do
   end
 
   create_table "forumthreads", force: :cascade do |t|
-    t.string   "title",          limit: 255
+    t.string   "title",          limit: 191
-    t.text     "content",        limit: 16777215
+    t.text     "content",        limit: 65535
-    t.boolean  "sticky",                          default: false
+    t.boolean  "sticky",                       default: false
-    t.boolean  "locked",                          default: false
+    t.boolean  "locked",                       default: false
     t.integer  "user_author_id", limit: 4
     t.integer  "user_editor_id", limit: 4
     t.integer  "forum_id",       limit: 4
@@ -72,50 +64,65 @@ ActiveRecord::Schema.define(version: 20170703003647) do
     t.integer  "label_id",       limit: 4
   end
 
-  add_index "forumthreads", ["content"], name: "index_forumthreads_on_content", type: :fulltext
-  add_index "forumthreads", ["title", "content"], name: "forumthreads_title_content", type: :fulltext
-  add_index "forumthreads", ["title", "content"], name: "index_forumthreads_on_title_and_content", type: :fulltext
-  add_index "forumthreads", ["title"], name: "index_forumthreads_on_title", type: :fulltext
-
   create_table "info", force: :cascade do |t|
-    t.string   "title",      limit: 255
+    t.string   "title",      limit: 191
-    t.text     "content",    limit: 16777215
+    t.text     "content",    limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "labels", force: :cascade do |t|
-    t.string "name",  limit: 255
+    t.string "name",  limit: 191
-    t.string "color", limit: 255
+    t.string "color", limit: 191
+  end
+
+  create_table "messagereplies", force: :cascade do |t|
+    t.text     "text",           limit: 65535
+    t.integer  "user_author_id", limit: 4
+    t.integer  "user_editor_id", limit: 4
+    t.integer  "message_id",     limit: 4
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "messages", force: :cascade do |t|
+    t.text     "text",           limit: 65535
+    t.integer  "user_sender_id", limit: 4
+    t.integer  "user_target_id", limit: 4
+    t.integer  "user_editor_id", limit: 4
+    t.integer  "user_hidden_id", limit: 4
+    t.integer  "user_unread_id", limit: 4
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "subject",        limit: 191
   end
 
   create_table "register_tokens", force: :cascade do |t|
     t.string "uuid",  limit: 32,  null: false
     t.string "token", limit: 6,   null: false
-    t.string "email", limit: 191
+    t.string "email", limit: 191, null: false
   end
 
-  add_index "register_tokens", ["email"], name: "index_register_tokens_on_email", unique: true, using: :btree
   add_index "register_tokens", ["uuid"], name: "index_register_tokens_on_uuid", unique: true, using: :btree
 
   create_table "roles", force: :cascade do |t|
-    t.string  "name",  limit: 255
+    t.string  "name",  limit: 191
     t.integer "value", limit: 4
-    t.string  "color", limit: 255
+    t.string  "color", limit: 191
   end
 
   create_table "sessions", force: :cascade do |t|
-    t.string   "session_id", limit: 255,      null: false
+    t.string   "session_id", limit: 191,   null: false
-    t.text     "data",       limit: 16777215
+    t.text     "data",       limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", length: {"session_id"=>191}, using: :btree
+  add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
   add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
 
   create_table "threadreplies", force: :cascade do |t|
-    t.text     "content",        limit: 16777215
+    t.text     "content",        limit: 65535
     t.integer  "user_author_id", limit: 4
     t.integer  "user_editor_id", limit: 4
     t.integer  "forumthread_id", limit: 4
@@ -123,23 +130,21 @@ ActiveRecord::Schema.define(version: 20170703003647) do
     t.datetime "updated_at"
   end
 
-  add_index "threadreplies", ["content"], name: "index_threadreplies_on_content", type: :fulltext
-  add_index "threadreplies", ["forumthread_id"], name: "index_threadreplies_on_forumthread_id", using: :btree
-
   create_table "users", force: :cascade do |t|
-    t.string   "uuid",                        limit: 255,                   null: false
+    t.string   "uuid",                        limit: 191,                   null: false
-    t.string   "name",                        limit: 191
+    t.string   "name",                        limit: 191,                   null: false
-    t.string   "password_digest",             limit: 255,                   null: false
+    t.string   "password_digest",             limit: 191,                   null: false
-    t.string   "ign",                         limit: 255,                   null: false
+    t.string   "ign",                         limit: 191,                   null: false
-    t.string   "email",                       limit: 191
+    t.string   "email",                       limit: 191,                   null: false
     t.text     "about",                       limit: 65535
-    t.string   "last_ip",                     limit: 255
+    t.string   "last_ip",                     limit: 191
-    t.string   "skype",                       limit: 255
+    t.string   "skype",                       limit: 191
     t.boolean  "skype_public",                              default: false
-    t.string   "youtube",                     limit: 255
+    t.string   "youtube",                     limit: 191
-    t.string   "youtube_channelname",         limit: 255
+    t.string   "youtube_channelname",         limit: 191
-    t.string   "twitter",                     limit: 255
+    t.string   "twitter",                     limit: 191
-    t.string   "email_token",                 limit: 255
+    t.boolean  "donor",                                     default: false
+    t.string   "email_token",                 limit: 191
     t.boolean  "confirmed",                                 default: false
     t.datetime "last_seen"
     t.integer  "role_id",                     limit: 4,                     null: false
@@ -150,10 +155,6 @@ ActiveRecord::Schema.define(version: 20170703003647) do
     t.boolean  "mail_own_blogpost_comment",                 default: true
     t.boolean  "mail_other_blogpost_comment",               default: true
     t.boolean  "mail_mention",                              default: true
-    t.integer  "badge_id",                    limit: 4,     default: 0
-    t.boolean  "utc_time",                                  default: false
-    t.boolean  "header_scroll",                             default: false
-    t.boolean  "dark",                                      default: false
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree

db/seeds.rb

@@ -10,14 +10,6 @@ Role.create!([
   {name: "superadmin", value: 500, color: "#d22"}
 ])
 
-Badge.create!([
-  {name: "none", symbol: "", color: "#000"},
-  {name: "donor", symbol: "$", color: "#f60"},
-  {name: "developer", symbol: "D", color: "#a0a"},
-  {name: "retired", symbol: "R", color: "#0aa"},
-  {name: "lead", symbol: "L", color: "#a00"}
-])
-
 userpw = SecureRandom.hex(36)
 
 
@@ -31,14 +23,44 @@ deleted_user = User.create!(
   password: userpw,
   password_confirmation: userpw,
   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,
+  last_seen: Time.utc(0).to_datetime
-  header_scroll: false,
-  utc_time: false,
-  dark: false
 )
 deleted_user.update_attribute(:ign, "Steve")
+
+User.create!(
+  uuid: "ae795aa86327408e92ab25c8a59f3ba1",
+  ign: "jomo",
+  email: "jomo@example.com",
+  password: "123456789", # high seructity!
+  password_confirmation: "123456789",
+  role: Role.get(:superadmin)
+)
+User.create!(
+  uuid: "7f52491ab5d64c11b4a43806db47a101",
+  ign: "Yummy_",
+  name: "Yummy",
+  email: "yummy@example.com",
+  password: "123456789", # high seructity!
+  password_confirmation: "123456789",
+  role: Role.get(:superadmin)
+)
+User.create!(
+  uuid: "62fe35da05ae437ea44b4deae1be1dc4",
+  ign: "Logal",
+  email: "logal@example.com",
+  password: "123456789", # high seructity!
+  password_confirmation: "123456789",
+  role: Role.get(:superadmin)
+)
+
+Message.create!(
+  user_sender_id: 2,
+  user_target_id: 2,
+  text: "This is a very long message that I will be using to test a plentitude of things. :)",
+  created_at: Time.utc(0).to_datetime,
+  subject: "Hello there!"
+)

lib/tasks/create_admin_user.rake

@@ -1,18 +0,0 @@
-desc "Creates a superadmin user. Usage: rake create:create_admin_user[uuid, ign, email, pass]"
-namespace :create do
-  task :create_admin_user, [:uuid, :ign, :email, :pass] => :environment do |task, args|
-    User.create!(
-      uuid: args.uuid,
-      ign: args.ign,
-      email: args.email,
-      password: args.pass,
-      password_confirmation: args.pass,
-      role: Role.get(:superadmin),
-      header_scroll: false,
-      utc_time: false,
-      dark: false,
-      badge: Badge.get(:none),
-      confirmed: true
-    )
-  end
-end