From 1647614fc95b0cb9dd5c4c5699f4f7fbba0bee43 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Wed, 2 May 2018 16:07:26 +0200 Subject: [MM-10415] Reorder checks for command invite (#8701) --- app/command_invite.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/command_invite.go b/app/command_invite.go index 9045365ad..4b76c0c45 100644 --- a/app/command_invite.go +++ b/app/command_invite.go @@ -4,7 +4,6 @@ package app import ( - "fmt" "strings" "github.com/mattermost/mattermost-server/mlog" @@ -42,8 +41,6 @@ func (me *InviteProvider) DoCommand(a *App, args *model.CommandArgs, message str return &model.CommandResponse{Text: args.T("api.command_invite.missing_message.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - mlog.Debug(fmt.Sprint(message)) - splitMessage := strings.SplitN(message, " ", 2) targetUsername := splitMessage[0] targetUsername = strings.TrimPrefix(targetUsername, "@") @@ -77,12 +74,7 @@ func (me *InviteProvider) DoCommand(a *App, args *model.CommandArgs, message str return &model.CommandResponse{Text: args.T("api.command_invite.directchannel.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - // Check if user is already in the channel - _, err = a.GetChannelMember(channelToJoin.Id, userProfile.Id) - if err == nil { - return &model.CommandResponse{Text: args.T("api.command_invite.user_already_in_channel.app_error", map[string]interface{}{"User": userProfile.Username}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} - } - + // Check Permissions if channelToJoin.Type == model.CHANNEL_OPEN && !a.SessionHasPermissionToChannel(args.Session, channelToJoin.Id, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS) { return &model.CommandResponse{Text: args.T("api.command_invite.permission.app_error", map[string]interface{}{"User": userProfile.Username, "Channel": channelToJoin.Name}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } @@ -91,6 +83,12 @@ func (me *InviteProvider) DoCommand(a *App, args *model.CommandArgs, message str return &model.CommandResponse{Text: args.T("api.command_invite.permission.app_error", map[string]interface{}{"User": userProfile.Username, "Channel": channelToJoin.Name}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } + // Check if user is already in the channel + _, err = a.GetChannelMember(channelToJoin.Id, userProfile.Id) + if err == nil { + return &model.CommandResponse{Text: args.T("api.command_invite.user_already_in_channel.app_error", map[string]interface{}{"User": userProfile.Username}), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + } + if _, err := a.AddChannelMember(userProfile.Id, channelToJoin, args.Session.UserId, ""); err != nil { return &model.CommandResponse{Text: args.T("api.command_invite.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } -- cgit v1.2.3-1-g7c22 From d6537deb3ddace25b693932ae503b4fbdbe02935 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 2 May 2018 10:50:56 -0400 Subject: Add inactive user count to analytics and fix client analytics function (#8695) --- app/analytics.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/analytics.go b/app/analytics.go index 7a32e78c1..a09b56538 100644 --- a/app/analytics.go +++ b/app/analytics.go @@ -30,7 +30,7 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo } if name == "standard" { - var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 10) + var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 11) rows[0] = &model.AnalyticsRow{Name: "channel_open_count", Value: 0} rows[1] = &model.AnalyticsRow{Name: "channel_private_count", Value: 0} rows[2] = &model.AnalyticsRow{Name: "post_count", Value: 0} @@ -41,13 +41,17 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo rows[7] = &model.AnalyticsRow{Name: "total_read_db_connections", Value: 0} rows[8] = &model.AnalyticsRow{Name: "daily_active_users", Value: 0} rows[9] = &model.AnalyticsRow{Name: "monthly_active_users", Value: 0} + rows[10] = &model.AnalyticsRow{Name: "inactive_user_count", Value: 0} openChan := a.Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) privateChan := a.Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) teamChan := a.Srv.Store.Team().AnalyticsTeamCount() var userChan store.StoreChannel - if teamId != "" { + var userInactiveChan store.StoreChannel + if teamId == "" { + userInactiveChan = a.Srv.Store.User().AnalyticsGetInactiveUsersCount() + } else { userChan = a.Srv.Store.User().AnalyticsUniqueUserCount(teamId) } @@ -91,6 +95,16 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo } } + if userInactiveChan == nil { + rows[10].Value = -1 + } else { + if r := <-userInactiveChan; r.Err != nil { + return nil, r.Err + } else { + rows[10].Value = float64(r.Data.(int64)) + } + } + if r := <-teamChan; r.Err != nil { return nil, r.Err } else { -- cgit v1.2.3-1-g7c22 From 62898f4892b020b9bcf1b310830451f8bc57ba5a Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Wed, 2 May 2018 19:09:12 +0100 Subject: MM-10424: Migrate PostEditTimeLimit config setting. (#8702) --- app/app.go | 8 ++++++++ app/app_test.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) (limited to 'app') diff --git a/app/app.go b/app/app.go index b31f67d6b..2cdf333c1 100644 --- a/app/app.go +++ b/app/app.go @@ -560,6 +560,14 @@ func (a *App) DoAdvancedPermissionsMigration() { return } + config := a.Config() + if *config.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_ALWAYS { + *config.ServiceSettings.PostEditTimeLimit = -1 + if err := a.SaveConfig(config, true); err != nil { + mlog.Error("Failed to update config in Advanced Permissions Phase 1 Migration.", mlog.String("error", err.Error())) + } + } + system := model.System{ Name: ADVANCED_PERMISSIONS_MIGRATION_KEY, Value: "true", diff --git a/app/app_test.go b/app/app_test.go index ccf7faeeb..cb6917073 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -426,4 +426,32 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { assert.Nil(t, err) assert.Equal(t, permissions, role.Permissions) } + + // Check that the config setting for "always" and "time_limit" edit posts is updated correctly. + th.ResetRoleMigration() + + config := th.App.GetConfig() + *config.ServiceSettings.AllowEditPost = "always" + *config.ServiceSettings.PostEditTimeLimit = 300 + th.App.SaveConfig(config, false) + + th.App.DoAdvancedPermissionsMigration() + config = th.App.GetConfig() + assert.Equal(t, -1, *config.ServiceSettings.PostEditTimeLimit) + + th.ResetRoleMigration() + + config = th.App.GetConfig() + *config.ServiceSettings.AllowEditPost = "time_limit" + *config.ServiceSettings.PostEditTimeLimit = 300 + th.App.SaveConfig(config, false) + + th.App.DoAdvancedPermissionsMigration() + config = th.App.GetConfig() + assert.Equal(t, 300, *config.ServiceSettings.PostEditTimeLimit) + + config = th.App.GetConfig() + *config.ServiceSettings.AllowEditPost = "always" + *config.ServiceSettings.PostEditTimeLimit = 300 + th.App.SaveConfig(config, false) } -- cgit v1.2.3-1-g7c22 From ffb834ec3ce048db341e2438c0116475297a6f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 3 May 2018 15:40:54 +0200 Subject: Fix TestSendNotifications test (#8712) --- app/notification_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/notification_test.go b/app/notification_test.go index 24784940e..3b8b4adf5 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -37,7 +37,7 @@ func TestSendNotifications(t *testing.T) { } else if mentions == nil { t.Log(mentions) t.Fatal("user should have been mentioned") - } else if mentions[0] != th.BasicUser2.Id { + } else if !utils.StringInSlice(th.BasicUser2.Id, mentions) { t.Log(mentions) t.Fatal("user should have been mentioned") } -- cgit v1.2.3-1-g7c22 From 14b65b990c7f67b66c3188b4120bf27fb1f24a2d Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Thu, 3 May 2018 10:00:33 -0400 Subject: MM-10393: Fix for tracking active vs inactive users. (#8706) --- app/diagnostics.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'app') diff --git a/app/diagnostics.go b/app/diagnostics.go index 6237f5f83..7dcea839e 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -138,7 +138,7 @@ func (a *App) trackActivity() { activeUserCount = ucr.Data.(int64) } - if iucr := <-a.Srv.Store.Status().GetTotalActiveUsersCount(); iucr.Err == nil { + if iucr := <-a.Srv.Store.User().AnalyticsGetInactiveUsersCount(); iucr.Err == nil { inactiveUserCount = iucr.Data.(int64) } @@ -171,17 +171,17 @@ func (a *App) trackActivity() { } a.SendDiagnostic(TRACK_ACTIVITY, map[string]interface{}{ - "registered_users": userCount, - "active_users": activeUserCount, - "registered_inactive_users": inactiveUserCount, - "teams": teamCount, - "public_channels": publicChannelCount, - "private_channels": privateChannelCount, - "direct_message_channels": directChannelCount, - "public_channels_deleted": deletedPublicChannelCount, - "private_channels_deleted": deletedPrivateChannelCount, - "posts": postsCount, - "used_apiv3": atomic.LoadInt32(model.UsedApiV3) == 1, + "registered_users": userCount, + "active_users": activeUserCount, + "registered_deactivated_users": inactiveUserCount, + "teams": teamCount, + "public_channels": publicChannelCount, + "private_channels": privateChannelCount, + "direct_message_channels": directChannelCount, + "public_channels_deleted": deletedPublicChannelCount, + "private_channels_deleted": deletedPrivateChannelCount, + "posts": postsCount, + "used_apiv3": atomic.LoadInt32(model.UsedApiV3) == 1, }) atomic.StoreInt32(model.UsedApiV3, 0) -- cgit v1.2.3-1-g7c22 From 5000eac24f8d9aeef9cd24a58af43597e6c62b02 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Fri, 4 May 2018 01:02:22 +0800 Subject: respect image orientation before saving height and width of FileInfo (#8710) --- app/file.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app') diff --git a/app/file.go b/app/file.go index a1addd7ac..96d1caabd 100644 --- a/app/file.go +++ b/app/file.go @@ -361,6 +361,14 @@ func (a *App) DoUploadFile(now time.Time, rawTeamId string, rawChannelId string, return nil, err } + if orientation, err := getImageOrientation(bytes.NewReader(data)); err == nil && + (orientation == RotatedCWMirrored || + orientation == RotatedCCW || + orientation == RotatedCCWMirrored || + orientation == RotatedCW) { + info.Width, info.Height = info.Height, info.Width + } + info.Id = model.NewId() info.CreatorId = userId -- cgit v1.2.3-1-g7c22 From fc513a9e61605a947c2bb8552eb7abfcecc729c1 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 4 May 2018 16:11:15 -0400 Subject: Added missing i18n strings for files and email batching (#8700) * Added missing i18n strings for files and email batching * Added more fields to log messages --- app/email_batching.go | 2 +- app/file.go | 59 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 17 deletions(-) (limited to 'app') diff --git a/app/email_batching.go b/app/email_batching.go index e1ea7abb5..e75979bca 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -250,7 +250,7 @@ func (a *App) sendBatchedEmailNotification(userId string, notifications []*batch body.Props["BodyText"] = translateFunc("api.email_batching.send_batched_email_notification.body_text", len(notifications)) if err := a.SendMail(user.Email, subject, body.Render()); err != nil { - mlog.Warn(fmt.Sprint("api.email_batchings.send_batched_email_notification.send.app_error FIXME: NOT FOUND IN TRANSLATIONS FILE", user.Email, err)) + mlog.Warn(fmt.Sprintf("Unable to send batched email notification err=%v", err), mlog.String("email", user.Email)) } } diff --git a/app/file.go b/app/file.go index 96d1caabd..87e1986a2 100644 --- a/app/file.go +++ b/app/file.go @@ -98,7 +98,7 @@ func (a *App) GetInfoForFilename(post *model.Post, teamId string, filename strin // Find the path from the Filename of the form /{channelId}/{userId}/{uid}/{nameWithExtension} split := strings.SplitN(filename, "/", 5) if len(split) < 5 { - mlog.Error(fmt.Sprintf("Unable to decipher filename when migrating post to use FileInfos, post_id=%v, filename=%v", post.Id, filename), mlog.String("post_id", post.Id)) + mlog.Error("Unable to decipher filename when migrating post to use FileInfos", mlog.String("post_id", post.Id), mlog.String("filename", filename)) return nil } @@ -108,7 +108,13 @@ func (a *App) GetInfoForFilename(post *model.Post, teamId string, filename strin name, _ := url.QueryUnescape(split[4]) if split[0] != "" || split[1] != post.ChannelId || split[2] != post.UserId || strings.Contains(split[4], "/") { - mlog.Warn(fmt.Sprintf("Found an unusual filename when migrating post to use FileInfos, post_id=%v, channel_id=%v, user_id=%v, filename=%v", post.Id, post.ChannelId, post.UserId, filename), mlog.String("post_id", post.Id)) + mlog.Warn( + "Found an unusual filename when migrating post to use FileInfos", + mlog.String("post_id", post.Id), + mlog.String("channel_id", post.ChannelId), + mlog.String("user_id", post.UserId), + mlog.String("filename", filename), + ) } pathPrefix := fmt.Sprintf("teams/%s/channels/%s/users/%s/%s/", teamId, channelId, userId, oldId) @@ -117,13 +123,22 @@ func (a *App) GetInfoForFilename(post *model.Post, teamId string, filename strin // Open the file and populate the fields of the FileInfo var info *model.FileInfo if data, err := a.ReadFile(path); err != nil { - mlog.Error(fmt.Sprint("api.file.migrate_filenames_to_file_infos.file_not_found.error FIXME: NOT FOUND IN TRANSLATIONS FILE", post.Id, filename, path, err), mlog.String("post_id", post.Id)) + mlog.Error( + fmt.Sprintf("File not found when migrating post to use FileInfos, err=%v", err), + mlog.String("post_id", post.Id), + mlog.String("filename", filename), + mlog.String("path", path), + ) return nil } else { var err *model.AppError info, err = model.GetInfoForBytes(name, data) if err != nil { - mlog.Warn(fmt.Sprintf("Unable to fully decode file info when migrating post to use FileInfos, post_id=%v, filename=%v, err=%v", post.Id, filename, err), mlog.String("post_id", post.Id)) + mlog.Warn( + fmt.Sprintf("Unable to fully decode file info when migrating post to use FileInfos, err=%v", err), + mlog.String("post_id", post.Id), + mlog.String("filename", filename), + ) } } @@ -151,7 +166,7 @@ func (a *App) FindTeamIdForFilename(post *model.Post, filename string) string { // This post is in a direct channel so we need to figure out what team the files are stored under. if result := <-a.Srv.Store.Team().GetTeamsByUserId(post.UserId); result.Err != nil { - mlog.Error(fmt.Sprintf("Unable to get teams when migrating post to use FileInfos, post_id=%v, err=%v", post.Id, result.Err), mlog.String("post_id", post.Id)) + mlog.Error(fmt.Sprintf("Unable to get teams when migrating post to use FileInfo, err=%v", result.Err), mlog.String("post_id", post.Id)) } else if teams := result.Data.([]*model.Team); len(teams) == 1 { // The user has only one team so the post must've been sent from it return teams[0].Id @@ -173,7 +188,7 @@ var fileMigrationLock sync.Mutex // Creates and stores FileInfos for a post created before the FileInfos table existed. func (a *App) MigrateFilenamesToFileInfos(post *model.Post) []*model.FileInfo { if len(post.Filenames) == 0 { - mlog.Warn(fmt.Sprintf("Unable to migrate post to use FileInfos with an empty Filenames field, post_id=%v", post.Id), mlog.String("post_id", post.Id)) + mlog.Warn("Unable to migrate post to use FileInfos with an empty Filenames field", mlog.String("post_id", post.Id)) return []*model.FileInfo{} } @@ -184,7 +199,11 @@ func (a *App) MigrateFilenamesToFileInfos(post *model.Post) []*model.FileInfo { var channel *model.Channel if result := <-cchan; result.Err != nil { - mlog.Error(fmt.Sprintf("Unable to get channel when migrating post to use FileInfos, post_id=%v, channel_id=%v, err=%v", post.Id, post.ChannelId, result.Err), mlog.String("post_id", post.Id)) + mlog.Error( + fmt.Sprintf("Unable to get channel when migrating post to use FileInfos, err=%v", result.Err), + mlog.String("post_id", post.Id), + mlog.String("channel_id", post.ChannelId), + ) return []*model.FileInfo{} } else { channel = result.Data.(*model.Channel) @@ -202,7 +221,10 @@ func (a *App) MigrateFilenamesToFileInfos(post *model.Post) []*model.FileInfo { // Create FileInfo objects for this post infos := make([]*model.FileInfo, 0, len(filenames)) if teamId == "" { - mlog.Error(fmt.Sprint("api.file.migrate_filenames_to_file_infos.team_id.error FIXME: NOT FOUND IN TRANSLATIONS FILE", post.Id, filenames), mlog.String("post_id", post.Id)) + mlog.Error( + fmt.Sprintf("Unable to find team id for files when migrating post to use FileInfos, filenames=%v", filenames), + mlog.String("post_id", post.Id), + ) } else { for _, filename := range filenames { info := a.GetInfoForFilename(post, teamId, filename) @@ -219,26 +241,31 @@ func (a *App) MigrateFilenamesToFileInfos(post *model.Post) []*model.FileInfo { defer fileMigrationLock.Unlock() if result := <-a.Srv.Store.Post().Get(post.Id); result.Err != nil { - mlog.Error(fmt.Sprint("api.file.migrate_filenames_to_file_infos.get_post_again.app_error FIXME: NOT FOUND IN TRANSLATIONS FILE", post.Id, result.Err), mlog.String("post_id", post.Id)) + mlog.Error(fmt.Sprintf("Unable to get post when migrating post to use FileInfos, err=%v", result.Err), mlog.String("post_id", post.Id)) return []*model.FileInfo{} } else if newPost := result.Data.(*model.PostList).Posts[post.Id]; len(newPost.Filenames) != len(post.Filenames) { // Another thread has already created FileInfos for this post, so just return those if result := <-a.Srv.Store.FileInfo().GetForPost(post.Id, true, false); result.Err != nil { - mlog.Error(fmt.Sprint("api.file.migrate_filenames_to_file_infos.get_post_file_infos_again.app_error FIXME: NOT FOUND IN TRANSLATIONS FILE", post.Id, result.Err), mlog.String("post_id", post.Id)) + mlog.Error(fmt.Sprintf("Unable to get FileInfos for migrated post, err=%v", result.Err), mlog.String("post_id", post.Id)) return []*model.FileInfo{} } else { - mlog.Debug(fmt.Sprintf("Post already migrated to use FileInfos, post_id=%v", post.Id), mlog.String("post_id", post.Id)) + mlog.Debug("Post already migrated to use FileInfos", mlog.String("post_id", post.Id)) return result.Data.([]*model.FileInfo) } } - mlog.Debug(fmt.Sprintf("Migrating post to use FileInfos, post_id=%v", post.Id), mlog.String("post_id", post.Id)) + mlog.Debug("Migrating post to use FileInfos", mlog.String("post_id", post.Id)) savedInfos := make([]*model.FileInfo, 0, len(infos)) fileIds := make([]string, 0, len(filenames)) for _, info := range infos { if result := <-a.Srv.Store.FileInfo().Save(info); result.Err != nil { - mlog.Error(fmt.Sprint("api.file.migrate_filenames_to_file_infos.save_file_info.app_error FIXME: NOT FOUND IN TRANSLATIONS FILE", post.Id, info.Id, info.Path, result.Err), mlog.String("post_id", post.Id)) + mlog.Error( + fmt.Sprintf("Unable to save file info when migrating post to use FileInfos, err=%v", result.Err), + mlog.String("post_id", post.Id), + mlog.String("file_info_id", info.Id), + mlog.String("file_info_path", info.Path), + ) continue } @@ -255,7 +282,7 @@ func (a *App) MigrateFilenamesToFileInfos(post *model.Post) []*model.FileInfo { // Update Posts to clear Filenames and set FileIds if result := <-a.Srv.Store.Post().Update(newPost, post); result.Err != nil { - mlog.Error(fmt.Sprint("api.file.migrate_filenames_to_file_infos.save_post.app_error FIXME: NOT FOUND IN TRANSLATIONS FILE", post.Id, newPost.FileIds, post.Filenames, result.Err), mlog.String("post_id", post.Id)) + mlog.Error(fmt.Sprintf("Unable to save migrated post when migrating to use FileInfos, new_file_ids=%v, old_filenames=%v, err=%v", newPost.FileIds, post.Filenames, result.Err), mlog.String("post_id", post.Id)) return []*model.FileInfo{} } else { return savedInfos @@ -522,12 +549,12 @@ func (a *App) generatePreviewImage(img image.Image, previewPath string, width in buf := new(bytes.Buffer) if err := jpeg.Encode(buf, preview, &jpeg.Options{Quality: 90}); err != nil { - mlog.Error(fmt.Sprintf("Unable to encode image as preview jpg path=%v err=%v", previewPath, err)) + mlog.Error(fmt.Sprintf("Unable to encode image as preview jpg err=%v", err), mlog.String("path", previewPath)) return } if err := a.WriteFile(buf.Bytes(), previewPath); err != nil { - mlog.Error(fmt.Sprintf("Unable to upload preview path=%v err=%v", previewPath, err)) + mlog.Error(fmt.Sprintf("Unable to upload preview err=%v", err), mlog.String("path", previewPath)) return } } -- cgit v1.2.3-1-g7c22