I noticed that the rest are either:

1. Handled by the new PR already, OR
2. Simply uses the User::encodable_public() function that does not
rely on `email` variable at all.

Author: hbina

src/models/krate.rs

@@ -7,6 +7,7 @@ use indexmap::IndexMap;
 use url::Url;
 
 use crate::app::App;
+use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
 use crate::util::{human, CargoResult};
 
 use crate::models::{
@@ -399,14 +400,25 @@ impl Crate {
         Ok(Version::max(vs))
     }
 
+    //  FIXME   ::  This function takes the result from user table so we must check
+    //              if its using the email variable...
     pub fn owners(&self, conn: &PgConnection) -> CargoResult<Vec<Owner>> {
         let base_query = CrateOwner::belonging_to(self).filter(crate_owners::deleted.eq(false));
         let users = base_query
             .inner_join(users::table)
-            .select(users::all_columns)
+            .select(USER_NO_EMAIL)
             .filter(crate_owners::owner_kind.eq(OwnerKind::User as i32))
-            .load(conn)?
+            .load::<UserNoEmailType>(conn)?
             .into_iter()
+            .map(|user| User {
+                id: user.0,
+                email: None,
+                gh_access_token: user.1,
+                gh_login: user.2,
+                name: user.3,
+                gh_avatar: user.4,
+                gh_id: user.5,
+            })
             .map(Owner::User);
         let teams = base_query
             .inner_join(teams::table)

src/models/owner.rs

@@ -4,6 +4,7 @@ use crate::app::App;
 use crate::github;
 use crate::util::{human, CargoResult};
 
+use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
 use crate::models::{Crate, Team, User};
 use crate::schema::{crate_owners, users};
 use crate::views::EncodableOwner;
@@ -54,8 +55,18 @@ impl Owner {
             )?))
         } else {
             users::table
+                .select(USER_NO_EMAIL)
                 .filter(users::gh_login.eq(name))
-                .first(conn)
+                .first::<UserNoEmailType>(conn)
+                .map(|user| User {
+                    id: user.0,
+                    email: None,
+                    gh_access_token: user.1,
+                    gh_login: user.2,
+                    name: user.3,
+                    gh_avatar: user.4,
+                    gh_id: user.5,
+                })
                 .map(Owner::User)
                 .map_err(|_| human(&format_args!("could not find user with login `{}`", name)))
         }