From ed6b2cd164b249c67db0e0421cc78964450240c9 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Wed, 7 Oct 2015 10:39:36 -0400
Subject: Removed setting direct channels for a new user at creation time

---
 api/preference.go | 43 ++++++++++++++++++++++++++++++++++++++++++-
 api/user.go       | 49 -------------------------------------------------
 2 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/api/preference.go b/api/preference.go
index 810917a7c..aa19ee071 100644
--- a/api/preference.go
+++ b/api/preference.go
@@ -59,10 +59,51 @@ func getPreferencesByName(c *Context, w http.ResponseWriter, r *http.Request) {
 		if len(data) == 0 {
 			if category == model.PREFERENCE_CATEGORY_DIRECT_CHANNELS && name == model.PREFERENCE_NAME_SHOW {
 				// add direct channels for a user that existed before preferences were added
-				data = AddDirectChannels(c.Session.UserId, c.Session.TeamId)
+				data = addDirectChannels(c.Session.UserId, c.Session.TeamId)
 			}
 		}
 
 		w.Write([]byte(model.PreferenceListToJson(data)))
 	}
 }
+
+func addDirectChannels(userId, teamId string) []*model.Preference {
+	var profiles map[string]*model.User
+	if result := <-Srv.Store.User().GetProfiles(teamId); result.Err != nil {
+		l4g.Error("Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v", userId, teamId, result.Err.Error())
+		return []*model.Preference{}
+	} else {
+		profiles = result.Data.(map[string]*model.User)
+	}
+
+	var preferences []*model.Preference
+
+	for id := range profiles {
+		if id == userId {
+			continue
+		}
+
+		profile := profiles[id]
+
+		preference := &model.Preference{
+			UserId:   userId,
+			Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS,
+			Name:     model.PREFERENCE_NAME_SHOW,
+			AltId:    profile.Id,
+			Value:    "true",
+		}
+
+		if result := <-Srv.Store.Preference().Save(preference); result.Err != nil {
+			l4g.Error("Failed to add direct channel preferences for user user_id=%s, alt_id=%s, team_id=%s, err=%v", userId, profile.Id, teamId, result.Err.Error())
+			continue
+		}
+
+		preferences = append(preferences, preference)
+
+		if len(preferences) >= 10 {
+			break
+		}
+	}
+
+	return preferences
+}
diff --git a/api/user.go b/api/user.go
index 204f00dcd..faf828cf9 100644
--- a/api/user.go
+++ b/api/user.go
@@ -198,8 +198,6 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User {
 			l4g.Error("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", ruser.Id, ruser.TeamId, err)
 		}
 
-		fireAndForgetAddDirectChannels(ruser, team)
-
 		fireAndForgetWelcomeEmail(ruser.Email, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team))
 		if user.EmailVerified {
 			if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil {
@@ -220,53 +218,6 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User {
 	}
 }
 
-func fireAndForgetAddDirectChannels(user *model.User, team *model.Team) {
-	go func() {
-		AddDirectChannels(user.Id, team.Id)
-	}()
-}
-
-func AddDirectChannels(userId, teamId string) []*model.Preference {
-	var profiles map[string]*model.User
-	if result := <-Srv.Store.User().GetProfiles(teamId); result.Err != nil {
-		l4g.Error("Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v", userId, teamId, result.Err.Error())
-		return []*model.Preference{}
-	} else {
-		profiles = result.Data.(map[string]*model.User)
-	}
-
-	var preferences []*model.Preference
-
-	for id := range profiles {
-		if id == userId {
-			continue
-		}
-
-		profile := profiles[id]
-
-		preference := &model.Preference{
-			UserId:   userId,
-			Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS,
-			Name:     model.PREFERENCE_NAME_SHOW,
-			AltId:    profile.Id,
-			Value:    "true",
-		}
-
-		if result := <-Srv.Store.Preference().Save(preference); result.Err != nil {
-			l4g.Error("Failed to add direct channel preferences for user user_id=%s, alt_id=%s, team_id=%s, err=%v", userId, profile.Id, teamId, result.Err.Error())
-			continue
-		}
-
-		preferences = append(preferences, preference)
-
-		if len(preferences) >= 10 {
-			break
-		}
-	}
-
-	return preferences
-}
-
 func fireAndForgetWelcomeEmail(email, teamDisplayName, siteURL, teamURL string) {
 	go func() {
 
-- 
cgit v1.2.3-1-g7c22