mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2024-11-15 01:07:19 +00:00
26b74aefaf
* fix existing bio text showing as HTML - updated replaced mentions to include instance - strips HTML from account source note in Verify handler - update text formatter to use buffers for string writes Signed-off-by: kim <grufwub@gmail.com> * go away linter Signed-off-by: kim <grufwub@gmail.com> * change buf reset location, change html mention tags Signed-off-by: kim <grufwub@gmail.com> * reduce FindLinks code complexity Signed-off-by: kim <grufwub@gmail.com> * fix HTML to text conversion Signed-off-by: kim <grufwub@gmail.com> * Update internal/regexes/regexes.go Co-authored-by: Mina Galić <mina.galic@puppet.com> * use improved html2text lib with more options Signed-off-by: kim <grufwub@gmail.com> * fix to produce actual plaintext from html Signed-off-by: kim <grufwub@gmail.com> * fix span tags instead written as space Signed-off-by: kim <grufwub@gmail.com> * performance improvements to regex replacements, fix link replace logic for un-html-ing in the future Signed-off-by: kim <grufwub@gmail.com> * fix tag/mention replacements to use input string, fix link replace to not include scheme Signed-off-by: kim <grufwub@gmail.com> * use matched input string for link replace href text Signed-off-by: kim <grufwub@gmail.com> * remove unused code (to appease linter :sobs:) Signed-off-by: kim <grufwub@gmail.com> * improve hashtagFinger regex to be more compliant Signed-off-by: kim <grufwub@gmail.com> * update breakReplacer to include both unix and windows line endings Signed-off-by: kim <grufwub@gmail.com> * add NoteRaw field to Account to store plaintext account bio, add migration for this, set for sensitive accounts Signed-off-by: kim <grufwub@gmail.com> * drop unnecessary code Signed-off-by: kim <grufwub@gmail.com> * update text package tests to fix logic changes Signed-off-by: kim <grufwub@gmail.com> * add raw note content testing to account update and account verify Signed-off-by: kim <grufwub@gmail.com> * remove unused modules Signed-off-by: kim <grufwub@gmail.com> * fix emoji regex Signed-off-by: kim <grufwub@gmail.com> * fix replacement of hashtags Signed-off-by: kim <grufwub@gmail.com> * update code comment Signed-off-by: kim <grufwub@gmail.com> Co-authored-by: Mina Galić <mina.galic@puppet.com>
168 lines
5.2 KiB
Go
168 lines
5.2 KiB
Go
package cache
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/ReneKroon/ttlcache"
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
|
)
|
|
|
|
// AccountCache is a wrapper around ttlcache.Cache to provide URL and URI lookups for gtsmodel.Account
|
|
type AccountCache struct {
|
|
cache *ttlcache.Cache // map of IDs -> cached accounts
|
|
urls map[string]string // map of account URLs -> IDs
|
|
uris map[string]string // map of account URIs -> IDs
|
|
mutex sync.Mutex
|
|
}
|
|
|
|
// NewAccountCache returns a new instantiated AccountCache object
|
|
func NewAccountCache() *AccountCache {
|
|
c := AccountCache{
|
|
cache: ttlcache.NewCache(),
|
|
urls: make(map[string]string, 100),
|
|
uris: make(map[string]string, 100),
|
|
mutex: sync.Mutex{},
|
|
}
|
|
|
|
// Set callback to purge lookup maps on expiration
|
|
c.cache.SetExpirationCallback(func(key string, value interface{}) {
|
|
account, ok := value.(*gtsmodel.Account)
|
|
if !ok {
|
|
logrus.Panicf("AccountCache could not assert entry with key %s to *gtsmodel.Account", key)
|
|
}
|
|
|
|
c.mutex.Lock()
|
|
delete(c.urls, account.URL)
|
|
delete(c.uris, account.URI)
|
|
c.mutex.Unlock()
|
|
})
|
|
|
|
return &c
|
|
}
|
|
|
|
// GetByID attempts to fetch a account from the cache by its ID, you will receive a copy for thread-safety
|
|
func (c *AccountCache) GetByID(id string) (*gtsmodel.Account, bool) {
|
|
c.mutex.Lock()
|
|
account, ok := c.getByID(id)
|
|
c.mutex.Unlock()
|
|
return account, ok
|
|
}
|
|
|
|
// GetByURL attempts to fetch a account from the cache by its URL, you will receive a copy for thread-safety
|
|
func (c *AccountCache) GetByURL(url string) (*gtsmodel.Account, bool) {
|
|
// Perform safe ID lookup
|
|
c.mutex.Lock()
|
|
id, ok := c.urls[url]
|
|
|
|
// Not found, unlock early
|
|
if !ok {
|
|
c.mutex.Unlock()
|
|
return nil, false
|
|
}
|
|
|
|
// Attempt account lookup
|
|
account, ok := c.getByID(id)
|
|
c.mutex.Unlock()
|
|
return account, ok
|
|
}
|
|
|
|
// GetByURI attempts to fetch a account from the cache by its URI, you will receive a copy for thread-safety
|
|
func (c *AccountCache) GetByURI(uri string) (*gtsmodel.Account, bool) {
|
|
// Perform safe ID lookup
|
|
c.mutex.Lock()
|
|
id, ok := c.uris[uri]
|
|
|
|
// Not found, unlock early
|
|
if !ok {
|
|
c.mutex.Unlock()
|
|
return nil, false
|
|
}
|
|
|
|
// Attempt account lookup
|
|
account, ok := c.getByID(id)
|
|
c.mutex.Unlock()
|
|
return account, ok
|
|
}
|
|
|
|
// getByID performs an unsafe (no mutex locks) lookup of account by ID, returning a copy of account in cache
|
|
func (c *AccountCache) getByID(id string) (*gtsmodel.Account, bool) {
|
|
v, ok := c.cache.Get(id)
|
|
if !ok {
|
|
return nil, false
|
|
}
|
|
|
|
a, ok := v.(*gtsmodel.Account)
|
|
if !ok {
|
|
panic("account cache entry was not an account")
|
|
}
|
|
|
|
return copyAccount(a), true
|
|
}
|
|
|
|
// Put places a account in the cache, ensuring that the object place is a copy for thread-safety
|
|
func (c *AccountCache) Put(account *gtsmodel.Account) {
|
|
if account == nil || account.ID == "" {
|
|
panic("invalid account")
|
|
}
|
|
|
|
c.mutex.Lock()
|
|
c.cache.Set(account.ID, copyAccount(account))
|
|
if account.URL != "" {
|
|
c.urls[account.URL] = account.ID
|
|
}
|
|
if account.URI != "" {
|
|
c.uris[account.URI] = account.ID
|
|
}
|
|
c.mutex.Unlock()
|
|
}
|
|
|
|
// copyAccount performs a surface-level copy of account, only keeping attached IDs intact, not the objects.
|
|
// due to all the data being copied being 99% primitive types or strings (which are immutable and passed by ptr)
|
|
// this should be a relatively cheap process
|
|
func copyAccount(account *gtsmodel.Account) *gtsmodel.Account {
|
|
return >smodel.Account{
|
|
ID: account.ID,
|
|
Username: account.Username,
|
|
Domain: account.Domain,
|
|
AvatarMediaAttachmentID: account.AvatarMediaAttachmentID,
|
|
AvatarMediaAttachment: nil,
|
|
AvatarRemoteURL: account.AvatarRemoteURL,
|
|
HeaderMediaAttachmentID: account.HeaderMediaAttachmentID,
|
|
HeaderMediaAttachment: nil,
|
|
HeaderRemoteURL: account.HeaderRemoteURL,
|
|
DisplayName: account.DisplayName,
|
|
Fields: account.Fields,
|
|
Note: account.Note,
|
|
NoteRaw: account.NoteRaw,
|
|
Memorial: account.Memorial,
|
|
MovedToAccountID: account.MovedToAccountID,
|
|
CreatedAt: account.CreatedAt,
|
|
UpdatedAt: account.UpdatedAt,
|
|
Bot: account.Bot,
|
|
Reason: account.Reason,
|
|
Locked: account.Locked,
|
|
Discoverable: account.Discoverable,
|
|
Privacy: account.Privacy,
|
|
Sensitive: account.Sensitive,
|
|
Language: account.Language,
|
|
URI: account.URI,
|
|
URL: account.URL,
|
|
LastWebfingeredAt: account.LastWebfingeredAt,
|
|
InboxURI: account.InboxURI,
|
|
OutboxURI: account.OutboxURI,
|
|
FollowingURI: account.FollowingURI,
|
|
FollowersURI: account.FollowersURI,
|
|
FeaturedCollectionURI: account.FeaturedCollectionURI,
|
|
ActorType: account.ActorType,
|
|
AlsoKnownAs: account.AlsoKnownAs,
|
|
PrivateKey: account.PrivateKey,
|
|
PublicKey: account.PublicKey,
|
|
PublicKeyURI: account.PublicKeyURI,
|
|
SensitizedAt: account.SensitizedAt,
|
|
SilencedAt: account.SilencedAt,
|
|
SuspendedAt: account.SuspendedAt,
|
|
HideCollections: account.HideCollections,
|
|
SuspensionOrigin: account.SuspensionOrigin,
|
|
}
|
|
}
|