diff options
author | 2023-08-19 14:33:15 +0200 | |
---|---|---|
committer | 2023-08-19 14:33:15 +0200 | |
commit | 92de8fb396265d057f18aab4de0bc8aff4b90188 (patch) | |
tree | 46438b9ff550261f56aa58d038cdf2f1e15493e3 /internal/gtsmodel | |
parent | [bugfix] fix double firing bun.DB query hooks (#2124) (diff) | |
download | gotosocial-92de8fb396265d057f18aab4de0bc8aff4b90188.tar.xz |
[feature] Instance rules (#2125)
* init instance rules database model, admin api
* expose instance rules in public instance api
* public /api/v1/instance/rules route
* GET ruleById
* createRule route
* createRule auth check
* updateRule
* deleteRule
* list rules on about page
* ruleGet auth
* add about page ids for anchors
* process and store adding violated rules to reports
* admin api models for instance rules
* instance rule edit frontend
* change rule inputs to textareas
* database fixes after rebase (#2124)
* remove unused imports
* fix db migration column name
* fix tests
* fix more tests
* fix postgres error with wrongly used Ident
* add some tests, fiddle with rule model a bit, fix postgres migration
* swagger docs
---------
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/gtsmodel')
-rw-r--r-- | internal/gtsmodel/instance.go | 1 | ||||
-rw-r--r-- | internal/gtsmodel/report.go | 2 | ||||
-rw-r--r-- | internal/gtsmodel/rule.go | 30 |
3 files changed, 33 insertions, 0 deletions
diff --git a/internal/gtsmodel/instance.go b/internal/gtsmodel/instance.go index 388f0f4ed..6d572f519 100644 --- a/internal/gtsmodel/instance.go +++ b/internal/gtsmodel/instance.go @@ -39,4 +39,5 @@ type Instance struct { ContactAccount *Account `bun:"rel:belongs-to"` // account corresponding to contactAccountID Reputation int64 `bun:",notnull,default:0"` // Reputation score of this instance Version string `bun:",nullzero"` // Version of the software used on this instance + Rules []Rule `bun:"-"` // List of instance rules } diff --git a/internal/gtsmodel/report.go b/internal/gtsmodel/report.go index e5b942563..b332ec348 100644 --- a/internal/gtsmodel/report.go +++ b/internal/gtsmodel/report.go @@ -37,6 +37,8 @@ type Report struct { Comment string `bun:",nullzero"` // comment / explanation for this report, by the reporter StatusIDs []string `bun:"statuses,array"` // database IDs of any statuses referenced by this report Statuses []*Status `bun:"-"` // statuses corresponding to StatusIDs + RuleIDs []string `bun:"rules,array"` // database IDs of any rules referenced by this report + Rules []*Rule `bun:"-"` // rules corresponding to RuleIDs Forwarded *bool `bun:",nullzero,notnull,default:false"` // flag to indicate report should be forwarded to remote instance ActionTaken string `bun:",nullzero"` // string description of what action was taken in response to this report ActionTakenAt time.Time `bun:"type:timestamptz,nullzero"` // time at which action was taken, if any diff --git a/internal/gtsmodel/rule.go b/internal/gtsmodel/rule.go new file mode 100644 index 000000000..76fa6f7bd --- /dev/null +++ b/internal/gtsmodel/rule.go @@ -0,0 +1,30 @@ +// 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 gtsmodel + +import "time" + +// Rule models an instance rule set by the admin +type Rule struct { + ID string `bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database + CreatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item created + UpdatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item last updated + Text string `bun:",nullzero"` // text content of the rule + Order *uint `bun:",nullzero,notnull,unique"` // rule ordering, index from 0 + Deleted *bool `bun:",nullzero,notnull,default:false"` // has this rule been deleted, still kept in database for reference in historic reports +} |