IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining references to model.NewXX (#28678)

Browse Source 
And we remove the deprecated functions to force uses
only of the new function.
```release-note
NONE
```
This commit is contained in:
Agniva De Sarker 2024-10-10 22:15:22 +05:30 committed by GitHub
parent 3db139f746
commit a258fd80b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
server/channels/app/import_functions_test.go
View File

@ -3350,7 +3350,7 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
}, },
Header: ptrStr("Channel Header"), Header: ptrStr("Channel Header"),
@ -3371,10 +3371,10 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
}, },
}) })
@ -3394,13 +3394,13 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
}, },
}) })
@ -3420,7 +3420,7 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
}, },
}) })
@ -3440,10 +3440,10 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
}, },
}) })
@ -3485,16 +3485,16 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
{ {
Username: model.NewString(user3.Username), Username: model.NewPointer(user3.Username),
}, },
{ {
Username: model.NewString(model.NewId()), Username: model.NewPointer(model.NewId()),
}, },
}, },
}) })
@ -3514,13 +3514,13 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
{ {
Username: model.NewString(user3.Username), Username: model.NewPointer(user3.Username),
}, },
}, },
}) })
@ -3567,10 +3567,10 @@ func TestImportImportDirectChannel(t *testing.T) {
dataset := generateDataset(imports.DirectChannelImportData{ dataset := generateDataset(imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
}, },
}) })
@ -3596,11 +3596,11 @@ func TestImportImportDirectChannel(t *testing.T) {
data := imports.DirectChannelImportData{ data := imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
LastViewedAt: ptrInt64(lastView), LastViewedAt: ptrInt64(lastView),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
}, },
} }
@ -3626,10 +3626,10 @@ func TestImportImportDirectChannel(t *testing.T) {
data := imports.DirectChannelImportData{ data := imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
}, },
ShownBy: &[]string{ ShownBy: &[]string{
@ -3658,13 +3658,13 @@ func TestImportImportDirectChannel(t *testing.T) {
data := imports.DirectChannelImportData{ data := imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
{ {
Username: model.NewString(user3.Username), Username: model.NewPointer(user3.Username),
}, },
}, },
ShownBy: &[]string{ ShownBy: &[]string{
@ -3698,10 +3698,10 @@ func TestImportImportDirectPost(t *testing.T) {
channelData := imports.DirectChannelImportData{ channelData := imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
}, },
} }
@ -4161,13 +4161,13 @@ func TestImportImportDirectPost(t *testing.T) {
channelData = imports.DirectChannelImportData{ channelData = imports.DirectChannelImportData{
Participants: []*imports.DirectChannelMemberImportData{ Participants: []*imports.DirectChannelMemberImportData{
{ {
Username: model.NewString(th.BasicUser.Username), Username: model.NewPointer(th.BasicUser.Username),
}, },
{ {
Username: model.NewString(th.BasicUser2.Username), Username: model.NewPointer(th.BasicUser2.Username),
}, },
{ {
Username: model.NewString(user3.Username), Username: model.NewPointer(user3.Username),
}, },
}, },
} }

2
server/cmd/mmctl/commands/sampledata_util.go
View File

@ -398,7 +398,7 @@ func createDirectChannel(members []string) imports.LineImportData {
for _, m := range members { for _, m := range members {
p = append(p, &imports.DirectChannelMemberImportData{ p = append(p, &imports.DirectChannelMemberImportData{
Username: model.NewString(m), Username: model.NewPointer(m),
}) })
} }

6
server/public/model/builtin.go
View File

@ -3,12 +3,6 @@
package model package model
// These functions are deprecated. Please use only NewPointer.
func NewBool(b bool) *bool { return &b }
func NewInt(n int) *int { return &n }
func NewInt64(n int64) *int64 { return &n }
func NewString(s string) *string { return &s }
// NewPointer returns a pointer to the object passed. // NewPointer returns a pointer to the object passed.
func NewPointer[T any](t T) *T { return &t } func NewPointer[T any](t T) *T { return &t }

4
server/public/model/config.go
View File

@ -808,7 +808,7 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
} }
if s.EnableAPIPostDeletion == nil { if s.EnableAPIPostDeletion == nil {
s.EnableAPIPostDeletion = NewBool(false) s.EnableAPIPostDeletion = NewPointer(false)
} }
if s.EnableAPIChannelDeletion == nil { if s.EnableAPIChannelDeletion == nil {
@ -1141,7 +1141,7 @@ func (s *ExperimentalSettings) SetDefaults() {
} }
if s.YoutubeReferrerPolicy == nil { if s.YoutubeReferrerPolicy == nil {
s.YoutubeReferrerPolicy = NewBool(false) s.YoutubeReferrerPolicy = NewPointer(false)
} }
} }