IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed setting direct channels for a new user at creation time

Browse Source
This commit is contained in:
hmhealey
2015-10-07 10:39:36 -04:00
parent a6cd2a7961
commit ed6b2cd164
2 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
api/preference.go
View File

@@ -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
}

49
api/user.go
View File

@@ -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() {