Merge branch 'develop'

Author: vendion

README.md

@@ -97,6 +97,10 @@ devlunch me| Returns details for the next listed Chadev Lunch talk
 devlunch url (date) (url) | Set live stream url for the dev lunch talks
 link to devlunch | Returns the link to the dev lunch live stream
 is `username` alive | Returns status of user
+\[groups\|meetups\] list | Lists all groups that are known to Ash
+\[groups\|meetups\] add (group name): (url) | Adds a new group to Ash
+\[group\|meetup\] details | Returns details about a group
+\[group\|meetup\] remove (group name) | Removes a group that Ash knows about
 
 ## Contributing
 

events.go

@@ -176,6 +176,7 @@ func getCalendarEvents() (string, error) {
 			return "", err
 		}
 	}
+	hal.Logger.Debugf("Access Token: %s", accessToken.Token)
 
 	URL := fmt.Sprintf("%s/[email protected]/events?access_token=%s&singleEvents=true&orderBy=startTime&timeMin=%s&maxResults=7",
 		baseURL, url.QueryEscape(accessToken.Token),
@@ -190,6 +191,7 @@ func getCalendarEvents() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	hal.Logger.Debugf("Google calendal response: %v", string(body))
 
 	var Events Event
 
@@ -322,6 +324,7 @@ func getNextEvent() (string, error) {
 			return "", err
 		}
 	}
+	hal.Logger.Debugf("Access Token: %s", accessToken.Token)
 
 	URL := fmt.Sprintf("%s/[email protected]/events?access_token=%s&singleEvents=true&orderBy=startTime&timeMin=%s&maxResults=1",
 		baseURL, url.QueryEscape(accessToken.Token),
@@ -336,6 +339,7 @@ func getNextEvent() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	hal.Logger.Debugf("Google calendal response: %v", string(body))
 
 	var E Event
 

groups.go

@@ -0,0 +1,177 @@
+// Copyright 2014-2015 Chadev. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/danryan/hal"
+)
+
+// Groups contains data on the various dev groups.
+type Groups struct {
+	// Name of the group
+	Name string `json:"name"`
+	// URL for the group page/meetup page
+	URL string `json:"url"`
+	// Meetup is the group name from the meetup URL
+	// this is used for Meetup API calls.
+	Meetup string `json:"meetup_name"`
+}
+
+var groupListHandler = hear(`(groups|meetups) list`, "(groups|meetups) list", "Lists all groups that are known to Ash", func(res *hal.Response) error {
+	groups, err := res.Robot.Store.Get("GROUPS")
+	if err != nil {
+		res.Send("I am currently unaware of any groups, try adding some")
+		return err
+	}
+
+	var g []Groups
+	err = json.Unmarshal(groups, &g)
+	if err != nil {
+		hal.Logger.Errorf("error parsing JSON: %v", err)
+		return res.Send("I had an error parsing the groups")
+	}
+
+	var gn []string
+	for _, val := range g {
+		gn = append(gn, val.Name)
+	}
+	names := strings.Join(gn, ", ")
+
+	return res.Send(fmt.Sprintf("Here is a list of groups: %s", names))
+})
+
+var groupAddHandler = hear(`(groups|meetups) add (.+): (.+)`, "(groups|meetups) add [group name]: [group url]", "Adds a new group to Ash", func(res *hal.Response) error {
+	name := res.Match[2]
+	url := res.Match[3]
+
+	if name == "" {
+		hal.Logger.Warn("no group name given")
+		return res.Send("I need a name for the group to add it.")
+	}
+	if url == "" {
+		hal.Logger.Warn("no group url given")
+		return res.Send("I need the url for the groups webpage or meetup group")
+	}
+
+	var g []Groups
+	groups, err := res.Robot.Store.Get("GROUPS")
+	if len(groups) > 0 {
+		err := json.Unmarshal(groups, &g)
+		if err != nil {
+			hal.Logger.Errorf("faild to parse json: %v", err)
+			return res.Send("Failed to parse groups list")
+		}
+	}
+
+	var meetupName string
+	if strings.Contains(url, "meetup.com") {
+		meetupName = parseMeetupName(url)
+	}
+
+	g = append(g, Groups{Name: name, URL: url, Meetup: meetupName})
+	groups, err = json.Marshal(g)
+	if err != nil {
+		hal.Logger.Errorf("faild to build json: %v", err)
+		return res.Send("Failed write updated groups list")
+	}
+	err = res.Robot.Store.Set("GROUPS", groups)
+	if err != nil {
+		hal.Logger.Error(err)
+		return res.Send("Failed writing to the datastore")
+	}
+
+	return res.Send("Added new group")
+})
+
+var groupDetailsHandler = hear(`(group|meetup) details (.+)`, "(group|meetup) details [group name]", "Returns details about a group", func(res *hal.Response) error {
+	name := res.Match[2]
+
+	var g []Groups
+	groups, _ := res.Robot.Store.Get("GROUPS")
+	if len(groups) > 0 {
+		err := json.Unmarshal(groups, &g)
+		if err != nil {
+			hal.Logger.Errorf("faild to parse json: %v", err)
+			return res.Send("Failed to parse groups list")
+		}
+	}
+
+	if len(groups) == 0 {
+		hal.Logger.Error("no groups currently defined")
+		return res.Send("I currently don't know of any groups, try adding some first")
+	}
+
+	group := searchGroups(g, strings.ToLower(name))
+	if group.Name == "" {
+		hal.Logger.Warnf("no group with the name %s found", name)
+		return res.Send(fmt.Sprintf("I could not find a group with the name %s", name))
+	}
+
+	return res.Send(fmt.Sprintf("Group name: %s URL: %s", group.Name, group.URL))
+
+})
+
+var groupRemoveHandler = hear(`(group|meetup) remove (.+)`, "(group|meetup) remove [group name]", "Removes a group that ash knows about", func(res *hal.Response) error {
+	name := res.Match[2]
+
+	var g []Groups
+	groups, err := res.Robot.Store.Get("GROUPS")
+	if err != nil {
+		hal.Logger.Error("no groups currently in the datastore")
+		res.Send("Sorry I don't know of any groups.")
+		return err
+	}
+
+	err = json.Unmarshal(groups, &g)
+	if err != nil {
+		hal.Logger.Errorf("couldn't unmarshal json: %v", err)
+		res.Send("Sorry I was unable to parse the json object")
+		return err
+	}
+
+	for i, group := range g {
+		if group.Name == name {
+			// remove the group from the slice
+			var e Groups
+			g[len(g)-1], g = e, append(g[:i], g[i+1:]...)
+		}
+	}
+	groups, err = json.Marshal(g)
+	if err != nil {
+		hal.Logger.Errorf("couldn't marshal json: %v", err)
+		res.Send("Sorry I was unable to generate json object")
+		return err
+	}
+	err = res.Robot.Store.Set("GROUPS", groups)
+	if err != nil {
+		hal.Logger.Errorf("error writing to datastore: %v", err)
+		res.Send("Sorry I was unable to update group listing")
+		return err
+	}
+
+	return res.Send("Group list updated")
+})
+
+func parseMeetupName(u string) string {
+	// meetup URLs are structured as www.meetup.com/(group name)
+	parts := strings.Split(u, "/")
+
+	return parts[len(parts)-1]
+}
+
+func searchGroups(g []Groups, n string) Groups {
+	var group Groups
+	for _, val := range g {
+		if strings.ToLower(val.Name) == n {
+			group = val
+		}
+	}
+
+	return group
+}

main.go

@@ -121,6 +121,10 @@ func run() int {
 		addTalkHandler,
 		devTalkLinkHandler,
 		isAliveHandler,
+		groupListHandler,
+		groupAddHandler,
+		groupDetailsHandler,
+		groupRemoveHandler,
 	)
 
 	if err := robot.Run(); err != nil {

whois.go

@@ -27,13 +27,7 @@ var isHandler = hear(`(.+) is (.+)`, "(name) is (role)", "Tell Ash who the user
 	key := strings.ToUpper(name)
 	role := res.Match[2]
 
-	storedRoles, err := res.Robot.Store.Get(key)
-	roleToStore := role
-	if len(storedRoles) > 0 {
-		roleToStore = roleToStore + ", " + string(storedRoles)
-	}
-
-	err = res.Robot.Store.Set(key, []byte(roleToStore))
+	err := res.Robot.Store.Set(key, []byte(role))
 	if err != nil {
 		res.Send("There's something wrong")
 		return err