Merge pull request #11 from ProjectSegfault/options-pub

Options pub

.gitignore

@@ -1,2 +1,2 @@
 data/config.toml
-data/options.json
+data/announcements.json

.woodpecker.yml

@@ -7,9 +7,12 @@ pipeline:
       - go build -o segfautils
   dockerize_n_publish:
     when:
+      branch : [master]
       event: [push]
     name: dockerize and publish
-    image: plugins/docker 
+    image: plugins/docker
+    registry: git.projectsegfau.lt
+    repo: git.projectsegfau.lt/projectsegfault/segfautils 
     settings:
       username:
         from_secret: username
@@ -17,6 +20,20 @@ pipeline:
         from_secret: password
       repo: projectsegfault/segfautils 
       dockerfile: Dockerfile
-
+  dockerize_dev:
+    when:
+      event: [push]
+    image: plugins/docker
+    name: dockerize and publish dev
+    registry: git.projectsegfau.lt
+    repo: git.projectsegfau.lt/projectsegfault/segfautils
+    settings:
+      username:
+        from_secret: username
+      password:
+        from_secret: password
+      repo: projectsegfau.lt/segfautils
+      tags: dev
+      dockerfile: Dockerfile
     
   

api/announcements.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
@@ -16,28 +15,30 @@ import (
 
 var (
 	authToken = config.AuthToken()
+	resAnn    = config.OptAnn()
 )
 
-func CheckAnn() {
-	jsonFile, err := os.Open("./data/options.json")
-	if err != nil {
-		fmt.Println(err)
-	}
-	defer jsonFile.Close()
-	byteValue, _ := ioutil.ReadAll(jsonFile)
-	var result map[string]interface{}
-	json.Unmarshal([]byte(byteValue), &result)
-	res := result["Announcements"]
-	if res == "true" {
-		Announcements()
-	} else {
-		log.Println("Announcements disabled")
-		http.HandleFunc("/api/announcements", func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "Announcements are disabled.", http.StatusNotFound)
+func AnnCheck() {
+	if resAnn == "false" {
+		log.Println("[Segfautils] ℹ Announcements are disabled")
+		http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
+			http.Error(w, "Announcements are disabled.", http.StatusServiceUnavailable)
 		})
+		http.HandleFunc("/api/announcements", func(w http.ResponseWriter, r *http.Request) {
+			http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable)
+		})
+	} else {
+		AnnPage()
+		Announcements()
 	}
 }
 
+func AnnPage() {
+	http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, "static/announcements.html")
+	})
+}
+
 func Announcements() {
 	http.HandleFunc("/api/announcements", getAnnouncements)
 	http.HandleFunc("/api/announcements/post", handleAnnouncements)
@@ -60,6 +61,7 @@ func handleAnnouncements(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 			now := time.Now().Unix()
 			data := map[string]interface{}{
+				"enabled":  "true",
 				"title":    r.FormValue("title"),
 				"link":     r.FormValue("link"),
 				"severity": r.FormValue("severity"),

api/form.go

@@ -1,21 +1,16 @@
 package api
 
 import (
-	"io/ioutil"
+	"fmt"
+	"io"
 	"log"
 	"net/http"
-	"os"
-
-	"github.com/goccy/go-json"
-	"github.com/kataras/hcaptcha"
-
-	"fmt"
-
-	"io"
 	"net/url"
+	"text/template"
 
 	"github.com/ProjectSegfault/segfautils/config"
 	"github.com/ProjectSegfault/segfautils/utils"
+	"github.com/kataras/hcaptcha"
 )
 
 var (
@@ -23,28 +18,37 @@ var (
 	secretKey  = config.HCaptchaSecretKey()
 	webhookURL = config.WebhookURL()
 	client     = hcaptcha.New(secretKey) /* See `Client.FailureHandler` too. */
+	resForm    = config.OptForm()
 )
 
 func FormCheck() {
-	jsonFile, err := os.Open("./data/options.json")
-	if err != nil {
-		fmt.Println(err)
-	}
-	defer jsonFile.Close()
-	byteValue, _ := ioutil.ReadAll(jsonFile)
-	var result map[string]interface{}
-	json.Unmarshal([]byte(byteValue), &result)
-	res := result["Form"]
-	if res == "true" {
-		Form()
-	} else {
-		log.Println("Forms disabled")
-		http.HandleFunc("/api/form", func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "Disabled")
+	if resForm == "false" {
+		log.Println("[Segfautils] ℹ Contact form is disabled")
+		http.HandleFunc("/form", func(w http.ResponseWriter, r *http.Request) {
+			http.Error(w, "Form is disabled.", http.StatusServiceUnavailable)
 		})
+	} else {
+		FormPage()
+		Form()
 	}
 }
 
+func FormPage() {
+	type StaticThing struct {
+		HCaptchaSiteKey string
+	}
+
+	tmpl_form := template.Must(template.ParseFiles("static/form.html"))
+	http.HandleFunc("/form/", func(w http.ResponseWriter, r *http.Request) {
+
+		hcaptcha_site_key := config.HCaptchaSiteKey()
+		data := StaticThing{
+			HCaptchaSiteKey: hcaptcha_site_key,
+		}
+		tmpl_form.Execute(w, data)
+	})
+}
+
 func Form() {
 	http.HandleFunc("/api/form", client.HandlerFunc(theActualFormCode))
 }

api/settings.go

@@ -1,90 +0,0 @@
-package api
-
-import (
-	"errors"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-
-	"github.com/ProjectSegfault/segfautils/config"
-	"github.com/goccy/go-json"
-)
-
-var (
-	announcements = config.OptAnn()
-	form          = config.OptForm()
-)
-
-func Settings() {
-	CheckSet()
-	http.HandleFunc("/api/options", getOpt)
-}
-
-func CheckSet() {
-	os.Remove("./data/options.json")
-	if form == "true" && announcements == "false" {
-		data := map[string]interface{}{
-			"Announcements": "false",
-			"Form":          "true",
-		}
-
-		jsonData, err := json.Marshal(data)
-		if err != nil {
-			log.Printf("Could not marshal json : %s\n", err)
-			return
-		}
-
-		ioutil.WriteFile("./data/options.json", jsonData, os.ModePerm)
-
-	} else if form == "true" && announcements == "true" {
-		data := map[string]interface{}{
-			"Announcements": "true",
-			"Form":          "true",
-		}
-
-		jsonData, err := json.Marshal(data)
-		if err != nil {
-			log.Printf("Could not marshal json : %s\n", err)
-			return
-		}
-
-		ioutil.WriteFile("./data/options.json", jsonData, os.ModePerm)
-
-	} else if form == "false" && announcements == "true" {
-		data := map[string]interface{}{
-			"Announcements": "true",
-			"Form":          "false",
-		}
-
-		jsonData, err := json.Marshal(data)
-		if err != nil {
-			log.Printf("Could not marshal json : %s\n", err)
-			return
-		}
-
-		ioutil.WriteFile("./data/options.json", jsonData, os.ModePerm)
-
-	} else {
-		resp := []byte("The fuck do you want me to do then?")
-		ioutil.WriteFile("./data/options.json", resp, os.ModePerm)
-	}
-}
-func getOpt(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	if _, err := os.Stat("./data/options.json"); errors.Is(err, os.ErrNotExist) {
-		http.Error(w, "There is nothing to see here.", http.StatusNotFound)
-		return
-	} else {
-		f, err := os.Open("./data/options.json")
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer f.Close()
-		io.Copy(w, f)
-	}
-}

config/optionannounce.go

@@ -6,13 +6,13 @@ import (
 	"github.com/spf13/viper"
 )
 
-func OptForm() string {
+func OptAnn() string {
 	viper.SetConfigName("config")
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config. Error getting: options.form", err.Error())
+		log.Println("Error reading config. Error getting: options.announce", err.Error())
 	}
-	result := viper.GetString("options.form")
+	result := viper.GetString("options.announce")
 	return result
 }

config/optionform.go

@@ -6,13 +6,13 @@ import (
 	"github.com/spf13/viper"
 )
 
-func OptAnn() string {
+func OptForm() string {
 	viper.SetConfigName("config")
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config. Error getting: options.announce", err.Error())
+		log.Println("Error reading config. Error getting: options.form", err.Error())
 	}
-	result := viper.GetString("options.announce")
+	result := viper.GetString("options.form")
 	return result
 }

main.go

@@ -12,18 +12,13 @@ import (
 )
 
 type StaticThingy struct {
-	Port            string
-	HCaptchaSiteKey string
+	Port string
 }
 
-var port string
-var shit bool
-
 func main() {
 	log.Println("[Segfautils] Starting")
 	utils.CheckConfig()
-	log.Println("[HTTP] Starting server")
-	hcaptcha_site_key := config.HCaptchaSiteKey()
+
 	tmpl := template.Must(template.ParseFiles("static/index.html"))
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		data := StaticThingy{
@@ -32,23 +27,14 @@ func main() {
 		tmpl.Execute(w, data)
 	})
 
-	tmpl_form := template.Must(template.ParseFiles("static/form.html"))
-	http.HandleFunc("/form/", func(w http.ResponseWriter, r *http.Request) {
-		data := StaticThingy{
-			HCaptchaSiteKey: hcaptcha_site_key,
-		}
-		tmpl_form.Execute(w, data)
-	})
+	log.Println("[HTTP] Starting server")
+	api.AnnCheck()
+	api.FormCheck()
 
 	http.HandleFunc("/api/", func(w http.ResponseWriter, r *http.Request) {
 		io.WriteString(w, "welcome to hell")
 	})
-	http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, "static/announcements.html")
-	})
-	api.Settings()
-	api.FormCheck()
-	api.CheckAnn()
+
 	log.Println("[HTTP] HTTP server is now running at " + config.Port() + "!")
 	log.Println(http.ListenAndServe(":"+config.Port(), nil))
 }