diff options
author | 2023-07-29 03:49:14 -0700 | |
---|---|---|
committer | 2023-07-29 12:49:14 +0200 | |
commit | b874e9251e00961f295e4c409e1b34da89fab4ed (patch) | |
tree | cb528816250f322707a90c0954c963886ea96c19 /internal/processing/markers | |
parent | [chore] Update activity dependency (#2031) (diff) | |
download | gotosocial-b874e9251e00961f295e4c409e1b34da89fab4ed.tar.xz |
[feature] Implement markers API (#1989)
* Implement markers API
Fixes #1856
* Correct import grouping in markers files
* Regenerate Swagger for markers API
* Shorten names for readability
* Cache markers for 6 hours
* Update DB ref
* Update envparsing.sh
Diffstat (limited to 'internal/processing/markers')
-rw-r--r-- | internal/processing/markers/get.go | 54 | ||||
-rw-r--r-- | internal/processing/markers/markers.go | 35 | ||||
-rw-r--r-- | internal/processing/markers/update.go | 48 |
3 files changed, 137 insertions, 0 deletions
diff --git a/internal/processing/markers/get.go b/internal/processing/markers/get.go new file mode 100644 index 000000000..dd94376f1 --- /dev/null +++ b/internal/processing/markers/get.go @@ -0,0 +1,54 @@ +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. + +package markers + +import ( + "context" + "errors" + "fmt" + + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/typeutils" +) + +// Get returns an API model for the markers of the requested timelines. +// If a timeline marker hasn't been set yet, it's not included in the response. +func (p *Processor) Get(ctx context.Context, account *gtsmodel.Account, names []apimodel.MarkerName) (*apimodel.Marker, gtserror.WithCode) { + markers := make([]*gtsmodel.Marker, 0, len(names)) + for _, name := range names { + marker, err := p.state.DB.GetMarker(ctx, account.ID, typeutils.APIMarkerNameToMarkerName(name)) + if err != nil { + if errors.Is(err, db.ErrNoEntries) { + continue + } + // Real database error. + return nil, gtserror.NewErrorInternalError(err) + } + markers = append(markers, marker) + } + + apiMarker, err := p.tc.MarkersToAPIMarker(ctx, markers) + if err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting marker to api: %w", err)) + } + + return apiMarker, nil +} diff --git a/internal/processing/markers/markers.go b/internal/processing/markers/markers.go new file mode 100644 index 000000000..7a1215241 --- /dev/null +++ b/internal/processing/markers/markers.go @@ -0,0 +1,35 @@ +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. + +package markers + +import ( + "github.com/superseriousbusiness/gotosocial/internal/state" + "github.com/superseriousbusiness/gotosocial/internal/typeutils" +) + +type Processor struct { + state *state.State + tc typeutils.TypeConverter +} + +func New(state *state.State, tc typeutils.TypeConverter) Processor { + return Processor{ + state: state, + tc: tc, + } +} diff --git a/internal/processing/markers/update.go b/internal/processing/markers/update.go new file mode 100644 index 000000000..96eb17833 --- /dev/null +++ b/internal/processing/markers/update.go @@ -0,0 +1,48 @@ +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. + +package markers + +import ( + "context" + "errors" + "fmt" + + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +) + +// Update updates the given markers and returns an API model for them. +func (p *Processor) Update(ctx context.Context, markers []*gtsmodel.Marker) (*apimodel.Marker, gtserror.WithCode) { + for _, marker := range markers { + if err := p.state.DB.UpdateMarker(ctx, marker); err != nil { + if errors.Is(err, db.ErrAlreadyExists) { + return nil, gtserror.NewErrorConflict(err, "marker updated by another client") + } + return nil, gtserror.NewErrorInternalError(err) + } + } + + apiMarker, err := p.tc.MarkersToAPIMarker(ctx, markers) + if err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting marker to api: %w", err)) + } + + return apiMarker, nil +} |