5 files changed, 32 insertions(+), 11 deletions(-)

M DiscordGo/structs.go
M DiscordGo/voice.go
M DiscordGo/wsapi.go
M helper.go
A mkfile

@@ 17,7 17,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gorilla/websocket"
+	"bitbucket.org/henesy/disco/websocket"
 )
 
 // A Session represents a connection to the Discord API.

@@ 19,7 19,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gorilla/websocket"
+	"bitbucket.org/henesy/disco/websocket"
 )
 
 // ------------------------------------------------------------------------------------------------

@@ 22,7 22,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/gorilla/websocket"
+	"bitbucket.org/henesy/disco/websocket"
 )
 
 type handshakeProperties struct {

@@ 1,21 1,22 @@
 package main
 
 import (
-	"encoding/binary"
+//	"encoding/binary"
 	"log"
-	"math"
+//	"math"
 	"os"
 	"os/exec"
 	"strings"
 	"time"
+	"fmt"
 
-	"bitbucket.org/henesy/disco/color"
+//	"bitbucket.org/henesy/disco/color"
 	"bitbucket.org/henesy/disco/DiscordGo"
 )
 
 //HexColor is a struct gives RGB values
 type HexColor struct {
-	Color color.Attribute
+//	Color color.Attribute
 	R     int
 	G     int
 	B     int


@@ 26,12 27,13 @@ func Msg(MsgType, format string, a ...interface{}) {
 
 	// TODO: Add support for changing color by configuration
 
-	Error := color.New(color.FgRed, color.Bold)
+/*	Error := color.New(color.FgRed, color.Bold)
 	Info := color.New(color.FgYellow, color.Bold)
 	Head := color.New(color.FgCyan, color.Bold)
 	Text := color.New(color.FgWhite)
 
 	switch MsgType {
+
 	case "Error":
 		Error.Printf(format, a...)
 	case "Info":


@@ 42,7 44,8 @@ func Msg(MsgType, format string, a ...interface{}) {
 		Text.Printf(format, a...)
 	default:
 		Text.Printf(format, a...)
-	}
+	}*/
+	fmt.Print(a...)
 }
 
 //Clear clears the terminal => This barely works, please fix


@@ 116,19 119,22 @@ func Notify(m *discordgo.Message) {
 
 //MessagePrint prints one correctly formatted Message to stdout
 func MessagePrint(Time, Username, Content string) {
-	var Color color.Attribute
+	//var Color color.Attribute
 	TimeStamp, _ := time.Parse(time.RFC3339, Time)
 	LocalTime := TimeStamp.Local().Format("2006/01/02 15:04:05")
+	/*
 	if val, ok := State.MemberRole[Username]; ok {
 		Color = ColorMatch(val.Color)
 	}
 	UserName := color.New(Color).SprintFunc()
+	*/
 
 	log.SetFlags(0)
-	log.Printf("%s > %s > %s\n", LocalTime, UserName(Username), Content)
+	log.Printf("%s > %s > %s\n", LocalTime, Username, Content)
 	log.SetFlags(log.LstdFlags)
 }
 
+/*
 //ColorMatch compares HEX->DEC colorcoding and returns the closest ANSI color
 func ColorMatch(colorinput int) color.Attribute {
 	var Result float64


@@ 160,6 166,7 @@ func ColorMatch(colorinput int) color.Attribute {
 
 	return ColorResult
 }
+*/
 
 func dis(a, b int) float64 {
 	return float64((a - b) * (a - b))

@@ 0,0 1,14 @@
+all: 
+	go build
+
+deps: 
+	mkdir -p $GOPATH/src/bitbucket.org/henesy/disco
+	dircp ./ $GOPATH/src/bitbucket.org/henesy/disco
+
+crypto:
+	orig=`{pwd}
+	mkdir -p $GOPATH/src/golang.org/x/crypto
+	cd $GOPATH/src/golang.org/x
+	hget https://github.com/golang/crypto/archive/master.zip > crypto.zip; unzip -f crypto.zip
+	dircp crypto-master crypto; rm -r crypto-master
+	cd $orig