mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[MM-28985] Remove pointers to slice (part 1) (#18034)

Просмотр исходного кода 
* Remove pointers to slice (part 1)

* Remove use of pointers to slice from model package (#18045)

* Fix after merge
Этот коммит содержится в:
Claudio Costa
2021-08-17 11:18:33 +02:00
коммит произвёл GitHub
родитель 132f114793
Коммит 04b27ce93c
64 изменённых файлов: 767 добавлений и 771 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
plugin/api.go
Просмотреть файл

@@ -525,14 +525,14 @@ type API interface {
// @tag Channel
// @tag User
// Minimum server version: 5.6
GetChannelMembers(channelId string, page, perPage int) (*model.ChannelMembers, *model.AppError)
GetChannelMembers(channelId string, page, perPage int) (model.ChannelMembers, *model.AppError)
// GetChannelMembersByIds gets a channel membership for a particular User
//
// @tag Channel
// @tag User
// Minimum server version: 5.6
GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError)
GetChannelMembersByIds(channelId string, userIds []string) (model.ChannelMembers, *model.AppError)
// GetChannelMembersForUser returns all channel memberships on a team for a user.
//

4
plugin/api_timer_layer_generated.go
Просмотреть файл

@@ -574,14 +574,14 @@ func (api *apiTimerLayer) GetChannelMember(channelId, userID string) (*model.Cha
return _returnsA, _returnsB
}
func (api *apiTimerLayer) GetChannelMembers(channelId string, page, perPage int) (*model.ChannelMembers, *model.AppError) {
func (api *apiTimerLayer) GetChannelMembers(channelId string, page, perPage int) (model.ChannelMembers, *model.AppError) {
startTime := timePkg.Now()
_returnsA, _returnsB := api.apiImpl.GetChannelMembers(channelId, page, perPage)
api.recordTime(startTime, "GetChannelMembers", _returnsB == nil)
return _returnsA, _returnsB
}
func (api *apiTimerLayer) GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) {
func (api *apiTimerLayer) GetChannelMembersByIds(channelId string, userIds []string) (model.ChannelMembers, *model.AppError) {
startTime := timePkg.Now()
_returnsA, _returnsB := api.apiImpl.GetChannelMembersByIds(channelId, userIds)
api.recordTime(startTime, "GetChannelMembersByIds", _returnsB == nil)

12
plugin/client_rpc_generated.go
Просмотреть файл

@@ -2828,11 +2828,11 @@ type Z_GetChannelMembersArgs struct {
}
type Z_GetChannelMembersReturns struct {
A *model.ChannelMembers
A model.ChannelMembers
B *model.AppError
}
func (g *apiRPCClient) GetChannelMembers(channelId string, page, perPage int) (*model.ChannelMembers, *model.AppError) {
func (g *apiRPCClient) GetChannelMembers(channelId string, page, perPage int) (model.ChannelMembers, *model.AppError) {
_args := &Z_GetChannelMembersArgs{channelId, page, perPage}
_returns := &Z_GetChannelMembersReturns{}
if err := g.client.Call("Plugin.GetChannelMembers", _args, _returns); err != nil {
@@ -2843,7 +2843,7 @@ func (g *apiRPCClient) GetChannelMembers(channelId string, page, perPage int) (*
func (s *apiRPCServer) GetChannelMembers(args *Z_GetChannelMembersArgs, returns *Z_GetChannelMembersReturns) error {
if hook, ok := s.impl.(interface {
GetChannelMembers(channelId string, page, perPage int) (*model.ChannelMembers, *model.AppError)
GetChannelMembers(channelId string, page, perPage int) (model.ChannelMembers, *model.AppError)
}); ok {
returns.A, returns.B = hook.GetChannelMembers(args.A, args.B, args.C)
} else {
@@ -2858,11 +2858,11 @@ type Z_GetChannelMembersByIdsArgs struct {
}
type Z_GetChannelMembersByIdsReturns struct {
A *model.ChannelMembers
A model.ChannelMembers
B *model.AppError
}
func (g *apiRPCClient) GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) {
func (g *apiRPCClient) GetChannelMembersByIds(channelId string, userIds []string) (model.ChannelMembers, *model.AppError) {
_args := &Z_GetChannelMembersByIdsArgs{channelId, userIds}
_returns := &Z_GetChannelMembersByIdsReturns{}
if err := g.client.Call("Plugin.GetChannelMembersByIds", _args, _returns); err != nil {
@@ -2873,7 +2873,7 @@ func (g *apiRPCClient) GetChannelMembersByIds(channelId string, userIds []string
func (s *apiRPCServer) GetChannelMembersByIds(args *Z_GetChannelMembersByIdsArgs, returns *Z_GetChannelMembersByIdsReturns) error {
if hook, ok := s.impl.(interface {
GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError)
GetChannelMembersByIds(channelId string, userIds []string) (model.ChannelMembers, *model.AppError)
}); ok {
returns.A, returns.B = hook.GetChannelMembersByIds(args.A, args.B)
} else {

16
plugin/plugintest/api.go
Просмотреть файл

@@ -790,15 +790,15 @@ func (_m *API) GetChannelMember(channelId string, userID string) (*model.Channel
}
// GetChannelMembers provides a mock function with given fields: channelId, page, perPage
func (_m *API) GetChannelMembers(channelId string, page int, perPage int) (*model.ChannelMembers, *model.AppError) {
func (_m *API) GetChannelMembers(channelId string, page int, perPage int) (model.ChannelMembers, *model.AppError) {
ret := _m.Called(channelId, page, perPage)
var r0 *model.ChannelMembers
if rf, ok := ret.Get(0).(func(string, int, int) *model.ChannelMembers); ok {
var r0 model.ChannelMembers
if rf, ok := ret.Get(0).(func(string, int, int) model.ChannelMembers); ok {
r0 = rf(channelId, page, perPage)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.ChannelMembers)
r0 = ret.Get(0).(model.ChannelMembers)
}
}
@@ -815,15 +815,15 @@ func (_m *API) GetChannelMembers(channelId string, page int, perPage int) (*mode
}
// GetChannelMembersByIds provides a mock function with given fields: channelId, userIds
func (_m *API) GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) {
func (_m *API) GetChannelMembersByIds(channelId string, userIds []string) (model.ChannelMembers, *model.AppError) {
ret := _m.Called(channelId, userIds)
var r0 *model.ChannelMembers
if rf, ok := ret.Get(0).(func(string, []string) *model.ChannelMembers); ok {
var r0 model.ChannelMembers
if rf, ok := ret.Get(0).(func(string, []string) model.ChannelMembers); ok {
r0 = rf(channelId, userIds)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.ChannelMembers)
r0 = ret.Get(0).(model.ChannelMembers)
}
}