mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 07:23:40 +08:00
3e4621c2cb
This pull request follows on from https://github.com/discourse/discourse/pull/16308. This one does the following:
* Changes `BookmarkQuery` to allow for querying more than just Post and Topic bookmarkables
* Introduces a `Bookmark.register_bookmarkable` method which requires a model, serializer, fields and preload includes for searching. These registered `Bookmarkable` types are then used when validating new bookmarks, and also when determining which serializer to use for the bookmark list. The `Post` and `Topic` bookmarkables are registered by default.
* Adds new specific types for Post and Topic bookmark serializers along with preloading of associations in `UserBookmarkList`
* Changes to the user bookmark list template to allow for more generic bookmarkable types alongside the Post and Topic ones which need to display in a particular way
All of these changes are gated behind the `use_polymorphic_bookmarks` site setting, apart from the .hbs changes where I have updated the original `UserBookmarkSerializer` with some stub methods.
Following this PR will be several plugin PRs (for assign, chat, encrypt) that will register their own bookmarkable types or otherwise alter the bookmark serializers in their own way, also gated behind `use_polymorphic_bookmarks`.
This commit also removes `BookmarkQuery.preloaded_custom_fields` and the functionality surrounding it. It was added in 0cd502a558 but only used by one plugin (discourse-assign) where it has since been removed, and is now used by no plugins. We don't need it anymore.
43 lines
2.2 KiB
Ruby
43 lines
2.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe UserTopicBookmarkSerializer do
|
|
before do
|
|
SiteSetting.use_polymorphic_bookmarks = true
|
|
end
|
|
|
|
fab!(:user) { Fabricate(:user) }
|
|
let!(:topic) { Fabricate(:topic, user: user) }
|
|
let!(:post) { Fabricate(:post, topic: topic) }
|
|
let!(:bookmark) { Fabricate(:bookmark, name: 'Test', user: user, bookmarkable: topic) }
|
|
|
|
it "uses the last_read_post_number + 1 for the bookmarks excerpt" do
|
|
next_unread_post = Fabricate(:post_with_long_raw_content, topic: bookmark.bookmarkable)
|
|
Fabricate(:post_with_external_links, topic: bookmark.bookmarkable)
|
|
bookmark.reload
|
|
TopicUser.change(user.id, bookmark.bookmarkable.id, { last_read_post_number: post.post_number })
|
|
serializer = UserTopicBookmarkSerializer.new(bookmark, scope: Guardian.new(user))
|
|
expect(serializer.excerpt).to eq(PrettyText.excerpt(next_unread_post.cooked, 300, keep_emoji_images: true))
|
|
end
|
|
|
|
it "does not use a small post for the last unread cooked post" do
|
|
small_action_post = Fabricate(:small_action, topic: bookmark.bookmarkable)
|
|
next_unread_post = Fabricate(:post_with_long_raw_content, topic: bookmark.bookmarkable)
|
|
Fabricate(:post_with_external_links, topic: bookmark.bookmarkable)
|
|
bookmark.reload
|
|
TopicUser.change(user.id, bookmark.bookmarkable.id, { last_read_post_number: post.post_number })
|
|
serializer = UserTopicBookmarkSerializer.new(bookmark, scope: Guardian.new(user))
|
|
expect(serializer.excerpt).to eq(PrettyText.excerpt(next_unread_post.cooked, 300, keep_emoji_images: true))
|
|
end
|
|
|
|
it "handles the last read post in the topic being a small post by getting the last read regular post" do
|
|
last_regular_post = Fabricate(:post_with_long_raw_content, topic: bookmark.bookmarkable)
|
|
small_action_post = Fabricate(:small_action, topic: bookmark.bookmarkable)
|
|
bookmark.reload
|
|
topic.reload
|
|
TopicUser.change(user.id, bookmark.bookmarkable.id, { last_read_post_number: small_action_post.post_number })
|
|
serializer = UserTopicBookmarkSerializer.new(bookmark, scope: Guardian.new(user))
|
|
expect(serializer.cooked).to eq(last_regular_post.cooked)
|
|
expect(serializer.excerpt).to eq(PrettyText.excerpt(last_regular_post.cooked, 300, keep_emoji_images: true))
|
|
end
|
|
end
|