From e2fe053609395b54c934ad36b36f9e27778e99cc Mon Sep 17 00:00:00 2001 From: JJTech0130 Date: Fri, 28 Jun 2024 12:12:45 -0400 Subject: [PATCH] clean up and format --- build.v2.sh => build-v2.sh | 0 cmd/{mautrix-meta => mautrix-meta-v2}/main.go | 0 pkg/connector/config.go | 5 ++--- pkg/connector/connector.go | 8 ++++---- pkg/connector/login.go | 14 ++++++-------- 5 files changed, 12 insertions(+), 15 deletions(-) rename build.v2.sh => build-v2.sh (100%) rename cmd/{mautrix-meta => mautrix-meta-v2}/main.go (100%) diff --git a/build.v2.sh b/build-v2.sh similarity index 100% rename from build.v2.sh rename to build-v2.sh diff --git a/cmd/mautrix-meta/main.go b/cmd/mautrix-meta-v2/main.go similarity index 100% rename from cmd/mautrix-meta/main.go rename to cmd/mautrix-meta-v2/main.go diff --git a/pkg/connector/config.go b/pkg/connector/config.go index 61b2e6b..eae36bf 100644 --- a/pkg/connector/config.go +++ b/pkg/connector/config.go @@ -3,14 +3,13 @@ package connector import ( _ "embed" up "go.mau.fi/util/configupgrade" - ) //go:embed example-config.yaml var ExampleConfig string type MetaConfig struct { - Mode string `yaml:"mode"` + Mode string `yaml:"mode"` } func upgradeConfig(helper up.Helper) { @@ -19,4 +18,4 @@ func upgradeConfig(helper up.Helper) { func (s *MetaConnector) GetConfig() (string, any, up.Upgrader) { return ExampleConfig, &s.Config, up.SimpleUpgrader(upgradeConfig) -} \ No newline at end of file +} diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go index 8bc91a3..19171b4 100644 --- a/pkg/connector/connector.go +++ b/pkg/connector/connector.go @@ -2,13 +2,13 @@ package connector import ( "context" - + "maunium.net/go/mautrix/bridgev2" ) type MetaConnector struct { Bridge *bridgev2.Bridge - Config *MetaConfig + Config *MetaConfig } func NewConnector() *MetaConnector { @@ -39,7 +39,7 @@ func (s *MetaConnector) GetName() bridgev2.BridgeName { NetworkIcon: "mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv", // Instagram icon NetworkID: "meta", BeeperBridgeType: "meta", - DefaultPort: 29328, + DefaultPort: 29319, } } @@ -54,4 +54,4 @@ func (m *MetaConnector) Start(context.Context) error { func (m *MetaConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLogin) error { panic("unimplemented") -} \ No newline at end of file +} diff --git a/pkg/connector/login.go b/pkg/connector/login.go index cc97758..c402de3 100644 --- a/pkg/connector/login.go +++ b/pkg/connector/login.go @@ -23,18 +23,16 @@ func (m *MetaConnector) GetLoginFlows() []bridgev2.LoginFlow { }} } -type CookieLogin struct {} +type CookieLogin struct{} var _ bridgev2.LoginProcessCookies = (*CookieLogin)(nil) func (p *CookieLogin) Start(ctx context.Context) (*bridgev2.LoginStep, error) { return &bridgev2.LoginStep{ - Type: bridgev2.LoginStepTypeCookies, - StepID: "fi.mau.meta.cookies", - Instructions: "Please enter cookies from your browser", - CookiesParams: &bridgev2.LoginCookiesParams{ - - }, + Type: bridgev2.LoginStepTypeCookies, + StepID: "fi.mau.meta.cookies", + Instructions: "Please enter cookies from your browser", + CookiesParams: &bridgev2.LoginCookiesParams{}, }, nil } @@ -46,4 +44,4 @@ func (p *CookieLogin) SubmitCookies(ctx context.Context, cookies map[string]stri StepID: "fi.mau.meta.complete", Instructions: "Login successful", }, nil -} \ No newline at end of file +}