Fix styles.
This commit is contained in:
12
cli/cli.go
12
cli/cli.go
@ -7,19 +7,19 @@ import (
|
||||
"net/url"
|
||||
"os"
|
||||
|
||||
machinery "github.com/RichardKnop/machinery/v1"
|
||||
"github.com/RichardKnop/machinery/v1"
|
||||
"github.com/RichardKnop/machinery/v1/config"
|
||||
"github.com/go-redis/redis"
|
||||
"github.com/urfave/cli"
|
||||
"github.com/yukimochi/Activity-Relay/KeyLoader"
|
||||
"github.com/yukimochi/Activity-Relay/RelayConf"
|
||||
"github.com/yukimochi/Activity-Relay/State"
|
||||
)
|
||||
|
||||
var hostname *url.URL
|
||||
var hostkey *rsa.PrivateKey
|
||||
var redClient *redis.Client
|
||||
var macServer *machinery.Server
|
||||
var exportConfig relayconf.ExportConfig
|
||||
var relayState state.RelayState
|
||||
|
||||
func main() {
|
||||
pemPath := os.Getenv("ACTOR_PEM")
|
||||
@ -140,7 +140,7 @@ func main() {
|
||||
},
|
||||
{
|
||||
Name: "manually-accept",
|
||||
Usage: "Enable Manually accept follow-request",
|
||||
Usage: "Enable manually accept follow-request",
|
||||
Flags: []cli.Flag{
|
||||
cli.BoolFlag{
|
||||
Name: "undo, u",
|
||||
@ -151,7 +151,7 @@ func main() {
|
||||
},
|
||||
{
|
||||
Name: "create-as-announce",
|
||||
Usage: "Enable Announce activity instead of relay create activity (Not recommended)",
|
||||
Usage: "Enable announce activity instead of relay create activity (Not recommend)",
|
||||
Flags: []cli.Flag{
|
||||
cli.BoolFlag{
|
||||
Name: "undo, u",
|
||||
@ -197,7 +197,7 @@ func main() {
|
||||
},
|
||||
}
|
||||
|
||||
exportConfig = relayconf.NewConfig(redClient)
|
||||
relayState = state.NewState(redClient)
|
||||
err = app.Run(os.Args)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
@ -9,7 +9,7 @@ import (
|
||||
"github.com/RichardKnop/machinery/v1/config"
|
||||
"github.com/go-redis/redis"
|
||||
"github.com/yukimochi/Activity-Relay/KeyLoader"
|
||||
"github.com/yukimochi/Activity-Relay/RelayConf"
|
||||
"github.com/yukimochi/Activity-Relay/State"
|
||||
)
|
||||
|
||||
func TestMain(m *testing.M) {
|
||||
@ -31,7 +31,7 @@ func TestMain(m *testing.M) {
|
||||
}
|
||||
macServer, _ = machinery.NewServer(macConfig)
|
||||
redClient.FlushAll().Result()
|
||||
exportConfig = relayconf.NewConfig(redClient)
|
||||
relayState = state.NewState(redClient)
|
||||
code := m.Run()
|
||||
os.Exit(code)
|
||||
redClient.FlushAll().Result()
|
||||
|
@ -7,53 +7,53 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/urfave/cli"
|
||||
"github.com/yukimochi/Activity-Relay/RelayConf"
|
||||
"github.com/yukimochi/Activity-Relay/State"
|
||||
)
|
||||
|
||||
const (
|
||||
BlockService relayconf.Config = iota
|
||||
BlockService state.Config = iota
|
||||
ManuallyAccept
|
||||
CreateAsAnnounce
|
||||
)
|
||||
|
||||
func serviceBlock(c *cli.Context) {
|
||||
if c.Bool("undo") {
|
||||
exportConfig.SetConfig(BlockService, false)
|
||||
relayState.SetConfig(BlockService, false)
|
||||
fmt.Println("Blocking for service-type actor is Disabled.")
|
||||
} else {
|
||||
exportConfig.SetConfig(BlockService, true)
|
||||
relayState.SetConfig(BlockService, true)
|
||||
fmt.Println("Blocking for service-type actor is Enabled.")
|
||||
}
|
||||
}
|
||||
|
||||
func manuallyAccept(c *cli.Context) {
|
||||
if c.Bool("undo") {
|
||||
exportConfig.SetConfig(ManuallyAccept, false)
|
||||
relayState.SetConfig(ManuallyAccept, false)
|
||||
fmt.Println("Manually accept follow-request is Disabled.")
|
||||
} else {
|
||||
exportConfig.SetConfig(ManuallyAccept, true)
|
||||
relayState.SetConfig(ManuallyAccept, true)
|
||||
fmt.Println("Manually accept follow-request is Enabled.")
|
||||
}
|
||||
}
|
||||
|
||||
func createAsAnnounce(c *cli.Context) {
|
||||
if c.Bool("undo") {
|
||||
exportConfig.SetConfig(CreateAsAnnounce, false)
|
||||
relayState.SetConfig(CreateAsAnnounce, false)
|
||||
fmt.Println("Announce activity instead of relay create activity is Disabled.")
|
||||
} else {
|
||||
exportConfig.SetConfig(CreateAsAnnounce, true)
|
||||
relayState.SetConfig(CreateAsAnnounce, true)
|
||||
fmt.Println("Announce activity instead of relay create activity is Enabled.")
|
||||
}
|
||||
}
|
||||
|
||||
func listConfigs(c *cli.Context) {
|
||||
fmt.Println("Blocking for service-type actor : ", exportConfig.RelayConfig.BlockService)
|
||||
fmt.Println("Manually accept follow-request : ", exportConfig.RelayConfig.ManuallyAccept)
|
||||
fmt.Println("Announce activity instead of relay create activity : ", exportConfig.RelayConfig.CreateAsAnnounce)
|
||||
fmt.Println("Blocking for service-type actor : ", relayState.RelayConfig.BlockService)
|
||||
fmt.Println("Manually accept follow-request : ", relayState.RelayConfig.ManuallyAccept)
|
||||
fmt.Println("Announce activity instead of relay create activity : ", relayState.RelayConfig.CreateAsAnnounce)
|
||||
}
|
||||
|
||||
func exportConfigs(c *cli.Context) {
|
||||
jsonData, _ := json.Marshal(&exportConfig)
|
||||
jsonData, _ := json.Marshal(&relayState)
|
||||
fmt.Println(string(jsonData))
|
||||
}
|
||||
|
||||
@ -68,7 +68,7 @@ func importConfigs(c *cli.Context) {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
return
|
||||
}
|
||||
var data relayconf.ExportConfig
|
||||
var data state.RelayState
|
||||
err = json.Unmarshal(jsonData, &data)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
@ -76,24 +76,24 @@ func importConfigs(c *cli.Context) {
|
||||
}
|
||||
|
||||
if data.RelayConfig.BlockService {
|
||||
exportConfig.SetConfig(BlockService, true)
|
||||
relayState.SetConfig(BlockService, true)
|
||||
}
|
||||
if data.RelayConfig.ManuallyAccept {
|
||||
exportConfig.SetConfig(ManuallyAccept, true)
|
||||
relayState.SetConfig(ManuallyAccept, true)
|
||||
}
|
||||
if data.RelayConfig.CreateAsAnnounce {
|
||||
exportConfig.SetConfig(CreateAsAnnounce, true)
|
||||
relayState.SetConfig(CreateAsAnnounce, true)
|
||||
}
|
||||
for _, LimitedDomain := range data.LimitedDomains {
|
||||
exportConfig.SetLimitedDomain(LimitedDomain, true)
|
||||
relayState.SetLimitedDomain(LimitedDomain, true)
|
||||
redClient.HSet("relay:config:limitedDomain", LimitedDomain, "1")
|
||||
}
|
||||
for _, BlockedDomain := range data.BlockedDomains {
|
||||
exportConfig.SetLimitedDomain(BlockedDomain, true)
|
||||
relayState.SetLimitedDomain(BlockedDomain, true)
|
||||
redClient.HSet("relay:config:blockedDomain", BlockedDomain, "1")
|
||||
}
|
||||
for _, Subscription := range data.Subscriptions {
|
||||
exportConfig.AddSubscription(relayconf.Subscription{
|
||||
relayState.AddSubscription(state.Subscription{
|
||||
Domain: Subscription.Domain,
|
||||
InboxURL: Subscription.InboxURL,
|
||||
ActivityID: Subscription.ActivityID,
|
||||
|
@ -25,14 +25,14 @@ func TestServiceBlock(t *testing.T) {
|
||||
fooCmd,
|
||||
}
|
||||
|
||||
exportConfig.SetConfig(BlockService, false)
|
||||
relayState.SetConfig(BlockService, false)
|
||||
app.Run([]string{"", "service-block"})
|
||||
if !exportConfig.RelayConfig.BlockService {
|
||||
if !relayState.RelayConfig.BlockService {
|
||||
t.Fatalf("Not Enabled ServiceBlock feature,")
|
||||
}
|
||||
|
||||
app.Run([]string{"", "service-block", "-u"})
|
||||
if exportConfig.RelayConfig.BlockService {
|
||||
if relayState.RelayConfig.BlockService {
|
||||
t.Fatalf("Not Disabled ServiceBlock feature,")
|
||||
}
|
||||
}
|
||||
@ -54,14 +54,14 @@ func TestManuallyAccept(t *testing.T) {
|
||||
fooCmd,
|
||||
}
|
||||
|
||||
exportConfig.SetConfig(ManuallyAccept, false)
|
||||
relayState.SetConfig(ManuallyAccept, false)
|
||||
app.Run([]string{"", "manually-accept"})
|
||||
if !exportConfig.RelayConfig.ManuallyAccept {
|
||||
if !relayState.RelayConfig.ManuallyAccept {
|
||||
t.Fatalf("Not Enabled Manually accept follow-request feature,")
|
||||
}
|
||||
|
||||
app.Run([]string{"", "manually-accept", "-u"})
|
||||
if exportConfig.RelayConfig.ManuallyAccept {
|
||||
if relayState.RelayConfig.ManuallyAccept {
|
||||
t.Fatalf("Not Disabled Manually accept follow-request feature,")
|
||||
}
|
||||
}
|
||||
@ -83,14 +83,14 @@ func TestCreateAsAnnounce(t *testing.T) {
|
||||
fooCmd,
|
||||
}
|
||||
|
||||
exportConfig.SetConfig(CreateAsAnnounce, false)
|
||||
relayState.SetConfig(CreateAsAnnounce, false)
|
||||
app.Run([]string{"", "create-as-announce"})
|
||||
if !exportConfig.RelayConfig.CreateAsAnnounce {
|
||||
if !relayState.RelayConfig.CreateAsAnnounce {
|
||||
t.Fatalf("Not Enabled Announce activity instead of relay create activity feature,")
|
||||
}
|
||||
|
||||
app.Run([]string{"", "create-as-announce", "-u"})
|
||||
if exportConfig.RelayConfig.CreateAsAnnounce {
|
||||
if relayState.RelayConfig.CreateAsAnnounce {
|
||||
t.Fatalf("Not Disabled Announce activity instead of relay create activity feature,")
|
||||
}
|
||||
}
|
||||
@ -106,9 +106,9 @@ func TestListConfigs(t *testing.T) {
|
||||
fooCmd,
|
||||
}
|
||||
|
||||
exportConfig.SetConfig(BlockService, true)
|
||||
exportConfig.SetConfig(ManuallyAccept, true)
|
||||
exportConfig.SetConfig(CreateAsAnnounce, true)
|
||||
relayState.SetConfig(BlockService, true)
|
||||
relayState.SetConfig(ManuallyAccept, true)
|
||||
relayState.SetConfig(CreateAsAnnounce, true)
|
||||
out := capturer.CaptureStdout(func() {
|
||||
app.Run([]string{"", "show"})
|
||||
})
|
||||
@ -130,9 +130,9 @@ func TestListConfigs(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
exportConfig.SetConfig(BlockService, false)
|
||||
exportConfig.SetConfig(ManuallyAccept, false)
|
||||
exportConfig.SetConfig(CreateAsAnnounce, false)
|
||||
relayState.SetConfig(BlockService, false)
|
||||
relayState.SetConfig(ManuallyAccept, false)
|
||||
relayState.SetConfig(CreateAsAnnounce, false)
|
||||
out = capturer.CaptureStdout(func() {
|
||||
app.Run([]string{"", "show"})
|
||||
})
|
||||
|
@ -11,13 +11,13 @@ func listDomains(c *cli.Context) error {
|
||||
switch c.String("type") {
|
||||
case "limited":
|
||||
fmt.Println(" - Limited domain :")
|
||||
domains = exportConfig.LimitedDomains
|
||||
domains = relayState.LimitedDomains
|
||||
case "blocked":
|
||||
fmt.Println(" - Blocked domain :")
|
||||
domains = exportConfig.BlockedDomains
|
||||
domains = relayState.BlockedDomains
|
||||
default:
|
||||
fmt.Println(" - Subscribed domain :")
|
||||
temp := exportConfig.Subscriptions
|
||||
temp := relayState.Subscriptions
|
||||
for _, domain := range temp {
|
||||
domains = append(domains, domain.Domain)
|
||||
}
|
||||
@ -37,18 +37,18 @@ func setDomainType(c *cli.Context) error {
|
||||
switch c.String("type") {
|
||||
case "limited":
|
||||
if c.Bool("undo") {
|
||||
exportConfig.SetLimitedDomain(c.String("domain"), false)
|
||||
relayState.SetLimitedDomain(c.String("domain"), false)
|
||||
fmt.Println("Unset [" + c.String("domain") + "] as Limited domain.")
|
||||
} else {
|
||||
exportConfig.SetLimitedDomain(c.String("domain"), true)
|
||||
relayState.SetLimitedDomain(c.String("domain"), true)
|
||||
fmt.Println("Set [" + c.String("domain") + "] as Limited domain.")
|
||||
}
|
||||
case "blocked":
|
||||
if c.Bool("undo") {
|
||||
exportConfig.SetBlockedDomain(c.String("domain"), false)
|
||||
relayState.SetBlockedDomain(c.String("domain"), false)
|
||||
fmt.Println("Unset [" + c.String("domain") + "] as Blocked domain.")
|
||||
} else {
|
||||
exportConfig.SetBlockedDomain(c.String("domain"), true)
|
||||
relayState.SetBlockedDomain(c.String("domain"), true)
|
||||
fmt.Println("Set [" + c.String("domain") + "] as Blocked domain.")
|
||||
}
|
||||
default:
|
||||
|
@ -70,13 +70,11 @@ func acceptFollow(c *cli.Context) error {
|
||||
return err
|
||||
}
|
||||
activity := activitypub.Activity{
|
||||
[]string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"},
|
||||
data["activity_id"],
|
||||
data["actor"],
|
||||
data["type"],
|
||||
data["object"],
|
||||
nil,
|
||||
nil,
|
||||
Context: []string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"},
|
||||
ID: data["activity_id"],
|
||||
Actor: data["actor"],
|
||||
Type: data["type"],
|
||||
Object: data["object"],
|
||||
}
|
||||
|
||||
resp := activity.GenerateResponse(hostname, "Accept")
|
||||
@ -85,11 +83,10 @@ func acceptFollow(c *cli.Context) error {
|
||||
pushRegistorJob(data["inbox_url"], jsonData)
|
||||
redClient.HSet("relay:subscription:"+domain, "inbox_url", data["inbox_url"])
|
||||
redClient.Del("relay:pending:" + domain)
|
||||
return nil
|
||||
} else {
|
||||
fmt.Println("No domain given.")
|
||||
return nil
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func rejectFollow(c *cli.Context) error {
|
||||
@ -110,13 +107,11 @@ func rejectFollow(c *cli.Context) error {
|
||||
return err
|
||||
}
|
||||
activity := activitypub.Activity{
|
||||
[]string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"},
|
||||
data["activity_id"],
|
||||
data["actor"],
|
||||
data["type"],
|
||||
data["object"],
|
||||
nil,
|
||||
nil,
|
||||
Context: []string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"},
|
||||
ID: data["activity_id"],
|
||||
Actor: data["actor"],
|
||||
Type: data["type"],
|
||||
Object: data["object"],
|
||||
}
|
||||
|
||||
resp := activity.GenerateResponse(hostname, "Reject")
|
||||
@ -124,9 +119,8 @@ func rejectFollow(c *cli.Context) error {
|
||||
|
||||
pushRegistorJob(data["inbox_url"], jsonData)
|
||||
redClient.Del("relay:pending:" + domain)
|
||||
return nil
|
||||
} else {
|
||||
fmt.Println("No domain given.")
|
||||
return nil
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user