add is protected index (#126)

* add is protected index Update 019_comments_protected_idx.sql * fix sqlboiler * update import path update go update ubuntu update binddata Co-authored-by: Niko Storni <[email protected]>
OdyseeTeam · Sep 21, 2022 · 1bf2462 · 1bf2462
1 parent b4b755c
commit 1bf2462
Show file tree

Hide file tree

Showing 69 changed files with 227 additions and 320 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 os: linux
-dist: bionic
+dist: focal
 language: go
-go_import_path: github.com/lbryio/commentron
+go_import_path: github.com/OdyseeTeam/commentron
 
-go: 1.17.x
+go: 1.18.x
 
 install: true
 

diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ The only integration we really support right now, is via the [Go Client API](com
 ```golang
 package main
 
-import "github.com/lbryio/commentron/commentapi"
+import "github.com/lbryio/OdyseeTeam/commentapi"
 
 func main() {
 	commentID := "0fa2eacf0b91fa3187e87733f103418e51f0c40d0b06b67c5d6d3ff2c13b2925"

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -1,11 +1,11 @@
 package cmd
 
 import (
-	"github.com/lbryio/commentron/config"
-	"github.com/lbryio/commentron/env"
-	"github.com/lbryio/commentron/jobs"
-	"github.com/lbryio/commentron/server"
-	"github.com/lbryio/commentron/server/lbry"
+	"github.com/OdyseeTeam/commentron/config"
+	"github.com/OdyseeTeam/commentron/env"
+	"github.com/OdyseeTeam/commentron/jobs"
+	"github.com/OdyseeTeam/commentron/server"
+	"github.com/OdyseeTeam/commentron/server/lbry"
 
 	"github.com/pkg/profile"
 	"github.com/sirupsen/logrus"

diff --git a/cmd/test.go b/cmd/test.go
@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/lbryio/commentron/config"
-	"github.com/lbryio/commentron/env"
-	"github.com/lbryio/commentron/server/lbry"
-	"github.com/lbryio/commentron/tests"
+	"github.com/OdyseeTeam/commentron/config"
+	"github.com/OdyseeTeam/commentron/env"
+	"github.com/OdyseeTeam/commentron/server/lbry"
+	"github.com/OdyseeTeam/commentron/tests"
 
 	"github.com/pkg/profile"
 	"github.com/sirupsen/logrus"

diff --git a/cmd/version.go b/cmd/version.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/lbryio/commentron/meta"
+	"github.com/OdyseeTeam/commentron/meta"
 
 	"github.com/spf13/cobra"
 )

diff --git a/commentapi/blocked_lists.go b/commentapi/blocked_lists.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/lbryio/commentron/validator"
-	
+	"github.com/OdyseeTeam/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/client.go b/commentapi/client.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lbryio/commentron/server/lbry"
+	"github.com/OdyseeTeam/commentron/server/lbry"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
-	
+
 	"github.com/fatih/structs"
 	"github.com/mitchellh/mapstructure"
 	log "github.com/sirupsen/logrus"

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

diff --git a/commentapi/moderation.go b/commentapi/moderation.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/lbryio/commentron/validator"
+	"github.com/OdyseeTeam/commentron/validator"
 
 	"github.com/lbryio/lbry.go/v2/extras/api"
 	"github.com/lbryio/lbry.go/v2/extras/errors"

diff --git a/commentapi/setting.go b/commentapi/setting.go
@@ -3,7 +3,7 @@ package commentapi
 import (
 	"net/http"
 
-	"github.com/lbryio/commentron/validator"
+	"github.com/OdyseeTeam/commentron/validator"
 
 	"github.com/lbryio/lbry.go/v2/extras/api"
 	"github.com/lbryio/lbry.go/v2/extras/errors"

diff --git a/commentapi/test/comment.go b/commentapi/test/comment.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/lbryio/commentron/commentapi"
-	"github.com/lbryio/commentron/env"
+	"github.com/OdyseeTeam/commentron/commentapi"
+	"github.com/OdyseeTeam/commentron/env"
 
 	"github.com/sirupsen/logrus"
 )

diff --git a/config/config.go b/config/config.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/lbryio/commentron/db"
-	"github.com/lbryio/commentron/env"
-	"github.com/lbryio/commentron/helper"
+	"github.com/OdyseeTeam/commentron/db"
+	"github.com/OdyseeTeam/commentron/env"
+	"github.com/OdyseeTeam/commentron/helper"
 
 	"github.com/johntdyer/slackrus"
 	"github.com/sirupsen/logrus"

diff --git a/config/stripe.go b/config/stripe.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/lbryio/commentron/env"
+import "github.com/OdyseeTeam/commentron/env"
 
 var connectAPIKey string
 var connectAPIKeyTest string

diff --git a/db/init.go b/db/init.go
@@ -1,7 +1,7 @@
 package db
 
 import (
-	"github.com/lbryio/commentron/migration"
+	"github.com/OdyseeTeam/commentron/migration"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 

diff --git a/flags/flagged.go b/flags/flagged.go
@@ -1,7 +1,7 @@
 package flags
 
 import (
-	"github.com/lbryio/commentron/model"
+	"github.com/OdyseeTeam/commentron/model"
 )
 
 // CheckComment checks and flags comments for deletion due to spam or key phrases

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
-module github.com/lbryio/commentron
+module github.com/OdyseeTeam/commentron
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Avalanche-io/counter v0.0.0-20180124180526-1336089e985a

diff --git a/go.sum b/go.sum
diff --git a/helper/model.go b/helper/model.go
@@ -4,8 +4,8 @@ import (
 	"database/sql"
 	"time"
 
-	"github.com/lbryio/commentron/db"
-	"github.com/lbryio/commentron/model"
+	"github.com/OdyseeTeam/commentron/db"
+	"github.com/OdyseeTeam/commentron/model"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 

diff --git a/helper/moderation.go b/helper/moderation.go
@@ -4,9 +4,9 @@ import (
 	"database/sql"
 	"net/http"
 
-	"github.com/lbryio/commentron/db"
-	"github.com/lbryio/commentron/model"
-	m "github.com/lbryio/commentron/model"
+	"github.com/OdyseeTeam/commentron/db"
+	"github.com/OdyseeTeam/commentron/model"
+	m "github.com/OdyseeTeam/commentron/model"
 
 	"github.com/lbryio/lbry.go/v2/extras/api"
 	"github.com/lbryio/lbry.go/v2/extras/errors"

diff --git a/jobs/jobs.go b/jobs/jobs.go
@@ -3,9 +3,9 @@ package jobs
 import (
 	"time"
 
-	"github.com/lbryio/commentron/db"
-	"github.com/lbryio/commentron/metrics"
-	"github.com/lbryio/commentron/model"
+	"github.com/OdyseeTeam/commentron/db"
+	"github.com/OdyseeTeam/commentron/metrics"
+	"github.com/OdyseeTeam/commentron/model"
 
 	"github.com/go-co-op/gocron"
 	"github.com/sirupsen/logrus"

diff --git a/main.go b/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/lbryio/commentron/cmd"
+import "github.com/OdyseeTeam/commentron/cmd"
 
 //go:generate go-bindata -o migration/bindata.go -nometadata -pkg migration -ignore bindata.go migration/
 //go:generate go fmt ./migration/bindata.go

diff --git a/migration/019_comments_protected_idx.sql b/migration/019_comments_protected_idx.sql
@@ -0,0 +1,5 @@
+-- +migrate Up
+
+-- +migrate StatementBegin
+ALTER TABLE comment ADD INDEX idx_is_protected (is_protected), ALGORITHM=INPLACE, LOCK=NONE;
+-- +migrate StatementEnd
diff --git a/migration/bindata.go b/migration/bindata.go
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -20,7 +20,7 @@ set -e
 
 
 echo "== Compiling =="
-export IMPORTPATH="github.com/lbryio/commentron"
+export IMPORTPATH="github.com/OdyseeTeam/commentron"
 mkdir -p "$DIR/bin"
 go generate -v
 export VERSIONSHORT="${TRAVIS_COMMIT:-"$(git describe --tags --always --dirty)"}"

diff --git a/server/auth/auth.go b/server/auth/auth.go
@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/lbryio/commentron/commentapi"
-	"github.com/lbryio/commentron/db"
-	"github.com/lbryio/commentron/helper"
-	"github.com/lbryio/commentron/model"
-	"github.com/lbryio/commentron/server/lbry"
+	"github.com/OdyseeTeam/commentron/commentapi"
+	"github.com/OdyseeTeam/commentron/db"
+	"github.com/OdyseeTeam/commentron/helper"
+	"github.com/OdyseeTeam/commentron/model"
+	"github.com/OdyseeTeam/commentron/server/lbry"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 

diff --git a/server/lbry/apis.go b/server/lbry/apis.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/lbryio/commentron/helper"
+	"github.com/OdyseeTeam/commentron/helper"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 

diff --git a/server/lbry/channel.go b/server/lbry/channel.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/lbryio/commentron/helper"
+	"github.com/OdyseeTeam/commentron/helper"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	"github.com/lbryio/lbry.go/v2/extras/jsonrpc"

diff --git a/server/lbry/client.go b/server/lbry/client.go
@@ -1,7 +1,7 @@
 package lbry
 
 import (
-	"github.com/lbryio/commentron/env"
+	"github.com/OdyseeTeam/commentron/env"
 
 	"github.com/lbryio/lbry.go/v2/extras/jsonrpc"
 

diff --git a/server/lbry/sdk.go b/server/lbry/sdk.go
@@ -3,7 +3,7 @@ package lbry
 import (
 	"time"
 
-	"github.com/lbryio/commentron/metrics"
+	"github.com/OdyseeTeam/commentron/metrics"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	"github.com/lbryio/lbry.go/v2/extras/jsonrpc"

diff --git a/server/lbry/validator.go b/server/lbry/validator.go
@@ -16,8 +16,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/lbryio/commentron/config"
-	"github.com/lbryio/commentron/helper"
+	"github.com/OdyseeTeam/commentron/config"
+	"github.com/OdyseeTeam/commentron/helper"
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	"github.com/lbryio/lbry.go/v2/extras/jsonrpc"

diff --git a/server/lbry/validator_test.go b/server/lbry/validator_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lbryio/commentron/helper"
+	"github.com/OdyseeTeam/commentron/helper"
 
 	"github.com/lbryio/lbry.go/v2/schema/keys"