Merge pull request #34.

app/controllers/users_controller.rb

@@ -137,9 +137,9 @@ class UsersController < ApplicationController
   def update
     if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
       if mod?
-        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
+        userdata = user_params([:name, :skype, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
       else
-        userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
+        userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
       end
       if User.find_by(name: userdata[:name])
         flash[:alert] = "You have entered a name that belongs to someone else. Please try another."

app/views/users/edit.html.erb

@@ -48,12 +48,6 @@
           <%= f.text_field :skype, placeholder: "Skype username", disabled: !can_edit? %>
         </td>
       </tr>
-      <tr>
-        <td>Show Skype to</td>
-        <td>
-          <%= f.select :skype_public, [["Staff only", false], ["All users", true]], {}, { disabled: !can_edit? } %>
-        </td>
-      </tr>
       <tr>
         <td>YouTube Channel ID</td>
         <td>

app/views/users/show.html.erb

@@ -52,7 +52,7 @@
         <td><b>Role</b></td>
         <td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
       </tr>
-      <% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
+      <% if current_user && !@user.skype.blank? %>
       <tr>
         <td><b>Skype</b></td>
         <td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>

db/migrate/20170708011014_remove_skype_visibility_from_users.rb

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