codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FEATURE: search your bookmarks using in:bookmarks

Browse source
This commit is contained in:
Sam 2015-02-05 11:50:20 +11:00
parent eb7a5c251d
commit 16465edd88
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/locales/server.en.yml
View file

@ -2228,6 +2228,7 @@ en:
<tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr> <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>
<tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr> <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>
<tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr> <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
<tr><td><code>in:bookmarks</code></td><td colspan=4></td></tr>
</table> </table>
</p> </p>
<p> <p>

18
lib/search.rb
View file

@ -192,6 +192,9 @@ class Search
elsif word == 'in:private' elsif word == 'in:private'
@search_pms = true @search_pms = true
nil nil
elsif word == 'in:bookmarks'
@bookmarked_only = true
nil
else else
word word
end end
@ -329,11 +332,15 @@ class Search
end end
if @guardian.user if @guardian.user
if @liked_only if @liked_only || @bookmarked_only
post_action_type = PostActionType.types[:like] if @liked_only
post_action_type = PostActionType.types[:bookmark] if @bookmarked_only
posts = posts.where("posts.id IN ( posts = posts.where("posts.id IN (
SELECT pa.post_id FROM post_actions pa SELECT pa.post_id FROM post_actions pa
WHERE pa.user_id = #{@guardian.user.id} AND WHERE pa.user_id = #{@guardian.user.id} AND
pa.post_action_type_id = #{PostActionType.types[:like]} pa.post_action_type_id = #{post_action_type}
)") )")
end end
@ -341,6 +348,13 @@ class Search
posts = posts.where("posts.user_id = #{@guardian.user.id}") posts = posts.where("posts.user_id = #{@guardian.user.id}")
end end
if @search_bookmarks
post_action_type = @search_likes ? PostActionType.types(:like) : PostActionType.types[:bookmark]
posts = posts.where(["posts.id IN (SELECT post_id FROM post_actions
WHERE user_id = ? AND post_action_type_id = ?)",
@guardian.user.id, post_action_type])
end
if @notification_level if @notification_level
posts = posts.where("posts.topic_id IN ( posts = posts.where("posts.topic_id IN (
SELECT tu.topic_id FROM topic_users tu SELECT tu.topic_id FROM topic_users tu