1 files changed, 39 insertions, 0 deletions
diff --git a/cmd/mattermost/commands/userargs.go b/cmd/mattermost/commands/userargs.go
new file mode 100644
index 000000000..ddeed6460
--- /dev/null
+++ b/cmd/mattermost/commands/userargs.go
@@ -0,0 +1,39 @@
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package commands
+
+import (
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+)
+
+func getUsersFromUserArgs(a *app.App, userArgs []string) []*model.User {
+	users := make([]*model.User, 0, len(userArgs))
+	for _, userArg := range userArgs {
+		user := getUserFromUserArg(a, userArg)
+		users = append(users, user)
+	}
+	return users
+}
+
+func getUserFromUserArg(a *app.App, userArg string) *model.User {
+	var user *model.User
+	if result := <-a.Srv.Store.User().GetByEmail(userArg); result.Err == nil {
+		user = result.Data.(*model.User)
+	}
+
+	if user == nil {
+		if result := <-a.Srv.Store.User().GetByUsername(userArg); result.Err == nil {
+			user = result.Data.(*model.User)
+		}
+	}
+
+	if user == nil {
+		if result := <-a.Srv.Store.User().Get(userArg); result.Err == nil {
+			user = result.Data.(*model.User)
+		}
+	}
+
+	return user
+}