taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

WTF-400 Move name and configKey values from widget to settings

Browse Source
This commit is contained in:
Chris Cummer
2019-04-17 17:16:26 -07:00
parent d174bd1497
commit b50c762dab
93 changed files with 351 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/twitter/settings.go
View File

@@ -7,6 +7,8 @@ import (
"github.com/wtfutil/wtf/cfg"
)
const configKey = "twitter"
type Settings struct {
common *cfg.Common
@@ -15,11 +17,11 @@ type Settings struct {
screenNames []interface{}
}
func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods.twitter")
func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
settings := Settings{
common: cfg.NewCommonSettingsFromYAML(ymlConfig),
common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
bearerToken: localConfig.UString("bearerToken", os.Getenv("WTF_TWITTER_BEARER_TOKEN")),
count: localConfig.UInt("count", 5),

4
modules/twitter/widget.go
View File

@@ -36,8 +36,8 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
MultiSourceWidget: wtf.NewMultiSourceWidget("twitter", "screenName", "screenNames"),
TextWidget: wtf.NewTextWidget(app, "Twitter", "twitter", true),
MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "screenName", "screenNames"),
TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
idx: 0,
settings: settings,