From 0f0a5c42b961719bc0981572fae46f0796cfdda6 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Mon, 22 Sep 2014 06:46:08 +0200
Subject: [PATCH] friendly urls

---
 app/controllers/forumgroups_controller.rb | 2 +-
 app/models/blogpost.rb                    | 7 +++++++
 app/models/forum.rb                       | 4 ++++
 app/models/forumgroup.rb                  | 4 ++++
 app/models/forumthread.rb                 | 4 ++++
 app/models/info.rb                        | 8 ++++++++
 app/models/user.rb                        | 8 ++++++++
 app/views/users/_username.html.erb        | 2 +-
 8 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/controllers/forumgroups_controller.rb b/app/controllers/forumgroups_controller.rb
index bd6e3cb..a7b31ab 100644
--- a/app/controllers/forumgroups_controller.rb
+++ b/app/controllers/forumgroups_controller.rb
@@ -5,7 +5,7 @@ class ForumgroupsController < ApplicationController
   end
 
   def show
-    redirect_to forums_path + "#group-#{params[:id]}"
+    redirect_to forums_path + "#group-#{params[:id].to_i}"
   end
 
   def edit
diff --git a/app/models/blogpost.rb b/app/models/blogpost.rb
index 8b72a5c..a08a59a 100644
--- a/app/models/blogpost.rb
+++ b/app/models/blogpost.rb
@@ -26,6 +26,10 @@ class Blogpost < ActiveRecord::Base
     !!user_editor_id
   end
 
+  def to_s
+    title
+  end
+
   def send_new_mention_mail(old_content = "")
     new_mentions = mentions(content) - mentions(old_content)
     mails = []
@@ -42,4 +46,7 @@ class Blogpost < ActiveRecord::Base
     background_mailer(mails)
   end
 
+  def to_param
+    [id, to_s.parameterize].join("-")
+  end
 end
diff --git a/app/models/forum.rb b/app/models/forum.rb
index af687bc..4d8b750 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -23,4 +23,8 @@ class Forum < ActiveRecord::Base
   def can_write?(user)
     group.can_write?(user) && can_read?(user) && (role_write.nil? || (!user.nil? && user.role >= role_write))
   end
+
+  def to_param
+    [id, to_s.parameterize].join("-")
+  end
 end
\ No newline at end of file
diff --git a/app/models/forumgroup.rb b/app/models/forumgroup.rb
index b15e01f..20fcd53 100644
--- a/app/models/forumgroup.rb
+++ b/app/models/forumgroup.rb
@@ -20,4 +20,8 @@ class Forumgroup < ActiveRecord::Base
   def can_write?(user)
     !user.nil? && can_read?(user) && user.confirmed? && (role_write.nil? || user.role >= role_write)
   end
+
+  def to_param
+    [id, to_s.parameterize].join("-")
+  end
 end
diff --git a/app/models/forumthread.rb b/app/models/forumthread.rb
index 158f31a..e2de6a7 100644
--- a/app/models/forumthread.rb
+++ b/app/models/forumthread.rb
@@ -57,4 +57,8 @@ class Forumthread < ActiveRecord::Base
     end
     background_mailer(mails)
   end
+
+  def to_param
+    [id, to_s.parameterize].join("-")
+  end
 end
\ No newline at end of file
diff --git a/app/models/info.rb b/app/models/info.rb
index b8fdfb4..b900ad0 100644
--- a/app/models/info.rb
+++ b/app/models/info.rb
@@ -3,4 +3,12 @@ class Info < ActiveRecord::Base
 
   validates_presence_of :title, :content
 
+  def to_s
+    title
+  end
+
+  def to_param
+    [id, to_s.parameterize].join("-")
+  end
+
 end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 8743e5c..9d93a9c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -80,6 +80,10 @@ class User < ActiveRecord::Base
     return image_tag("https://minotar.net/helm/#{CGI.escape(self.ign)}/#{CGI.escape(size.to_s)}", options)
   end
 
+  def to_s
+    ign
+  end
+
 
 
   #check if this user is an idiot and uses their mc password.
@@ -176,6 +180,10 @@ class User < ActiveRecord::Base
   end
 
 
+  def to_param
+    [id, to_s.parameterize].join("-")
+  end
+
 
 
 
diff --git a/app/views/users/_username.html.erb b/app/views/users/_username.html.erb
index a6c481a..7045e73 100644
--- a/app/views/users/_username.html.erb
+++ b/app/views/users/_username.html.erb
@@ -1,4 +1,4 @@
 <div class="user">
-  <%= link_to user.name, user_path(user.id), class: "role #{user.role.name} #{"banned" if user.banned?} #{"disabled" if user.disabled?} #{"unconfirmed" unless user.confirmed?}", title: user.ign %>
+  <%= 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 %>
   <%= link_to "$", donate_statics_path, class: "role donor", title: "Donator" if user.donor? %>
 </div>
\ No newline at end of file