|
@@ -50,7 +50,7 @@ func (h *ClientsManager) Run() { |
|
|
} |
|
|
} |
|
|
case message := <-models.ActionChan: |
|
|
case message := <-models.ActionChan: |
|
|
if isInOpTypes(opTypes, message.OpType) { |
|
|
if isInOpTypes(opTypes, message.OpType) { |
|
|
message.Comment = nil |
|
|
|
|
|
|
|
|
filterUserPrivateInfo(message) |
|
|
LastActionsQueue.Push(message) |
|
|
LastActionsQueue.Push(message) |
|
|
for _, client := range h.Clients.Keys() { |
|
|
for _, client := range h.Clients.Keys() { |
|
|
select { |
|
|
select { |
|
@@ -95,6 +95,7 @@ func initActionQueue() { |
|
|
user, err := models.GetUserByID(actions[i].UserID) |
|
|
user, err := models.GetUserByID(actions[i].UserID) |
|
|
if err == nil { |
|
|
if err == nil { |
|
|
if !user.IsOrganization() { |
|
|
if !user.IsOrganization() { |
|
|
|
|
|
filterUserPrivateInfo(actions[i]) |
|
|
LastActionsQueue.Push(actions[i]) |
|
|
LastActionsQueue.Push(actions[i]) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@@ -103,3 +104,19 @@ func initActionQueue() { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func filterUserPrivateInfo(action *models.Action) { |
|
|
|
|
|
action.Comment = nil |
|
|
|
|
|
action.ActUser.Email = "" |
|
|
|
|
|
action.ActUser.Passwd = "" |
|
|
|
|
|
action.ActUser.PasswdHashAlgo = "" |
|
|
|
|
|
action.ActUser.PrivateKey = "" |
|
|
|
|
|
action.ActUser.PublicKey = "" |
|
|
|
|
|
action.ActUser.Salt = "" |
|
|
|
|
|
action.ActUser.FullName = "" |
|
|
|
|
|
action.ActUser.AvatarEmail = "" |
|
|
|
|
|
action.ActUser.IsAdmin = false |
|
|
|
|
|
action.ActUser.EmailNotificationsPreference = "" |
|
|
|
|
|
action.ActUser.IsOperator = false |
|
|
|
|
|
|
|
|
|
|
|
} |