edit server side unit tests, add code optimization

Makefile

@@ -1,4 +1,5 @@
 all:
+	make test
 	make prepare
 	make linux
 	make macos
@@ -31,3 +32,6 @@ pack:
 	cp -r dist/main.js mattermost-pr0gramm-plugin/client
 	cp plugin.json mattermost-pr0gramm-plugin/
 	tar -czvf mattermost-pr0gramm-plugin.tar.gz mattermost-pr0gramm-plugin
+
+test:
+	go test ./server -v

client/index.jsx

@@ -125,7 +125,7 @@ class PostWillRenderEmbed extends React.Component {
 
     handleTagResult(uid, data) {
         const info = new Pr0grammInfo(data);
-        if (info.clientSettings.tags == false) {
+        if (PostWillRenderEmbed.settings.tags == false) {
             return;
         }
         /**
@@ -149,7 +149,7 @@ class PostWillRenderEmbed extends React.Component {
 
     handleRating(uid, data, isFileUrl = false) {
         const get = new Pr0grammGet(data);
-        if (get.clientSettings.rating == false) {
+        if (PostWillRenderEmbed.settings.rating == false) {
             return;
         }
         const file = get.items[0];
@@ -183,7 +183,7 @@ class PostWillRenderEmbed extends React.Component {
          */
         const fileElement = document.getElementById(uid + '_file');
         const f = file.items[0].image;
-        const maxHeight = file.clientSettings.maxHeight;
+        const maxHeight = PostWillRenderEmbed.settings.maxHeight;
         if (f.includes('.mp4')) {
             const fileUrl = `https://vid.pr0gramm.com/` + f;
             fileElement.innerHTML = this.getVideoElement(fileUrl, maxHeight, 'video/mp4');
@@ -263,7 +263,7 @@ class Pr0grammPlugin {
                 this.registerPlugin(registry);
             })
             .catch(err => {
-                PostWillRenderEmbed.settings = new ClientSettings(res.data);
+                PostWillRenderEmbed.settings = new ClientSettings();
                 this.registerPlugin(registry);
             });
     }

client/types.jsx

@@ -134,10 +134,6 @@ export class Pr0grammInfo {
          * @type {number}
          */
         this.ts = data.ts;
-        /**
-         * @type {ClientSettings}
-         */
-        this.clientSettings = new ClientSettings(data.clientSettings);
     }
 }
 
@@ -261,9 +257,5 @@ export class Pr0grammGet {
          * @type {number}
          */
         this.qc = data.qc;
-        /**
-         * @type {ClientSettings}
-         */
-        this.clientSettings = new ClientSettings(data.clientSettings);
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mattermost-pr0gramm",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "",
     "main": "webpack.config.js",
     "scripts": {

plugin.json

@@ -4,8 +4,8 @@
     "description": "This plugin serves as a starting point for writing a Mattermost plugin.",
     "homepage_url": "https://github.com/Shadowsith/mattermost-plugin-pr0gramm",
     "support_url": "https://github.com/Shadowsith/mattermost-plugin-pr0gramm/issues",
-    "release_notes_url": "https://github.com/Shadowsith/mattermost-plugin-pr0gramm/releases/tag/1.2.0",
-    "version": "1.2.0",
+    "release_notes_url": "https://github.com/Shadowsith/mattermost-plugin-pr0gramm/releases/tag/1.2.1",
+    "version": "1.2.1",
     "min_server_version": "6.2.1",
     "server": {
         "executables": {

server/plugin.go

@@ -6,8 +6,6 @@ import (
 	"io"
 	"log"
 	"net/http"
-	"strconv"
-	"strings"
 
 	"github.com/mattermost/mattermost-server/v6/plugin"
 )
@@ -40,132 +38,122 @@ const (
 )
 
 // ServeHTTP demonstrates a plugin that handles HTTP requests by greeting the world.
+
 func (p *Pr0grammPlugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Request) {
 	path := r.URL.Path
 	w.Header().Set("Content-Type", "application/json")
 
 	switch path {
 	case routeSettings:
 		clientSettings := p.getClientSettings(w)
-		// fmt.Fprint(w, clientSettings.maxHeightStr)
 		p.handleClientSettingsResult(w, clientSettings)
-		break
 
 	case routeInfo:
 		resp, err := p.itemsInfo(w, r)
 		p.handleRequestResult(w, resp, err)
-		break
 
 	case routeGet:
 		resp, err := p.itemsGet(w, r)
 		p.handleRequestResult(w, resp, err)
-		break
 
 	case routeReverse:
 		resp, err := p.itemsReverse(w, r)
 		p.handleRequestResult(w, resp, err)
-		break
 
 	default:
 		resp, err := p.any(w, r)
 		p.handleRequestResult(w, resp, err)
-		break
 	}
 }
 
-func (p *Pr0grammPlugin) getSettings() *PluginSettings {
+func (p *Pr0grammPlugin) getSettings() PluginSettings {
 	pluginSettings, ok := p.API.GetConfig().PluginSettings.Plugins["pr0gramm"]
-	settings := new(PluginSettings)
-	if ok {
-		for k, v := range pluginSettings {
-			if k == "username" {
-				settings.Username = v.(string)
-			} else if k == "password" {
-				settings.Password = v.(string)
-			} else if k == "maxheight" {
-				maxHeight, err := strconv.Atoi(
-					fmt.Sprintf("%v", v))
-				if err != nil {
-					log.Fatal(err)
-				}
-				settings.MaxHeight = maxHeight
-			} else if k == "tags" {
-				val, ok := v.(bool)
-				if !ok {
-					val = false
-				}
-				settings.Tags = val
-			} else if k == "rating" {
-				val, ok := v.(bool)
-				if !ok {
-					val = false
-				}
-				settings.Rating = val
-			}
-		}
+	if !ok {
+		return p.getDefaultSettings()
+	}
+
+	settings := PluginSettings{
+		Username:  p.getStrVal(pluginSettings["username"]),
+		Password:  p.getStrVal(pluginSettings["password"]),
+		MaxHeight: p.getIntVal(pluginSettings["maxheight"]),
+		Tags:      p.getBoolVal(pluginSettings["tags"]),
+		Rating:    p.getBoolVal(pluginSettings["rating"]),
 	}
+
 	return settings
 }
 
-func (p *Pr0grammPlugin) getClientSettings(w http.ResponseWriter) *ClientSettings {
+func (p *Pr0grammPlugin) getClientSettings(w http.ResponseWriter) ClientSettings {
 	pluginSettings, ok := p.API.GetConfig().PluginSettings.Plugins["pr0gramm"]
-	settings := new(ClientSettings)
-	if ok {
-		for k, v := range pluginSettings {
-			if k == "maxheight" {
-				maxHeight, err := strconv.Atoi(
-					fmt.Sprintf("%v", v))
-				if err != nil {
-					log.Fatal(err)
-				}
-				settings.MaxHeight = maxHeight
-			} else if k == "tags" {
-				val, ok := v.(bool)
-				if !ok {
-					val = false
-				}
-				settings.Tags = val
-			} else if k == "rating" {
-				val, ok := v.(bool)
-				if !ok {
-					val = false
-				}
-				settings.Rating = val
-			}
-		}
+	if !ok {
+		return p.getDefaultClientSettings()
+	}
+
+	settings := ClientSettings{
+		MaxHeight: p.getIntVal(pluginSettings["maxheight"]),
+		Tags:      p.getBoolVal(pluginSettings["tags"]),
+		Rating:    p.getBoolVal(pluginSettings["rating"]),
 	}
+
 	return settings
 }
 
-func (p *Pr0grammPlugin) handleRequestResult(w http.ResponseWriter, resp *http.Response, err error) {
-	if err != nil {
-		fmt.Fprint(w, "{ \"error\":\""+err.Error()+"\"}")
-	} else {
-		response := p.handleResponse(resp)
-		if response == "error" {
-			fmt.Fprint(w, "{ \"error\":\"pr0gramm http request error \"}")
-		} else {
-			clientSettings := p.getClientSettings(w)
-			response = strings.TrimRight(response, "}")
-			fmt.Fprint(w, p.addClientSettingsToResult(w, response, clientSettings))
-		}
+func (p *Pr0grammPlugin) getDefaultSettings() PluginSettings {
+	return PluginSettings{
+		MaxHeight: 400,
+		Tags:      true,
+		Rating:    true,
+		Username:  "",
+		Password:  "",
 	}
 }
 
-func (p *Pr0grammPlugin) addClientSettingsToResult(w http.ResponseWriter, response string, settings *ClientSettings) string {
-	json, err := json.Marshal(&settings)
+func (p *Pr0grammPlugin) getDefaultClientSettings() ClientSettings {
+	return ClientSettings{
+		MaxHeight: 400,
+		Tags:      true,
+		Rating:    true,
+	}
+}
+
+func (p *Pr0grammPlugin) getStrVal(v interface{}) string {
+	val, ok := v.(string)
+	if !ok {
+		val = ""
+	}
+	return val
+}
+
+func (p *Pr0grammPlugin) getBoolVal(v interface{}) bool {
+	val, ok := v.(bool)
+	if !ok {
+		val = true
+	}
+	return val
+}
+
+func (p *Pr0grammPlugin) getIntVal(v interface{}) int {
+	val, ok := v.(int)
+	if !ok {
+		val = 400
+	}
+	return val
+}
+
+func (p *Pr0grammPlugin) handleRequestResult(w http.ResponseWriter, resp *http.Response, err error) {
 	if err != nil {
-		return response
+		fmt.Fprintf(w, `{"error": "%s"}`, err.Error())
 	} else {
-		if string(json) != "{}" {
-			return strings.TrimRight(response, "}") + ", \"clientSettings\": " + string(json) + "}"
+		response := p.handleResponse(resp)
+		if response == "error" {
+			fmt.Fprint(w, `{ "error": "pr0gramm http request error"}`)
 		} else {
-			return response
+			fmt.Fprint(w, response)
 		}
 	}
 }
 
-func (p *Pr0grammPlugin) handleClientSettingsResult(w http.ResponseWriter, settings *ClientSettings) {
+func (p *Pr0grammPlugin) handleClientSettingsResult(w http.ResponseWriter, settings ClientSettings) {
 	json, err := json.Marshal(&settings)
 	if err != nil {
 		fmt.Fprint(w, "{\"error\": \"serialization error\"}")