Merge pull request #2 from mgerb/mitchell

Mitchell

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015", "react", "stage-0"],
+  "plugins": ["add-module-exports"]
+}

.eslintrc.js

@@ -0,0 +1,49 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "installedESLint": true,
+    "parserOptions": {
+        "ecmaFeatures": {
+            "experimentalObjectRestSpread": true,
+            "jsx": true
+        },
+        "sourceType": "module"
+    },
+    "plugins": [
+        "react"
+    ],
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+
+        "react/display-name": 0, // Prevent missing displayName in a React component definition
+        "react/jsx-no-undef": 2, // Disallow undeclared variables in JSX
+        "react/jsx-sort-props": 0, // Enforce props alphabetical sorting
+        "react/jsx-uses-react": 2, // Prevent React to be incorrectly marked as unused
+        "react/jsx-uses-vars": 2, // Prevent variables used in JSX to be incorrectly marked as unused
+        "react/no-did-mount-set-state": 2, // Prevent usage of setState in componentDidMount
+        "react/no-did-update-set-state": 2, // Prevent usage of setState in componentDidUpdate
+        "react/no-multi-comp": 0, // Prevent multiple component definition per file
+        "react/no-unknown-property": 2, // Prevent usage of unknown DOM property
+        "react/prop-types": 2, // Prevent missing props validation in a React component definition
+        "react/react-in-jsx-scope": 2, // Prevent missing React when using JSX
+        "react/self-closing-comp": 2, // Prevent extra closing tags for components without children
+        "react/wrap-multilines": 2 // Prevent missing parentheses around multilines JSX
+    }
+
+};

.gitignore

@@ -1,2 +1,5 @@
 config.json
 dist/config.json
+node_modules
+yarn-error*
+dist

.jsbeautifyrc

@@ -0,0 +1,15 @@
+{
+    "indent_size": 4,
+    "beautify.language": {
+        "js": {
+            "type": ["javascript", "json", "jsx"],
+            "filename": [".jshintrc", ".jsbeautify"],
+            "e4x": true
+                // "ext": ["js", "json"]
+                // ^^ to set extensions to be beautified using the javascript beautifier
+        },
+        "css": ["css", "scss"],
+        "html": ["htm", "html"]
+            // ^^ providing just an array sets the VS Code file type
+    }
+}

app/Wrapper.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import Navbar from './components/Navbar/Navbar';
+
+//styling
+import './scss/index.scss';
+
+export default class Wrapper extends React.Component {
+
+    render() {
+        return (
+            <div>
+                <Navbar/>
+                <div className="content">
+                    {this.props.children}
+                </div>
+            </div>
+        );
+    }
+}
+
+Wrapper.propTypes = {
+    children: React.PropTypes.node,
+};

app/app.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Router, Route, IndexRoute, browserHistory } from 'react-router';
+
+import Wrapper from './Wrapper';
+import Soundboard from './pages/Soundboard/Soundboard';
+import NotFound from './pages/NotFound/NotFound';
+
+//pages
+import Home from './pages/Home/Home';
+
+ReactDOM.render(
+    <Router history={browserHistory}>
+        <Route path="/" component={Wrapper}>
+            <IndexRoute component={Home}/>
+            <Route path="/soundboard" component={Soundboard}/>
+            <Route path="*" component={NotFound}/>
+        </Route>
+    </Router>
+, document.getElementById('app'));

app/assets/normalize.css

@@ -0,0 +1,461 @@
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+
+/**
+ * 1. Change the default font family in all browsers (opinionated).
+ * 2. Correct the line height in all browsers.
+ * 3. Prevent adjustments of font size after orientation changes in
+ *    IE on Windows Phone and in iOS.
+ */
+
+/* Document
+   ========================================================================== */
+
+html {
+  font-family: sans-serif; /* 1 */
+  line-height: 1.15; /* 2 */
+  -ms-text-size-adjust: 100%; /* 3 */
+  -webkit-text-size-adjust: 100%; /* 3 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers (opinionated).
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in IE.
+ */
+
+figcaption,
+figure,
+main { /* 1 */
+  display: block;
+}
+
+/**
+ * Add the correct margin in IE 8.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * 1. Remove the gray background on active links in IE 10.
+ * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ */
+
+a {
+  background-color: transparent; /* 1 */
+  -webkit-text-decoration-skip: objects; /* 2 */
+}
+
+/**
+ * Remove the outline on focused links when they are also active or hovered
+ * in all browsers (opinionated).
+ */
+
+a:active,
+a:hover {
+  outline-width: 0;
+}
+
+/**
+ * 1. Remove the bottom border in Firefox 39-.
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
+ */
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font style in Android 4.3-.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Add the correct background and color in IE 9-.
+ */
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+audio,
+video {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in iOS 4-7.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Remove the border on images inside links in IE 10-.
+ */
+
+img {
+  border-style: none;
+}
+
+/**
+ * Hide the overflow in IE.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
+ *    controls in Android 4.
+ * 2. Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+html [type="button"], /* 1 */
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Change the border, margin, and padding in all browsers (opinionated).
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * 1. Add the correct display in IE 9-.
+ * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Remove the default vertical scrollbar in IE.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10-.
+ * 2. Remove the padding in IE 10-.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ */
+
+details, /* 1 */
+menu {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Scripting
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+canvas {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in IE.
+ */
+
+template {
+  display: none;
+}
+
+/* Hidden
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10-.
+ */
+
+[hidden] {
+  display: none;
+}

app/components/Navbar/Navbar.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Link } from 'react-router';
+
+import './Navbar.scss';
+
+export default class Navbar extends React.Component {
+
+    render() {
+        return (
+            <div className="Navbar">
+                <div className="Navbar__header">GoBot</div>
+                <Link to="/" className="Navbar__item" onlyActiveOnIndex activeClassName="Navbar__item--active">Home</Link>
+                <Link to="/soundboard" className="Navbar__item" activeClassName="Navbar__item--active">Soundboard</Link>
+            </div>
+        );
+    }
+}
+
+Navbar.propTypes = {
+    children: React.PropTypes.node,
+};

app/components/Navbar/Navbar.scss

@@ -0,0 +1,48 @@
+@import '../../scss/variables';
+
+.Navbar {
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: $navbarWidth;
+    background-color: $gray2;
+    border-right: 1px solid darken($gray2, 2%);
+    overflow-y: auto;
+}
+
+.Navbar__header {
+    min-height: 100px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: $gray2;
+    border-bottom: 1px solid $gray3;
+}
+
+.Navbar__item {
+    min-height: 50px;
+    text-decoration: none;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    color: $white;
+    transition: background-color 0.1s linear;
+    
+    &:hover {
+        background-color: $gray1; 
+    }
+    
+    & + .Navbar__item {
+        border-top: 1px solid $gray3;
+    }
+    
+}
+
+.Navbar__item--active {
+    padding-left: 4px;
+    border-right: 4px solid $primaryBlue;
+}

app/pages/Home/Home.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import './Home.scss';
+
+export default class Home extends React.Component {
+
+    render() {
+        return (
+            <div className="Home">
+                GoBot Home Page
+            </div>
+        );
+    }
+}

app/pages/Home/Home.scss

@@ -0,0 +1,7 @@
+.Home {
+    display: flex;
+    height: 100%;
+    align-items: center;
+    justify-content: center;
+    font-size: 25px;
+}

app/pages/NotFound/NotFound.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import './NotFound.scss';
+
+export default class Default extends React.Component {
+    render() {
+        return (
+            <div className="NotFound">
+                404 Not Found
+            </div>
+        );
+    }
+}

app/pages/NotFound/NotFound.scss

@@ -0,0 +1,8 @@
+.NotFound {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    font-size: 20px;
+}

app/pages/Soundboard/Soundboard.js

@@ -0,0 +1,77 @@
+import React from 'react';
+import Dropzone from 'react-dropzone';
+import axios from 'axios';
+
+import './Soundboard.scss';
+
+let self;
+
+export default class Soundboard extends React.Component {
+    
+    constructor() {
+        super();
+        this.state = {
+            uploaded: false,
+            percentCompleted: 0,
+        }
+        self = this;
+    }
+    
+    componentDidMount() {
+        this.config = {
+            headers: {
+                'Content-Type': 'multipart/form-data',
+            },
+            onUploadProgress: (progressEvent) => {
+                this.setState({
+                    percentCompleted: Math.round( (progressEvent.loaded * 100) / progressEvent.total ),
+                });
+            }
+        };
+    }
+    
+    onDrop(acceptedFiles, rejectedFiles) {
+      if (acceptedFiles.length > 0) {
+          self.uploadFile(acceptedFiles[0]);
+      }
+    }
+    
+    uploadFile(file) {
+        let formData = new FormData();
+        formData.append("name", file.name);
+        formData.append("file", file);
+        
+        axios.put("/upload", formData, this.config)
+            .then(() => {
+                this.setState({
+                    percentCompleted: 0,
+                    uploaded: true,
+                    uploadError: undefined,
+                });
+            }).catch((err) => {
+                this.setState({
+                    percentCompleted: 0,
+                    uploaded: false,
+                    uploadError: "Upload error.",
+                });
+            });
+    }
+    
+    render() {
+        return (
+            <div className="Soundboard">
+                <Dropzone className="Dropzone"
+                        activeClassName="Dropzone--active"
+                        onDrop={this.onDrop}
+                        multiple={false}
+                        accept={"audio/*"}>
+                        
+                    <div>Drop file here to upload.</div>
+                    {this.state.percentCompleted > 0 ? <div>Progress: {this.state.percentCompleted}</div> : ""}
+                    {this.state.uploaded ? <div>File uploded!</div> : ""}
+                    {this.state.uploadError ? <div>{this.state.uploadError}</div> : ""}
+                </Dropzone>
+            </div>
+        )
+    }
+}

app/pages/Soundboard/Soundboard.scss

@@ -0,0 +1,25 @@
+@import '../../scss/variables';
+
+.Soundboard {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+}
+
+.Dropzone {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: 2px solid lighten($gray1, 10%);
+    padding: 20px;
+    color: lighten($gray1, 15%);
+    border-radius: 1em;
+    width: 200px;
+    height: 200px;
+}
+
+.Dropzone--active {
+    background-color: lighten($gray1, 20%);
+}

app/scss/index.scss

@@ -0,0 +1,3 @@
+@import '../assets/normalize.css';
+@import './variables.scss';
+@import './style.scss';

app/scss/style.scss

@@ -0,0 +1,9 @@
+body {
+    background-color: $gray1;
+    color: $white;
+    padding-left: $navbarWidth;
+}
+
+.content {
+    padding: 10px;
+}

app/scss/variables.scss

@@ -0,0 +1,13 @@
+$navbarWidth: 200px;
+
+
+// colors
+$primaryBlue: #42adf4;
+$white: darken(white, 10%);
+
+$gray1: #686a6e;
+$gray2: #424549;
+$gray3: #36393e;
+$gray4: #2e3136;
+$gray5: #282b30;
+$gray6: #1e2124;

dist/config.template.json

@@ -1,4 +1,6 @@
 {
     "Token": "",
-    "BotPrefix": "#"
+    "BotPrefix": "#",
+    "SoundsPath": "./sounds/",
+    "UploadPassword": ""
 }

index.html

@@ -1,10 +1,5 @@
 <html>
-   <head>
-       
-   </head> 
-   
-   <body>
-       test 123
-   </body>
-    
+    <body>
+        <div id="app"></div>
+    </body>
 </html>

makefile

@@ -1,20 +1,21 @@
 run:
-	go run ./src/main.go
+	go run ./server/main.go
 
 linux:
-	go build -o ./dist/GoBot-linux ./src/main.go
+	go build -o ./dist/GoBot-linux ./server/main.go
 	
 mac:
-	GOOS=darwin GOARCH=amd64 go build -o ./dist/GoBot-mac ./src/main.go
+	GOOS=darwin GOARCH=amd64 go build -o ./dist/GoBot-mac ./server/main.go
 
 windows:
-	GOOS=windows GOARCH=386 go build -o ./dist/GoBot-windows.exe ./src/main.go
+	GOOS=windows GOARCH=386 go build -o ./dist/GoBot-windows.exe ./server/main.go
 	
 clean:
 	rm -rf ./dist
 
-copyconfig:
+copyfiles:
 	cp config.template.json ./dist/config.template.json
 	cp -r ./sounds ./dist/
+	cp ./dca-rs ./dist/
 
-all: linux mac windows copyconfig
+all: linux mac windows copyfiles

package.json

@@ -0,0 +1,38 @@
+{
+  "name": "todoapp",
+  "version": "1.0.0",
+  "description": "A seed for a simple react application",
+  "scripts": {
+    "build": "webpack -p --progress --colors",
+    "dev": "webpack-dev-server --inline --hot --history-api-fallback",
+    "c9": "webpack-dev-server --host 0.0.0.0 --port 8080 --inline --hot --history-api-fallback"
+  },
+  "author": "Mitchell Gerber",
+  "license": "MIT",
+  "devDependencies": {
+    "autoprefixer": "^6.6.0",
+    "axios": "^0.15.3",
+    "babel-core": "^6.21.0",
+    "babel-loader": "^6.2.10",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-0": "^6.16.0",
+    "clean-webpack-plugin": "^0.1.14",
+    "css-loader": "^0.26.1",
+    "eslint": "^3.12.2",
+    "eslint-plugin-react": "^6.8.0",
+    "extract-text-webpack-plugin": "2.0.0-rc.1",
+    "html-webpack-plugin": "^2.24.1",
+    "node-sass": "^4.5.0",
+    "postcss-loader": "^1.2.1",
+    "react": "^15.4.1",
+    "react-dom": "^15.4.1",
+    "react-dropzone": "^3.9.2",
+    "react-router": "^3.0.0",
+    "sass-loader": "^4.1.1",
+    "style-loader": "^0.13.1",
+    "webpack": "2.2.1",
+    "webpack-dev-server": "2.2.0"
+  }
+}

postcss.config.js

@@ -0,0 +1,10 @@
+const browserList = [
+    'last 3 versions',
+    '> 1%'
+];
+
+module.exports = {
+    plugins: [
+        require('autoprefixer')(browserList)
+    ]
+};

server/handlers/sounds.go

@@ -7,17 +7,24 @@ import (
 	"fmt"
 	"github.com/bwmarrin/discordgo"
 	"io"
+	"io/ioutil"
 	"os"
 	"strings"
 	"time"
 )
 
 var (
-	sounds = make(map[string][][]byte, 0)
+	sounds = make(map[string]*AudioClip, 0)
 
 	soundPlayingLock = false
 )
 
+type AudioClip struct {
+	Name      string
+	Extension string
+	Content   [][]byte
+}
+
 const SOUNDS_DIR string = "./sounds/"
 
 func SoundsHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
@@ -77,6 +84,26 @@ func SoundsHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
 func loadFile(fileName string) error {
 	fmt.Println("Loading file: " + fileName + ".dca")
 
+	// scan directory for file
+	files, _ := ioutil.ReadDir("./sounds")
+	var fextension string
+	var fname string
+	for _, f := range files {
+		fname = strings.Split(f.Name(), ".")[0]
+		fextension = "." + strings.Split(f.Name(), ".")[1]
+
+		if fname == fileName {
+			break
+		}
+
+		fname = ""
+	}
+
+	if fname == "" {
+		return errors.New("File not found")
+	}
+
+	// open file and load into memory
 	file, err := os.Open(SOUNDS_DIR + fileName + ".dca")
 
 	if err != nil {
@@ -84,7 +111,11 @@ func loadFile(fileName string) error {
 		return err
 	}
 
-	sounds[fileName] = make([][]byte, 0)
+	sounds[fileName] = &AudioClip{
+		Content:   make([][]byte, 0),
+		Name:      fileName,
+		Extension: fextension,
+	}
 
 	var opuslen int16
 
@@ -102,11 +133,6 @@ func loadFile(fileName string) error {
 			}
 		}
 
-		if err != nil {
-			fmt.Println("Error reading from dca file :", err)
-			return err
-		}
-
 		// Read encoded pcm from dca file.
 		InBuf := make([]byte, opuslen)
 		err = binary.Read(file, binary.LittleEndian, &InBuf)
@@ -117,7 +143,7 @@ func loadFile(fileName string) error {
 			return err
 		}
 
-		sounds[fileName] = append(sounds[fileName], InBuf)
+		sounds[fileName].Content = append(sounds[fileName].Content, InBuf)
 	}
 
 }
@@ -145,7 +171,7 @@ func playSound(s *discordgo.Session, guildID, channelID string, sound string) (e
 	_ = vc.Speaking(true)
 
 	// Send the buffer data.
-	for _, buff := range sounds[sound] {
+	for _, buff := range sounds[sound].Content {
 		vc.OpusSend <- buff
 	}
 

server/webserver/server.go

@@ -0,0 +1,174 @@
+package webserver
+
+import (
+	"fmt"
+	"github.com/buaazp/fasthttprouter"
+	"github.com/valyala/fasthttp"
+	"io"
+	"log"
+	"os"
+	"os/exec"
+	"strings"
+	"sync"
+)
+
+func logger(next fasthttp.RequestHandler) fasthttp.RequestHandler {
+	return func(ctx *fasthttp.RequestCtx) {
+		logger := ctx.Logger()
+		logger.Printf(ctx.RemoteAddr().String())
+		next(ctx)
+	}
+}
+
+func applyMiddleware(handler fasthttp.RequestHandler) fasthttp.RequestHandler {
+	newHandler := logger(handler)
+	//newHandler = fasthttp.CompressHandler(newHandler)
+
+	return newHandler
+}
+
+func registerRoutes(router *fasthttprouter.Router) {
+
+	router.PUT("/upload", fileUpload)
+
+	router.ServeFiles("/static/*filepath", "./static")
+
+	router.NotFound = func(ctx *fasthttp.RequestCtx) {
+		fasthttp.ServeFile(ctx, "./index.html")
+	}
+}
+
+func Start() {
+	router := fasthttprouter.New()
+
+	registerRoutes(router)
+
+	// apply our middleware
+	handlers := applyMiddleware(router.Handler)
+
+	// start web server
+	log.Fatal(fasthttp.ListenAndServe("0.0.0.0:8080", handlers))
+}
+
+func fileUpload(ctx *fasthttp.RequestCtx) {
+
+	file, err := ctx.FormFile("file")
+	if err != nil {
+		ctx.SetStatusCode(500)
+		fmt.Fprint(ctx, "Error reading file.")
+		return
+	}
+
+	src, err := file.Open()
+	if err != nil {
+		ctx.SetStatusCode(500)
+		fmt.Fprint(ctx, "Error opening file.")
+		return
+	}
+
+	defer src.Close()
+
+	// create uploads folder if it does not exist
+	if _, err := os.Stat("./uploads"); os.IsNotExist(err) {
+		os.Mkdir("./uploads", os.ModePerm)
+	}
+
+	// check if file already exists
+	if _, err := os.Stat("./uploads/" + file.Filename); err == nil {
+		ctx.SetStatusCode(403)
+		fmt.Fprint(ctx, "File already exists.")
+		return
+	}
+
+	dst, err := os.Create("./uploads/" + file.Filename)
+	if err != nil {
+		ctx.SetStatusCode(500)
+		fmt.Fprint(ctx, "Error writing file.")
+		return
+	}
+
+	defer dst.Close()
+
+	if _, err = io.Copy(dst, src); err != nil {
+		ctx.SetStatusCode(500)
+		fmt.Fprint(ctx, "Error writing file.")
+		return
+	}
+
+	err = convertFile(file.Filename)
+	if err != nil {
+		ctx.SetStatusCode(500)
+		fmt.Fprint(ctx, err.Error())
+		return
+	}
+
+	fmt.Fprint(ctx, "Success")
+}
+
+func convertFile(fileName string) error {
+	trimmedName := strings.Split(fileName, ".")[0]
+	outputPath := "./sounds/"
+	inputPath := "./uploads/"
+
+	fmt.Println(inputPath + fileName)
+	fmt.Println(outputPath + trimmedName + ".dca")
+
+	command := "./dca-rs " + "--raw " + "--i " + inputPath + fileName + " > " + outputPath + trimmedName + ".dca"
+
+	wg := new(sync.WaitGroup)
+	commands := []string{command}
+	for _, str := range commands {
+		wg.Add(1)
+		go exe_cmd(str, wg)
+	}
+	wg.Wait()
+
+	/*
+		cmd := exec.Command("./dca-rs", "--raw", "--i", inputPath+fileName+" > "+outputPath+trimmedName+".dca")
+
+		_, err := cmd.Output()
+
+		if err != nil {
+			fmt.Println(err.Error())
+		}
+
+		err = cmd.Wait()
+		if err == nil {
+			fmt.Println(err.Error())
+		}
+	*/
+
+	/*
+		outFile, err := os.Create(outputPath + trimmedName + ".dca")
+		if err != nil {
+			return err
+		}
+		defer outFile.Close()
+
+		stdoutPipe, err := cmd.StdoutPipe()
+		if err != nil {
+			return err
+		}
+
+		writer := bufio.NewWriter(outFile)
+		defer writer.Flush()
+
+		fmt.Println(stdoutPipe)
+		go io.Copy(writer, stdoutPipe)
+	*/
+
+	fmt.Println("working")
+	return nil
+}
+
+func exe_cmd(cmd string, wg *sync.WaitGroup) {
+	fmt.Println(cmd)
+	parts := strings.Fields(cmd)
+	out, err := exec.Command(parts[0], parts[1]).Output()
+	if err != nil {
+		fmt.Println("error occured")
+		fmt.Printf("%s", err)
+	}
+	fmt.Printf("%s", out)
+	wg.Done()
+}

src/webserver/server.go

@@ -1,45 +0,0 @@
-package webserver
-
-import (
-	"fmt"
-	"github.com/buaazp/fasthttprouter"
-	"github.com/valyala/fasthttp"
-	"log"
-)
-
-func logger(next fasthttp.RequestHandler) fasthttp.RequestHandler {
-	return func(ctx *fasthttp.RequestCtx) {
-		logger := ctx.Logger()
-		logger.Printf(ctx.RemoteAddr().String())
-		next(ctx)
-	}
-}
-
-func applyMiddleware(handler fasthttp.RequestHandler) fasthttp.RequestHandler {
-	newHandler := logger(handler)
-	newHandler = fasthttp.CompressHandler(newHandler)
-
-	return newHandler
-}
-
-func registerRoutes(router *fasthttprouter.Router) {
-	router.GET("/test", func(ctx *fasthttp.RequestCtx) {
-		fmt.Fprint(ctx, "routing works!")
-	})
-
-	router.NotFound = func(ctx *fasthttp.RequestCtx) {
-		fasthttp.ServeFile(ctx, "./index.html")
-	}
-}
-
-func Start() {
-	router := fasthttprouter.New()
-
-	registerRoutes(router)
-
-	// apply our middleware
-	handlers := applyMiddleware(router.Handler)
-
-	// start web server
-	log.Fatal(fasthttp.ListenAndServe("0.0.0.0:8080", handlers))
-}

webpack.config.js

@@ -0,0 +1,48 @@
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+    entry: {
+        app: './app/app.js',
+        vendor: ['react', 'react-dom']
+    },
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: '/static/[name].js'
+    },
+    module: {
+        rules: [{
+            test: /\.(js|jsx)$/,
+            loaders: ['babel-loader']
+        }, {
+            test: /\.scss$/,
+            loader: ExtractTextPlugin.extract({
+                fallbackLoader: 'style-loader',
+                loader: 'css-loader!postcss-loader!sass-loader'
+            })
+        }, {
+            test: /\.css$/,
+            loader: ExtractTextPlugin.extract({
+                fallbackLoader: 'style-loader',
+                loader: 'css-loader'
+            })
+        }]
+    },
+    plugins: [
+        new ExtractTextPlugin({
+            filename: '/static/[name].css',
+            disable: false,
+            allChunks: true
+        }),
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            template: './index.html'
+        }),
+        new webpack.optimize.CommonsChunkPlugin({
+            name: ['vendor', 'manifest'],
+            minChunks: 'Infinity'
+        })
+    ]
+};