From 74976de6cf806428876369230d0a6b86cd77aa7b Mon Sep 17 00:00:00 2001
From: Mitchell Gerber <mgerb42@gmail.com>
Date: Wed, 4 Oct 2017 20:56:55 -0500
Subject: [PATCH] audio clips - client done

---
 client/app/Wrapper.tsx                        | 37 +++++--------
 client/app/app.tsx                            |  2 +
 .../{Navbar.component.tsx => Navbar.tsx}      |  1 +
 client/app/components/Navbar/index.ts         |  1 +
 .../SoundList}/SoundList.scss                 |  0
 .../SoundList/SoundList.tsx}                  | 53 ++++++-------------
 client/app/components/SoundList/index.ts      |  1 +
 client/app/pages/Clips/Clips.tsx              | 46 ++++++++++++++++
 client/app/pages/Clips/index.ts               |  1 +
 client/app/pages/Downloader/Downloader.tsx    | 10 +---
 client/app/pages/Home/Home.tsx                | 20 ++++++-
 client/app/pages/Pubg/Pubg.tsx                |  2 +-
 client/app/pages/Soundboard/Soundboard.tsx    | 35 +++++++++---
 config.template.json                          |  1 +
 server/bothandlers/sounds.go                  | 11 ++--
 server/config/config.go                       |  1 +
 server/webserver/handlers/soundlist.go        | 29 ++++++++++
 server/webserver/server.go                    | 16 +++---
 18 files changed, 175 insertions(+), 92 deletions(-)
 rename client/app/components/Navbar/{Navbar.component.tsx => Navbar.tsx} (88%)
 create mode 100644 client/app/components/Navbar/index.ts
 rename client/app/{pages/Soundboard => components/SoundList}/SoundList.scss (100%)
 rename client/app/{pages/Soundboard/SoundList.component.tsx => components/SoundList/SoundList.tsx} (59%)
 create mode 100644 client/app/components/SoundList/index.ts
 create mode 100644 client/app/pages/Clips/Clips.tsx
 create mode 100644 client/app/pages/Clips/index.ts

diff --git a/client/app/Wrapper.tsx b/client/app/Wrapper.tsx
index 832c51b..16ac061 100644
--- a/client/app/Wrapper.tsx
+++ b/client/app/Wrapper.tsx
@@ -1,31 +1,20 @@
 import React from 'react';
-import { Navbar } from './components/Navbar/Navbar.component';
+import { Navbar } from './components/Navbar';
 
 //styling
 import './scss/index.scss';
 
-interface Props {
+export class Wrapper extends React.Component<any, any> {
+  constructor() {
+    super();
+  }
 
-}
-
-interface State {
-
-}
-
-export class Wrapper extends React.Component<Props, State> {
-
-    constructor() {
-        super();
-    }
-
-    render() {
-        return (
-            <div>
-                <Navbar/>
-                <div>
-                    {this.props.children}
-                </div>
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <Navbar />
+        <div>{this.props.children}</div>
+      </div>
+    );
+  }
 }
diff --git a/client/app/app.tsx b/client/app/app.tsx
index c3b30d3..894f458 100644
--- a/client/app/app.tsx
+++ b/client/app/app.tsx
@@ -8,6 +8,7 @@ import { Soundboard } from './pages/Soundboard/Soundboard';
 import { NotFound } from './pages/NotFound/NotFound';
 import { Downloader } from './pages/Downloader/Downloader';
 import { Pubg } from './pages/Pubg/Pubg';
+import { Clips } from './pages/Clips';
 
 ReactDOM.render(
     <Router history={browserHistory}>
@@ -16,6 +17,7 @@ ReactDOM.render(
             <Route path="/soundboard" component={Soundboard}/>
             <Route path="/downloader" component={Downloader}/>
             <Route path="/pubg" component={Pubg}/>
+            <Route path="/clips" component={Clips}/>
             <Route path="*" component={NotFound}/>
         </Route>
     </Router>
diff --git a/client/app/components/Navbar/Navbar.component.tsx b/client/app/components/Navbar/Navbar.tsx
similarity index 88%
rename from client/app/components/Navbar/Navbar.component.tsx
rename to client/app/components/Navbar/Navbar.tsx
index d7324e4..615aa2c 100644
--- a/client/app/components/Navbar/Navbar.component.tsx
+++ b/client/app/components/Navbar/Navbar.tsx
@@ -21,6 +21,7 @@ export class Navbar extends React.Component<Props, State> {
                 <Link to="/soundboard" className="Navbar__item" activeClassName="Navbar__item--active">Soundboard</Link>
                 <Link to="/downloader" className="Navbar__item" activeClassName="Navbar__item--active">Youtube Downloader</Link>
                 <Link to="/pubg" className="Navbar__item" activeClassName="Navbar__item--active">Pubg</Link>
+                <Link to="/clips" className="Navbar__item" activeClassName="Navbar__item--active">Clips</Link>
             </div>
         );
     }
diff --git a/client/app/components/Navbar/index.ts b/client/app/components/Navbar/index.ts
new file mode 100644
index 0000000..e8a6562
--- /dev/null
+++ b/client/app/components/Navbar/index.ts
@@ -0,0 +1 @@
+export * from './Navbar';
diff --git a/client/app/pages/Soundboard/SoundList.scss b/client/app/components/SoundList/SoundList.scss
similarity index 100%
rename from client/app/pages/Soundboard/SoundList.scss
rename to client/app/components/SoundList/SoundList.scss
diff --git a/client/app/pages/Soundboard/SoundList.component.tsx b/client/app/components/SoundList/SoundList.tsx
similarity index 59%
rename from client/app/pages/Soundboard/SoundList.component.tsx
rename to client/app/components/SoundList/SoundList.tsx
index 0c04dab..fb2a82c 100644
--- a/client/app/pages/Soundboard/SoundList.component.tsx
+++ b/client/app/components/SoundList/SoundList.tsx
@@ -1,54 +1,32 @@
 import React from 'react';
-import axios from 'axios';
 
 import './SoundList.scss';
 
 interface Props {
-
+    soundList: SoundType[];
+    type: string;
 }
 
 interface State {
     showAudioControls: boolean[];
-    soundList: {
-        extension: string;
-        name: string;
-        prefix: string;
-    }[];
+}
+
+export interface SoundType {
+    extension: string;
+    name: string;
+    prefix?: string;
 }
 
 export class SoundList extends React.Component<Props, State> {
     
-    private soundListCache: any;
 
     constructor() {
         super();
         this.state = {
-            soundList: [],
             showAudioControls: [],
         };
     }
     
-    componentDidMount() {
-        this.getSoundList();
-    }
-    
-    getSoundList() {
-        if (!this.soundListCache) {
-            axios.get("/soundlist").then((response) => {
-                this.soundListCache = response.data;
-                this.setState({
-                    soundList: response.data,
-                });
-            }).catch(() => {
-                //console.warn(error.response.data);
-            });
-        } else {
-            this.setState({
-                soundList: this.soundListCache,
-            });
-        }
-    }
-    
     checkExtension(extension: string) {
         switch(extension) {
         case "wav":
@@ -72,26 +50,27 @@ export class SoundList extends React.Component<Props, State> {
     }
     
     render() {
+
+        const { soundList, type } = this.props;
+
         return (
             <div className="Card">
                 <div className="Card__header" style={{display:'flex'}}>
                     <div>
-                        Sounds
+                        <span>{type}</span>
                         <i className="fa fa fa-volume-up" aria-hidden="true"/>
                     </div>
                     <div style={{flex:1}}/>
-                    <div>({this.state.soundList.length})</div>
+                    <div>({soundList.length})</div>
                 </div>
                 
-                {this.state.soundList.length > 0 ? this.state.soundList.map((sound, index) => {
+                {soundList.length > 0 ? soundList.map((sound: SoundType, index: number) => {
                     return (
                         <div key={index} className="SoundList__item">
-                            <div>
-                                {sound.prefix + sound.name}
-                            </div>
+                            <div>{(sound.prefix || '') + sound.name}</div>
                             
                             {this.checkExtension(sound.extension) && this.state.showAudioControls[index] ?
-                            <audio controls src={"/public/sounds/" + sound.name + "." + sound.extension}
+                            <audio controls src={`/public/${type.toLowerCase()}/` + sound.name + "." + sound.extension}
                                     itemType={"audio/" + sound.extension}
                                     style={{width: "100px"}}/>
                             : <i className="fa fa-play link" aria-hidden="true" onClick={() => this.handleShowAudio(index)}/> }
diff --git a/client/app/components/SoundList/index.ts b/client/app/components/SoundList/index.ts
new file mode 100644
index 0000000..81dc08b
--- /dev/null
+++ b/client/app/components/SoundList/index.ts
@@ -0,0 +1 @@
+export * from './SoundList';
diff --git a/client/app/pages/Clips/Clips.tsx b/client/app/pages/Clips/Clips.tsx
new file mode 100644
index 0000000..67bc631
--- /dev/null
+++ b/client/app/pages/Clips/Clips.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import axios from 'axios';
+
+import { SoundList, SoundType } from '../../components/SoundList';
+
+interface Props {}
+
+interface State {
+  clipList: SoundType[];
+}
+
+export class Clips extends React.Component<Props, State> {
+  constructor() {
+    super();
+    this.state = {
+      clipList: [],
+    };
+  }
+
+  componentDidMount() {
+    this.getClipList();
+  }
+
+  private getClipList() {
+    axios
+      .get('/api/cliplist')
+      .then(response => {
+        this.setState({
+          clipList: response.data,
+        });
+      })
+      .catch((error: any) => {
+        console.error(error.response.data);
+      });
+  }
+
+  render() {
+    return (
+      <div className="Soundboard">
+        <div className="column">
+          <SoundList soundList={this.state.clipList} type="Clips"/>
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/client/app/pages/Clips/index.ts b/client/app/pages/Clips/index.ts
new file mode 100644
index 0000000..c4eda8c
--- /dev/null
+++ b/client/app/pages/Clips/index.ts
@@ -0,0 +1 @@
+export * from './Clips';
diff --git a/client/app/pages/Downloader/Downloader.tsx b/client/app/pages/Downloader/Downloader.tsx
index 2bff2c7..a3b20da 100644
--- a/client/app/pages/Downloader/Downloader.tsx
+++ b/client/app/pages/Downloader/Downloader.tsx
@@ -48,7 +48,7 @@ export class Downloader extends React.Component<Props, State> {
             dataLoading: true,
         });
 
-        axios.get(`/ytdownloader`, {
+        axios.get(`/api/ytdownloader`, {
             params: {
                 fileType: this.state.fileType,
                 url: this.state.url,
@@ -81,14 +81,6 @@ export class Downloader extends React.Component<Props, State> {
                             value={this.state.url}
                             onChange={(event) => this.setState({url: event.target.value})}/>
 
-                    {/*<div style={{marginBottom:'10px'}}>
-                        <button className={"button Downloader__button" + (this.state.fileType === "mp3" ? " button--primary" : "")}
-                            onClick={() => this.setState({fileType:"mp3"})}>mp3</button>
-                        <button className={"button Downloader__button" + (this.state.fileType=== "mp4" ? " button--primary" : "")}
-                            onClick={() => this.setState({fileType:"mp4"})}>mp4</button>
-                    </div>*/}
-
-                    
                     <div style={{marginBottom:'10px'}}>
                         <button className="button button--primary"
                                 style={{width: '100px', height: '40px', fontSize: 'large'}}
diff --git a/client/app/pages/Home/Home.tsx b/client/app/pages/Home/Home.tsx
index 3a8605f..3d57740 100644
--- a/client/app/pages/Home/Home.tsx
+++ b/client/app/pages/Home/Home.tsx
@@ -19,10 +19,26 @@ export class Home extends React.Component<Props, State> {
                     <div className="Card__header">
                         Go Discord Bot
                     </div>
+                    <h3>Audio Clipping</h3>
+                    <p><em>NEW:</em> Audio clipping now supported! Try it out with the <code>clip</code> command!</p>
+
+                    <br/>
+
+                    <h3>PUBG Stats</h3>
+                    <p>PUBG stats are pulled from the score API.</p>
+
+                    <br/>
+
+                    <h3>Youtube Downloader</h3>
+                    <p>Convert Youtube URL's to MP3 files.</p>
+
+                    <br/>
+
+                    <h3>Soundboard Upload</h3>
                     <p>Drag and drop files to upload. Sounds can be played in discord by typing the commands on the next page.</p>
+
                     <br/>
-                    <p>Gif command now supported! Example: !gif awesome cat gifs</p>
-                    <br/>
+
                     <p>Check out the source code on 
                         <a href="https://github.com/mgerb/GoBot" target="_blank"> GitHub 
                             <i className="fa fa-github" aria-hidden="true"/>
diff --git a/client/app/pages/Pubg/Pubg.tsx b/client/app/pages/Pubg/Pubg.tsx
index 1bfee08..02c05f9 100644
--- a/client/app/pages/Pubg/Pubg.tsx
+++ b/client/app/pages/Pubg/Pubg.tsx
@@ -35,7 +35,7 @@ export class Pubg extends React.Component<Props, State> {
     }
 
     componentDidMount() {
-        axios.get("/stats/pubg").then((res) => {
+        axios.get("/api/stats/pubg").then((res) => {
 
             this.setState({
                 players: _.map(res.data) as any,
diff --git a/client/app/pages/Soundboard/Soundboard.tsx b/client/app/pages/Soundboard/Soundboard.tsx
index f1951ad..5d83aad 100644
--- a/client/app/pages/Soundboard/Soundboard.tsx
+++ b/client/app/pages/Soundboard/Soundboard.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Dropzone from 'react-dropzone';
 import axios, { AxiosRequestConfig } from 'axios';
 
-import { SoundList } from './SoundList.component';
+import { SoundList, SoundType } from '../../components/SoundList';
 
 import './Soundboard.scss';
 
@@ -17,12 +17,13 @@ interface State {
     password: string;
     uploaded: boolean;
     uploadError: string;
+    soundList: SoundType[];
 }
 
 export class Soundboard extends React.Component<Props, State> {
     
     private config: AxiosRequestConfig;
-    public refs: any;
+    private soundListCache: any;
 
     constructor() {
         super();
@@ -31,6 +32,7 @@ export class Soundboard extends React.Component<Props, State> {
             password: "",
             uploaded: false,
             uploadError: " ",
+            soundList: [],
         },
 
         self = this;
@@ -47,8 +49,27 @@ export class Soundboard extends React.Component<Props, State> {
                 });
             }
         };
+
+        this.getSoundList();
     }
     
+    private getSoundList() {
+        if (!this.soundListCache) {
+            axios.get("/api/soundlist").then((response) => {
+                this.soundListCache = response.data;
+                this.setState({
+                    soundList: response.data,
+                });
+            }).catch((error: any) => {
+                console.error(error.response.data);
+            });
+        } else {
+            this.setState({
+                soundList: this.soundListCache,
+            });
+        }
+    }
+
     onDrop(acceptedFiles: any) {
         if (acceptedFiles.length > 0) {
             self.uploadFile(acceptedFiles[0]);
@@ -61,7 +82,7 @@ export class Soundboard extends React.Component<Props, State> {
         formData.append("file", file);
         formData.append("password", this.state.password);
         
-        axios.put("/upload", formData, this.config)
+        axios.put("/api/upload", formData, this.config)
             .then(() => {
                 this.setState({
                     password: "",
@@ -70,9 +91,8 @@ export class Soundboard extends React.Component<Props, State> {
                     uploadError: " ",
                 });
                 
-                // reset sound list cache and load the new list
-                this.refs.SoundList.soundListCache = undefined;
-                this.refs.SoundList.getSoundList();
+                this.soundListCache = undefined;
+                this.getSoundList();
             }).catch((err) => {
                 this.setState({
                     percentCompleted: 0,
@@ -89,10 +109,11 @@ export class Soundboard extends React.Component<Props, State> {
     }
     
     render() {
+        const { soundList } = this.state;
         return (
             <div className="Soundboard">
                 <div className="column">
-                    <SoundList ref="SoundList"/>
+                    <SoundList soundList={soundList} type="Sounds"/>
                 </div>
             
                 <div className="column">
diff --git a/config.template.json b/config.template.json
index 7daa397..2690072 100644
--- a/config.template.json
+++ b/config.template.json
@@ -2,6 +2,7 @@
     "Token": "",
     "BotPrefix": "#",
     "SoundsPath": "./sounds/",
+    "ClipsPath": "./clips/",
     "UploadPassword": "",
     "ServerAddr": ":80",
     "pubg": {
diff --git a/server/bothandlers/sounds.go b/server/bothandlers/sounds.go
index 368c09a..e092422 100644
--- a/server/bothandlers/sounds.go
+++ b/server/bothandlers/sounds.go
@@ -28,9 +28,8 @@ const (
 	maxBytes      int = (frameSize * 2) * 2 // max size of opus data
 	maxSoundQueue int = 10                  // max amount of sounds that can be queued at one time
 
-	sampleRate               int    = 96000 // rate at which wav writer need to make audio up to speed
-	voiceClipQueuePacketSize int    = 2000  // this packet size equates to roughly 40 seconds of audio
-	voiceClipDirectory       string = "./clips"
+	sampleRate               int = 96000 // rate at which wav writer need to make audio up to speed
+	voiceClipQueuePacketSize int = 2000  // this packet size equates to roughly 40 seconds of audio
 )
 
 // store our connection objects in a map tied to a guild id
@@ -292,13 +291,13 @@ func (conn *audioConnection) clipAudio(m *discordgo.MessageCreate) {
 func writePacketsToFile(username string, packets chan *discordgo.Packet) {
 
 	// create clips folder if it does not exist
-	if _, err := os.Stat(voiceClipDirectory); os.IsNotExist(err) {
-		os.Mkdir(voiceClipDirectory, os.ModePerm)
+	if _, err := os.Stat(config.Config.ClipsPath); os.IsNotExist(err) {
+		os.Mkdir(config.Config.ClipsPath, os.ModePerm)
 	}
 
 	// construct filename
 	timestamp := time.Now().UTC().Format("2006-01-02") + "-" + strconv.Itoa(int(time.Now().Unix()))
-	wavOut, err := os.Create(voiceClipDirectory + "/" + timestamp + "-" + username + ".wav")
+	wavOut, err := os.Create(config.Config.ClipsPath + timestamp + "-" + username + ".wav")
 
 	checkErr(err)
 	defer wavOut.Close()
diff --git a/server/config/config.go b/server/config/config.go
index 5a1169c..649c99e 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -18,6 +18,7 @@ type configFile struct {
 	Token          string `json:"Token"`
 	BotPrefix      string `json:"BotPrefix"` //prefix to use for bot commands
 	SoundsPath     string `json:"SoundsPath"`
+	ClipsPath      string `json:"ClipsPath"`
 	UploadPassword string `json:"UploadPassword"`
 	ServerAddr     string `json:"ServerAddr`
 	Pubg           struct {
diff --git a/server/webserver/handlers/soundlist.go b/server/webserver/handlers/soundlist.go
index 80a2521..130637f 100644
--- a/server/webserver/handlers/soundlist.go
+++ b/server/webserver/handlers/soundlist.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"io/ioutil"
+	"log"
 	"strings"
 
 	"net/http"
@@ -58,3 +59,31 @@ func PopulateSoundList() error {
 
 	return nil
 }
+
+// ClipList -
+func ClipList(w http.ResponseWriter, r *http.Request) {
+
+	clipList := []sound{}
+
+	files, err := ioutil.ReadDir(config.Config.ClipsPath)
+
+	if err != nil {
+		log.Println(err)
+		response.ERR(w, 500, response.DefaultInternalError)
+		return
+	}
+
+	for _, f := range files {
+		fileName := strings.Split(f.Name(), ".")[0]
+		extension := strings.Split(f.Name(), ".")[1]
+
+		listItem := sound{
+			Name:      fileName,
+			Extension: extension,
+		}
+
+		clipList = append(clipList, listItem)
+	}
+
+	response.JSON(w, clipList)
+}
diff --git a/server/webserver/server.go b/server/webserver/server.go
index f34e566..aab0cab 100644
--- a/server/webserver/server.go
+++ b/server/webserver/server.go
@@ -30,18 +30,22 @@ func getRouter() *chi.Mux {
 	workDir, _ := os.Getwd()
 
 	FileServer(r, "/static", http.Dir(filepath.Join(workDir, "./dist/static")))
-	FileServer(r, "/public/sounds", http.Dir(filepath.Join(workDir, "./sounds")))
+	FileServer(r, "/public/sounds", http.Dir(filepath.Join(workDir, config.Config.SoundsPath)))
 	FileServer(r, "/public/youtube", http.Dir(filepath.Join(workDir, "./youtube")))
+	FileServer(r, "/public/clips", http.Dir(filepath.Join(workDir, config.Config.ClipsPath)))
 
 	r.NotFound(func(w http.ResponseWriter, r *http.Request) {
 		http.ServeFile(w, r, "./dist/index.html")
 	})
 
-	// configure end points
-	r.Get("/soundlist", handlers.SoundList)
-	r.Put("/upload", handlers.FileUpload)
-	r.Get("/ytdownloader", handlers.Downloader)
-	r.Get("/stats/pubg", pubg.Handler)
+	r.Route("/api", func(r chi.Router) {
+		// configure api end points
+		r.Get("/soundlist", handlers.SoundList)
+		r.Get("/cliplist", handlers.ClipList)
+		r.Put("/upload", handlers.FileUpload)
+		r.Get("/ytdownloader", handlers.Downloader)
+		r.Get("/stats/pubg", pubg.Handler)
+	})
 
 	return r
 }