summaryrefslogtreecommitdiff
path: root/pkg/motd
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/motd')
-rw-r--r--pkg/motd/fetch.go19
-rw-r--r--pkg/motd/motd.go10
2 files changed, 19 insertions, 10 deletions
diff --git a/pkg/motd/fetch.go b/pkg/motd/fetch.go
index 4f22388..fd76d7c 100644
--- a/pkg/motd/fetch.go
+++ b/pkg/motd/fetch.go
@@ -9,17 +9,26 @@ import (
"0xacab.org/leap/bitmask-vpn/pkg/config"
)
+const riseupMOTD = "https://static.riseup.net/vpn/motd.json"
+
func FetchLatest() []Message {
empty := []Message{}
if os.Getenv("SKIP_MOTD") == "1" {
return empty
}
url := ""
- switch config.Provider {
- case "riseup.net":
- url = "https://downloads.leap.se/motd/riseup/motd.json"
- default:
- return empty
+ if os.Getenv("DEBUG") == "1" {
+ url = os.Getenv("MOTD_URL")
+ if url == "" {
+ url = riseupMOTD
+ }
+ } else {
+ switch config.Provider {
+ case "riseup.net":
+ url = riseupMOTD
+ default:
+ return empty
+ }
}
log.Println("Fetching MOTD for", config.Provider)
b, err := fetchURL(url)
diff --git a/pkg/motd/motd.go b/pkg/motd/motd.go
index db21025..4dead55 100644
--- a/pkg/motd/motd.go
+++ b/pkg/motd/motd.go
@@ -47,6 +47,11 @@ type Message struct {
Text []LocalizedText `json:"text"`
}
+type LocalizedText struct {
+ Lang string `json:"lang"`
+ Str string `json:"str"`
+}
+
func (m *Message) IsValid() bool {
valid := (m.IsValidBegin() && m.IsValidEnd() &&
m.IsValidType() && m.IsValidPlatform() && m.IsValidUrgency() &&
@@ -111,8 +116,3 @@ func (m *Message) IsValidUrgency() bool {
func (m *Message) HasLocalizedText() bool {
return len(m.Text) > 0
}
-
-type LocalizedText struct {
- Lang string `json:"lang"`
- Str string `json:"str"`
-}