коммит произвёл
GitHub
родитель
f290745496
Коммит
c3ed07e679
@@ -153,7 +153,7 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64
|
||||
// we have to fill in the join/leave times, because that data doesn't exist in the channel members table
|
||||
for _, channelMemberHistory := range histories {
|
||||
channelMemberHistory.JoinTime = startTime
|
||||
channelMemberHistory.LeaveTime = model.NewInt64(endTime)
|
||||
channelMemberHistory.LeaveTime = model.NewPointer(endTime)
|
||||
}
|
||||
return histories, nil
|
||||
}
|
||||
|
||||
@@ -593,7 +593,7 @@ func (s SqlChannelStore) CreateDirectChannel(rctx request.CTX, user *model.User,
|
||||
|
||||
channel.Header = ""
|
||||
channel.Type = model.ChannelTypeDirect
|
||||
channel.Shared = model.NewBool(user.IsRemote() || otherUser.IsRemote())
|
||||
channel.Shared = model.NewPointer(user.IsRemote() || otherUser.IsRemote())
|
||||
channel.CreatorId = user.Id
|
||||
|
||||
cm1 := &model.ChannelMember{
|
||||
|
||||
@@ -1157,7 +1157,7 @@ type groupWithSchemeAdmin struct {
|
||||
|
||||
func (g groupWithSchemeAdmin) ToModel() *model.GroupWithSchemeAdmin {
|
||||
if g.SyncableSchemeAdmin == nil {
|
||||
g.SyncableSchemeAdmin = model.NewBool(false)
|
||||
g.SyncableSchemeAdmin = model.NewPointer(false)
|
||||
}
|
||||
res := &model.GroupWithSchemeAdmin{
|
||||
Group: *g.group.ToModel(),
|
||||
|
||||
@@ -856,7 +856,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
|
||||
ChildId: &channel.Id,
|
||||
}, data.Records[0])
|
||||
require.Equal(t, model.OrphanedRecord{
|
||||
ParentId: model.NewString("test"),
|
||||
ParentId: model.NewPointer("test"),
|
||||
ChildId: &direct.Id,
|
||||
}, data.Records[1])
|
||||
dbmap.Exec(`DELETE FROM Channels WHERE Id=?`, channel.Id)
|
||||
|
||||
@@ -1156,7 +1156,7 @@ func (s *SqlPostStore) prepareThreadedResponse(posts []*postWithExtra, extended,
|
||||
processPost := func(p *postWithExtra) error {
|
||||
p.Post.ReplyCount = p.ThreadReplyCount
|
||||
if p.IsFollowing != nil {
|
||||
p.Post.IsFollowing = model.NewBool(*p.IsFollowing)
|
||||
p.Post.IsFollowing = model.NewPointer(*p.IsFollowing)
|
||||
}
|
||||
for _, userID := range p.ThreadParticipants {
|
||||
participant, ok := usersMap[userID]
|
||||
|
||||
@@ -462,7 +462,7 @@ func (s *SqlRetentionPolicyStore) GetChannels(policyId string, offset, limit int
|
||||
}
|
||||
|
||||
for _, channel := range channels {
|
||||
channel.PolicyID = model.NewString(policyId)
|
||||
channel.PolicyID = model.NewPointer(policyId)
|
||||
}
|
||||
|
||||
return channels, nil
|
||||
|
||||
@@ -537,8 +537,8 @@ func TestIsBinaryParamEnabled(t *testing.T) {
|
||||
{
|
||||
store: SqlStore{
|
||||
settings: &model.SqlSettings{
|
||||
DriverName: model.NewString(model.DatabaseDriverPostgres),
|
||||
DataSource: model.NewString("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable\u0026binary_parameters=yes"),
|
||||
DriverName: model.NewPointer(model.DatabaseDriverPostgres),
|
||||
DataSource: model.NewPointer("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable\u0026binary_parameters=yes"),
|
||||
},
|
||||
},
|
||||
expected: true,
|
||||
@@ -546,8 +546,8 @@ func TestIsBinaryParamEnabled(t *testing.T) {
|
||||
{
|
||||
store: SqlStore{
|
||||
settings: &model.SqlSettings{
|
||||
DriverName: model.NewString(model.DatabaseDriverMysql),
|
||||
DataSource: model.NewString("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable\u0026binary_parameters=yes"),
|
||||
DriverName: model.NewPointer(model.DatabaseDriverMysql),
|
||||
DataSource: model.NewPointer("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable\u0026binary_parameters=yes"),
|
||||
},
|
||||
},
|
||||
expected: false,
|
||||
@@ -555,8 +555,8 @@ func TestIsBinaryParamEnabled(t *testing.T) {
|
||||
{
|
||||
store: SqlStore{
|
||||
settings: &model.SqlSettings{
|
||||
DriverName: model.NewString(model.DatabaseDriverPostgres),
|
||||
DataSource: model.NewString("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable&binary_parameters=yes"),
|
||||
DriverName: model.NewPointer(model.DatabaseDriverPostgres),
|
||||
DataSource: model.NewPointer("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable&binary_parameters=yes"),
|
||||
},
|
||||
},
|
||||
expected: true,
|
||||
@@ -564,8 +564,8 @@ func TestIsBinaryParamEnabled(t *testing.T) {
|
||||
{
|
||||
store: SqlStore{
|
||||
settings: &model.SqlSettings{
|
||||
DriverName: model.NewString(model.DatabaseDriverPostgres),
|
||||
DataSource: model.NewString("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable"),
|
||||
DriverName: model.NewPointer(model.DatabaseDriverPostgres),
|
||||
DataSource: model.NewPointer("postgres://mmuser:mostest@localhost/loadtest?sslmode=disable"),
|
||||
},
|
||||
},
|
||||
expected: false,
|
||||
@@ -760,9 +760,9 @@ func TestReplicaLagQuery(t *testing.T) {
|
||||
}
|
||||
|
||||
settings.ReplicaLagSettings = []*model.ReplicaLagSettings{{
|
||||
DataSource: model.NewString(*settings.DataSource),
|
||||
QueryAbsoluteLag: model.NewString(query),
|
||||
QueryTimeLag: model.NewString(query),
|
||||
DataSource: model.NewPointer(*settings.DataSource),
|
||||
QueryAbsoluteLag: model.NewPointer(query),
|
||||
QueryTimeLag: model.NewPointer(query),
|
||||
}}
|
||||
|
||||
mockMetrics := &mocks.MetricsInterface{}
|
||||
|
||||
@@ -546,16 +546,16 @@ func (s SqlTeamStore) SearchAllPaged(opts *model.TeamSearch) ([]*model.Team, int
|
||||
// SearchOpen returns from the database a list of public teams that match the Name or DisplayName
|
||||
// passed as the term search parameter.
|
||||
func (s SqlTeamStore) SearchOpen(opts *model.TeamSearch) ([]*model.Team, error) {
|
||||
opts.TeamType = model.NewString("O")
|
||||
opts.AllowOpenInvite = model.NewBool(true)
|
||||
opts.TeamType = model.NewPointer("O")
|
||||
opts.AllowOpenInvite = model.NewPointer(true)
|
||||
return s.SearchAll(opts)
|
||||
}
|
||||
|
||||
// SearchPrivate returns from the database a list of private teams that match the Name or DisplayName
|
||||
// passed as the term search parameter.
|
||||
func (s SqlTeamStore) SearchPrivate(opts *model.TeamSearch) ([]*model.Team, error) {
|
||||
opts.TeamType = model.NewString("O")
|
||||
opts.AllowOpenInvite = model.NewBool(false)
|
||||
opts.TeamType = model.NewPointer("O")
|
||||
opts.AllowOpenInvite = model.NewPointer(false)
|
||||
return s.SearchAll(opts)
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user