diff options
Diffstat (limited to 'internal/gtsmodel')
| -rw-r--r-- | internal/gtsmodel/account.go | 17 | ||||
| -rw-r--r-- | internal/gtsmodel/move.go | 38 |
2 files changed, 54 insertions, 1 deletions
diff --git a/internal/gtsmodel/account.go b/internal/gtsmodel/account.go index 5421c41bb..8b1412255 100644 --- a/internal/gtsmodel/account.go +++ b/internal/gtsmodel/account.go @@ -23,6 +23,7 @@ package gtsmodel import ( "crypto/rsa" + "slices" "strings" "time" @@ -54,8 +55,10 @@ type Account struct { Memorial *bool `bun:",default:false"` // Is this a memorial account, ie., has the user passed away? AlsoKnownAsURIs []string `bun:"also_known_as_uris,array"` // This account is associated with these account URIs. AlsoKnownAs []*Account `bun:"-"` // This account is associated with these accounts (field not stored in the db). - MovedToURI string `bun:",nullzero"` // This account has moved to this account URI. + MovedToURI string `bun:",nullzero"` // This account has (or claims to have) moved to this account URI. Even if this field is set the move may not yet have been processed. Check `move` for this. MovedTo *Account `bun:"-"` // This account has moved to this account (field not stored in the db). + MoveID string `bun:""` // ID of a Move in the database for this account. Only set if we received or created a Move activity for which this account URI was the origin. + Move *Move `bun:"-"` // Move corresponding to MoveID, if set. Bot *bool `bun:",default:false"` // Does this account identify itself as a bot? Reason string `bun:""` // What reason was given for signing up when this account was created? Locked *bool `bun:",default:true"` // Does this account need an approval for new followers? @@ -172,6 +175,18 @@ func (a *Account) PubKeyExpired() bool { a.PublicKeyExpiresAt.Before(time.Now()) } +// IsAliasedTo returns true if account +// is aliased to the given account URI. +func (a *Account) IsAliasedTo(uri string) bool { + return slices.Contains(a.AlsoKnownAsURIs, uri) +} + +// IsSuspended returns true if account +// has been suspended from this instance. +func (a *Account) IsSuspended() bool { + return !a.SuspendedAt.IsZero() +} + // AccountToEmoji is an intermediate struct to facilitate the many2many relationship between an account and one or more emojis. type AccountToEmoji struct { AccountID string `bun:"type:CHAR(26),unique:accountemoji,nullzero,notnull"` diff --git a/internal/gtsmodel/move.go b/internal/gtsmodel/move.go new file mode 100644 index 000000000..c8b803822 --- /dev/null +++ b/internal/gtsmodel/move.go @@ -0,0 +1,38 @@ +// 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 ( + "net/url" + "time" +) + +// Move represents an ActivityPub "Move" activity +// received (or created) by this instance. +type Move 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. + AttemptedAt time.Time `bun:"type:timestamptz,nullzero"` // When was processing of the Move to TargetURI last attempted by our instance (zero if not yet attempted). + SucceededAt time.Time `bun:"type:timestamptz,nullzero"` // When did the processing of the Move to TargetURI succeed according to our criteria (zero if not yet complete). + OriginURI string `bun:",nullzero,notnull,unique:moveorigintarget"` // OriginURI of the Move. Ie., the Move Object. + Origin *url.URL `bun:"-"` // URL corresponding to OriginURI. Not stored in the database. + TargetURI string `bun:",nullzero,notnull,unique:moveorigintarget"` // TargetURI of the Move. Ie., the Move Target. + Target *url.URL `bun:"-"` // URL corresponding to TargetURI. Not stored in the database. + URI string `bun:",nullzero,notnull,unique"` // ActivityPub ID/URI of the Move Activity itself. +} |