merging

4 files changed, 19 insertions, 5 deletions

diff --git a/model/channel.go b/model/channel.go
index b46f79f75..7d8edeee7 100644
--- a/model/channel.go
+++ b/model/channel.go
@@ -117,3 +117,6 @@ func (o *Channel) PreUpdate() {
 func (o *Channel) ExtraUpdated() {
 	o.ExtraUpdateAt = GetMillis()
 }
+
+func (o *Channel) PreExport() {
+}
diff --git a/model/post.go b/model/post.go
index 0c035d4e7..e78469940 100644
--- a/model/post.go
+++ b/model/post.go
@@ -147,3 +147,6 @@ func (o *Post) AddProp(key string, value string) {
 
 	o.Props[key] = value
 }
+
+func (o *Post) PreExport() {
+}
diff --git a/model/team.go b/model/team.go
index 95e2757c8..6006f738c 100644
--- a/model/team.go
+++ b/model/team.go
@@ -197,3 +197,6 @@ func CleanTeamName(s string) string {
 
 	return s
 }
+
+func (o *Team) PreExport() {
+}
diff --git a/model/user.go b/model/user.go
index 9cec37ac6..1a169f763 100644
--- a/model/user.go
+++ b/model/user.go
@@ -317,6 +317,16 @@ func IsInRole(userRoles string, inRole string) bool {
 	return false
 }
 
+func (u *User) PreExport() {
+	u.Password = ""
+	u.AuthData = ""
+	u.LastActivityAt = 0
+	u.LastPingAt = 0
+	u.LastPasswordUpdate = 0
+	u.LastPictureUpdate = 0
+	u.FailedAttempts = 0
+}
+
 // UserFromJson will decode the input and return a User
 func UserFromJson(data io.Reader) *User {
 	decoder := json.NewDecoder(data)
@@ -370,11 +380,6 @@ func ComparePassword(hash string, password string) bool {
 	return err == nil
 }
 
-func IsUsernameValid(username string) bool {
-
-	return true
-}
-
 var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
 
 var restrictedUsernames = []string{