Revert "Add packaging for commentapi"

This reverts commit 3b4b688.
OdyseeTeam · Jan 12, 2022 · c37ecf1 · c37ecf1
1 parent 4a549d1
commit c37ecf1
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 241 deletions.
diff --git a/commentapi/api.go b/commentapi/api.go
@@ -1,6 +1,6 @@
 package commentapi
 
-import "github.com/lbryio/lbry.go/v2/extras/api"
+import "github.com/lbryio/lbry.go/extras/api"
 
 // Validator for api arguments that should have some checks applied for every request.
 type Validator interface {

diff --git a/commentapi/blocked_lists.go b/commentapi/blocked_lists.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/volatiletech/null"
 
-	"github.com/lbryio/commentron/commentapi/validator"
+	"github.com/lbryio/commentron/validator"
 
 	"github.com/lbryio/lbry.go/v2/extras/api"
 	"github.com/lbryio/lbry.go/v2/extras/errors"

diff --git a/commentapi/client.go b/commentapi/client.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lbryio/commentron/commentapi/lbry"
+	"github.com/lbryio/commentron/server/lbry"
 
 	"github.com/fatih/structs"
 	"github.com/lbryio/lbry.go/v2/extras/errors"

diff --git a/commentapi/comment.go b/commentapi/comment.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"regexp"
 
-	"github.com/lbryio/commentron/commentapi/validator"
+	"github.com/lbryio/commentron/validator"
 	"github.com/lbryio/lbry.go/v2/extras/api"
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	v "github.com/lbryio/ozzo-validation"

diff --git a/commentapi/go.mod b/commentapi/go.mod
diff --git a/commentapi/go.sum b/commentapi/go.sum
diff --git a/commentapi/helper/bytes.go b/commentapi/helper/bytes.go
diff --git a/commentapi/lbry/validator.go b/commentapi/lbry/validator.go
diff --git a/commentapi/setting.go b/commentapi/setting.go
@@ -3,9 +3,9 @@ package commentapi
 import (
 	"net/http"
 
-	"github.com/lbryio/commentron/commentapi/validator"
+	"github.com/lbryio/commentron/validator"
 
-	"github.com/lbryio/lbry.go/v2/extras/api"
+	"github.com/lbryio/lbry.go/extras/api"
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	v "github.com/lbryio/ozzo-validation"
 )

diff --git a/commentapi/test/comment.go b/commentapi/test/comment.go
@@ -0,0 +1,40 @@
+package main
+
+import (
+	"github.com/lbryio/commentron/commentapi"
+	"github.com/lbryio/commentron/env"
+	"github.com/sirupsen/logrus"
+)
+
+func main() {
+	conf, err := env.NewWithEnvVars() //
+	if err != nil {
+		logrus.Panic(err)
+	}
+	testCommenting(conf)
+	testReacting(conf)
+}
+
+func testReacting(conf *env.Config) {
+	c := commentapi.NewClient(conf.TestURL).WithSigning(conf.TestChannel)
+	_, err := c.ReactionReact(commentapi.ReactArgs{
+		CommentIDs: "0000125eb5349851d3aecfef344092e801a3b84ea5ab055158d2911b3b96dd57",
+		Type:       "like",
+	})
+	if err != nil {
+		logrus.Error(err)
+	}
+}
+
+func testCommenting(conf *env.Config) {
+	c := commentapi.NewClient(conf.TestURL).WithSigning(conf.TestChannel)
+	_, err := c.CommentCreate(commentapi.CreateArgs{
+		CommentText: "Can I create comments?",
+		ClaimID:     "ca1ab0d129060ad12774b239976fd3379d571846",
+		ChannelID:   c.Channel.ChannelID,
+		ChannelName: c.Channel.Name,
+	})
+	if err != nil {
+		logrus.Error(err)
+	}
+}
diff --git a/commentapi/lbry/channel.go → server/lbry/channel.go b/commentapi/lbry/channel.go → server/lbry/channel.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/lbryio/commentron/commentapi/helper"
+	"github.com/lbryio/commentron/helper"
 
 	"github.com/sirupsen/logrus"
 
@@ -93,7 +93,7 @@ func (l *Channel) Sign(data []byte) (string, string, error) {
 	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
 	hash := sha256.Sum256(helper.CreateDigest(
 		[]byte(timestamp),
-		UnhelixifyAndReverse(l.ChannelID),
+		unhelixifyAndReverse(l.ChannelID),
 		data))
 	hashBytes := make([]byte, len(hash))
 	for i, b := range hash {

diff --git a/commentapi/validator/validator.go → validator/validator.go b/commentapi/validator/validator.go → validator/validator.go