From 7f4c9cf31197304a6518e35cbd0ec302bdca4e01 Mon Sep 17 00:00:00 2001
From: Chris Sexton <chrissexton@users.noreply.github.com>
Date: Tue, 26 Feb 2013 11:10:13 -0500
Subject: [PATCH] Simple twitter stuff, nothing working yet

---
 config.json        | 63 ++++------------------------------------------
 plugins/twitter.go |  4 +--
 2 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/config.json b/config.json
index 0217ec7..08e79d0 100644
--- a/config.json
+++ b/config.json
@@ -11,15 +11,15 @@
 	"QuoteChance": 0.99,
 	"QuoteTime": 1,
 	"LogLength": 50,
-	"Admins": ["flyngpngn1"],
+	"Admins": ["<Admin Nick>"],
 
 	"UntappdToken": "<Your Token>",
 	"UntappdFreq": 3600,
 
-	"TwitterConsumerKey": "9c2EpWSOv4NIb413Sl6ipg",
-	"TwitterConsumerSecret": "JmAAAXFcYr6nUM5Jhq3d5oTSzZUmgtJwwUfptob2WsU",
-	"TwitterUserKey": "644233-KsPtbllqrx8ziCptfyEUxggVqguwKkpPeg2Nis3zXY",
-	"TwitterUserSecret": "rPiQC7fs9L5j9biMhJD41O7avJitW2z1TjpmoOZc",
+	"TwitterConsumerKey": "<Consumer Key>",
+	"TwitterConsumerSecret": "<Consumer Secret>",
+	"TwitterUserKey": "<User Key>",
+	"TwitterUserSecret": "<User Secret>",
 
 	"WelcomeMsgs": [
 			"Real men use screen, %s.",
@@ -27,57 +27,4 @@
 			"Joins upset the hivemind's CDO, %s.",
 			"%s, I WILL CUT YOU!"
 	],
-
-	"comment": "Follows is the old bot",
-
-	"bot": {
-		"dbname":	"deepintir",
-		"inchan": 	"out",
-		"outchan": 	"in",
-		"logchan": 	"logs",
-		"nick": "|AlePale|",
-		"channel": "#flagonslayers",
-		"command_char": "!",
-		"plugins": {
-			"help": "Help",
-			"talker": "Talker",
-			"remember": "Remember",
-			"beers": "Beers",
-			"first": "First",
-			"sudo": "Sudo"
-		},
-		"_plugins": {
-			"tama": "Tama"
-		},
-		"datastore": "datastore.dat"
-	},
-	"Talker": {
-		"names": ["fredfelps", "felps"],
-		"slogan": "GOD HATES %NICK%"
-	},
-	"Remember": {
-		"quotefile": "quotes.txt",
-		"loglength": 50,
-		"quotechance": 0.10,
-		"quotetimer": 1800
-	},
-	"Beers": {
-		"responses": [
-			"Stay thirsty, my friend!",
-			"HIC!",
-			"ZIGGY! ZAGGY!"
-		],
-		"countfile": "beers.txt",
-		"drinktriggers": [
-			"drink",
-			"imbibe"
-		],
-		"puketriggers": [
-			"puke",
-			"yack"
-		]
-	},
-	"Sudo": {
-		"chance": 0.01
-	}
 }
diff --git a/plugins/twitter.go b/plugins/twitter.go
index 8858a39..d2d9208 100644
--- a/plugins/twitter.go
+++ b/plugins/twitter.go
@@ -2,7 +2,7 @@ package plugins
 
 import (
 	"bitbucket.org/phlyingpenguin/godeepintir/bot"
-	"github.com/astrata/twitter"
+	"bitbucket.org/phlyingpenguin/twitter"
 	"github.com/garyburd/go-oauth/oauth"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
@@ -120,7 +120,7 @@ func (p *TwitterPlugin) checkMessages() {
 	for {
 		time.Sleep(time.Minute * 30)
 		var u url.Values
-		u["screen_name"] = []string{"phlyingpenguin"}
+		u.Set("screen_name", "phlyingpenguin")
 		data, err := p.Client.UserTimeline(u)
 		if err != nil {
 			log.Println(err)