WIP: Method 2

Author: bryanburgers

app/routes/team.js

@@ -16,6 +16,7 @@ export default Route.extend({
         return this.store.queryRecord('team', { team_id }).then(
             team => {
                 params.team_id = team.get('id');
+                params.include_yanked = 'n';
                 return RSVP.hash({
                     crates: this.store.query('crate', params),
                     team,

app/routes/user.js

@@ -15,6 +15,7 @@ export default Route.extend({
         return this.store.queryRecord('user', { user_id }).then(
             user => {
                 params.user_id = user.get('id');
+                params.include_yanked = 'n';
                 return RSVP.hash({
                     crates: this.store.query('crate', params),
                     user,

src/controllers/krate/search.rs

@@ -1,6 +1,7 @@
 //! Endpoint for searching and discovery functionality
 
 use diesel_full_text_search::*;
+use diesel::dsl::*;
 
 use crate::controllers::helpers::Paginate;
 use crate::controllers::prelude::*;
@@ -139,6 +140,19 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
         );
     }
 
+    if let Some(include_yanked) = params.get("include_yanked").map(|s| match s.to_lowercase().as_ref() {
+        "n" | "no" | "f" | "false" | "0" => false,
+        _ => true,
+    }) {
+        if !include_yanked {
+            query = query.filter(exists(
+                versions::table
+                    .filter(versions::crate_id.eq(crates::id))
+                    .filter(versions::yanked.eq(false))
+                ));
+        }
+    }
+
     if sort == "downloads" {
         query = query.then_order_by(crates::downloads.desc())
     } else if sort == "recent-downloads" {