Simplify thread_store/GetThreadForUser (#21588)

Этот коммит содержится в:
Shota Gvinepadze
2022-11-09 12:16:20 +04:00
коммит произвёл GitHub
родитель 534a9bcbf0
Коммит b9d00a1f28
17 изменённых файлов: 36 добавлений и 41 удалений

Просмотреть файл

@@ -2468,8 +2468,8 @@ func (a *App) GetThreadMembershipForUser(userId, threadId string) (*model.Thread
return threadMembership, nil
}
func (a *App) GetThreadForUser(teamID string, threadMembership *model.ThreadMembership, extended bool) (*model.ThreadResponse, *model.AppError) {
thread, err := a.Srv().Store().Thread().GetThreadForUser(teamID, threadMembership, extended)
func (a *App) GetThreadForUser(threadMembership *model.ThreadMembership, extended bool) (*model.ThreadResponse, *model.AppError) {
thread, err := a.Srv().Store().Thread().GetThreadForUser(threadMembership, extended)
if err != nil {
return nil, model.NewAppError("GetThreadForUser", "app.user.get_threads_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
}
@@ -2551,7 +2551,7 @@ func (a *App) UpdateThreadFollowForUserFromChannelAdd(c request.CTX, userID, tea
}
message := model.NewWebSocketEvent(model.WebsocketEventThreadUpdated, teamID, "", userID, nil, "")
userThread, err := a.Srv().Store().Thread().GetThreadForUser(teamID, tm, true)
userThread, err := a.Srv().Store().Thread().GetThreadForUser(tm, true)
if err != nil {
var errNotFound *store.ErrNotFound
@@ -2633,7 +2633,7 @@ func (a *App) UpdateThreadReadForUser(c request.CTX, currentSessionId, userID, t
if nErr != nil {
return nil, model.NewAppError("UpdateThreadReadForUser", "app.user.update_thread_read_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
}
thread, err := a.GetThreadForUser(teamID, membership, false)
thread, err := a.GetThreadForUser(membership, false)
if err != nil {
return nil, err
}