Updated to Go1

Author: rselbach

Makefile

@@ -8,7 +8,7 @@ Installing
 
 Best way to isntall this package is by running goinstall:
 
-	goinstall github.com/robteix/fblib
+	go get github.com/robteix/fblib
 
 And then you can import it in your code like this:
 
@@ -18,11 +18,6 @@ And then you can import it in your code like this:
 		...
 	)
 
-And of course, if you want to do it manually, just check the code,
-cd to the project's root dir and do a:
-
-	gomake install
-
 License
 -------
 

README.md

@@ -14,27 +14,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package facebooklib
+package fblib
 
 import (
 	"bytes"
+	"encoding/json"
+	"errors"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
-	"json"
-	"os"
+	"net/http"
 	"strconv"
 
+	"net/url"
 	"time"
-	"url"
 )
 
 var (
-	ErrOAuth = os.NewError("OAuth authorization failure")
-	)
+	ErrOAuth = errors.New("OAuth authorization failure")
+)
+
 const (
-	tokenRequestURL = "https://www.facebook.com/dialog/oauth"         // request token endpoint
+	tokenRequestURL = "https://www.faceook.com/dialog/oauth"         // request token endpoint
 	accessTokenURL  = "https://graph.facebook.com/oauth/access_token" // access token endpoint
 
 	apiURL = "https://graph.facebook.com"
@@ -53,15 +54,15 @@ type TempToken struct {
 }
 
 func nonce() string {
-	s := time.Nanoseconds()
-	return strconv.Itoa64(s)
+	s := time.Now()
+	return strconv.FormatInt(s.Unix(), 10)
 }
 
 func NewFacebookClient(key, secret string) *FacebookClient {
 	return &FacebookClient{APIKey: key,
 		AppSecret: secret,
 		Transport: http.DefaultTransport}
-	}
+}
 
 func (fc *FacebookClient) AuthURL(redirectURI, scope string) string {
 	params := make(url.Values)
@@ -73,9 +74,7 @@ func (fc *FacebookClient) AuthURL(redirectURI, scope string) string {
 	return fmt.Sprintf("%s?%s", tokenRequestURL, params.Encode())
 }
 
-
-
-func (fc *FacebookClient) RequestAccessToken(code, redirectURI string) os.Error {
+func (fc *FacebookClient) RequestAccessToken(code, redirectURI string) error {
 	var body io.Reader
 	body = bytes.NewBuffer([]byte(""))
 	params := make(url.Values)
@@ -108,7 +107,7 @@ func (fc *FacebookClient) RequestAccessToken(code, redirectURI string) os.Error
 	return nil
 }
 
-func (fc *FacebookClient) parseError(respBody []byte) os.Error {
+func (fc *FacebookClient) parseError(respBody []byte) error {
 	var buf map[string]interface{}
 	json.Unmarshal(respBody, &buf)
 	errorMap := buf["error"]
@@ -120,14 +119,14 @@ func (fc *FacebookClient) parseError(respBody []byte) os.Error {
 			if kind == "OAuthException" {
 				return ErrOAuth
 			} else {
-				return os.NewError(error["message"].(string))
+				return errors.New(error["message"].(string))
 			}
 		}
 	}
-	return os.NewError("Unknown error")
+	return errors.New("Unknown error")
 }
 
-func (fc *FacebookClient) GetUser(id string) (*User, os.Error) {
+func (fc *FacebookClient) GetUser(id string) (*User, error) {
 	u := make(url.Values)
 	u.Set("access_token", fc.AccessToken)
 	body := bytes.NewBuffer([]byte(u.Encode()))
@@ -154,7 +153,7 @@ func (fc *FacebookClient) GetUser(id string) (*User, os.Error) {
 
 // Performs API call based on httpMethod
 // returns the response body as string and error/nil
-func (fc *FacebookClient) Call(httpMethod, endpoint string, params url.Values) ([]byte, os.Error) {
+func (fc *FacebookClient) Call(httpMethod, endpoint string, params url.Values) ([]byte, error) {
 	body := bytes.NewBuffer([]byte(params.Encode()))
 	cmdStr := fmt.Sprintf("%s/%s?access_token=%s", apiURL, endpoint, fc.AccessToken)
 	if httpMethod == "GET" {
@@ -179,25 +178,27 @@ func (fc *FacebookClient) Call(httpMethod, endpoint string, params url.Values) (
 	return respBody, nil
 }
 
-func (fc *FacebookClient) User(id string) (*User, os.Error) {
+func (fc *FacebookClient) User(id string) (*User, error) {
 	u := new(url.Values)
 	resp, err := fc.Call("GET", id, *u)
 	if err != nil {
 		return nil, err
 	}
 	user := new(User)
-	if err = json.Unmarshal(resp, user); err != nil {
-		return nil, err
-	}
+
+	//if err = json.Unmarshal(resp, user); err != nil {
+	//	return nil, os.NewError(fmt.Sprintf("fc.User error -> %s (resp body: '%s')", err, resp))
+	//}
+	json.Unmarshal(resp, user)
 	user.Client = fc
 	return user, nil
 }
 
-func (fc *FacebookClient) CurrentUser() (*User, os.Error) {
+func (fc *FacebookClient) CurrentUser() (*User, error) {
 	return fc.User("me")
 }
 
-func (fc *FacebookClient) PostLink(message, link string) os.Error {
+func (fc *FacebookClient) PostLink(message, link string) error {
 	u := make(url.Values)
 	u.Add("message", message)
 	u.Add("link", link)
@@ -206,9 +207,9 @@ func (fc *FacebookClient) PostLink(message, link string) os.Error {
 	return err
 }
 
-func (fc *FacebookClient) PostStatus(message string) os.Error {
+func (fc *FacebookClient) PostStatus(message string) error {
 	u := make(url.Values)
 	u.Add("message", message)
 	_, err := fc.Call("POST", "me/feed", u)
 	return err
-}
+}

facebook.go

@@ -1,4 +1,4 @@
-// twitterlib - A simple, fully oauth-authenticated Twitter library
+// fblib - A simple, fully oauth-authenticated Twitter library
 
 // Copyright (c) 2011, Roberto Teixeira <[email protected]>
 //
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package facebooklib
+package fblib
 
 // User object. See http://developers.facebook.com/docs/reference/api/user/
 type User struct {

types.go

@@ -1,45 +1,45 @@
-package facebooklib
+package fblib
 
 import (
-	"os"
-	"url"
-	)
+	"errors"
+	"net/url"
+)
 
 var (
-	UserNotConnectedError = os.NewError("User Not Connected")
-	)
+	UserNotConnectedError = errors.New("User Not Connected")
+)
 
 // Useful if all you want is to have an Id to perform actions
 // This prevents having to query a user object from FB.
 func NewUser(Id string, fc *FacebookClient) *User {
 	return &User{Id: Id, Client: fc}
 }
 
-func (user *User) PostStatus(message string) os.Error {
+func (user *User) PostStatus(message string) error {
 	if user.Client == nil {
 		return UserNotConnectedError
 	}
 	if message == "" {
-		return os.NewError("Missing message parameter")
+		return errors.New("Missing message parameter")
 	}
 	u := make(url.Values)
 	u.Set("message", message)
-	_, err := user.Client.Call("POST", user.Id + "/feed", u)
+	_, err := user.Client.Call("POST", user.Id+"/feed", u)
 	return err
 }
 
-func (user *User) PostLink(link, message string) os.Error {
+func (user *User) PostLink(link, message string) error {
 	if user.Client == nil {
 		return UserNotConnectedError
 	}
 	if link == "" {
-		return os.NewError("Missing link parameter")
+		return errors.New("Missing link parameter")
 	}
 	u := make(url.Values)
 	if message != "" {
 		u.Set("message", message)
 	}
 	u.Set("link", link)
-	_, err := user.Client.Call("POST", user.Id + "/links", u)
+	_, err := user.Client.Call("POST", user.Id+"/links", u)
 	return err
-}
+}