|
|
|
@ -117,15 +117,19 @@ func groupNotification(contentType int32, m proto.Message, sendID, groupID, recv
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tips.JsonDetail, _ = marshaler.MarshalToString(m)
|
|
|
|
|
|
|
|
|
|
from, err := imdb.GetUserByUserID(sendID)
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.Error(operationID, "GetUserByUserID failed ", err.Error(), sendID)
|
|
|
|
|
}
|
|
|
|
|
nickname := ""
|
|
|
|
|
if from != nil {
|
|
|
|
|
nickname = from.Nickname
|
|
|
|
|
var nickname string
|
|
|
|
|
if utils.IsContain(sendID, config.Config.Manager.AppManagerUid) {
|
|
|
|
|
nickname = sendID
|
|
|
|
|
} else {
|
|
|
|
|
from, err := imdb.GetUserByUserID(sendID)
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.Error(operationID, "GetUserByUserID failed ", err.Error(), sendID)
|
|
|
|
|
}
|
|
|
|
|
if from != nil {
|
|
|
|
|
nickname = from.Nickname
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
to, err := imdb.GetUserByUserID(recvUserID)
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.NewWarn(operationID, "GetUserByUserID failed ", err.Error(), recvUserID)
|
|
|
|
|