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

Implement Cobra CLI tooling, Viper config tooling (#336)

Browse Source 
* start pulling out + replacing urfave and config

* replace many many instances of config

* move more stuff => viper

* properly remove urfave

* move some flags to root command

* add testrig commands to root

* alias config file keys

* start adding cli parsing tests

* reorder viper init

* remove config path alias

* fmt

* change config file keys to non-nested

* we're more or less in business now

* tidy up the common func

* go fmt

* get tests passing again

* add note about the cliparsing tests

* reorganize

* update docs with changes

* structure cmd dir better

* rename + move some files around

* fix dangling comma
This commit is contained in:
tobi
2021-12-07 13:31:39 +01:00
committed by GitHub
parent 182b4eea73
commit 0884f89431
487 changed files with 46667 additions and 8831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/typeutils/internaltofrontend.go
View File

@ -21,11 +21,14 @@ package typeutils
import (
"context"
"fmt"
"github.com/sirupsen/logrus"
"strings"
"time"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
"github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
)
@ -567,34 +570,32 @@ func (c *converter) InstanceToAPIInstance(ctx context.Context, i *gtsmodel.Insta
}
// if the requested instance is *this* instance, we can add some extra information
if i.Domain == c.config.Host {
userCountKey := "user_count"
statusCountKey := "status_count"
domainCountKey := "domain_count"
userCount, err := c.db.CountInstanceUsers(ctx, c.config.Host)
keys := config.Keys
host := viper.GetString(keys.Host)
if i.Domain == host {
userCount, err := c.db.CountInstanceUsers(ctx, host)
if err == nil {
mi.Stats[userCountKey] = userCount
mi.Stats["user_count"] = userCount
}
statusCount, err := c.db.CountInstanceStatuses(ctx, c.config.Host)
statusCount, err := c.db.CountInstanceStatuses(ctx, host)
if err == nil {
mi.Stats[statusCountKey] = statusCount
mi.Stats["status_count"] = statusCount
}
domainCount, err := c.db.CountInstanceDomains(ctx, c.config.Host)
domainCount, err := c.db.CountInstanceDomains(ctx, host)
if err == nil {
mi.Stats[domainCountKey] = domainCount
mi.Stats["domain_count"] = domainCount
}
mi.Registrations = c.config.AccountsConfig.OpenRegistration
mi.ApprovalRequired = c.config.AccountsConfig.RequireApproval
mi.Registrations = viper.GetBool(keys.AccountsRegistrationOpen)
mi.ApprovalRequired = viper.GetBool(keys.AccountsApprovalRequired)
mi.InvitesEnabled = false // TODO
mi.MaxTootChars = uint(c.config.StatusesConfig.MaxChars)
mi.MaxTootChars = uint(viper.GetInt(keys.StatusesMaxChars))
mi.URLS = &model.InstanceURLs{
StreamingAPI: fmt.Sprintf("wss://%s", c.config.Host),
StreamingAPI: fmt.Sprintf("wss://%s", host),
}
mi.Version = c.config.SoftwareVersion
mi.Version = viper.GetString(keys.SoftwareVersion)
}
// get the instance account if it exists and just skip if it doesn't