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

Fixed compatability issues in methods for thread-like messages
see previous commit
2017-06-17 17:22:58 +02:00 · 2017-06-16 22:27:03 +02:00 · 2017-06-16 21:19:13 +02:00 · 2017-06-16 21:16:35 +02:00 · 2017-06-16 21:14:09 +02:00 · 2017-06-15 15:04:15 +02:00
117 changed files with 1078 additions and 1435 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-public/* linguist-vendored
--- a/9
+++ b/9
@@ -7,17 +7,14 @@ gem 'jquery-rails'
 gem 'bcrypt' # To use ActiveModel's has_secure_password
 gem 'sanitize'
 gem 'strip_attributes'
-gem 'redcarpet'
+gem 'redcarpet', '~> 3.2.3'
 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' # @mentions
-gem 'actionpack-action_caching', github: 'antulik/actionpack-action_caching', ref: '8c6e52c69315d67437f480da5dce4b7c8737fb32'
-gem 'mail-gpg', github: 'jomo/mail-gpg', ref: 'a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9'
-gem 'totp'
+gem 'jquery-textcomplete-rails', github: 'RedstonerServer/jquery-textcomplete-rails' # @mentions

 # Gems used only for assets and not required
 # in production environments by default.
@@ -46,4 +43,4 @@ end
 group :production do
  # Use unicorn as the app server
  gem 'unicorn'
-end
+end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,12 +6,13 @@ GIT
      rails (>= 3.1.1)

 GIT
-  remote: git://github.com/antulik/actionpack-action_caching.git
-  revision: 8c6e52c69315d67437f480da5dce4b7c8737fb32
-  ref: 8c6e52c69315d67437f480da5dce4b7c8737fb32
+  remote: git://github.com/RedstonerServer/jquery-textcomplete-rails.git
+  revision: 8bf23af2d8fa1c5226c2b6889c7796adfe1f8772
  specs:
-    actionpack-action_caching (1.2.0)
-      actionpack (>= 4.0.0, < 6)
+    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/jomo/kaminari.git
@@ -22,241 +23,206 @@ 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: 22aec58a2565a76e0f55d05d045b7a45715c5bb9
+  revision: 2c8f567e53580872d8c6dfe61201e58793ca131e
  branch: 4-2-stable
  specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
      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.10)
-      activesupport (= 4.2.10)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
      arel (~> 6.0)
-    activesupport (4.2.10)
+    activesupport (4.2.5.1)
      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.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
+      railties (= 4.2.5.1)
      sprockets-rails
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)

 GEM
  remote: https://rubygems.org/
  specs:
-    activerecord-session_store (1.1.1)
-      actionpack (>= 4.0)
-      activerecord (>= 4.0)
-      multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0)
-    airbrussh (1.3.1)
-      sshkit (>= 1.6.1, != 1.7.0)
-    arel (6.0.4)
-    base32 (0.3.2)
-    bcrypt (3.1.12)
-    better_errors (2.5.0)
+    activerecord-session_store (0.1.2)
+      actionpack (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
+      railties (>= 4.0.0, < 5)
+    arel (6.0.3)
+    bcrypt (3.1.10)
+    better_errors (2.1.1)
      coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
+      erubis (>= 2.6.6)
      rack (>= 0.9.0)
-    binding_of_caller (0.8.0)
+    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
-    builder (3.2.3)
-    capistrano (3.11.0)
-      airbrussh (>= 1.0.0)
+    builder (3.2.2)
+    capistrano (3.4.0)
      i18n
      rake (>= 10.0.0)
-      sshkit (>= 1.9.0)
+      sshkit (~> 1.3)
    capistrano-bundler (1.1.4)
      capistrano (~> 3.1)
      sshkit (~> 1.2)
-    capistrano-rails (1.1.8)
+    capistrano-rails (1.1.6)
      capistrano (~> 3.1)
      capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.1.4)
+    capistrano-rbenv (2.0.4)
      capistrano (~> 3.1)
      sshkit (~> 1.3)
    choice (0.2.0)
-    coderay (1.1.2)
-    coffee-rails (4.2.2)
+    coderay (1.1.0)
+    coffee-rails (4.1.1)
      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
+      railties (>= 4.0.0, < 5.1.x)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.3)
-    crass (1.0.4)
-    debug_inspector (0.0.3)
-    domain_name (0.5.20180417)
+    coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.0)
+    crass (1.0.2)
+    debug_inspector (0.0.2)
+    domain_name (0.5.25)
      unf (>= 0.0.5, < 1.0.0)
-    erubi (1.7.1)
    erubis (2.7.0)
-    execjs (2.7.0)
-    ffi (1.9.25)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    gpgme (2.0.16)
-      mini_portile2 (~> 2.3)
+    execjs (2.6.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
    hirb (0.7.3)
-    http-cookie (1.0.3)
+    http-cookie (1.0.2)
      domain_name (~> 0.5)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.3)
-      rails-dom-testing (>= 1, < 3)
+    i18n (0.7.0)
+    jquery-rails (4.1.0)
+      rails-dom-testing (~> 1.0)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    jquery-textcomplete-rails (0.1.5)
-      coffee-rails (>= 3.2.0)
-      railties (>= 3.2.0)
-      sass-rails (>= 3.2.0)
-    kgio (2.11.2)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
+    json (1.8.3)
+    kgio (2.10.0)
+    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    mysql2 (0.5.2)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    mysql2 (0.4.2)
    net-scp (1.2.1)
      net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
+    net-ssh (3.0.2)
    netrc (0.11.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    nokogumbo (2.0.1)
-      nokogiri (~> 1.8, >= 1.8.4)
-    rack (1.6.11)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogumbo (1.4.7)
+      nokogiri
+    rack (1.6.4)
    rack-test (0.6.3)
      rack (>= 1.0)
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-erd (1.5.2)
+    rails-erd (1.4.5)
      activerecord (>= 3.2)
      activesupport (>= 3.2)
      choice (~> 0.2.0)
      ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    raindrops (0.19.0)
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rb-readline (0.5.5)
-    redcarpet (3.4.0)
-    rest-client (2.0.2)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    raindrops (0.15.0)
+    rake (10.5.0)
+    rb-readline (0.5.3)
+    redcarpet (3.2.3)
+    rest-client (1.8.0)
      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    ruby-graphviz (1.2.4)
-    sanitize (5.0.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    ruby-graphviz (1.2.2)
+    sanitize (4.0.1)
      crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
-    sass (3.7.2)
-      sass-listen (~> 4.0.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)
+      nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)
+      railties (>= 4.0.0, < 5.0)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
-    sprockets (3.7.2)
+    sprockets (3.5.2)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.0.0)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    sshkit (1.18.0)
+    sqlite3 (1.3.11)
+    sshkit (1.8.1)
      net-scp (>= 1.1.2)
      net-ssh (>= 2.8.0)
-    strip_attributes (1.8.0)
-      activemodel (>= 3.0, < 6.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    totp (1.0.0)
-      base32
-    tzinfo (1.2.5)
+    strip_attributes (1.7.1)
+      activemodel (>= 3.0, < 5.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.2)
+    tzinfo (1.2.2)
      thread_safe (~> 0.1)
-    uglifier (4.1.20)
-      execjs (>= 0.3.0, < 3)
+    uglifier (2.7.2)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.5)
-    unicorn (5.4.1)
+    unf_ext (0.0.7.1)
+    unicorn (5.0.1)
      kgio (~> 2.6)
+      rack
      raindrops (~> 0.7)
-    webrick (1.4.2)
+    webrick (1.3.1)

 PLATFORMS
  ruby

 DEPENDENCIES
-  actionpack-action_caching!
  activerecord-session_store
  bcrypt
  better_errors
@@ -267,24 +233,22 @@ DEPENDENCIES
  highlight_js-rails!
  hirb
  jquery-rails
-  jquery-textcomplete-rails
+  jquery-textcomplete-rails!
  kaminari!
-  mail-gpg!
  mysql2
  rails!
  rails-erd
  rb-readline
-  redcarpet
+  redcarpet (~> 3.2.3)
  rest-client
  sanitize
  sass-rails
  sqlite3
  strip_attributes
-  totp
  tzinfo-data
  uglifier
  unicorn
  webrick

 BUNDLED WITH
-   1.17.3
+   1.11.2
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,116 +0,0 @@
-CC0 1.0 Universal
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator and
-subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later
-claims of infringement build upon, modify, incorporate in other works, reuse
-and redistribute as freely as possible in any form whatsoever and for any
-purposes, including without limitation commercial purposes. These owners may
-contribute to the Commons to promote the ideal of a free culture and the
-further production of creative, cultural and scientific works, or to gain
-reputation or greater distribution for their Work in part through the use and
-efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with a
-Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or her
-Copyright and Related Rights in the Work and the meaning and intended legal
-effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not limited
-to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display, communicate,
-  and translate a Work;
-
-  ii. moral rights retained by the original author(s) and/or performer(s);
-
-  iii. publicity and privacy rights pertaining to a person's image or likeness
-  depicted in a Work;
-
-  iv. rights protecting against unfair competition in regards to a Work,
-  subject to the limitations in paragraph 4(a), below;
-
-  v. rights protecting the extraction, dissemination, use and reuse of data in
-  a Work;
-
-  vi. database rights (such as those arising under Directive 96/9/EC of the
-  European Parliament and of the Council of 11 March 1996 on the legal
-  protection of databases, and under any national implementation thereof,
-  including any amended or successor version of such directive); and
-
-  vii. other similar, equivalent or corresponding rights throughout the world
-  based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time
-extensions), (iii) in any current or future medium and for any number of
-copies, and (iv) for any purpose whatsoever, including without limitation
-commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
-the Waiver for the benefit of each member of the public at large and to the
-detriment of Affirmer's heirs and successors, fully intending that such Waiver
-shall not be subject to revocation, rescission, cancellation, termination, or
-any other legal or equitable action to disrupt the quiet enjoyment of the Work
-by the public as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account
-Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
-is so judged Affirmer hereby grants to each affected person a royalty-free,
-non transferable, non sublicensable, non exclusive, irrevocable and
-unconditional license to exercise Affirmer's Copyright and Related Rights in
-the Work (i) in all territories worldwide, (ii) for the maximum duration
-provided by applicable law or treaty (including future time extensions), (iii)
-in any current or future medium and for any number of copies, and (iv) for any
-purpose whatsoever, including without limitation commercial, advertising or
-promotional purposes (the "License"). The License shall be deemed effective as
-of the date CC0 was applied by Affirmer to the Work. Should any part of the
-License for any reason be judged legally invalid or ineffective under
-applicable law, such partial invalidity or ineffectiveness shall not
-invalidate the remainder of the License, and in such case Affirmer hereby
-affirms that he or she will not (i) exercise any of his or her remaining
-Copyright and Related Rights in the Work or (ii) assert any associated claims
-and causes of action with respect to the Work, in either case contrary to
-Affirmer's express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
-  a. No trademark or patent rights held by Affirmer are waived, abandoned,
-  surrendered, licensed or otherwise affected by this document.
-
-  b. Affirmer offers the Work as-is and makes no representations or warranties
-  of any kind concerning the Work, express, implied, statutory or otherwise,
-  including without limitation warranties of title, merchantability, fitness
-  for a particular purpose, non infringement, or the absence of latent or
-  other defects, accuracy, or the present or absence of errors, whether or not
-  discoverable, all to the greatest extent permissible under applicable law.
-
-  c. Affirmer disclaims responsibility for clearing rights of other persons
-  that may apply to the Work or any use thereof, including without limitation
-  any person's Copyright and Related Rights in the Work. Further, Affirmer
-  disclaims responsibility for obtaining any necessary consents, permissions
-  or other rights required for any use of the Work.
-
-  d. Affirmer understands and acknowledges that Creative Commons is not a
-  party to this document and has no duty or obligation with respect to this
-  CC0 or use of the Work.
-
-For more information, please see
-<http://creativecommons.org/publicdomain/zero/1.0/>
--- a/app/assets/images/discord.png
+++ b/app/assets/images/discord.png
--- a/app/assets/images/mastodon.png
+++ b/app/assets/images/mastodon.png
--- a/app/assets/images/tor.png
+++ b/app/assets/images/tor.png
--- a/app/assets/stylesheets/dark.css.scss
+++ b/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;
-}
--- a/app/assets/stylesheets/mobi.css.scss
+++ b/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;
@@ -75,4 +66,4 @@
    margin: 50px 20px 0;
  }

-}
+}
--- a/app/assets/stylesheets/style.css.scss
+++ b/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;
-  }
-}
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
  protect_from_forgery
-  before_filter :update_ip, :update_seen, :check_banned, :check_2fa
+  before_filter :update_ip, :update_seen, :check_banned
  # TODO: use SSL


@@ -41,14 +41,6 @@ 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?
--- a/app/controllers/blogposts_controller.rb
+++ b/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
@@ -75,4 +75,4 @@ class BlogpostsController < ApplicationController
    end
  end

-end
+end
--- a/app/controllers/forumgroups_controller.rb
+++ b/app/controllers/forumgroups_controller.rb
@@ -77,4 +77,4 @@ class ForumgroupsController < ApplicationController
    params.require(:forumgroup).permit(a)
  end

-end
+end
--- a/app/controllers/forums_controller.rb
+++ b/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
@@ -78,6 +77,7 @@ class ForumsController < ApplicationController
    redirect_to forums_path
  end

+
  private

  def check_permission
@@ -89,7 +89,7 @@ class ForumsController < ApplicationController
  end

  def forum_params(add = [])
-    a = [:name, :position, :role_read_id, :role_write_id, :necro_length, :disable_deletion] + add
+    a = [:name, :position, :role_read_id, :role_write_id] + add
    params.require(:forum).permit(a)
  end
 end
--- a/app/controllers/forumthreads_controller.rb
+++ b/app/controllers/forumthreads_controller.rb
@@ -3,20 +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])
-
-    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)
+    redirect_to forum_path(@thread.forum.forumgroup, f)
  end

  def show
-    if params[:reverse] == "true"
-      @replies = @thread.replies.order(id: :desc).page(params[:page])
-    else
-      @replies = @thread.replies.order(:id).page(params[:page])
-    end
+    @replies = @thread.replies.page(params[:page])
  end

  def edit
@@ -73,7 +64,7 @@ class ForumthreadsController < ApplicationController
  end

  def destroy
-    if mod? || (@thread.author.is?(current_user) && !@thread.forum.disable_deletion)
+    if mod? || @thread.author.is?(current_user)
      if @thread.destroy
        flash[:notice] = "Thread deleted!"
      else
@@ -85,9 +76,6 @@ class ForumthreadsController < ApplicationController
    redirect_to @thread.forum
  end

-  def search
-  end
-
  private

  def check_permission
--- a/app/controllers/messagereplies_controller.rb
+++ b/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
--- a/app/controllers/messages_controller.rb
+++ b/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
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -21,10 +21,6 @@ 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!"
@@ -114,4 +110,4 @@ class SessionsController < ApplicationController
      redirect_to login_path
    end
  end
-end
+end
--- a/app/controllers/statics_controller.rb
+++ b/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,30 +14,4 @@ class StaticsController < ApplicationController
  def donate
  end

-  def online
-    @players = []
-    @count = 0
-    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
--- a/app/controllers/threadreplies_controller.rb
+++ b/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
@@ -69,4 +69,4 @@ class ThreadrepliesController < ApplicationController
  def reply_params
    params.require(:threadreply).permit(:content)
  end
-end
+end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,21 +7,29 @@ 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])
-    badge = Badge.find_by(name: params[:badge])
-
-    @users = User.search(params[:search], role, badge, params.include?(:staff), params.include?(:donor))
+    if params[:role]
+      if params[:role].downcase == "staff"
+        @users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
+      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

  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
@@ -87,12 +95,6 @@ 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
@@ -149,14 +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, :discord, :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, :discord, :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
+        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about])
      end
      if userdata[:role]
        role = Role.get(userdata[:role])
@@ -167,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]
@@ -235,18 +229,6 @@ 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
-
-  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

@@ -262,18 +244,6 @@ 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
@@ -381,7 +351,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, :public_key, :totp_code] + 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
    params.require(:user).permit(a)
  end
 end
--- a/app/helpers/application_helper.rb
+++ b/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

--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -51,4 +51,5 @@ module UsersHelper
      return nil
    end
  end
+
 end
--- a/app/mailers/redstoner_mailer.rb
+++ b/app/mailers/redstoner_mailer.rb
@@ -1,8 +1,8 @@
 class RedstonerMailer < ActionMailer::Base

  add_template_helper(ApplicationHelper)
-  default from: "\"Redstoner\" <noreply@redstoner.com>"
-  default reply_to: "staff@redstoner.com"
+  default from: "info@redstoner.com"
+  default reply_to: "redstonerserver+website@gmail.com"

  def register_mail(user, uses_mc_pass)
    @user = user
@@ -19,49 +19,35 @@ class RedstonerMailer < ActionMailer::Base
  def new_thread_mention_mail(user, thread)
    @user   = user
    @thread = thread
-    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
+    mail(to: @user.email, subject: "#{thread.author.name} mentioned you in '#{thread.title}' on Redstoner")
  end

  def new_thread_reply_mail(user, reply)
    @user  = user
    @reply = reply
-    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
+    mail(to: @user.email, subject: "#{reply.author.name} replied to '#{reply.thread.title}' on Redstoner")
  end

  def new_post_mention_mail(user, post)
    @user = user
    @post = post
-    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
+    mail(to: @user.email, subject: "#{post.author.name} mentioned you in '#{post.title}' on Redstoner")
  end

  def new_post_comment_mail(user, comment)
    @user    = user
    @comment = comment
-    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
+    mail(to: @user.email, subject: "#{comment.author.name} replied to '#{comment.blogpost.title}' on Redstoner")
  end

  def email_change_confirm_mail(user)
    @user = user
-    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
+    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
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -1,18 +0,0 @@
-class Badge < ActiveRecord::Base
-  include Comparable
-  has_many :users
-
-  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
--- a/app/models/blogpost.rb
+++ b/app/models/blogpost.rb
@@ -8,8 +8,6 @@ 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?
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -4,7 +4,6 @@ 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
@@ -33,4 +32,4 @@ class Forum < ActiveRecord::Base
  def to_param
    [id, to_s.parameterize].join("-")
  end
-end
+end
--- a/app/models/forumgroup.rb
+++ b/app/models/forumgroup.rb
@@ -7,7 +7,7 @@ class Forumgroup < ActiveRecord::Base


  validates_presence_of :name, :position
-  validates_length_of :name, in: 4..20
+  validates_length_of :name, in: 2..20

  def to_s
    name
--- a/app/models/forumthread.rb
+++ b/app/models/forumthread.rb
@@ -11,7 +11,6 @@ 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
@@ -66,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})", user_id, role_value, role_value, role_value, role_value)
-    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
--- a/app/models/info.rb
+++ b/app/models/info.rb
@@ -11,4 +11,4 @@ class Info < ActiveRecord::Base
    [id, to_s.parameterize].join("-")
  end

-end
+end
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -23,4 +23,4 @@ class Label < ActiveRecord::Base
      end
    end
  end
-end
+end
--- a/app/models/message.rb
+++ b/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
--- a/app/models/messagereply.rb
+++ b/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
--- a/app/models/register_token.rb
+++ b/app/models/register_token.rb
@@ -1,2 +1,2 @@
 class RegisterToken < ActiveRecord::Base
-end
+end
--- a/app/models/role.rb
+++ b/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
@@ -53,4 +53,4 @@ class Role < ActiveRecord::Base
    Role.order(:value).select {|r| r >= from}.select {|r| r <= to}
  end

-end
+end
--- a/app/models/threadreply.rb
+++ b/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? && thread.can_read?(post.author)
+        if post.author != author && post.author.normal? && post.author.confirmed? # &&
          users << post.author if post.author.mail_other_thread_reply?
        end
      end
--- a/app/models/user.rb
+++ b/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
@@ -21,18 +20,21 @@ 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 :discord, uniqueness: {case_sensitive: false}, format: {with: /\A^(?!everyone|here|discordtag|.*```.*)([^@#:]{2,32}#[0-9]{4})$\z/i, message: "Discord name is invalid."}, allow_blank: true
-
-  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

+  cattr_accessor :current
+
  # foo.bar.is?(current_user)
  def is? (user)
    self == user
  end

+  def donor?
+    !!self.donor
+  end
+
  def confirmed?
    !!self.confirmed
  end
@@ -150,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
@@ -169,7 +167,7 @@ class User < ActiveRecord::Base
    self.ign.strip! if self.ign
    self.email.strip! if self.email
    self.about.strip! if self.about
-    self.discord.strip! if self.discord
+    self.skype.strip! if self.skype
    self.youtube.strip! if self.youtube
    self.twitter.strip! if self.twitter
  end
@@ -177,23 +175,4 @@ class User < ActiveRecord::Base
  def set_email_token
    self.email_token ||= SecureRandom.hex(16)
  end
-
-  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
-      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
--- a/app/views/application/_md_editor.html.erb
+++ b/app/views/application/_md_editor.html.erb
@@ -8,4 +8,4 @@
    <%= text_area_tag name, content, options %>
    <div class="preview"><i>(Loading...)</i></div>
  </div>
-</div>
+</div>
--- a/app/views/blogposts/edit.html.erb
+++ b/app/views/blogposts/edit.html.erb
@@ -1,10 +1,10 @@
-<% title "Edit Post: #{@post.title}" %>
+<% title "Edit News: #{@post.title}" %>

-<h1>Edit Post: #{@post.title}</h1>
+<h1>Edit post</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>
-<div class="clear"></div>
+<p><%= button_to "Delete post", @post, method: "delete", data: {confirm: "Delete post & comments forever?"}, class: "btn red right" %></p>
+<div class="clear"></div>
--- a/app/views/blogposts/index.html.erb
+++ b/app/views/blogposts/index.html.erb
@@ -1,7 +1,6 @@
 <% title "News" %>
-
 <h1>News</h1>
-<%= link_to 'New Post', new_blogpost_path, class: "btn blue" if mod? %>
+<%= link_to 'Make 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 %>">
--- a/app/views/comments/_new.html.erb
+++ b/app/views/comments/_new.html.erb
@@ -1,5 +1,5 @@
-<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>
-<% end %>
+<% end %>
--- a/app/views/comments/edit.html.erb
+++ b/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>
-<div class="clear"></div>
+<p><%= button_to "Delete comment", [@comment.blogpost, @comment] , method: "delete", data: {confirm: "Delete comment forever?"}, class: "btn red right" %></p>
+<div class="clear"></div>
--- a/app/views/forumgroups/edit.html.erb
+++ b/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>
-<div class="clear"></div>
+<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>
--- a/app/views/forumgroups/new.html.erb
+++ b/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 %>
+<% end %>
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -21,16 +21,8 @@
      <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><%= 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>
-    <tr>
-      <td><%= f.label :disable_deletion, "Disable deletion of threads for non-staff" %></td>
-      <td><%= f.check_box :disable_deletion %></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>
-<div class="clear"></div>
+<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>
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -1,7 +1,5 @@
 <% title "Forums" %>

-<%= link_to "Search 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 %>
@@ -58,4 +56,4 @@
  <%= link_to "New group", new_forumgroup_path, class: "btn blue" %>
 <% elsif mod? %>
  <%= link_to "New group", "#", class: "btn blue", disabled: true %>
-<% end %>
+<% end %>
--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@@ -21,16 +21,8 @@
      <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><%= 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>
-    <tr>
-      <td><%= f.label :disable_deletion %></td>
-      <td><%= f.check_box :disable_deletion %></td>
-    </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 %>
+<% end %>
--- a/app/views/forums/show.atom.builder
+++ b/app/views/forums/show.atom.builder
@@ -1,19 +0,0 @@
-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
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,13 +1,8 @@
 <%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= @forum %>

-<h1>
-  <%= title @forum %>
-  <%= link_to "Search Threads", forumthreads_path(forum: @forum.id), class: "btn blue right" %>
-</h1>
+<h1><%= title @forum %></h1>
 <% if @forum.can_write?(current_user) %>
-  <p>
-    <%= link_to "New Thread", new_forumthread_path(forum: @forum), class: "btn blue" %>
-  </p>
+  <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
--- a/app/views/forumthreads/edit.html.erb
+++ b/app/views/forumthreads/edit.html.erb
@@ -11,9 +11,7 @@
  end
 %>

-<% forum = Forum.find(@thread.forum_id) %>
-
-<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>
@@ -37,9 +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>
-<% end %>
-<% if mod? || !forum.disable_deletion %>
-  <%= button_to "Delete Thread", @thread, :method => "delete", data: {confirm: "Delete thread & comments forever?"}, class: "btn red right" %>
+  <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" %>
 <div class="clear"></div>
--- a/app/views/forumthreads/index.html.erb
+++ b/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>
--- a/app/views/forumthreads/new.html.erb
+++ b/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 %>
--- a/app/views/forumthreads/search.html.erb
+++ b/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>
--- a/app/views/forumthreads/show.html.erb
+++ b/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>
-  <%= 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>
+<h1><%= render partial: "labels/label", locals: {label: @thread.label} %><%= title @thread.title %></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) %>
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -13,12 +13,11 @@
    <% 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 %>
+        Join us on <img src="/slack/badge.svg" alt="Slack">
+      <% end %>
    <% end %>
  </div>
-</div>
+</div>
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,9 +1,4 @@
-<% head = "head_top" %>
-<% if current_user != nil && current_user.header_scroll == true %>
-  <% head = "head_scroll" %>
-<% end %>
-
-<div id="<%= head %>">
+<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">
@@ -49,4 +41,4 @@
      <% end %>
    </div>
  </div>
-</div>
+</div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,23 +5,16 @@
  <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.jsdelivr.net/gh/jomo/ago.js@0.0.1/ago.min.js", crossorigin: :anonymous, integrity: "sha256-xw0JUUdbuZQCVO+QScoxrlEsD4nZGCjMRh9PP8GLhcY=" %>
+  <%= javascript_include_tag "https://cdn.rawgit.com/jomo/ago.js/v0.0.1/ago.min.js", crossorigin: :anonymous, integrity: "sha256-xw0JUUdbuZQCVO+QScoxrlEsD4nZGCjMRh9PP8GLhcY=" %>
  <%= javascript_include_tag "application" %>
  <link type="application/atom+xml" rel="alternate" href="<%= blogposts_path(:atom) %>">
  <%= yield(:site_headers) %>
 </head>
 <body>
  <%= render partial: "/layouts/head" %>
-  <% content = "main-content" %>
-  <% if current_user.try(:header_scroll) == true %>
-    <% content = "main-content-scroll" %>
-  <% end %>
-  <div id="<%=content%>" class="<%=yield(:main_class) %>">
+  <div id="main-content" class="<%= yield(:main_class) %>">
    <% if alert %>
      <div class='flash alert'><%= alert %></div>
    <% end %>
@@ -32,4 +25,4 @@
  </div>
  <%= render partial: "/layouts/footer" %>
 </body>
-</html>
+</html>
--- a/app/views/messagereplies/_new.html.erb
+++ b/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 %>
+
--- a/app/views/messagereplies/_reply.html.erb
+++ b/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>
--- a/app/views/messagereplies/edit.html.erb
+++ b/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>
--- a/app/views/messages/edit.html.erb
+++ b/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>
+
--- a/app/views/messages/index.html.erb
+++ b/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>
--- a/app/views/messages/new.html.erb
+++ b/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 %>
--- a/app/views/messages/show.html.erb
+++ b/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>
--- a/app/views/redstoner_mailer/email_change_confirm_mail.html.erb
+++ b/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(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(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
      <p>Your Redstoner team</p>

    </div>
@@ -25,9 +25,9 @@
      <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 "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:staff@redstoner.com", 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>
+</div>
--- a/app/views/redstoner_mailer/new_message_mail.html.erb
+++ b/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>
--- a/app/views/redstoner_mailer/new_post_comment_mail.html.erb
+++ b/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(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(role: "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 "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:staff@redstoner.com", 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>
--- a/app/views/redstoner_mailer/new_post_mention_mail.html.erb
+++ b/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(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(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
      <p>Your Redstoner team</p>

    </div>
@@ -21,9 +21,9 @@
      <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 "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:staff@redstoner.com", 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>
+</div>
--- a/app/views/redstoner_mailer/new_thread_mention_mail.html.erb
+++ b/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(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(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
      <p>Your Redstoner team</p>

    </div>
@@ -23,9 +23,9 @@
      <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 "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:staff@redstoner.com", 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>
+</div>
--- a/app/views/redstoner_mailer/new_thread_reply_mail.html.erb
+++ b/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(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(role: "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 "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-      <%= link_to "Email", "mailto:staff@redstoner.com", 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>
--- a/app/views/redstoner_mailer/register_mail.html.erb
+++ b/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(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(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
      <p>Your Redstoner team</p>

    </div>
@@ -37,9 +37,9 @@
      <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 "Mastodon", "https://mstdn.io/@RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
-        <%= link_to "Email", "mailto:staff@redstoner.com", 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>
+</div>
--- a/app/views/sessions/new.html.erb
+++ b/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,14 +16,6 @@
      <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 %>
+<% end %>
--- a/app/views/statics/donate.html.erb
+++ b/app/views/statics/donate.html.erb
@@ -1,4 +1,3 @@
-<% title "Donate" %>
 <h1>Donate</h1>

 <p>Running a server is really stressful and requires a lot of work.<br>
@@ -12,26 +11,24 @@
  <li>Donator+ ($20 or more)
 </ul>

-<p>We also have a <%= link_to "list of users who donated", users_path(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>
 <ul>
  <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>You can chat in <font color="red">color</font> in-game.</i>  
  <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">
  <div class="donation">
    <div class="left">
-      <img src="https://crafatar.com/renders/body/d2693e91-93e1-4e3f-929f-f38e1ce8df03?overlay=true&scale=3" alt="sponsor's skin" class="body">
+      <img src="<%= image_url("anonymous_skin.png") %>" alt="sponsor's skin" class="body">
    </div>
    <div>
      <h1>Donate to our server sponsor</h1>
-      <h4>Pepich1851 pays for the server hardware. You can help him by donating here.</h4>
+      <h4>They pay for our server, but prefer to stay anonymous</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 %>">
@@ -48,4 +45,4 @@
 </div>
 <hr>

-<p class="small">Please note that you are not buying anything. We do not guarantee for these perks, however, we will try hard to make sure you'll get them! Donations are processed manually, it can take a few hours.</p>
+<p class="small">Please note that you are not buying anything. We do not guarantee for these perks, however, we will try hard to make sure you'll get them! Donations are processed manually, it can take a few hours.</p>
--- a/app/views/statics/home.html.erb
+++ b/app/views/statics/home.html.erb
@@ -30,4 +30,4 @@
  <span>for those who just want to mine some ore</span>
  <span>and we have a freebuild world for large projects.</span>
 </p>
-<p>Join us now!</p>
+<p>Join us now!</p>
--- a/app/views/statics/online.html.erb
+++ b/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>
-
--- a/app/views/statics/privacy.html.erb
+++ b/app/views/statics/privacy.html.erb
@@ -1,41 +0,0 @@
-<% 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>
--- a/app/views/threadreplies/_new.html.erb
+++ b/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 = "" %>
-  <% 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 = "" %>
+  <p><%= f.submit "Reply#{ ' (Locked)' if reply.thread.locked? }", class: "btn blue" %></p>
 <% end %>
--- a/app/views/threadreplies/edit.html.erb
+++ b/app/views/threadreplies/edit.html.erb
@@ -1,15 +1,15 @@
-<% title "Edit Reply: #{@reply.thread.title}" %>
+<% 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
 %>

 <%= 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>
--- a/app/views/users/_username.html.erb
+++ b/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 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>
+  <%= link_to "$", donate_statics_path, class: "role donor", title: "Donator" if user.donor? %>
+</div>
--- a/app/views/users/change_password.html.erb
+++ b/app/views/users/change_password.html.erb
@@ -1,10 +1,10 @@
 <% title "Change Password" %>

-<h1>Change Password</h1>
+<h1>Change password</h1>

 <%= form_for @user do |f| %>
  <%= f.text_field :current_password %>
  <%= f.text_field :email %>
  <%= f.text_field :password %>
  <%= f.text_field :password_confirmation %>
-<% end %>
+<% end %>
--- a/app/views/users/edit.html.erb
+++ b/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>
@@ -27,25 +27,29 @@
            <% 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>Discord username</td>
+        <td>Skype username</td>
        <td>
-          <%= f.text_field :discord, placeholder: "Discord username", disabled: !can_edit? %>
+          <%= 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>
@@ -69,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 "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 "Website Settings", edit_website_settings_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 blue right" %>
 </p>
 <div class="clear"></div>

--- a/app/views/users/edit_login.html.erb
+++ b/app/views/users/edit_login.html.erb
@@ -1,7 +1,7 @@
 <% title "Edit Login Credentials: #{@user.name}" %>

-<%= link_to @user.name, @user %> → Edit Login settings
-<h1>Edit Login Settings</h1>
+<%= link_to @user.name, @user %> → Edit Login credentials
+<h1>Edit Login credentials</h1>


 <%= form_for @user, url: update_login_user_path(@user), method: :put do |f| %>
@@ -25,51 +25,14 @@
          <%= 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 %>
+<% end %>
--- a/app/views/users/edit_notifications.html.erb
+++ b/app/views/users/edit_notifications.html.erb
@@ -45,9 +45,6 @@
      </tr>
    </tbody>
  </table>
-  <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>
+  <p><%= f.submit "Save changes", class: "btn blue left" %></p>
  <div class="clear"></div>
-<% end %>
+<% end %>
--- a/app/views/users/edit_website_settings.html.erb
+++ b/app/views/users/edit_website_settings.html.erb
@@ -1,32 +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</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 %>
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,34 +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] && !params[:badge]
-      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"
-    elsif params.include?(:donor)
-      text = "All donors"
-    else
-      text = "All users"
-    end
-    text += " that contain '#{params[:search]}'" if params[:search]
-  %>
-  <%= title text %>
-  <% if params[:search] %>
-    (<%= @users.total_count %>)
+  <% if params[:role] %>
+    <%= title "All '#{params[:role]}' users" %>
  <% 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| %>
@@ -41,4 +19,4 @@
    </div>
  <% end %>
  <%= paginate @users %>
-</div>
+</div>
--- a/app/views/users/lost_password.html.erb
+++ b/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>
-<% end %>
+  <p><%= submit_tag "Reset password", class: "btn blue" %></p>
+<% end %>
--- a/app/views/users/new.html.erb
+++ b/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 %>
+  <p>Contact us ingame if you have problems singing up!</p>
+<% end %>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,31 +1,34 @@
 <% title @user.name %>

 <div id="user-info">
-  <% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %>
-    <div class="profile-action" ><%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %></div>
-  <% 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] %>
+  <div class="profile-action">
+    <% if 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>

  <h1><%= @user.name %></h1>

  <div class="clear"></div>
-  <% if @ban_json && (@ban_json["expires"] == "forever" || !(DateTime.parse(@ban_json["expires"]) <= DateTime.now)) %>
-    <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>
-  <% end %>
+
  <% if @user.banned? %>
-      <span class="user-banned">This user is banned on the website!</span>
+    <span class="user-banned">This user is banned!</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>
-      <%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn blue", form_class: "inline-block", data: {confirm: "Did you check your spam folder?"} %>
+      <%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn dark", form_class: "inline-block", data: {confirm: "Did you check your spam folder?"} %>
    <% else %>
      <span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
    <% end %>
@@ -54,10 +57,10 @@
        <td><b>Role</b></td>
        <td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
      </tr>
-      <% if current_user && !@user.discord.blank? %>
+      <% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
      <tr>
-        <td><b>Discord</b></td>
-        <td><%= @user.discord %></td>
+        <td><b>Skype</b></td>
+        <td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>
      </tr>
      <% end %>
      <% if !@user.youtube.blank? && !@user.youtube_channelname.blank? %>
@@ -82,16 +85,6 @@
        <td><b>Joined</b></td>
        <td><%= ago @user.created_at %></td>
      </tr>
-      <tr>
-        <td><b>Last seen</b></td>
-        <td>
-          <% if @user.last_seen %>
-            <%= ago @user.last_seen %>
-          <% else %>
-            Never
-          <% end %>
-        </td>
-      </tr>
      <% if mod? || @user.is?(current_user) %>
        <tr>
          <td><b>Last IP</b></td>
@@ -101,6 +94,16 @@
          <td><b>Email</b></td>
          <td><%= mail_to @user.email, @user.email, :subject => "Redstoner" %></td>
        </tr>
+        <tr>
+          <td><b>Last seen</b></td>
+          <td>
+            <% if @user.last_seen %>
+              <%= ago @user.last_seen %>
+            <% else %>
+              Never
+            <% end %>
+          </td>
+        </tr>
      <% end %>
    </tbody>
  </table>
--- a/config/database.yml
+++ b/config/database.yml
@@ -24,4 +24,4 @@ test:
  adapter: sqlite3
  database: db/test.sqlite3
  pool: 5
-  timeout: 5000
+  timeout: 5000
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.11.0'
+lock '3.4.0'

 set :repo_url, 'https://github.com/RedstonerServer/redstoner.com'

@@ -13,9 +13,9 @@ set :default_environment, {

 set :keep_releases, 5

-set :deploy_to, -> { "/var/www/#{fetch(:application)}" }
+set :deploy_to, -> { "/home/www-data/apps/#{fetch(:application)}" }

-set :rbenv_ruby, '2.5.0-dev'
+set :rbenv_ruby, '2.0.0-p648'

 set :bundle_without, %w{development test}.join(' ')

@@ -24,4 +24,4 @@ set :linked_dirs, fetch(:linked_dirs, []).push('bin', 'log', 'tmp/pids', 'tmp/ca

 namespace :deploy do
  after :publishing, :restart
-end
+end
--- a/config/environments/development.rb
+++ b/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

@@ -37,12 +35,12 @@ Redstoner::Application.configure do
  }

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

-end
+end
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -71,12 +71,12 @@ Redstoner::Application.configure do
  }

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

 end
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1 +0,0 @@
-Rails.application.config.assets.precompile += %w( dark.css )
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,12 +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 'privacy'
      get 'index'
    end
  end
@@ -23,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'
@@ -33,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
@@ -47,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'
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -3,8 +3,8 @@ timeout 15
 preload_app true


-stderr_path "/var/www/redstoner/shared/log/unicorn.stderr.log"
-stdout_path "/var/www/redstoner/shared/log/unicorn.stdout.log"
+stderr_path "/home/www-data/apps/redstoner/shared/log/unicorn.stderr.log"
+stdout_path "/home/www-data/apps/redstoner/shared/log/unicorn.stdout.log"

 before_fork do |server, worker|
  Signal.trap 'TERM' do
@@ -23,4 +23,4 @@ after_fork do |server, worker|

  defined?(ActiveRecord::Base) and
    ActiveRecord::Base.establish_connection
-end
+end
--- a/db/migrate/20140617183701_create_roles.rb
+++ b/db/migrate/20140617183701_create_roles.rb
@@ -5,4 +5,4 @@ class CreateRoles < ActiveRecord::Migration
       t.integer :value
     end
  end
-end
+end
--- a/db/migrate/20140617183702_create_users.rb
+++ b/db/migrate/20140617183702_create_users.rb
@@ -23,4 +23,4 @@ class CreateUsers < ActiveRecord::Migration
      t.timestamps null: true
    end
  end
-end
+end
--- a/db/migrate/20170319193517_add_badge_id_to_users.rb
+++ b/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
--- a/db/migrate/20170320195301_add_utc_time_to_users.rb
+++ b/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
--- a/db/migrate/20170328100851_add_header_scroll_to_users.rb
+++ b/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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
MrYummy	8bf5164301	just making this so I don't lose work when I switch branches	2017-06-17 17:22:58 +02:00
MrYummy	6a0eedc585	Fixed compatability issues in methods for thread-like messages	2017-06-16 22:27:03 +02:00
MrYummy	4e8d94a7b6	see previous commit	2017-06-16 21:19:13 +02:00
MrYummy	f60edea1be	Fixed 'No private messages' bug	2017-06-16 21:16:35 +02:00
MrYummy	2bb75bb0b6	tweaked message 'read' system	2017-06-16 21:14:09 +02:00
MrYummy	dd193e740a	Added 'read' check; message name is only bold if unread	2017-06-15 15:04:15 +02:00
MrYummy	9b50ec652c	Made messages more thread-like (replies, editing, etc.)	2017-06-15 14:29:25 +02:00
MrYummy	80026caebc	Added subject support to messages	2017-06-13 03:48:30 +02:00
MrYummy	f00677a68b	Added subject column to messages	2017-06-13 02:35:22 +02:00
MrYummy	b075a5fd75	Apparently that 'unnecessary permission check' was necessary. ¯\_(ツ)_/¯	2017-06-13 02:19:29 +02:00
MrYummy	4d42fdfeb4	Moved messages index link to users/show.html.erb, added 'message this user' button	2017-06-13 02:08:13 +02:00
MrYummy	dd63941657	Added message length validity (1..8000) and rewrote 'target' method	2017-06-12 21:59:39 +02:00
MrYummy	fbae985d86	Prettified link style in message mail	2017-06-12 21:47:21 +02:00
MrYummy	32231e4eea	Updated user_target autocomplete regex, removed unnecessary permission check	2017-06-12 21:40:33 +02:00
MrYummy	895e56ff06	Link to 'all messages' in message email fixed, added "delete_all" action	2017-06-12 21:17:18 +02:00
MrYummy	68ee779c11	Now sends mail to user_target on message creation	2017-06-04 20:02:57 +02:00
MrYummy	7c233c8fef	fixed routes and made 'Delete message' appear on cursor hover	2017-06-03 21:29:14 +02:00
MrYummy	e378dfab02	Added messaging feature	2017-05-27 00:34:47 +02:00
				`@@ -1 +0,0 @@`
				`Rails.application.config.assets.precompile += %w( dark.css )`