Merge pull request #321 from indentlabs/username-polish

Username improvements

Gemfile.lock

@@ -58,7 +58,7 @@ GEM
     ast (2.4.0)
     authority (3.3.0)
       activesupport (>= 3.0.0)
-    autoprefixer-rails (9.4.8)
+    autoprefixer-rails (9.4.10.2)
       execjs
     aws-eventstream (1.0.1)
     aws-partitions (1.131.0)
@@ -123,7 +123,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -174,7 +174,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
+    ffi (1.10.0)
     filesize (0.2.0)
     flamegraph (0.9.5)
     font-awesome-rails (4.7.0.4)
@@ -209,7 +209,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlentities (4.3.4)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     inline_svg (1.3.1)
       activesupport (>= 3.0)
@@ -287,7 +287,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    onebox (1.8.78)
+    onebox (1.8.82)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -445,8 +445,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.0.0)
-      ffi (~> 1.9.6)
+    sassc (2.0.1)
+      ffi (~> 1.9)
       rake
     sassc-rails (2.1.0)
       railties (>= 4.0.0)
@@ -496,7 +496,7 @@ GEM
       climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    thredded (0.16.8)
+    thredded (0.16.9)
       active_record_union (>= 1.3.0)
       autoprefixer-rails
       db_text_search (~> 0.3.0)

app/controllers/users_controller.rb

@@ -5,8 +5,8 @@ class UsersController < ApplicationController
 
   def show
     @sidenav_expansion = 'my account'
-    
-    @user    = User.find_by(id: params[:id])
+
+    @user    = User.find_by(user_params)
     return redirect_to(root_path, notice: 'That user does not exist.') if @user.nil?
 
     @content = @user.public_content.select { |type, list| list.any? }
@@ -70,4 +70,10 @@ class UsersController < ApplicationController
 
     notifier.ping ":bomb: :bomb: :bomb: #{user.email.split('@').first}@ (##{user.id}) just deleted their account."
   end
+
+  private
+
+  def user_params
+    params.permit(:id, :username)
+  end
 end

app/models/user.rb

@@ -12,6 +12,8 @@ class User < ApplicationRecord
   include Authority::UserAbilities
 
   validates_uniqueness_of :username, allow_nil: true, allow_blank: true
+  validates_format_of :username, with: /\A[A-Za-z0-9\-_\$\+\!\*]+\z/, message: 'must be between 1 and 40 alphanumeric characters (-, _, $, +, !, and * also accepted)'
+  validates :username, length: { in: 0..40, message: 'must be between 1 and 40 alphanumeric characters (-, _, $, +, !, and * also accepted)' }
 
   has_many :subscriptions,                dependent: :destroy
   has_many :billing_plans, through: :subscriptions
@@ -189,6 +191,14 @@ class User < ApplicationRecord
     found_key.user
   end
 
+  def profile_url
+    if self.username.present?
+      Rails.application.routes.url_helpers.profile_by_username_path(username: self.username)
+    else
+      Rails.application.routes.url_helpers.user_path(id: self.id)
+    end
+  end
+
   private
 
   # Attributes that are non-public, and should be blacklisted from any public

app/views/devise/registrations/edit.html.erb

@@ -1,5 +1,7 @@
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
+  <div class="red lighten-4">
+    <%= devise_error_messages! %>
+  </div>
 
   <div class="row">
     <div class="col s12">

app/views/devise/registrations/panes/_information.html.erb

@@ -16,6 +16,8 @@
         <div class="field">
           <%= f.label 'Username (users can @mention you with your username on the forums)' %><br />
           <%= f.text_field :username %>
+          <small class="help-text">Your Notebook.ai profile will be available at https://www.notebook.ai/@username.</small><br />
+          <small class="help-text">Up to 40 numbers, letters, and/or the following symbols are allowed: <strong>- _ $ + ! *</strong></small>
         </div>
       </div>
     </div>

app/views/layouts/_sidenav.html.erb

@@ -135,7 +135,7 @@
         <div class="collapsible-body">
           <ul>
             <li>
-              <%= link_to current_user, class: 'waves-effect' do %>
+              <%= link_to current_user.profile_url, class: 'waves-effect' do %>
                 <i class="material-icons left green-text">person</i>
                 Profile
               <% end %>

app/views/main/dashboard.html.erb

@@ -40,7 +40,7 @@
   </div>
 
   <div class="col s12 m3">
-    <%= link_to current_user do %>
+    <%= link_to current_user.profile_url do %>
       <div class="hoverable card green">
         <div class="card-content white-text">
           <span class="card-title">

app/views/thredded/posts/_post.html.erb

@@ -0,0 +1,20 @@
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+
+<%
+  muted_post = post.present? && post.to_model.content.split("\n").reject(&:empty?).all? { |paragraph| paragraph.strip.start_with?('(') && paragraph.strip.end_with?(')') }
+  muted_post_classes = 'grey lighten-4 grey-text text-darken-2'
+%>
+
+<%= render 'thredded/posts_common/before_first_unread_post', post: post if post.first_unread_in_page? %>
+<%= content_tag :article, id: dom_id(post), class: "thredded--post thredded--#{post.read_state}--post #{muted_post ? muted_post_classes : 'card'}" do %>
+  <%= render 'thredded/posts_common/actions', post: post, actions: local_assigns[:actions] %>
+  <%= render 'thredded/posts_common/header', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
+  <% if post.pending_moderation? && !Thredded.content_visible_while_pending_moderation %>
+    <p class="thredded--alert thredded--alert-warning"><%= t 'thredded.posts.pending_moderation_notice' %></p>
+  <% elsif post.blocked? && post.can_moderate? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
+  <% end %>
+<% end %>

app/views/users/profile/_info.html.erb

@@ -28,7 +28,7 @@
             Username
           </div>
           <div>
-            <%= link_to "@#{@user.username}", thredded_path %>
+            <%= link_to "@#{@user.username}", profile_by_username_path(username: @user.username) %>
           </div>
           <br />
         <% end %>

app/views/users/profile/_public_pages.html.erb

@@ -7,7 +7,7 @@
     </div>
     <% @tabs.each do |tab| %>
       <% content_type_class = @user.send(tab).build.class %>
-      <%= link_to send("#{tab}_user_path"), class: "collection-item #{content_type_class.color}-text" do %>
+      <%= link_to send("#{tab}_user_path", { id: @user.id }), class: "collection-item #{content_type_class.color}-text" do %>
         <%= pluralize @content[tab].length, tab.to_s.singularize %>
         <span class="secondary-content">
           <i class="material-icons <%= content_type_class.color %>-text"><%= content_type_class.icon %></i>

app/views/users/show.html.erb

@@ -5,7 +5,7 @@
     image_src: @user.image_url(120)
 
     content_jsonld = {
-      '@id': user_url,
+      '@id': user_url(id: @user.id),
       '@type': 'http://schema.org/Person',
       'http://schema.org/name': @user.name,
       'http://schema.org/description': "#{@user.name}’s profile on notebook.ai",

config/routes.rb

@@ -13,6 +13,8 @@ Rails.application.routes.draw do
       # todo page tags here
     end
   end
+  get '/@:username', to: 'users#show', as: :profile_by_username
+
   scope '/my' do
     get '/content',         to: 'main#dashboard', as: :dashboard
     get '/content/recent',  to: 'main#recent_content', as: :recent_content