From 85e0735fa3aaf723ea275478c18c40d4413df6a6 Mon Sep 17 00:00:00 2001 From: Farhan Khan Date: Tue, 29 Dec 2020 20:20:02 +0000 Subject: [PATCH] go fmt'ed --- db.go | 2 +- fedilogue.go | 2 +- headers.go | 18 +++++------ instance.go | 8 ++--- oauth.go | 12 +++---- retrieve.go | 89 ++++++++++++++++++++++++++-------------------------- stream.go | 16 +++++----- web.go | 14 ++++----- 8 files changed, 78 insertions(+), 83 deletions(-) diff --git a/db.go b/db.go index 30f84f1..4c2a7f7 100644 --- a/db.go +++ b/db.go @@ -3,8 +3,8 @@ package main import ( "context" "fmt" - "log" "github.com/jackc/pgx/pgxpool" + "log" ) func getDbPool() *pgxpool.Pool { diff --git a/fedilogue.go b/fedilogue.go index be6b796..83a9fb5 100644 --- a/fedilogue.go +++ b/fedilogue.go @@ -1,6 +1,7 @@ package main import ( + "github.com/jackc/pgx/pgxpool" "github.com/microcosm-cc/bluemonday" "log" "net/http" @@ -8,7 +9,6 @@ import ( "regexp" "runtime" "sync" - "github.com/jackc/pgx/pgxpool" ) // Current instances diff --git a/headers.go b/headers.go index 538ba23..e2e8ac2 100644 --- a/headers.go +++ b/headers.go @@ -23,7 +23,7 @@ const ( ) type ObjectType struct { - Id string `json:"id"` + Id string `json:"id"` } // Parsing Unmarshal JSON type @@ -52,14 +52,14 @@ type AccountType struct { // Instance's new min_id value type RunningInstance struct { - Software string `json:"software"` - Version string `json:"version"` - Status int `json:"status"` - LastRun string `json:"lastrun"` - CaptureType string `json:"capturetype"` - client http.Client - client_id string - client_secret string + Software string `json:"software"` + Version string `json:"version"` + Status int `json:"status"` + LastRun string `json:"lastrun"` + CaptureType string `json:"capturetype"` + client http.Client + client_id string + client_secret string } type NodeInfoSoftware struct { diff --git a/instance.go b/instance.go index cfd0772..97b607e 100644 --- a/instance.go +++ b/instance.go @@ -14,13 +14,13 @@ import ( var p *bluemonday.Policy var spaceReg *regexp.Regexp -func GetRunner(endpoint string) (RunningInstance) { +func GetRunner(endpoint string) RunningInstance { ri_mutex.Lock() o, exists := runninginstances[endpoint] if exists == false { o := RunningInstance{} - tr := &http.Transport {MaxIdleConns: 10, IdleConnTimeout: 7200 * time.Second} + tr := &http.Transport{MaxIdleConns: 10, IdleConnTimeout: 7200 * time.Second} o.client = http.Client{Transport: tr} o.Status = KEEPALIVE @@ -31,15 +31,13 @@ func GetRunner(endpoint string) (RunningInstance) { return o } - func UpdateRunner(endpoint string, o RunningInstance) { ri_mutex.Lock() runninginstances[endpoint] = o ri_mutex.Unlock() } - -func GetNodeInfo(endpoint string, o RunningInstance) (RunningInstance) { +func GetNodeInfo(endpoint string, o RunningInstance) RunningInstance { /* Checking order * Mastodon/Pleroma * Um..nothing else yet diff --git a/oauth.go b/oauth.go index b9fd8d9..b80f148 100644 --- a/oauth.go +++ b/oauth.go @@ -26,7 +26,7 @@ func (e *authError) Error() string { return e.msg } -func register_client(endpoint string, o *RunningInstance) (error) { +func register_client(endpoint string, o *RunningInstance) error { requestBodymap, _ := json.Marshal(map[string]string{ "client_name": "Tusky", // Hard-coded in for now... "scopes": "read write follow push", @@ -91,7 +91,7 @@ func register_client(endpoint string, o *RunningInstance) (error) { return nil } -func get_client(endpoint string, o *RunningInstance) (error) { +func get_client(endpoint string, o *RunningInstance) error { var err error client_file := "clients/" + endpoint _, err = os.Stat(client_file) @@ -100,7 +100,7 @@ func get_client(endpoint string, o *RunningInstance) (error) { if err != nil { log.Print("Unable to open " + client_file + ", creating new client") return err -// return register_client(endpoint, o) + // return register_client(endpoint, o) } defer f.Close() @@ -111,15 +111,15 @@ func get_client(endpoint string, o *RunningInstance) (error) { if err != nil { log.Print("Unable to read client_id line of " + client_file + ", building new client") return err -// return register_client(endpoint, o) + // return register_client(endpoint, o) } client_secret_bin, _, err := rd.ReadLine() o.client_secret = string(client_secret_bin) if err != nil { log.Print("Unable to read client_secret line of " + client_file + ", building new client") return err -// return register_client(endpoint, o) -// return o + // return register_client(endpoint, o) + // return o } return nil diff --git a/retrieve.go b/retrieve.go index e2a0fd1..e453de6 100644 --- a/retrieve.go +++ b/retrieve.go @@ -2,68 +2,67 @@ package main import ( "context" - "strings" - "log" "encoding/json" - "time" - "io/ioutil" - "net/http" - "html" "errors" + "html" + "io/ioutil" + "log" + "net/http" + "strings" + "time" ) type ImageType struct { -// Type string `json:"type"` - Url string `json:"url"` + // Type string `json:"type"` + Url string `json:"url"` } type PublicKeyType struct { - PublicKeyPem string `json:"publicKeyPem"` + PublicKeyPem string `json:"publicKeyPem"` } type UserJson struct { - ID string `json:"id"` - Type string `json:"type"` - Inbox string `json:"inbox"` - Outbox string `json:"outbox"` - Followers string `json:"followers"` - Following string `json:"following"` - Url string `json:"url"` - PreferredUsername string `json:"preferredUsername"` - Name string `json:"name"` - Summary string `json:"summary"` - Icon ImageType `json:"icon"` - Image ImageType `json:"image"` - PublicKey PublicKeyType `json:"publicKey"` + ID string `json:"id"` + Type string `json:"type"` + Inbox string `json:"inbox"` + Outbox string `json:"outbox"` + Followers string `json:"followers"` + Following string `json:"following"` + Url string `json:"url"` + PreferredUsername string `json:"preferredUsername"` + Name string `json:"name"` + Summary string `json:"summary"` + Icon ImageType `json:"icon"` + Image ImageType `json:"image"` + PublicKey PublicKeyType `json:"publicKey"` - instance string + instance string } type PostJson struct { - ID string `json:"id"` - InReplyTo string `json:"inReplyTo"` + ID string `json:"id"` + InReplyTo string `json:"inReplyTo"` normalized string posthash []byte receivedAt time.Time `json:"created_at"` + Content string `json:"content"` + Conversation string `json:"conversation"` + Published time.Time `json:"published"` + Source string `json:"source"` + Summary string `json:"summary"` + // Ignoring tag for now + To []string `json:"to"` + Type string `json:"type"` - Content string `json:"content"` - Conversation string `json:"conversation"` - Published time.Time `json:"published"` - Source string `json:"source"` - Summary string `json:"summary"` -// Ignoring tag for now - To []string `json:"to"` - Type string `json:"type"` + Actor string `json:"actor"` + AttributedTo string `json:"attributedTo"` - Actor string `json:"actor"` - AttributedTo string `json:"attributedTo"` - - instance string + instance string } -func GetHTTPSession(endpoint string) (RunningInstance) { +func GetHTTPSession(endpoint string) RunningInstance { ri_mutex.Lock() o, exist := runninginstances[endpoint] ri_mutex.Unlock() @@ -83,7 +82,7 @@ func GetHTTPSession(endpoint string) (RunningInstance) { func check_post(uri string) (PostJson, error) { var postjson PostJson for _, banned := range settings.Banned { - if strings.Index(uri, "https://" + banned + "/") == 0 { + if strings.Index(uri, "https://"+banned+"/") == 0 { return postjson, errors.New("Banned instance") } } @@ -98,7 +97,7 @@ func check_post(uri string) (PostJson, error) { if endslash == -1 { return postjson, errors.New("Invalid URI " + uri) } - postjson.instance = uri[8:endslash+8] + postjson.instance = uri[8 : endslash+8] o := GetHTTPSession(postjson.instance) req, _ := http.NewRequest("GET", uri, nil) @@ -141,11 +140,11 @@ func check_post(uri string) (PostJson, error) { _, err = pool.Exec(context.Background(), "INSERT INTO posts (id, inreplyto, published, summary, content, normalized, attributedto, posthash, instance) VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9)", postjson.ID, postjson.InReplyTo, postjson.Published, postjson.Summary, postjson.Content, postjson.normalized, postjson.AttributedTo, postjson.posthash, postjson.instance) if err != nil { -// log.Print("INSERT posts error of " + uri + ": ", err) + // log.Print("INSERT posts error of " + uri + ": ", err) return postjson, err } - for _, to := range postjson.To{ + for _, to := range postjson.To { if to != "https://www.w3.org/ns/activitystreams#Public" && to != "" { go check_user(to) } @@ -157,7 +156,7 @@ func check_post(uri string) (PostJson, error) { func check_user(uri string) (UserJson, error) { var userjson UserJson for _, banned := range settings.Banned { - if strings.Index(uri, "https://" + banned + "/") == 0 { + if strings.Index(uri, "https://"+banned+"/") == 0 { return userjson, errors.New("Banned instance") } } @@ -171,7 +170,7 @@ func check_user(uri string) (UserJson, error) { if endslash == -1 { return userjson, errors.New("Invalid user: " + uri) } - userjson.instance = uri[8:endslash+8] + userjson.instance = uri[8 : endslash+8] o := GetHTTPSession(userjson.instance) req, _ := http.NewRequest("GET", uri, nil) @@ -191,7 +190,7 @@ func check_user(uri string) (UserJson, error) { _, err = pool.Exec(context.Background(), "INSERT INTO accounts (id, actor_type, inbox, outbox, followers, following, url, preferredUsername, name, summary, icon, image, publicKey, instance) VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)", userjson.ID, userjson.Type, userjson.Inbox, userjson.Outbox, userjson.Followers, userjson.Following, userjson.Url, userjson.PreferredUsername, userjson.Name, userjson.Summary, userjson.Icon.Url, userjson.Image.Url, userjson.PublicKey.PublicKeyPem, userjson.instance) if err != nil { -// log.Print("INSERT accounts error: ", err) + // log.Print("INSERT accounts error: ", err) return userjson, err } diff --git a/stream.go b/stream.go index 5d8d54f..dda840f 100644 --- a/stream.go +++ b/stream.go @@ -48,7 +48,7 @@ func StreamMastodon(endpoint string, o *RunningInstance) { resp, err := http_client.Do(req) if err != nil { - log.Print("Unable to stream " + api_timeline + ": ", err) + log.Print("Unable to stream "+api_timeline+": ", err) return } defer resp.Body.Close() @@ -70,8 +70,6 @@ func StreamMastodon(endpoint string, o *RunningInstance) { continue } - - switch strings.TrimSpace(token[0]) { case "event": name = strings.TrimSpace(token[1]) @@ -117,10 +115,10 @@ func StreamMastodon(endpoint string, o *RunningInstance) { } } -// ri_mutex.Lock() -// m = runninginstances[endpoint] -// m.LastRun = time.Now().Format(time.RFC3339) -// m.Status = STREAM_ENDED -// runninginstances[endpoint] = m -// ri_mutex.Unlock() + // ri_mutex.Lock() + // m = runninginstances[endpoint] + // m.LastRun = time.Now().Format(time.RFC3339) + // m.Status = STREAM_ENDED + // runninginstances[endpoint] = m + // ri_mutex.Unlock() } diff --git a/web.go b/web.go index 841943d..935624c 100644 --- a/web.go +++ b/web.go @@ -1,21 +1,21 @@ package main import ( -// "crypto/sha1" + // "crypto/sha1" "encoding/json" "fmt" -// "html" + // "html" "io/ioutil" "log" "net/http" "os" "strings" -// "time" + // "time" ) // CreateObject - Used by post web receiver type CreateObject struct { - ID string `json:"id"` + ID string `json:"id"` Actor string `json:"actor"` Cc []string `json:"cc"` Content string `json:"content"` @@ -25,8 +25,8 @@ type CreateObject struct { // RelayBase - The base object used by web receiver type RelayBase struct { - Actor string `json:"actor"` - Cc []string `json:"cc"` + Actor string `json:"actor"` + Cc []string `json:"cc"` Object json.RawMessage `json:"Object"` ID string `json:"id"` Published string `json:"published"` @@ -119,7 +119,7 @@ func inboxHandler() http.HandlerFunc { go check_post(createobject.ID) slashend := strings.Index(createobject.ID[8:], "/") - newinstance := createobject.ID[8:8+slashend] + newinstance := createobject.ID[8 : 8+slashend] log.Print("The at sign is: ", newinstance) // Only done if we are crawling