- {{group-notifications-button group=group}}
+
+
+
+ {{#if canArchive}}
+
+ {{/if}}
+
+ {{#if canMoveToInbox}}
+
+ {{/if}}
+
+
+ {{#if bulkSelectEnabled}}
+
+ {{/if}}
+
+ {{#if isGroup}}
+ {{group-notifications-button group=group}}
+ {{/if}}
-{{/if}}
{{outlet}}
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 4858e420194..43379cc09c9 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -92,6 +92,7 @@
//= require ./discourse/components/conditional-loading-spinner
//= require ./discourse/helpers/user-avatar
//= require ./discourse/helpers/cold-age-class
+//= require ./discourse/helpers/capitalize
//= require ./discourse/helpers/loading-spinner
//= require ./discourse/helpers/category-link
//= require ./discourse/lib/export-result
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index d532078bfaa..1ca49d089ff 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -162,3 +162,9 @@
}
}
+.user-right .list-actions {
+ margin-bottom: 10px;
+ .btn {
+ margin-right: 10px;
+ }
+}
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 1e7a3245ff4..07fec8d6a3b 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -102,7 +102,7 @@ class ListController < ApplicationController
end
end
- [:topics_by, :private_messages, :private_messages_sent, :private_messages_unread, :private_messages_group].each do |action|
+ [:topics_by, :private_messages, :private_messages_sent, :private_messages_unread, :private_messages_archive, :private_messages_group, :private_messages_group_archive].each do |action|
define_method("#{action}") do
list_opts = build_topic_list_options
target_user = fetch_user_from_params(include_inactive: current_user.try(:staff?))
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 1a61e740d0b..1803f4b39e5 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -451,7 +451,7 @@ class TopicsController < ApplicationController
operation = params.require(:operation).symbolize_keys
raise ActionController::ParameterMissing.new(:operation_type) if operation[:type].blank?
- operator = TopicsBulkAction.new(current_user, topic_ids, operation)
+ operator = TopicsBulkAction.new(current_user, topic_ids, operation, group: operation[:group])
changed_topic_ids = operator.perform!
render_json_dump topic_ids: changed_topic_ids
end
diff --git a/app/models/group.rb b/app/models/group.rb
index 9748090a3b0..925c3d70966 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -5,6 +5,8 @@ class Group < ActiveRecord::Base
has_many :group_users, dependent: :destroy
has_many :group_mentions, dependent: :destroy
+ has_many :group_archived_messages, dependent: :destroy
+
has_many :categories, through: :category_groups
has_many :users, through: :group_users
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
new file mode 100644
index 00000000000..7c346518e4f
--- /dev/null
+++ b/app/models/group_archived_message.rb
@@ -0,0 +1,4 @@
+class GroupArchivedMessage < ActiveRecord::Base
+ belongs_to :user
+ belongs_to :topic
+end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index ace0481d2cb..d2440a57cf6 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -83,6 +83,9 @@ class Topic < ActiveRecord::Base
has_many :topic_allowed_users
has_many :topic_allowed_groups
+ has_many :group_archived_messages, dependent: :destroy
+ has_many :user_archived_messages, dependent: :destroy
+
has_many :allowed_group_users, through: :allowed_groups, source: :users
has_many :allowed_groups, through: :topic_allowed_groups, source: :group
has_many :allowed_users, through: :topic_allowed_users, source: :user
diff --git a/app/models/user.rb b/app/models/user.rb
index a9784dd6f9b..0c2d9989613 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -35,6 +35,8 @@ class User < ActiveRecord::Base
has_many :topic_links, dependent: :destroy
has_many :uploads
has_many :warnings
+ has_many :user_archived_messages, dependent: :destroy
+
has_one :user_avatar, dependent: :destroy
has_one :facebook_user_info, dependent: :destroy
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
new file mode 100644
index 00000000000..b24c26b54a9
--- /dev/null
+++ b/app/models/user_archived_message.rb
@@ -0,0 +1,4 @@
+class UserArchivedMessage < ActiveRecord::Base
+ belongs_to :user
+ belongs_to :topic
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 68cb3b42fbc..5a3da438085 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -504,9 +504,14 @@ en:
messages:
all: "All"
- mine: "Mine"
- unread: "Unread"
+ inbox: "Inbox"
+ sent: "Sent"
+ archive: "Archive"
groups: "My Groups"
+ bulk_select: "Select messages"
+ move_to_inbox: "Move to Inbox"
+ failed_to_move: "Failed to move selected messages (perhaps your network is down)"
+ select_all: "Select All"
change_password:
success: "(email sent)"
diff --git a/config/routes.rb b/config/routes.rb
index 3f7f8c8f2d6..6f1c3180bf0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -279,6 +279,9 @@ Discourse::Application.routes.draw do
get "users/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
get "users/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
get "users/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT}
+
+ get "users/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT}
+
get "users/:username.json" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json}
get "users/:username" => "users#show", as: 'user', constraints: {username: USERNAME_ROUTE_FORMAT}
put "users/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT}
@@ -468,12 +471,18 @@ Discourse::Application.routes.draw do
get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: {username: USERNAME_ROUTE_FORMAT}
get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
get "topics/private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", constraints: {username: USERNAME_ROUTE_FORMAT}
+ get "topics/private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", constraints: {username: USERNAME_ROUTE_FORMAT}
get "topics/private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", constraints: {username: USERNAME_ROUTE_FORMAT}
get "topics/private-messages-group/:username/:group_name.json" => "list#private_messages_group", as: "topics_private_messages_group", constraints: {
username: USERNAME_ROUTE_FORMAT,
group_name: USERNAME_ROUTE_FORMAT
}
+ get "topics/private-messages-group/:username/:group_name/archive.json" => "list#private_messages_group_archive", as: "topics_private_messages_group_archive", constraints: {
+ username: USERNAME_ROUTE_FORMAT,
+ group_name: USERNAME_ROUTE_FORMAT
+ }
+
get 'embed/comments' => 'embed#comments'
get 'embed/count' => 'embed#count'
get 'embed/info' => 'embed#info'
diff --git a/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb b/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb
new file mode 100644
index 00000000000..9ec99718711
--- /dev/null
+++ b/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb
@@ -0,0 +1,19 @@
+class AddUserArchivedMessagesGroupArchivedMessages < ActiveRecord::Migration
+ def change
+ create_table :user_archived_messages do |t|
+ t.integer :user_id, null: false
+ t.integer :topic_id, null: false
+ t.timestamps
+ end
+
+ add_index :user_archived_messages, [:user_id, :topic_id], unique: true
+
+ create_table :group_archived_messages do |t|
+ t.integer :group_id, null: false
+ t.integer :topic_id, null: false
+ t.timestamps
+ end
+
+ add_index :group_archived_messages, [:group_id, :topic_id], unique: true
+ end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 76dd6b9a58f..4d2b158b87f 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -134,6 +134,7 @@ class PostCreator
create_embedded_topic
ensure_in_allowed_users if guardian.is_staff?
+ unarchive_message
@post.advance_draft_sequence
@post.save_reply_relationships
end
@@ -268,6 +269,13 @@ class PostCreator
end
end
+ def unarchive_message
+ return unless @topic.private_message? && @topic.id
+
+ UserArchivedMessage.where(topic_id: @topic.id).destroy_all
+ GroupArchivedMessage.where(topic_id: @topic.id).destroy_all
+ end
+
private
def create_topic
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index d34f9c52e2a..cde31fffd9c 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -117,14 +117,35 @@ class TopicQuery
end
end
+ def not_archived(list, user)
+ list.joins("LEFT JOIN user_archived_messages um
+ ON um.user_id = #{user.id.to_i} AND um.topic_id = topics.id")
+ .where('um.user_id IS NULL')
+ end
+
def list_private_messages(user)
list = private_messages_for(user, :user)
+
+ list = not_archived(list, user)
+ .where('NOT (topics.participant_count = 1 AND topics.user_id = ?)', user.id)
+
+ create_list(:private_messages, {}, list)
+ end
+
+ def list_private_messages_archive(user)
+ list = private_messages_for(user, :user)
+ list = list.joins(:user_archived_messages).where('user_archived_messages.user_id = ?', user.id)
create_list(:private_messages, {}, list)
end
def list_private_messages_sent(user)
list = private_messages_for(user, :user)
- list = list.where(user_id: user.id)
+ list = list.where('EXISTS (
+ SELECT 1 FROM posts
+ WHERE posts.topic_id = topics.id AND
+ posts.user_id = ?
+ )', user.id)
+ list = not_archived(list, user)
create_list(:private_messages, {}, list)
end
@@ -136,6 +157,18 @@ class TopicQuery
def list_private_messages_group(user)
list = private_messages_for(user, :group)
+ group_id = Group.where('name ilike ?', @options[:group_name]).pluck(:id).first
+ list = list.joins("LEFT JOIN group_archived_messages gm ON gm.topic_id = topics.id AND
+ gm.group_id = #{group_id.to_i}")
+ list = list.where("gm.id IS NULL")
+ create_list(:private_messages, {}, list)
+ end
+
+ def list_private_messages_group_archive(user)
+ list = private_messages_for(user, :group)
+ group_id = Group.where('name ilike ?', @options[:group_name]).pluck(:id).first
+ list = list.joins("JOIN group_archived_messages gm ON gm.topic_id = topics.id AND
+ gm.group_id = #{group_id.to_i}")
create_list(:private_messages, {}, list)
end
@@ -195,7 +228,9 @@ class TopicQuery
topics = yield(topics) if block_given?
options = options.merge(@options)
- if ["activity","default"].include?(options[:order] || "activity") && !options[:unordered]
+ if ["activity","default"].include?(options[:order] || "activity") &&
+ !options[:unordered] &&
+ filter != :private_messages
topics = prioritize_pinned_topics(topics, options)
end
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index 1a54ae9e3c8..0fcdf8b713b 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -1,14 +1,17 @@
class TopicsBulkAction
- def initialize(user, topic_ids, operation)
+ def initialize(user, topic_ids, operation, options={})
@user = user
@topic_ids = topic_ids
@operation = operation
@changed_ids = []
+ @options = options
end
def self.operations
- @operations ||= %w(change_category close archive change_notification_level reset_read dismiss_posts delete unlist)
+ @operations ||= %w(change_category close archive change_notification_level
+ reset_read dismiss_posts delete unlist archive_messages
+ move_messages_to_inbox)
end
def self.register_operation(name, &block)
@@ -24,6 +27,43 @@ class TopicsBulkAction
private
+ def find_group
+ return unless @options[:group]
+
+ group = Group.where('name ilike ?', @options[:group]).first
+ raise Discourse::InvalidParameters.new(:group) unless group
+ unless group.group_users.where(user_id: @user.id).exists?
+ raise Discourse::InvalidParameters.new(:group)
+ end
+ group
+ end
+
+ def move_messages_to_inbox
+ group = find_group
+ topics.each do |t|
+ if guardian.can_see?(t) && t.private_message?
+ if group
+ GroupArchivedMessage.where(group_id: group.id, topic_id: t.id).destroy_all
+ else
+ UserArchivedMessage.where(user_id: @user.id, topic_id: t.id).destroy_all
+ end
+ end
+ end
+ end
+
+ def archive_messages
+ group = find_group
+ topics.each do |t|
+ if guardian.can_see?(t) && t.private_message?
+ if group
+ GroupArchivedMessage.create!(group_id: group.id, topic_id: t.id)
+ else
+ UserArchivedMessage.create!(user_id: @user.id, topic_id: t.id)
+ end
+ end
+ end
+ end
+
def dismiss_posts
sql = "
UPDATE topic_users tu
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 5bbada846e4..2cdef4aef8f 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -478,6 +478,9 @@ describe PostCreator do
expect(unrelated.notifications.count).to eq(0)
expect(post.topic.subtype).to eq(TopicSubtype.user_to_user)
+ # archive this message and ensure archive is cleared for all users on reply
+ UserArchivedMessage.create(user_id: target_user2.id, topic_id: post.topic_id)
+
# if an admin replies they should be added to the allowed user list
admin = Fabricate(:admin)
PostCreator.create(admin, raw: 'hi there welcome topic, I am a mod',
@@ -485,6 +488,8 @@ describe PostCreator do
post.topic.reload
expect(post.topic.topic_allowed_users.where(user_id: admin.id).count).to eq(1)
+
+ expect(UserArchivedMessage.where(user_id: target_user2.id, topic_id: post.topic_id).count).to eq(0)
end
end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index c0d18be282b..b92a14817b0 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -1148,7 +1148,7 @@ describe TopicsController do
it "delegates work to `TopicsBulkAction`" do
topics_bulk_action = mock
- TopicsBulkAction.expects(:new).with(user, topic_ids, operation).returns(topics_bulk_action)
+ TopicsBulkAction.expects(:new).with(user, topic_ids, operation, group: nil).returns(topics_bulk_action)
topics_bulk_action.expects(:perform!)
xhr :put, :bulk, topic_ids: topic_ids, operation: operation
end