[feature] User muting (#2960)

* User muting

* Address review feedback

* Rename uniqueness constraint on user_mutes to match convention

* Remove unused account_id from where clause

* Add UserMute to NewTestDB

* Update test/envparsing.sh with new and fixed cache stuff

* Address tobi's review comments

* Make compiledUserMuteListEntry.expired consistent with UserMute.Expired

* Make sure mute_expires_at is serialized as an explicit null for indefinite mutes

---------

Co-authored-by: tobi <tobi.smethurst@protonmail.com>

2 files changed, 45 insertions, 3 deletions

diff --git a/internal/api/model/account.go b/internal/api/model/account.go
index a2f7b46b6..b3a92d36f 100644
--- a/internal/api/model/account.go
+++ b/internal/api/model/account.go
@@ -86,9 +86,6 @@ type Account struct {
 	Fields []Field `json:"fields"`
 	// Account has been suspended by our instance.
 	Suspended bool `json:"suspended,omitempty"`
-	// If this account has been muted, when will the mute expire (ISO 8601 Datetime).
-	// example: 2021-07-30T09:20:25+00:00
-	MuteExpiresAt string `json:"mute_expires_at,omitempty"`
 	// Extra profile information. Shown only if the requester owns the account being requested.
 	Source *Source `json:"source,omitempty"`
 	// Filename of user-selected CSS theme to include when rendering this account's profile or statuses. Eg., `blurple-light.css`.
@@ -109,6 +106,17 @@ type Account struct {
 	Moved *Account `json:"moved,omitempty"`
 }
 
+// MutedAccount extends Account with a field used only by the muted user list.
+//
+// swagger:model mutedAccount
+type MutedAccount struct {
+	Account
+	// If this account has been muted, when will the mute expire (ISO 8601 Datetime).
+	// If the mute is indefinite, this will be null.
+	// example: 2021-07-30T09:20:25+00:00
+	MuteExpiresAt *string `json:"mute_expires_at"`
+}
+
 // AccountCreateRequest models account creation parameters.
 //
 // swagger:parameters accountCreate
diff --git a/internal/api/model/usermute.go b/internal/api/model/usermute.go
new file mode 100644
index 000000000..138f837db
--- /dev/null
+++ b/internal/api/model/usermute.go
@@ -0,0 +1,34 @@
+// 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 model
+
+// UserMuteCreateUpdateRequest captures params for creating or updating a user mute.
+//
+// swagger:ignore
+type UserMuteCreateUpdateRequest struct {
+	// Should the mute apply to notifications from that user?
+	//
+	// Example: true
+	Notifications *bool `form:"notifications" json:"notifications" xml:"notifications"`
+	// Number of seconds from now that the mute should expire. If omitted or 0, mute never expires.
+	Duration *int `json:"-" form:"duration" xml:"duration"`
+	// Number of seconds from now that the mute should expire. If omitted or 0, mute never expires.
+	//
+	// Example: 86400
+	DurationI interface{} `json:"duration"`
+}