👥 Massive update of chat features

chipzel - Disco Descent (1-1 Remix)

Author: Maxim Lebedev

AcceptTeamInvite.go

@@ -1,30 +1,31 @@
 package hitGox
 
 import (
-	"errors"
 	"fmt"
-	"github.com/valyala/fasthttp"
 	"strconv"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // AcceptTeamInvite accept an invite from teamName.
-func (account *Account) AcceptTeamInvite(teamName string, groupID interface{}) (*Status, error) {
-	var args fasthttp.Args
+func (account *Account) AcceptTeamInvite(teamName string, groupID interface{}) (*just.Status, error) {
+	var args f.Args
 	args.Add("authToken", account.AuthToken)
 	switch id := groupID.(type) {
 	case int:
 		args.Add("group_id", strconv.Itoa(id))
 	case string:
 		args.Add("group_id", id)
 	default:
-		return nil, errors.New("groupid can be only as string or int")
+		return nil, fmt.Errorf("groupid can be only as string or int")
 	}
 
-	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("/team/", teamName, "/", account.UserName))
-	resp, err := update(url, &args)
+	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("team/", teamName, "/", account.UserName))
+	resp, err := just.UPDATE(url, &args)
 	if err != nil {
 		return nil, err
 	}
 
-	return fixStatus(resp), nil
+	return just.FixStatus(resp), nil
 }

ChatConnection.go

@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/valyala/fasthttp"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // ChatSettings containing information about channel chat.
@@ -19,11 +21,11 @@ type ChatSettings struct {
 //
 // Moderators and Editors can view this API.
 func (account *Account) GetChatSettings(channel string) (*ChatSettings, error) {
-	var args fasthttp.Args
+	var args f.Args
 	args.Add("authToken", account.AuthToken)
 
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("chat/settings/", channel))
-	resp, err := get(url, &args)
+	resp, err := just.GET(url, &args)
 	if err != nil {
 		return nil, err
 	}

ChatSettings.go

@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/valyala/fasthttp"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // FollowingStatus is about follower relationship.
@@ -18,11 +20,11 @@ type FollowingStatus struct {
 
 // CheckFollowingStatus returns follower relationship from userName to channel.
 func CheckFollowingStatus(channel string, userName string) (*FollowingStatus, error) {
-	var args fasthttp.Args
+	var args f.Args
 	args.Add("user_name", userName)
 
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("following/user/", channel))
-	resp, err := get(url, &args)
+	resp, err := just.GET(url, &args)
 	if err != nil {
 		return nil, err
 	}

CheckFollowingStatus.go

@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/valyala/fasthttp"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // SubscriptionInfo is about user subscription status.
@@ -28,11 +30,11 @@ type SubscriptionInfo struct {
 
 // CheckSubscriptionInfo retruns subscription information between :channel and :user
 func (account *Account) CheckSubscriptionInfo(user string) (*SubscriptionInfo, error) {
-	var args fasthttp.Args
+	var args f.Args
 	args.Add("authToken", account.AuthToken)
 
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("subscription/", account.UserName, "/", user))
-	resp, err := get(url, &args)
+	resp, err := just.GET(url, &args)
 	if err != nil {
 		return nil, err
 	}

CheckSubscriptionInfo.go

@@ -4,12 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+
+	just "github.com/toby3d/hitGox/tools"
 )
 
-// CheckSubscriptionStatus rReturns subscription relationship between channel and auth.
+// CheckSubscriptionStatus returns subscription relationship between channel and auth.
 func (account *Account) CheckSubscriptionStatus(channel string) (bool, error) {
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("user/subscription/", channel, "/", account.AuthToken))
-	resp, err := get(url, nil)
+	resp, err := just.GET(url, nil)
 	if err != nil {
 		return false, err
 	}

CheckSubscriptionStatus.go

@@ -2,19 +2,21 @@ package hitGox
 
 import (
 	"fmt"
-	"github.com/valyala/fasthttp"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // CheckToken checks if the Token is valid.
-func (app *OAuthApplication) CheckToken(authToken string) (*Status, error) {
-	var args fasthttp.Args
+func (app *OAuthApplication) CheckToken(authToken string) (*just.Status, error) {
+	var args f.Args
 	args.Add("token", authToken)
 
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("auth/valid/", app.Name))
-	resp, err := get(url, &args)
+	resp, err := just.GET(url, &args)
 	if err != nil {
 		return nil, err
 	}
 
-	return fixStatus(resp), nil
+	return just.FixStatus(resp), nil
 }

CheckToken.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+
+	just "github.com/toby3d/hitGox/tools"
 )
 
 // VerifiedStatus is about validated user email address.
@@ -21,7 +23,7 @@ type VerifiedStatus struct {
 // CheckVerifiedEmail check if user has validated their email address.
 func CheckVerifiedEmail(userName string) (*VerifiedStatus, error) {
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("user/checkVerifiedEmail/", userName))
-	resp, err := get(url, nil)
+	resp, err := just.GET(url, nil)
 	if err != nil {
 		return nil, err
 	}

CheckVerifiedEmail.go

@@ -3,11 +3,13 @@ package hitGox
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/valyala/fasthttp"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // CreateOAuthApplication creates a OAuth Application.
-func (account *Account) CreateOAuthApplication(name string, redirectURI string) (*Status, error) {
+func (account *Account) CreateOAuthApplication(name string, redirectURI string) (*just.Status, error) {
 	var changes = struct {
 		AuthToken string `json:"authToken"`
 		UserName  string `json:"user_name"`
@@ -27,14 +29,14 @@ func (account *Account) CreateOAuthApplication(name string, redirectURI string)
 		return nil, err
 	}
 
-	var args fasthttp.Args
+	var args f.Args
 	args.Add("authToken", account.AuthToken)
 
 	url := fmt.Sprintf(APIEndpoint, fmt.Sprint("oauthapps/", account.UserName))
-	resp, err := post(dst, url, &args)
+	resp, err := just.POST(dst, url, &args)
 	if err != nil {
 		return nil, err
 	}
 
-	return fixStatus(resp), nil
+	return just.FixStatus(resp), nil
 }

CreateOAuthApplication.go

@@ -3,13 +3,15 @@ package hitGox
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/valyala/fasthttp"
+
+	just "github.com/toby3d/hitGox/tools"
+	f "github.com/valyala/fasthttp"
 )
 
 // CreateTeam creates a team object.
 //
 // displayName must match dame except casing.
-func (account *Account) CreateTeam(name string, displayName string, text string) (*Status, error) {
+func (account *Account) CreateTeam(name string, displayName string, text string) (*just.Status, error) {
 	var changes = struct {
 		AuthToken        string `json:"authToken"`
 		GroupUserName    string `json:"group_user_name"`
@@ -23,14 +25,14 @@ func (account *Account) CreateTeam(name string, displayName string, text string)
 		return nil, err
 	}
 
-	var args fasthttp.Args
+	var args f.Args
 	args.Add("authToken", account.AuthToken)
 
 	url := fmt.Sprintf(APIEndpoint, "team")
-	resp, err := post(dst, url, &args)
+	resp, err := just.POST(dst, url, &args)
 	if err != nil {
 		return nil, err
 	}
 
-	return fixStatus(resp), nil
+	return just.FixStatus(resp), nil
 }