mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 06:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Format everything

Browse source
This commit is contained in:
eyedeekay 2024-09-12 23:49:19 -04:00
parent 0832209cbe
commit 246a9a4d23
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
5 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/dendrite-demo-i2p/main.go
View file

@ -40,8 +40,10 @@ import (
"github.com/matrix-org/dendrite/userapi" "github.com/matrix-org/dendrite/userapi"
) )
var samAddr = flag.String("samaddr", "127.0.0.1:7656", "Address to connect to the I2P SAMv3 API") var (
var _, skip = os.LookupEnv("CI") samAddr = flag.String("samaddr", "127.0.0.1:7656", "Address to connect to the I2P SAMv3 API")
_, skip = os.LookupEnv("CI")
)
func main() { func main() {
cfg := setup.ParseFlags(true) cfg := setup.ParseFlags(true)

14
contrib/dendrite-demo-i2p/main_i2p.go
View file

@ -65,8 +65,10 @@ func dialer() (*tor.Dialer, error) {
return t.Dialer(context.TODO(), nil) return t.Dialer(context.TODO(), nil)
} }
var t, terr = start() var (
var tdialer, tderr = dialer() t, terr = start()
tdialer, tderr = dialer()
)
// Dial a network connection to an I2P server or a unix socket. Fail for clearnet addresses. // Dial a network connection to an I2P server or a unix socket. Fail for clearnet addresses.
func Dial(network, addr string) (net.Conn, error) { func Dial(network, addr string) (net.Conn, error) {
@ -85,6 +87,12 @@ func Dial(network, addr string) (net.Conn, error) {
if strings.HasSuffix(url.Host, ".i2p") { if strings.HasSuffix(url.Host, ".i2p") {
return sam.Dial(network, addr) return sam.Dial(network, addr)
} }
if terr != nil {
return nil, terr
}
if (tderr != nil) || (tdialer == nil) {
return nil, tderr
}
return tdialer.Dial(network, addr) return tdialer.Dial(network, addr)
} }
@ -139,7 +147,7 @@ func SetupAndServeHTTPS(
}, },
} }
//Redirect for Landing Page // Redirect for Landing Page
externalRouter.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { externalRouter.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, httputil.PublicStaticPath, http.StatusFound) http.Redirect(w, r, httputil.PublicStaticPath, http.StatusFound)
}) })

4
contrib/dendrite-demo-i2p/main_test.go
View file

@ -14,9 +14,7 @@ import (
// Generate HTML with coverage: go tool cover -html=/somewhere/where/there/is/integrationcover.out -o cover.html // Generate HTML with coverage: go tool cover -html=/somewhere/where/there/is/integrationcover.out -o cover.html
// Source: https://dzone.com/articles/measuring-integration-test-coverage-rate-in-pouchc // Source: https://dzone.com/articles/measuring-integration-test-coverage-rate-in-pouchc
func TestMain(t *testing.T) { func TestMain(t *testing.T) {
var ( var args []string
args []string
)
for _, arg := range os.Args { for _, arg := range os.Args {
switch { switch {

4
contrib/dendrite-demo-tor/main_test.go
View file

@ -14,9 +14,7 @@ import (
// Generate HTML with coverage: go tool cover -html=/somewhere/where/there/is/integrationcover.out -o cover.html // Generate HTML with coverage: go tool cover -html=/somewhere/where/there/is/integrationcover.out -o cover.html
// Source: https://dzone.com/articles/measuring-integration-test-coverage-rate-in-pouchc // Source: https://dzone.com/articles/measuring-integration-test-coverage-rate-in-pouchc
func TestMain(t *testing.T) { func TestMain(t *testing.T) {
var ( var args []string
args []string
)
for _, arg := range os.Args { for _, arg := range os.Args {
switch { switch {

8
contrib/dendrite-demo-tor/main_tor.go
View file

@ -54,8 +54,10 @@ func dialer() (*tor.Dialer, error) {
return t.Dialer(context.TODO(), nil) return t.Dialer(context.TODO(), nil)
} }
var t, terr = start() var (
var tdialer, tderr = dialer() t, terr = start()
tdialer, tderr = dialer()
)
// Dial either a unix socket address, or connect to a remote address over Tor. Always uses Tor. // Dial either a unix socket address, or connect to a remote address over Tor. Always uses Tor.
func Dial(network, addr string) (net.Conn, error) { func Dial(network, addr string) (net.Conn, error) {
@ -127,7 +129,7 @@ func SetupAndServeHTTPS(
}, },
} }
//Redirect for Landing Page // Redirect for Landing Page
externalRouter.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { externalRouter.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, httputil.PublicStaticPath, http.StatusFound) http.Redirect(w, r, httputil.PublicStaticPath, http.StatusFound)
}) })