Assign topic id for point message

main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"gitea.difrex.ru/Umbrella/lessmore/node"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

node/api.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
+	log "github.com/sirupsen/logrus"
 )
 
 // ListTXTHandler ...
@@ -28,6 +28,21 @@ func (es ESConf) ListTXTHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(echoes)
 }
 
+func (ed ESConf) BlacklistTXT(w http.ResponseWriter, r *http.Request) {
+	LogRequest(r)
+	w.WriteHeader(200)
+	w.Write([]byte(`KNMUXRTMJA6XWHMB22CD
+6AKO6DEWYF7EHXWMI2BY
+qcYj9ceDYjoxt2z6qhzN
+k1zaEUu1Tg0g97osDeS7
+j8s7ZMdTzmHzsRJna3xb
+vuMNfQWe8xonMFPZtOxP
+bcp6izdkdCj9AXUOP2aT
+0dIDXSJTLtR8N2KnLTl1
+2QzNqUiyuoPcPn0l74KP
+`))
+}
+
 // XFeaturesHandler list supported features
 func XFeaturesHandler(w http.ResponseWriter, r *http.Request) {
 	features := []string{"list.txt", "u/e", "u/m", "x/c"}
@@ -200,6 +215,7 @@ func (es ESConf) UPointHandler(w http.ResponseWriter, r *http.Request) {
 func Serve(listen string, es ESConf) {
 	r := mux.NewRouter()
 	r.HandleFunc("/list.txt", es.ListTXTHandler).Methods("GET")
+	r.HandleFunc("/blacklist.txt", es.BlacklistTXT).Methods("GET")
 	r.HandleFunc("/x/features", XFeaturesHandler).Methods("GET")
 
 	// Standart schemas

node/auth.go

@@ -17,7 +17,7 @@ import (
 
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 const (

node/elastic.go

@@ -13,7 +13,7 @@ import (
 	"encoding/base64"
 
 	"gitea.difrex.ru/Umbrella/fetcher/i2es"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 const (

node/helpers.go

@@ -7,7 +7,7 @@ import (
 
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"golang.org/x/crypto/bcrypt"
 )
 

node/logger.go

@@ -1,13 +1,14 @@
 package node
 
 import (
-	"log"
+	"fmt"
 	"net/http"
-	"strings"
+
+	log "github.com/sirupsen/logrus"
 )
 
 // LogRequest ...
 func LogRequest(r *http.Request) {
-	logString := strings.Join([]string{r.Method, string(r.ContentLength), r.RequestURI, r.RemoteAddr}, " ")
-	log.Print("[API] ", logString)
+	logString := fmt.Sprintf("%s %d %s %s", r.Method, r.ContentLength, r.RequestURI, r.RemoteAddr)
+	log.Print("[API] " + logString)
 }

node/point.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"strings"
 
 	"bytes"
 
-	log "github.com/Sirupsen/logrus"
 	idec "github.com/idec-net/go-idec"
+	log "github.com/sirupsen/logrus"
 )
 
 type ESDoc struct {
@@ -23,6 +24,7 @@ type ESDoc struct {
 	Tags    string `json:"tags"`
 	Repto   string `json:"repto"`
 	Address string `json:"address"`
+	TopicID string `json:"topicid"`
 }
 
 // PointMessage add point message into DB
@@ -41,8 +43,7 @@ func (es ESConf) PointMessage(req PointRequest, user User) error {
 	}
 
 	// Make bundle ID
-	// Prevent collission via adding Timestamp
-	id := idec.MakeMsgID(fmt.Sprintf("%s\n%d", pmsg.String(), bmsg.Timestamp))
+	id := idec.MakeMsgID(pmsg.String())
 	bmsg.ID = id
 	bmsg.From = user.Name
 	bmsg.Address = fmt.Sprintf("%s,%d", user.Address, user.UserID)
@@ -53,6 +54,42 @@ func (es ESConf) PointMessage(req PointRequest, user User) error {
 	return nil
 }
 
+func (es ESConf) getTopicID(msgid string) string {
+	var topicid string
+	if msgid == "" {
+		return topicid
+	}
+	reqURL := fmt.Sprintf("%s/%s/%s/%s", es.Host, es.Index, es.Type, msgid)
+	req, err := http.NewRequest("GET", reqURL, strings.NewReader(""))
+	if err != nil {
+		log.Error(err)
+		return topicid
+	}
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Error(err)
+		return topicid
+	}
+
+	defer resp.Body.Close()
+
+	var hit Hit
+	err = json.NewDecoder(resp.Body).Decode(&hit)
+	if err != nil {
+		log.Error(err)
+		return topicid
+	}
+
+	if hit.Source.TopicID != "" {
+		topicid = hit.Source.TopicID
+	} else if hit.Source.Repto != "" {
+		return es.getTopicID(hit.Source.Repto)
+	}
+
+	return topicid
+}
+
 func (es ESConf) IndexMessage(msg idec.Message) error {
 	tags, _ := msg.Tags.CollectTags()
 	doc := ESDoc{
@@ -66,6 +103,7 @@ func (es ESConf) IndexMessage(msg idec.Message) error {
 		Repto:   msg.Repto,
 		Address: msg.Address,
 		MsgID:   msg.ID,
+		TopicID: es.getTopicID(msg.Repto),
 	}
 	reqURL := fmt.Sprintf("%s/%s/%s/%s", es.Host, es.Index, es.Type, msg.ID)
 	bdoc, err := json.Marshal(doc)