diff --git a/Makefile b/Makefile index 0d22d392d7..f1300176b9 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ check-style: test: start-docker @echo Running tests - $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=240s ./api || exit 1 + $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=340s ./api || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 diff --git a/api/channel.go b/api/channel.go index 4b0e99b20e..5f0d032463 100644 --- a/api/channel.go +++ b/api/channel.go @@ -513,9 +513,18 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user_to_channel.type.app_error", nil, "") } + if result := <-Srv.Store.Channel().GetMember(channel.Id, user.Id); result.Err != nil { + if result.Err.Id != store.MISSING_MEMBER_ERROR { + return nil, result.Err + } + } else { + channelMember := result.Data.(model.ChannelMember) + return &channelMember, nil + } + newMember := &model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps()} - if cmresult := <-Srv.Store.Channel().SaveMember(newMember); cmresult.Err != nil { - l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, cmresult.Err) + if result := <-Srv.Store.Channel().SaveMember(newMember); result.Err != nil { + l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, result.Err) return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil, "") } diff --git a/api/channel_test.go b/api/channel_test.go index 8ac785f77a..a70e5532a7 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -691,8 +691,8 @@ func TestAddChannelMember(t *testing.T) { t.Fatal("Should have errored, bad user id") } - if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err == nil { - t.Fatal("Should have errored, user already a member") + if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil { + t.Fatal(err) } if _, err := Client.AddChannelMember("sgdsgsdg", user2.Id); err == nil { diff --git a/api/import.go b/api/import.go index c39ec52207..59d098d931 100644 --- a/api/import.go +++ b/api/import.go @@ -22,7 +22,7 @@ func ImportPost(post *model.Post) { } } -func ImportUser(teamId string, user *model.User) *model.User { +func ImportUser(team *model.Team, user *model.User) *model.User { user.MakeNonNil() if result := <-Srv.Store.User().Save(user); result.Err != nil { @@ -31,14 +31,14 @@ func ImportUser(teamId string, user *model.User) *model.User { } else { ruser := result.Data.(*model.User) - if err := JoinDefaultChannels(teamId, ruser, ""); err != nil { - l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, teamId, err) - } - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } + if err := JoinUserToTeam(team, user); err != nil { + l4g.Error(utils.T("api.import.import_user.join_team.error"), err) + } + return ruser } } diff --git a/api/slackimport.go b/api/slackimport.go index 4319fe409e..df43e1a8b5 100644 --- a/api/slackimport.go +++ b/api/slackimport.go @@ -99,6 +99,16 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map log.WriteString("===============\r\n\r\n") addedUsers := make(map[string]*model.User) + + // Need the team + var team *model.Team + if result := <-Srv.Store.Team().Get(teamId); result.Err != nil { + log.WriteString(utils.T("api.slackimport.slack_import.team_fail")) + return addedUsers + } else { + team = result.Data.(*model.Team) + } + for _, sUser := range slackusers { firstName := "" lastName := "" @@ -119,7 +129,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map Password: password, } - if mUser := ImportUser(teamId, &newUser); mUser != nil { + if mUser := ImportUser(team, &newUser); mUser != nil { addedUsers[sUser.Id] = mUser log.WriteString(utils.T("api.slackimport.slack_add_users.email_pwd", map[string]interface{}{"Email": newUser.Email, "Password": password})) } else { @@ -173,6 +183,18 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]* } } +func addSlackUsersToChannel(members []string, users map[string]*model.User, channel *model.Channel, log *bytes.Buffer) { + for _, member := range members { + if user, ok := users[member]; !ok { + log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": "?"})) + } else { + if _, err := AddUserToChannel(user, channel); err != nil { + log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": user.Username})) + } + } + } +} + func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[string][]SlackPost, users map[string]*model.User, log *bytes.Buffer) map[string]*model.Channel { // Write Header log.WriteString(utils.T("api.slackimport.slack_add_channels.added")) @@ -199,6 +221,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName})) } } + addSlackUsersToChannel(sChannel.Members, users, mChannel, log) log.WriteString(newChannel.DisplayName + "\r\n") addedChannels[sChannel.Id] = mChannel SlackAddPosts(mChannel, posts[sChannel.Name], users) diff --git a/api/team.go b/api/team.go index eefdc3d85d..6db8bc2452 100644 --- a/api/team.go +++ b/api/team.go @@ -40,8 +40,8 @@ func InitTeam() { BaseRoutes.NeedTeam.Handle("/add_user_to_team", ApiUserRequired(addUserToTeam)).Methods("POST") // These should be moved to the global admain console - BaseRoutes.Teams.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST") - BaseRoutes.Teams.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET") + BaseRoutes.NeedTeam.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST") + BaseRoutes.NeedTeam.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET") BaseRoutes.Teams.Handle("/add_user_to_team_from_invite", ApiUserRequired(addUserToTeamFromInvite)).Methods("POST") } diff --git a/i18n/en.json b/i18n/en.json index 4b67d8c788..5cc2ec9f68 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -667,6 +667,10 @@ "id": "api.import.import_user.set_email.error", "translation": "Failed to set email verified err=%v" }, + { + "id": "api.import.import_user.join_team.error", + "translation": "Failed to join team when importing err=%v" + }, { "id": "api.license.add_license.array.app_error", "translation": "Empty array under 'license' in request" @@ -995,6 +999,10 @@ "id": "api.slackimport.slack_add_channels.merge", "translation": "Merged with existing channel: {{.DisplayName}}\r\n" }, + { + "id": "api.slackimport.slack_add_channels.failed_to_add_user", + "translation": "Failed to add user to channel: {{.Username}}\r\n" + }, { "id": "api.slackimport.slack_add_posts.bot.warn", "translation": "Slack bot posts are not imported yet" @@ -1035,6 +1043,10 @@ "id": "api.slackimport.slack_import.log", "translation": "Mattermost Slack Import Log\r\n" }, + { + "id": "api.slackimport.slack_import.team_fail", + "translation": "Failed to get team to import into.\r\n" + }, { "id": "api.slackimport.slack_import.note1", "translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n" @@ -2851,6 +2863,10 @@ "id": "store.sql_channel.get_for_export.app_error", "translation": "We couldn't get all the channels" }, + { + "id": "store.sql_channel.get_member.missing.app_error", + "translation": "No channel member found for that user id and channel id" + }, { "id": "store.sql_channel.get_member.app_error", "translation": "We couldn't get the channel member" diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 46f56e7eba..6d549c7f0a 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -12,6 +12,7 @@ import ( const ( MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" + MISSING_MEMBER_ERROR = "store.sql_channel.get_member.missing.app_error" ) type SqlChannelStore struct { @@ -572,9 +573,13 @@ func (s SqlChannelStore) GetMember(channelId string, userId string) StoreChannel result := StoreResult{} var member model.ChannelMember - err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + + if err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}); err != nil { + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", MISSING_MEMBER_ERROR, nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + } } else { result.Data = member } diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 53a514082f..6a7c5de402 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -348,10 +348,9 @@ export default class Client { importSlack = (fileData, success, error) => { request. - post(`${this.getTeamsRoute()}/import_team`). + post(`${this.getTeamNeededRoute()}/import_team`). set(this.defaultHeaders). - type('application/json'). - accept('application/json'). + accept('application/octet-stream'). send(fileData). end(this.handleResponse.bind(this, 'importSlack', success, error)); } diff --git a/webapp/components/header_footer_template.jsx b/webapp/components/header_footer_template.jsx index ce2f595418..76061d532c 100644 --- a/webapp/components/header_footer_template.jsx +++ b/webapp/components/header_footer_template.jsx @@ -5,7 +5,6 @@ import $ from 'jquery'; import {FormattedMessage} from 'react-intl'; import React from 'react'; -import {Link} from 'react-router'; export default class NotLoggedIn extends React.Component { componentDidMount() { @@ -30,34 +29,38 @@ export default class NotLoggedIn extends React.Component {
{'© 2015 Mattermost, Inc.'} - - - + - - + - - + - +
diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx index 9238c87364..8f9eadab74 100644 --- a/webapp/components/notify_counts.jsx +++ b/webapp/components/notify_counts.jsx @@ -9,8 +9,12 @@ function getCountsStateFromStores() { var channels = ChannelStore.getAll(); var members = ChannelStore.getAllMembers(); - channels.forEach(function setChannelInfo(channel) { + channels.forEach((channel) => { var channelMember = members[channel.id]; + if (channelMember == null) { + return; + } + if (channel.type === 'D') { count += channel.total_msg_count - channelMember.msg_count; } else if (channelMember.mention_count > 0) { @@ -20,7 +24,7 @@ function getCountsStateFromStores() { } }); - return {count: count}; + return {count}; } import React from 'react'; diff --git a/webapp/components/posts_view_container.jsx b/webapp/components/posts_view_container.jsx index a49c77f8d7..edfa314f85 100644 --- a/webapp/components/posts_view_container.jsx +++ b/webapp/components/posts_view_container.jsx @@ -16,6 +16,8 @@ import {createChannelIntroMessage} from 'utils/channel_intro_messages.jsx'; import React from 'react'; +const MAXIMUM_CACHED_VIEWS = 3; + export default class PostsViewContainer extends React.Component { constructor() { super(); @@ -105,6 +107,12 @@ export default class PostsViewContainer extends React.Component { let newIndex = channels.indexOf(channelId); if (newIndex === -1) { + if (channels.length >= MAXIMUM_CACHED_VIEWS) { + channels.shift(); + atTop.shift(); + postLists.shift(); + } + newIndex = channels.length; channels.push(channelId); atTop[newIndex] = PostStore.getVisibilityAtTop(channelId); @@ -172,7 +180,7 @@ export default class PostsViewContainer extends React.Component { const isActive = (channels[i] === currentChannelId); postListCtls.push( { - delete this.typingUsers[loc][username]; + this.typingUsers[loc][name] = setTimeout(() => { + Reflect.deleteProperty(this.typingUsers[loc], name); if (this.typingUsers[loc] === {}) { - delete this.typingUsers[loc]; + Reflect.deleteProperty(this.typingUsers, loc); } this.emitChange(); }, Constants.UPDATE_TYPING_MS); @@ -76,14 +76,14 @@ class UserTypingStoreClass extends EventEmitter { } userPosted(userId, channelId, postParentId) { - const username = this.usernameFromId(userId); + const name = this.nameFromId(userId); const loc = channelId + postParentId; if (this.typingUsers[loc]) { - clearTimeout(this.typingUsers[loc][username]); - delete this.typingUsers[loc][username]; + clearTimeout(this.typingUsers[loc][name]); + Reflect.deleteProperty(this.typingUsers[loc], name); if (this.typingUsers[loc] === {}) { - delete this.typingUsers[loc]; + Reflect.deleteProperty(this.typingUsers, loc); } this.emitChange(); }