Merge in some fixes from master

chatroom.go

@@ -182,6 +182,10 @@ func (cr *ChatRoom) Ban(name string) string {
 		return "Cannot find that name"
 	}
 
+	if client.IsAdmin {
+		return "You cannot ban an admin Jebaited"
+	}
+
 	names := []string{}
 	host := client.Host()
 	color := client.color

common/emotes.go

@@ -16,7 +16,7 @@ func ParseEmotesArray(words []string) []string {
 		found := false
 		for key, val := range Emotes {
 			if key == word {
-				newWords = append(newWords, fmt.Sprintf("<img src=\"/emotes/%s\" title=\"%s\" />", val, key))
+				newWords = append(newWords, fmt.Sprintf(`<img src="/emotes/%s" height="28px" title="%s" />`, val, key))
 				found = true
 			}
 		}

wasm/main.go

@@ -224,7 +224,7 @@ func recieve(v []js.Value) {
 }
 
 func websocketSend(msg string, dataType common.ClientDataType) error {
-	if strings.TrimSpace(msg) == "" {
+	if strings.TrimSpace(msg) == "" && dataType == common.CdMessage {
 		return nil
 	}