From e6f849f87301ef17b5eb20a781a9ac4f1d6cbbfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 23 Jan 2015 19:17:33 +0100
Subject: [PATCH 01/15] FIX: make sure pasting an image in the composer is
 considered as an image instead of an attachment

---
 app/assets/javascripts/discourse/lib/utilities.js | 3 ++-
 test/javascripts/lib/utilities-test.js.es6        | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 8fe483a16d..81afac78a6 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -162,11 +162,12 @@ Discourse.Utilities = {
     }
 
     var upload = files[0];
-    var type = Discourse.Utilities.isAnImage(upload.name) ? 'image' : 'attachment';
 
     // CHROME ONLY: if the image was pasted, sets its name to a default one
     if (upload instanceof Blob && !(upload instanceof File) && upload.type === "image/png") { upload.name = "blob.png"; }
 
+    var type = Discourse.Utilities.isAnImage(upload.name) ? 'image' : 'attachment';
+
     return Discourse.Utilities.validateUploadedFile(upload, type, bypassNewUserRestriction);
   },
 
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index 0052767c4b..15ee484673 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -60,14 +60,16 @@ test("prevents files that are too big from being uploaded", function() {
   ok(bootbox.alert.calledWith(I18n.t('post.errors.file_too_large', { max_size_kb: 5 })));
 });
 
+var imageSize = 10 * 1024;
+
 var dummyBlob = function() {
   var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
   if (BlobBuilder) {
     var bb = new BlobBuilder();
-    bb.append([1]);
+    bb.append([new Int8Array(imageSize)]);
     return bb.getBlob("image/png");
   } else {
-    return new Blob([1], { "type" : "image\/png" });
+    return new Blob([new Int8Array(imageSize)], { "type" : "image\/png" });
   }
 };
 
@@ -75,10 +77,11 @@ test("allows valid uploads to go through", function() {
   Discourse.User.resetCurrent(Discourse.User.create());
   Discourse.User.currentProp("trust_level", 1);
   Discourse.SiteSettings.max_image_size_kb = 15;
+  Discourse.SiteSettings.max_attachment_size_kb = 1;
   sandbox.stub(bootbox, "alert");
 
   // image
-  var image = { name: "image.png", size: 10 * 1024 };
+  var image = { name: "image.png", size: imageSize };
   ok(validUpload([image]));
   // pasted image
   var pastedImage = dummyBlob();

From 05006389002b704ff6d8af5b841e9a46ff33efa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 23 Jan 2015 19:57:01 +0100
Subject: [PATCH 02/15] FIX: :arrow_up: update onebox gem for more
 dailymotion.com support

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index debd886241..6f663bb562 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    onebox (1.5.9)
+    onebox (1.5.10)
       moneta (~> 0.7)
       multi_json (~> 1.7)
       mustache (~> 0.99)

From f7f5e39f75adb8f5336322aae007f70f5e683f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 23 Jan 2015 20:31:48 +0100
Subject: [PATCH 03/15] FIX: Minor Admin bug with a setting when creating a new
 group

---
 app/assets/javascripts/admin/templates/group.hbs | 2 +-
 app/assets/javascripts/discourse/models/group.js | 7 ++++++-
 app/controllers/admin/groups_controller.rb       | 5 +++--
 app/serializers/basic_group_serializer.rb        | 4 ----
 spec/controllers/admin/groups_controller_spec.rb | 3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index ac76d7056a..2800ac2b9c 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -46,7 +46,7 @@
   {{#unless automatic}}
     <div>
       <label for="automatic_membership">{{i18n 'admin.groups.automatic_membership_email_domains'}}</label>
-      {{list-setting name="automatic_membership" settingValue=automatic_membership_email_domains}}
+      {{list-setting name="automatic_membership" settingValue=emailDomains}}
       <label>
         {{input type="checkbox" checked=automatic_membership_retroactive}}
         {{i18n 'admin.groups.automatic_membership_retroactive'}}
diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/models/group.js
index a598b9822b..5d7ff91c2b 100644
--- a/app/assets/javascripts/discourse/models/group.js
+++ b/app/assets/javascripts/discourse/models/group.js
@@ -11,6 +11,11 @@ Discourse.Group = Discourse.Model.extend({
   offset: 0,
   user_count: 0,
 
+  emailDomains: function() {
+    var value = this.get("automatic_membership_email_domains");
+    return Em.isEmpty(value) ? "" : value;
+  }.property("automatic_membership_email_domains"),
+
   type: function() {
     return this.get("automatic") ? "automatic" : "custom";
   }.property("automatic"),
@@ -69,7 +74,7 @@ Discourse.Group = Discourse.Model.extend({
       name: this.get('name'),
       alias_level: this.get('alias_level'),
       visible: !!this.get('visible'),
-      automatic_membership_email_domains: this.get('automatic_membership_email_domains'),
+      automatic_membership_email_domains: this.get('emailDomains'),
       automatic_membership_retroactive: !!this.get('automatic_membership_retroactive')
     };
   },
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 65b737392e..1b62db41e5 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -23,6 +23,7 @@ class Admin::GroupsController < Admin::AdminController
     group = Group.new
 
     group.name = (params[:name] || '').strip
+    group.alias_level = params[:alias_level].to_i if params[:alias_level].present?
     group.visible = params[:visible] == "true"
     group.automatic_membership_email_domains = params[:automatic_membership_email_domains]
     group.automatic_membership_retroactive = params[:automatic_membership_retroactive] == "true"
@@ -37,12 +38,12 @@ class Admin::GroupsController < Admin::AdminController
   def update
     group = Group.find(params[:id])
 
+    # group rename is ignored for automatic groups
+    group.name = params[:name] if params[:name] && !group.automatic
     group.alias_level = params[:alias_level].to_i if params[:alias_level].present?
     group.visible = params[:visible] == "true"
     group.automatic_membership_email_domains = params[:automatic_membership_email_domains]
     group.automatic_membership_retroactive = params[:automatic_membership_retroactive] == "true"
-    # group rename is ignored for automatic groups
-    group.name = params[:name] if params[:name] && !group.automatic
 
     if group.save
       render_serialized(group, BasicGroupSerializer)
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index 2bf2d111be..0e22994212 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -7,8 +7,4 @@ class BasicGroupSerializer < ApplicationSerializer
              :visible,
              :automatic_membership_email_domains,
              :automatic_membership_retroactive
-
-  def automatic_membership_email_domains
-    object.automatic_membership_email_domains.presence || ""
-  end
 end
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index 8efd09bd5e..6e85473edd 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -21,12 +21,13 @@ describe Admin::GroupsController do
       expect(response.status).to eq(200)
       expect(::JSON.parse(response.body).keep_if {|r| r["id"] == group.id }).to eq([{
         "id"=>group.id,
+        "automatic"=>false,
         "name"=>group.name,
         "user_count"=>1,
         "automatic"=>false,
         "alias_level"=>0,
         "visible"=>true,
-        "automatic_membership_email_domains"=>"",
+        "automatic_membership_email_domains"=>nil,
         "automatic_membership_retroactive"=>false
       }])
     end

From d06d050eb79c693ade6e0c7382b66d617632aa52 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 23 Jan 2015 15:02:25 -0500
Subject: [PATCH 04/15] UX: When oneboxing a topic, use the stripe category
 badge

---
 app/helpers/user_notifications_helper.rb      | 19 ++-------
 lib/category_badge.rb                         | 28 +++++++++++++
 lib/onebox/engine/discourse_local_onebox.rb   | 39 ++++++-------------
 .../templates/discourse_topic_onebox.hbs      |  2 +-
 4 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 lib/category_badge.rb

diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index c96da2c370..689e860ed3 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -1,3 +1,5 @@
+require_dependency 'category_badge'
+
 module UserNotificationsHelper
 
   def indent(text, by=2)
@@ -59,21 +61,6 @@ module UserNotificationsHelper
   end
 
   def email_category(category, opts=nil)
-    opts = opts || {}
-
-    # If there is no category, bail
-    return "" if category.blank?
-
-    # By default hide uncategorized
-    return "" if category.uncategorized? && !opts[:show_uncategorized]
-
-    result = ""
-
-    category_url = "#{Discourse.base_url}#{category.url}"
-
-    result << "<a href='#{category_url}' style='background-color: ##{category.color}; font-size: 12px; padding: 2px 1px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</a>"
-    result << "<a href='#{category_url}' style='font-size: 12px; font-weight: bold; margin-left: 3px; color: #222;'>#{category.name}</a>"
-
-    result.html_safe
+    CategoryBadge.html_for(category, opts).html_safe
   end
 end
diff --git a/lib/category_badge.rb b/lib/category_badge.rb
new file mode 100644
index 0000000000..26ddb74788
--- /dev/null
+++ b/lib/category_badge.rb
@@ -0,0 +1,28 @@
+module CategoryBadge
+
+  def self.html_for(category, opts=nil)
+    opts = opts || {}
+
+    # If there is no category, bail
+    return "" if category.blank?
+
+    # By default hide uncategorized
+    return "" if category.uncategorized? && !opts[:show_uncategorized]
+
+    category_url = "#{Discourse.base_url}#{category.url}"
+
+    result = ""
+
+    result << "<a href='#{category_url}' style='background-color: ##{category.color}; font-size: 12px; padding: 2px 1px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</a>"
+
+    unless category.parent_category_id.nil?
+      parent_category = Category.find_by(id: category.parent_category_id)
+      result << "<a href='#{category_url}' style='background-color: ##{parent_category.color}; font-size: 12px; padding: 2px 1px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</a>"
+    end
+
+    result << "<a href='#{category_url}' style='font-size: 12px; font-weight: bold; margin-left: 3px; color: #222;'>#{category.name}</a>"
+
+    "<span class='badge-wrapper'>#{result}</span>"
+  end
+
+end
diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb
index 8245821490..7857f55556 100644
--- a/lib/onebox/engine/discourse_local_onebox.rb
+++ b/lib/onebox/engine/discourse_local_onebox.rb
@@ -14,7 +14,6 @@ module Onebox
         uri = URI::parse(@url)
         route = Rails.application.routes.recognize_path(uri.path)
 
-        args = {original_url: @url}
 
         # Figure out what kind of onebox to show based on the URL
         case route[:controller]
@@ -57,37 +56,23 @@ module Onebox
               }
             end
 
-            category_name = ''
-            parent_category_name = ''
-            category = topic.category
-            if category && !category.uncategorized?
-              category_name = "<a href=\"#{category.url}\" class=\"badge badge-category\" style=\"background-color: ##{category.color}; color: ##{category.text_color}\">#{category.name}</a>"
-              if !category.parent_category_id.nil?
-                parent_category = Category.find_by(id: category.parent_category_id)
-                parent_category_name = "<a href=\"#{parent_category.url}\" class=\"badge badge-category\" style=\"background-color: ##{parent_category.color}; color: ##{parent_category.text_color}\">#{parent_category.name}</a>"
-              end
-            end
-
             quote = post.excerpt(SiteSetting.post_onebox_maxlength)
-            args.merge! title: topic.title,
-                        avatar: PrettyText.avatar_img(topic.user.avatar_template, 'tiny'),
-                        posts_count: topic.posts_count,
-                        last_post: FreedomPatches::Rails4.time_ago_in_words(topic.last_posted_at, false, scope: :'datetime.distance_in_words_verbose'),
-                        age: FreedomPatches::Rails4.time_ago_in_words(topic.created_at, false, scope: :'datetime.distance_in_words_verbose'),
-                        views: topic.views,
-                        posters: posters,
-                        quote: quote,
-                        category_name: category_name,
-                        parent_category_name: parent_category_name,
-                        topic: topic.id
+            args = { original_url: @url,
+                     title: topic.title,
+                     avatar: PrettyText.avatar_img(topic.user.avatar_template, 'tiny'),
+                     posts_count: topic.posts_count,
+                     last_post: FreedomPatches::Rails4.time_ago_in_words(topic.last_posted_at, false, scope: :'datetime.distance_in_words_verbose'),
+                     age: FreedomPatches::Rails4.time_ago_in_words(topic.created_at, false, scope: :'datetime.distance_in_words_verbose'),
+                     views: topic.views,
+                     posters: posters,
+                     quote: quote,
+                     category_html: CategoryBadge.html_for(topic.category),
+                     topic: topic.id }
 
-            @template = 'topic'
+            return Mustache.render(File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs"), args)
           end
-
         end
 
-        return nil unless @template
-        Mustache.render(File.read("#{Rails.root}/lib/onebox/templates/discourse_#{@template}_onebox.hbs"), args)
       rescue ActionController::RoutingError
         nil
       end
diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 2446ec6a9a..a070f974f1 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -2,7 +2,7 @@
   <div class='title'>
     <div class='quote-controls'></div>
     {{{avatar}}}
-    <a href="{{original_url}}">{{title}}</a> {{{parent_category_name}}} {{{category_name}}}
+    <a href="{{original_url}}">{{title}}</a> {{{category_html}}}
   </div>
   <blockquote>{{{quote}}}
     <div class='topic-info'>

From 545d5b49062e7ff94cd50e8619714ef8aa1de386 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 23 Jan 2015 12:39:03 -0800
Subject: [PATCH 05/15] turn down lightness scale of progress bar a bit

---
 app/assets/stylesheets/desktop/topic.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index ddea17cbe2..de28ec7e8d 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -204,7 +204,7 @@ a:hover.reply-new {
     bottom: 0;
     width: 0;
     border-right: 1px solid  scale-color-diff();
-    background-color:  dark-light-diff($success, $secondary, 60%, -35%);
+    background-color:  dark-light-diff($success, $secondary, 50%, -35%);
     transition: width .75s;
 
   }

From 4904eeaa6769bcdc3a026c75522e8ec99ee5ce5c Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 23 Jan 2015 14:03:27 -0800
Subject: [PATCH 06/15] more pastel (desaturated) progress bar

---
 app/assets/stylesheets/desktop/topic.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index de28ec7e8d..273e0240f7 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -204,7 +204,7 @@ a:hover.reply-new {
     bottom: 0;
     width: 0;
     border-right: 1px solid  scale-color-diff();
-    background-color:  dark-light-diff($success, $secondary, 50%, -35%);
+    background-color:  desaturate(dark-light-diff($success, $secondary, 60%, -35%), 30%);
     transition: width .75s;
 
   }

From 246ae75a31859e2ba55714d84fe962c2e2dc07c1 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 23 Jan 2015 15:57:29 -0800
Subject: [PATCH 07/15] FIX: language was not being inserted into RSS

---
 app/views/list/list.rss.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index 2e48d6737b..eb041a9686 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -6,7 +6,7 @@
     <title><%= @title %></title>
     <link><%= @link %></link>
     <description><%= @description %></description>
-    <% if lang %><language>#{lang}</language><% end %>
+    <% if lang %><language><%= lang%></language><% end %>
     <% if @topic_list.topics && @topic_list.topics.length > 0 %>
       <lastBuildDate><%= @topic_list.topics.first.created_at.rfc2822 %></lastBuildDate>
       <atom:link href="<%= @atom_link %>" rel="self" type="application/rss+xml" />

From c2e716cd88713fb7e46ff9dfc50f2e65eebba2b6 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 23 Jan 2015 16:29:15 -0800
Subject: [PATCH 08/15] use active tense on email settings

---
 config/locales/client.en.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3c37e443d2..78356760a4 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -315,7 +315,7 @@ en:
       notifications: "Notifications"
       dismiss_notifications: "Mark all as Read"
       dismiss_notifications_tooltip: "Mark all unread notifications as read"
-      disable_jump_reply: "Don't jump to your new post after replying"
+      disable_jump_reply: "Don't jump to my post after I reply"
       dynamic_favicon: "Show incoming message notifications on favicon (experimental)"
       edit_history_public: "Let other users view my post revisions"
       external_links_in_new_tab: "Open all external links in a new tab"
@@ -328,7 +328,7 @@ en:
       suspended_notice: "This user is suspended until {{date}}."
       suspended_reason: "Reason: "
       github_profile: "Github"
-      mailing_list_mode: "Receive an email for every new post (unless you mute the topic or category)"
+      mailing_list_mode: "Send me an email for every new post (unless I mute the topic or category)"
       watched_categories: "Watched"
       watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic's listing."
       tracked_categories: "Tracked"
@@ -404,8 +404,8 @@ en:
         authenticated: "Your email has been authenticated by {{provider}}"
         frequency:
           zero: "We'll email you immediately if you haven't read the thing we're emailing you about."
-          one: "We'll only email you if we haven't seen you in the last minute and you haven't read the thing we're emailing you about."
-          other: "We'll only email you if we haven't seen you in the last {{count}} minutes and you haven't read the thing we're emailing you about."
+          one: "We'll only email you if we haven't seen you in the last minute."
+          other: "We'll only email you if we haven't seen you in the last {{count}} minutes."
 
       name:
         title: "Name"
@@ -446,13 +446,13 @@ en:
       website: "Web Site"
       email_settings: "Email"
       email_digests:
-        title: "When you don't visit the site, send an email digest of what's new:"
+        title: "When I don't visit here, send an email digest of what's new:"
         daily: "daily"
         weekly: "weekly"
         bi_weekly: "every two weeks"
 
-      email_direct: "Receive an email when someone quotes you, replies to your post, or mentions your @username"
-      email_private_messages: "Receive an email when someone sends you a private message"
+      email_direct: "Send me an email when someone quotes me, replies to my post, or mentions my @username"
+      email_private_messages: "Send me an email when someone private messages me"
       email_always: "Do not suppress email notifications when I am active on the site"
 
       other_settings: "Other"
@@ -460,8 +460,8 @@ en:
 
       new_topic_duration:
         label: "Consider topics new when"
-        not_viewed: "you haven't viewed them yet"
-        last_here: "created since you were here last"
+        not_viewed: "I haven't viewed them yet"
+        last_here: "created since I was here last"
         after_n_days:
           one: "created in the last day"
           other: "created in the last {{count}} days"
@@ -469,7 +469,7 @@ en:
           one: "created in the last week"
           other: "created in the last {{count}} weeks"
 
-      auto_track_topics: "Automatically track topics you enter"
+      auto_track_topics: "Automatically track topics I enter"
       auto_track_options:
         never: "never"
         always: "always"

From fb72e2665f9f69f95f84fe2cfc3f6b0b3841a39a Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Fri, 23 Jan 2015 21:03:44 -0800
Subject: [PATCH 09/15] PERF :racehorse: Don't calculate preload data for
 non-xhr json requests

This will help out anyone querying as API instead of through a
browser.
---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b3158c509f..ff805687b4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -155,7 +155,7 @@ class ApplicationController < ActionController::Base
   # If we are rendering HTML, preload the session data
   def preload_json
     # We don't preload JSON on xhr or JSON request
-    return if request.xhr?
+    return if request.xhr? || request.format.json?
 
     preload_anonymous_data
 

From 1d24d8471ef3cad7df341468a1e5ba14c1761460 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Fri, 23 Jan 2015 21:04:14 -0800
Subject: [PATCH 10/15] FEATURE: Latest posts endpoint at /posts.json

---
 app/controllers/posts_controller.rb | 23 +++++++++++++++++++-
 app/serializers/post_serializer.rb  | 33 +++++++++++++++++++++++------
 config/routes.rb                    |  1 +
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 2d0b936d01..26c1900873 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -5,7 +5,7 @@ require_dependency 'distributed_memoizer'
 class PostsController < ApplicationController
 
   # Need to be logged in for all actions here
-  before_filter :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :revisions, :latest_revision, :expand_embed, :markdown, :raw, :cooked]
+  before_filter :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :revisions, :latest_revision, :expand_embed, :markdown_id, :markdown_num, :cooked, :latest]
 
   skip_before_filter :check_xhr, only: [:markdown_id, :markdown_num, :short_link]
 
@@ -25,6 +25,27 @@ class PostsController < ApplicationController
     end
   end
 
+  def latest
+    posts = Post.order(created_at: :desc)
+                .where('posts.id > ?', Post.last.id - 50) # last 50 post IDs only, to avoid counting deleted posts in security check
+                .includes(topic: :category)
+                .includes(:user)
+                .limit(50)
+    # Remove posts the user doesn't have permission to see
+    # This isn't leaking any information we weren't already through the post ID numbers
+    posts = posts.reject { |post| !guardian.can_see?(post) }
+
+    counts = PostAction.counts_for(posts, current_user)
+
+    render_json_dump(serialize_data(posts,
+                                    PostSerializer,
+                                    scope: guardian,
+                                    root: 'latest_posts',
+                                    add_raw: true,
+                                    all_post_actions: counts)
+    )
+  end
+
   def cooked
     post = find_post_from_params
     render json: {cooked: post.cooked}
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index b6ca0ba921..bb99bfd85e 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -1,12 +1,17 @@
 class PostSerializer < BasicPostSerializer
 
   # To pass in additional information we might need
-  attr_accessor :topic_view,
+  INSTANCE_VARS = [:topic_view,
                 :parent_post,
                 :add_raw,
                 :single_post_link_counts,
                 :draft_sequence,
-                :post_actions
+                :post_actions,
+                :all_post_actions]
+
+  INSTANCE_VARS.each do |v|
+    self.send(:attr_accessor, v)
+  end
 
   attributes :post_number,
              :post_type,
@@ -53,6 +58,15 @@ class PostSerializer < BasicPostSerializer
              :static_doc,
              :via_email
 
+  def initialize(object, opts)
+    super(object, opts)
+    PostSerializer::INSTANCE_VARS.each do |name|
+      if opts.include? name
+        self.send("#{name}=", opts[name])
+      end
+    end
+  end
+
   def topic_slug
     object.try(:topic).try(:slug)
   end
@@ -154,6 +168,13 @@ class PostSerializer < BasicPostSerializer
     scope.is_staff? && object.deleted_by.present?
   end
 
+  # Helper function to decide between #post_actions and @all_post_actions
+  def actions
+    return post_actions if post_actions.present?
+    return all_post_actions[object.id] if all_post_actions.present?
+    nil
+  end
+
   # Summary of the actions taken on this post
   def actions_summary
     result = []
@@ -167,7 +188,7 @@ class PostSerializer < BasicPostSerializer
         id: id,
         count: count,
         hidden: (sym == :vote),
-        can_act: scope.post_can_act?(object, sym, taken_actions: post_actions)
+        can_act: scope.post_can_act?(object, sym, taken_actions: actions)
       }
 
       if sym == :notify_user && scope.current_user.present? && scope.current_user == object.user
@@ -182,9 +203,9 @@ class PostSerializer < BasicPostSerializer
                                            active_flags[id].count > 0
       end
 
-      if post_actions.present? && post_actions.has_key?(id)
+      if actions.present? && actions.has_key?(id)
         action_summary[:acted] = true
-        action_summary[:can_undo] = scope.can_delete?(post_actions[id])
+        action_summary[:can_undo] = scope.can_delete?(actions[id])
       end
 
       # only show public data
@@ -225,7 +246,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def include_bookmarked?
-    post_actions.present? && post_actions.keys.include?(PostActionType.types[:bookmark])
+    actions.present? && actions.keys.include?(PostActionType.types[:bookmark])
   end
 
   def include_display_username?
diff --git a/config/routes.rb b/config/routes.rb
index 3c288b57d0..8a41b8be10 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -269,6 +269,7 @@ Discourse::Application.routes.draw do
   get "uploads/:site/:sha" => "uploads#show", constraints: { site: /\w+/, sha: /[a-z0-9]{40}/}
   post "uploads" => "uploads#create"
 
+  get "posts" => "posts#latest"
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
   get "posts/:id/reply-history" => "posts#reply_history"
   get "posts/:username/deleted" => "posts#deleted_posts", constraints: {username: USERNAME_ROUTE_FORMAT}

From 9e9119d1c1970999b252c8333e7349544e67e896 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Fri, 23 Jan 2015 21:22:19 -0800
Subject: [PATCH 11/15] FEATURE: Enable pagination of /posts.json

---
 app/controllers/posts_controller.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 26c1900873..9505c240de 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -26,8 +26,14 @@ class PostsController < ApplicationController
   end
 
   def latest
+    params.permit(:before)
+    last_post_id = params[:before].to_i
+    last_post_id = Post.last.id if last_post_id <= 0
+
+    # last 50 post IDs only, to avoid counting deleted posts in security check
     posts = Post.order(created_at: :desc)
-                .where('posts.id > ?', Post.last.id - 50) # last 50 post IDs only, to avoid counting deleted posts in security check
+                .where('posts.id <= ?', last_post_id)
+                .where('posts.id > ?', last_post_id - 50)
                 .includes(topic: :category)
                 .includes(:user)
                 .limit(50)

From 6c410ed09366bef17ccc109c4c957e0c9fb45ed5 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Fri, 30 Jan 2015 01:11:41 +0530
Subject: [PATCH 12/15] FIX: strip whitespaces from user email

---
 app/models/user.rb       |  9 ++++++---
 spec/models/user_spec.rb | 10 ++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index b90c5544d2..4a8cd72b09 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -62,7 +62,7 @@ class User < ActiveRecord::Base
 
   delegate :last_sent_email_address, :to => :email_logs
 
-  before_validation :downcase_email
+  before_validation :strip_downcase_email
 
   validates_presence_of :username
   validate :username_validator
@@ -764,8 +764,11 @@ class User < ActiveRecord::Base
     self.username_lower = username.downcase
   end
 
-  def downcase_email
-    self.email = self.email.downcase if self.email
+  def strip_downcase_email
+    if self.email
+      self.email = self.email.strip
+      self.email = self.email.downcase
+    end
   end
 
   def username_validator
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a13dc476f3..69bd8cb3a6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -261,8 +261,14 @@ describe User do
 
     it "downcases email addresses" do
       user = Fabricate.build(:user, email: 'Fancy.Caps.4.U@gmail.com')
-      user.save
-      expect(user.reload.email).to eq('fancy.caps.4.u@gmail.com')
+      user.valid?
+      expect(user.email).to eq('fancy.caps.4.u@gmail.com')
+    end
+
+    it "strips whitespace from email addresses" do
+      user = Fabricate.build(:user, email: ' example@gmail.com ')
+      user.valid?
+      expect(user.email).to eq('example@gmail.com')
     end
   end
 

From 4a2786dbf23ec0a4054dac2cf99af37a468b1e46 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Thu, 29 Jan 2015 13:42:15 -0800
Subject: [PATCH 13/15] better copy on enable names setting

---
 config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b8470eb786..a75be34e8d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1013,7 +1013,7 @@ en:
 
     disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
 
-    enable_names: "Allow showing user full names. Disable to hide full names."
+    enable_names: "Show the user's full name on their profile, user card, and emails. Disable to hide full name everywhere."
     display_name_on_posts: "Show a user's full name on their posts in addition to their @username."
     invites_per_page: "Default invites shown on the user page."
     short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value."

From 6a68e8c27284b542e344ea3b1a8d81311b62e39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 29 Jan 2015 22:53:48 +0100
Subject: [PATCH 14/15] FIX: use CDN for user card/profile background and user
 avatars (for real this time)

---
 app/assets/javascripts/discourse.js                |  6 ++++++
 .../discourse/dialects/quote_dialect.js            |  1 +
 app/assets/javascripts/discourse/models/user.js    | 14 +++++---------
 .../javascripts/discourse/views/user-card.js.es6   |  3 ++-
 lib/pretty_text.rb                                 | 12 ++++++++----
 spec/components/pretty_text_spec.rb                |  8 ++++----
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 27b12c53ab..feb375d90c 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -24,6 +24,12 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
     return u + url;
   },
 
+  getURLWithCDN: function(url) {
+    url = this.getURL(url);
+    if (Discourse.CDN) { url = Discourse.CDN + url; }
+    return url;
+  },
+
   Resolver: DiscourseResolver,
 
   _titleChanged: function() {
diff --git a/app/assets/javascripts/discourse/dialects/quote_dialect.js b/app/assets/javascripts/discourse/dialects/quote_dialect.js
index b0b8f5bbb8..3c50598cfc 100644
--- a/app/assets/javascripts/discourse/dialects/quote_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/quote_dialect.js
@@ -1,4 +1,5 @@
 var esc = Handlebars.Utils.escapeExpression;
+
 Discourse.BBCode.register('quote', {noWrap: true, singlePara: true}, function(contents, bbParams, options) {
   var params = {'class': 'quote'},
       username = null;
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 7a5bd5c37c..fde7692255 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -72,10 +72,9 @@ Discourse.User = Discourse.Model.extend({
     @type {String}
   **/
   profileBackground: function() {
-    var background = this.get('profile_background');
-    if(Em.isEmpty(background) || !Discourse.SiteSettings.allow_profile_backgrounds) { return; }
-
-    return 'background-image: url(' + background + ')';
+    var url = this.get('profile_background');
+    if (Em.isEmpty(url) || !Discourse.SiteSettings.allow_profile_backgrounds) { return; }
+    return 'background-image: url(' + Discourse.getURLWithCDN(url) + ')';
   }.property('profile_background'),
 
   /**
@@ -442,6 +441,7 @@ Discourse.User.reopenClass(Discourse.Singleton, {
 
   avatarTemplate: function(username, uploadedAvatarId) {
     var url;
+
     if (uploadedAvatarId) {
       url = "/user_avatar/" +
             Discourse.BaseUrl +
@@ -456,11 +456,7 @@ Discourse.User.reopenClass(Discourse.Singleton, {
             Discourse.LetterAvatarVersion + ".png";
     }
 
-    url = Discourse.getURL(url);
-    if (Discourse.CDN) {
-      url = Discourse.CDN + url;
-    }
-    return url;
+    return Discourse.getURLWithCDN(url);
   },
 
   /**
diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6
index 1239420297..66e62b88d5 100644
--- a/app/assets/javascripts/discourse/views/user-card.js.es6
+++ b/app/assets/javascripts/discourse/views/user-card.js.es6
@@ -11,6 +11,7 @@ export default Discourse.View.extend(CleansUp, {
 
   addBackground: function() {
     var url = this.get('controller.user.card_background');
+
     if (!this.get('allowBackgrounds')) { return; }
 
     var $this = this.$();
@@ -19,7 +20,7 @@ export default Discourse.View.extend(CleansUp, {
     if (Ember.isEmpty(url)) {
       $this.css('background-image', '').addClass('no-bg');
     } else {
-      $this.css('background-image', "url(" + url + ")").removeClass('no-bg');
+      $this.css('background-image', "url(" + Discourse.getURLWithCDN(url) + ")").removeClass('no-bg');
     }
   }.observes('controller.user.card_background'),
 
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index ee5aa57833..d095bd0c6a 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -1,11 +1,13 @@
 require 'v8'
 require 'nokogiri'
+require_dependency 'url_helper'
 require_dependency 'excerpt_parser'
 require_dependency 'post'
 
 module PrettyText
 
   class Helpers
+    include UrlHelper
 
     def t(key, opts)
       key = "js." + key
@@ -21,15 +23,15 @@ module PrettyText
     # function here are available to v8
     def avatar_template(username)
       return "" unless username
-
       user = User.find_by(username_lower: username.downcase)
-      user.avatar_template if user.present?
+      return "" unless user.present?
+      schemaless absolute user.avatar_template
     end
 
     def is_username_valid(username)
       return false unless username
       username = username.downcase
-      return User.exec_sql('SELECT 1 FROM users WHERE username_lower = ?', username).values.length == 1
+      User.exec_sql('SELECT 1 FROM users WHERE username_lower = ?', username).values.length == 1
     end
   end
 
@@ -128,7 +130,9 @@ module PrettyText
     context.eval("Discourse.SiteSettings = #{SiteSetting.client_settings_json};")
     context.eval("Discourse.CDN = '#{Rails.configuration.action_controller.asset_host}';")
     context.eval("Discourse.BaseUrl = 'http://#{RailsMultisite::ConnectionManagement.current_hostname}';")
-    context.eval("Discourse.getURL = function(url) {return '#{Discourse::base_uri}' + url};")
+
+    context.eval("Discourse.getURL = function(url) { return '#{Discourse::base_uri}' + url };")
+    context.eval("Discourse.getURLWithCDN = function(url) { url = Discourse.getURL(url); if (Discourse.CDN) { url = Discourse.CDN + url; } return url; };")
   end
 
   def self.markdown(text, opts=nil)
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 7dda67ae99..00bb220717 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -12,20 +12,20 @@ describe PrettyText do
 
       before(:each) do
         eviltrout = User.new
-        eviltrout.stubs(:avatar_template).returns("http://test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png")
+        eviltrout.stubs(:avatar_template).returns("//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png")
         User.expects(:find_by).with(username_lower: "eviltrout").returns(eviltrout)
       end
 
       it "produces a quote even with new lines in it" do
-        expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"http://test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">EvilTrout:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+        expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">EvilTrout:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
       end
 
       it "should produce a quote" do
-        expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"http://test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">EvilTrout:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+        expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">EvilTrout:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
       end
 
       it "trims spaces on quote params" do
-        expect(PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"555\" data-topic=\"666\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"http://test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">EvilTrout:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+        expect(PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"555\" data-topic=\"666\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">EvilTrout:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
       end
 
     end

From d1ec1e2681c4ac1af1b9ecb89c3a43ee8de6fa11 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 29 Jan 2015 17:17:32 -0500
Subject: [PATCH 15/15] Allow code to save custom fields without saving the
 attached object

---
 app/models/concerns/has_custom_fields.rb | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index 854dee20ef..7b68761902 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -78,17 +78,6 @@ module HasCustomFields
     !@custom_fields || @custom_fields_orig == @custom_fields
   end
 
-  protected
-
-  def refresh_custom_fields_from_db
-    target = Hash.new
-    _custom_fields.pluck(:name,:value).each do |key, value|
-      self.class.append_custom_field(target, key, value)
-    end
-    @custom_fields_orig = target
-    @custom_fields = @custom_fields_orig.dup
-  end
-
   def save_custom_fields
     if !custom_fields_clean?
       dup = @custom_fields.dup
@@ -134,4 +123,16 @@ module HasCustomFields
       refresh_custom_fields_from_db
     end
   end
+
+  protected
+
+  def refresh_custom_fields_from_db
+    target = Hash.new
+    _custom_fields.pluck(:name,:value).each do |key, value|
+      self.class.append_custom_field(target, key, value)
+    end
+    @custom_fields_orig = target
+    @custom_fields = @custom_fields_orig.dup
+  end
+
 end