mirror of
https://github.com/discourse/discourse.git
synced 2025-02-10 05:14:59 +00:00
e1eb5fb9b3
* This PR changes the user activity bookmarks stream to show a new list of bookmarks based on the Bookmark record. * If a bookmark has a name or reminder it will be shown as metadata above the topic title in the list * The categories, tags, topic status, and assigned show for each bookmarked post based on the post topic * Bookmarks can be deleted from the [...] menu in the list * As well as this, the list of bookmarks from the quick access panel is now drawn from the Bookmarks table for a user: * All of this new functionality is gated behind the enable_bookmarks_with_reminders site setting The /bookmarks/ route now redirects directly to /user/:username/activity/bookmarks-with-reminders * The structure of the Ember for the list of bookmarks is not ideal, this is an MVP PR so we can start testing this functionality internally. There is a little repeated code from topic.js.es6. There is an ongoing effort to start standardizing these lists that will be addressed in future PRs. * This PR also fixes issues with feature detection for at_desktop bookmark reminders
33 lines
713 B
Ruby
33 lines
713 B
Ruby
# frozen_string_literal: true
|
|
|
|
##
|
|
# Allows us to query Bookmark records for lists. Used mainly
|
|
# in the user/activity/bookmarks page.
|
|
|
|
class BookmarkQuery
|
|
def initialize(user, params)
|
|
@user = user
|
|
@params = params
|
|
end
|
|
|
|
def list_all
|
|
results = user_bookmarks
|
|
.joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
|
|
.joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
|
|
.joins('INNER JOIN users ON users.id = posts.user_id')
|
|
.order('created_at DESC')
|
|
|
|
if @params[:limit]
|
|
results = results.limit(@params[:limit])
|
|
end
|
|
|
|
results
|
|
end
|
|
|
|
private
|
|
|
|
def user_bookmarks
|
|
Bookmark.where(user: @user).includes(:topic).includes(post: :user)
|
|
end
|
|
end
|