mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-29 15:56:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

some very small fixups

Browse source
This commit is contained in:
kim 2025-01-30 07:56:55 +00:00
commit 8431326295
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/cleaner/emoji.go
View file

@ -104,13 +104,14 @@ func (e *Emoji) UncacheRemote(ctx context.Context, olderThan time.Time) (int, er
return total, gtserror.Newf("error getting remote emoji: %w", err) return total, gtserror.Newf("error getting remote emoji: %w", err)
} }
// If no emojis / same group is returned, we reached the end. // If no emojis / same group is
// returned, we reached the end.
if len(emojis) == 0 || if len(emojis) == 0 ||
olderThan.Equal(emojis[len(emojis)-1].CreatedAt) { olderThan.Equal(emojis[len(emojis)-1].CreatedAt) {
break break
} }
// Use last created-at as the next 'olderThan' value. // Use last createdAt as next 'olderThan' value.
olderThan = emojis[len(emojis)-1].CreatedAt olderThan = emojis[len(emojis)-1].CreatedAt
for _, emoji := range emojis { for _, emoji := range emojis {

16
internal/gtsmodel/account.go
View file

@ -31,7 +31,8 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/log"
) )
// Account represents either a local or a remote fediverse account, gotosocial or otherwise (mastodon, pleroma, etc). // Account represents either a local or a remote fediverse
// account, gotosocial or otherwise (mastodon, pleroma, etc).
type Account struct { type Account struct {
ID string `bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database 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. CreatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item created.
@ -83,9 +84,20 @@ type Account struct {
Stats *AccountStats `bun:"-"` // gtsmodel.AccountStats for this account. Stats *AccountStats `bun:"-"` // gtsmodel.AccountStats for this account.
} }
// UsernameDomain returns account @username@domain (missing domain if local).
func (a *Account) UsernameDomain() string {
if a.IsLocal() {
return "@" + a.Username
}
return "@" + a.Username + "@" + a.Domain
}
// IsLocal returns whether account is a local user account. // IsLocal returns whether account is a local user account.
func (a *Account) IsLocal() bool { func (a *Account) IsLocal() bool {
return a.Domain == "" || a.Domain == config.GetHost() || a.Domain == config.GetAccountDomain() // TODO: can we simplify this to just domain == ""?
return a.Domain == "" ||
a.Domain == config.GetHost() ||
a.Domain == config.GetAccountDomain()
} }
// IsRemote returns whether account is a remote user account. // IsRemote returns whether account is a remote user account.

3
internal/gtsmodel/emoji.go
View file

@ -19,7 +19,8 @@ package gtsmodel
import "time" import "time"
// Emoji represents a custom emoji that's been uploaded through the admin UI or downloaded from a remote instance. // Emoji represents a custom emoji that's been uploaded
// through the admin UI or downloaded from a remote instance.
type Emoji struct { type Emoji struct {
ID string `bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database 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 CreatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item created