diff options
| author | Tulir Asokan <tulir@maunium.net> | 2018-04-14 18:09:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-14 18:09:02 +0300 |
| commit | 53cdfb64c1773b63fb9432a1525b4ac4acb154fc (patch) | |
| tree | 1c1aa180313abe8179d0b07591348e222b60483e /config | |
| parent | 14a84295d72a24a8bce8a71c240ab2b155ed5a1f (diff) | |
| parent | d060d10615434c557373ee00ba009cc8b583e881 (diff) | |
Merge pull request #18 from tulir/ui-refactor
Refactor UI to use interfaces and add advanced message rendering
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.go | 4 | ||||
| -rw-r--r-- | config/session.go | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/config.go b/config/config.go index 4ad6793..85160c6 100644 --- a/config/config.go +++ b/config/config.go @@ -23,7 +23,7 @@ import ( "path/filepath" "gopkg.in/yaml.v2" - "maunium.net/go/gomuks/ui/debug" + "maunium.net/go/gomuks/debug" ) // Config contains the main config of gomuks. @@ -33,6 +33,7 @@ type Config struct { Dir string `yaml:"-"` HistoryDir string `yaml:"history_dir"` + MediaDir string `yaml:"media_dir"` Session *Session `yaml:"-"` } @@ -41,6 +42,7 @@ func NewConfig(dir string) *Config { return &Config{ Dir: dir, HistoryDir: filepath.Join(dir, "history"), + MediaDir: filepath.Join(dir, "media"), } } diff --git a/config/session.go b/config/session.go index 912fed0..26d0daa 100644 --- a/config/session.go +++ b/config/session.go @@ -24,7 +24,7 @@ import ( "maunium.net/go/gomatrix" "maunium.net/go/gomuks/matrix/pushrules" "maunium.net/go/gomuks/matrix/rooms" - "maunium.net/go/gomuks/ui/debug" + "maunium.net/go/gomuks/debug" ) type Session struct { |