SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[bugfix] Fix setting bot on/off (#3986)

Browse Source 
* [bugfix] Fix setting bot on/off

* read client messages in tests

* test fix
This commit is contained in:
tobi
2025-04-11 16:36:40 +02:00
committed by GitHub
parent eb4114bf12
commit c8a780e12a
5 changed files with 97 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
internal/typeutils/internaltoas.go
View File

@@ -39,20 +39,32 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/util/xslices"
)
// AccountToAS converts a gts model account
// into an activity streams person or service.
func accountableForActorType(actorType gtsmodel.AccountActorType) ap.Accountable {
switch actorType {
case gtsmodel.AccountActorTypeApplication:
return streams.NewActivityStreamsApplication()
case gtsmodel.AccountActorTypeGroup:
return streams.NewActivityStreamsGroup()
case gtsmodel.AccountActorTypeOrganization:
return streams.NewActivityStreamsOrganization()
case gtsmodel.AccountActorTypePerson:
return streams.NewActivityStreamsPerson()
case gtsmodel.AccountActorTypeService:
return streams.NewActivityStreamsService()
default:
panic("invalid actor type")
}
}
// AccountToAS converts a gts model
// account into an accountable.
func (c *Converter) AccountToAS(
ctx context.Context,
a *gtsmodel.Account,
) (ap.Accountable, error) {
// accountable is a service if this
// is a bot account, otherwise a person.
var accountable ap.Accountable
if a.ActorType.IsBot() {
accountable = streams.NewActivityStreamsService()
} else {
accountable = streams.NewActivityStreamsPerson()
}
// Use appropriate underlying
// actor type of accountable.
accountable := accountableForActorType(a.ActorType)
// id should be the activitypub URI of this user
// something like https://example.org/users/example_user
@@ -389,14 +401,9 @@ func (c *Converter) AccountToASMinimal(
ctx context.Context,
a *gtsmodel.Account,
) (ap.Accountable, error) {
// accountable is a service if this
// is a bot account, otherwise a person.
var accountable ap.Accountable
if a.ActorType.IsBot() {
accountable = streams.NewActivityStreamsService()
} else {
accountable = streams.NewActivityStreamsPerson()
}
// Use appropriate underlying
// actor type of accountable.
accountable := accountableForActorType(a.ActorType)
// id should be the activitypub URI of this user
// something like https://example.org/users/example_user