lx/easybridge
0
0
Fork 0
Code Issues 1.6k Pull requests Releases Activity

Go fmt

Browse source
This commit is contained in:
Alex 2020-02-17 19:02:26 +01:00
parent 531b59bf95
commit a4dd3b310d
9 changed files with 142 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
appservice/account.go
View file

@ -240,4 +240,3 @@ func (a *Account) eventInternal(event *Event) error {
return mxSendMessageAs(mx_room_id, typ, event.Text, mx_user_id) return mxSendMessageAs(mx_room_id, typ, event.Text, mx_user_id)
} }
} }

4
appservice/db.go
View file

@ -3,14 +3,14 @@ package appservice
import ( import (
"fmt" "fmt"
log "github.com/sirupsen/logrus"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/mysql" _ "github.com/jinzhu/gorm/dialects/mysql"
_ "github.com/jinzhu/gorm/dialects/postgres" _ "github.com/jinzhu/gorm/dialects/postgres"
_ "github.com/jinzhu/gorm/dialects/sqlite" _ "github.com/jinzhu/gorm/dialects/sqlite"
log "github.com/sirupsen/logrus"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/connector" "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib"
) )
var db *gorm.DB var db *gorm.DB

44
appservice/matrix.go
View file

@ -1,12 +1,12 @@
package appservice package appservice
import ( import (
"fmt"
"net/url"
"net/http"
"time"
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt"
"net/http"
"net/url"
"time"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -33,7 +33,7 @@ func init() {
func mxGetApiCall(endpoint string, response interface{}) error { func mxGetApiCall(endpoint string, response interface{}) error {
log.Debugf("Matrix GET request: %s\n", endpoint) log.Debugf("Matrix GET request: %s\n", endpoint)
req, err := http.NewRequest("GET", config.Server + endpoint, nil) req, err := http.NewRequest("GET", config.Server+endpoint, nil)
if err != nil { if err != nil {
return err return err
} }
@ -49,7 +49,7 @@ func mxPutApiCall(endpoint string, data interface{}, response interface{}) error
log.Debugf("Matrix PUT request: %s %s\n", endpoint, string(body)) log.Debugf("Matrix PUT request: %s %s\n", endpoint, string(body))
req, err := http.NewRequest("PUT", config.Server + endpoint, bytes.NewBuffer(body)) req, err := http.NewRequest("PUT", config.Server+endpoint, bytes.NewBuffer(body))
if err != nil { if err != nil {
return err return err
} }
@ -66,7 +66,7 @@ func mxPostApiCall(endpoint string, data interface{}, response interface{}) erro
log.Debugf("Matrix POST request: %s %s\n", endpoint, string(body)) log.Debugf("Matrix POST request: %s %s\n", endpoint, string(body))
req, err := http.NewRequest("POST", config.Server + endpoint, bytes.NewBuffer(body)) req, err := http.NewRequest("POST", config.Server+endpoint, bytes.NewBuffer(body))
if err != nil { if err != nil {
return err return err
} }
@ -76,7 +76,7 @@ func mxPostApiCall(endpoint string, data interface{}, response interface{}) erro
} }
func mxDoAndParse(req *http.Request, response interface{}) error { func mxDoAndParse(req *http.Request, response interface{}) error {
req.Header.Add("Authorization", "Bearer " + registration.AsToken) req.Header.Add("Authorization", "Bearer "+registration.AsToken)
resp, err := httpClient.Do(req) resp, err := httpClient.Do(req)
if err != nil { if err != nil {
@ -125,7 +125,7 @@ func mxProfileDisplayname(userid string, displayname string) error {
func mxDirectoryRoom(alias string) (string, error) { func mxDirectoryRoom(alias string) (string, error) {
var rep DirectoryRoomResponse var rep DirectoryRoomResponse
err := mxGetApiCall("/_matrix/client/r0/directory/room/" + url.QueryEscape(alias), &rep) err := mxGetApiCall("/_matrix/client/r0/directory/room/"+url.QueryEscape(alias), &rep)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -139,12 +139,12 @@ func mxCreateRoom(name string, alias string, invite []string) (string, error) {
Name: name, Name: name,
Topic: "", Topic: "",
Invite: invite, Invite: invite,
CreationContent: map[string]interface{} { CreationContent: map[string]interface{}{
"m.federate": false, "m.federate": false,
}, },
PowerLevels: map[string]interface{} { PowerLevels: map[string]interface{}{
"invite": 100, "invite": 100,
"events": map[string]interface{} { "events": map[string]interface{}{
"m.room.topic": 0, "m.room.topic": 0,
"m.room.avatar": 0, "m.room.avatar": 0,
}, },
@ -164,16 +164,16 @@ func mxCreateDirectRoomAs(name string, invite []string, as_user string) (string,
Name: name, Name: name,
Topic: "", Topic: "",
Invite: invite, Invite: invite,
CreationContent: map[string]interface{} { CreationContent: map[string]interface{}{
"m.federate": false, "m.federate": false,
}, },
PowerLevels: map[string]interface{} { PowerLevels: map[string]interface{}{
"invite": 100, "invite": 100,
}, },
IsDirect: true, IsDirect: true,
} }
var rep CreateRoomResponse var rep CreateRoomResponse
err := mxPostApiCall("/_matrix/client/r0/createRoom?user_id=" + url.QueryEscape(as_user), &rq, &rep) err := mxPostApiCall("/_matrix/client/r0/createRoom?user_id="+url.QueryEscape(as_user), &rq, &rep)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -185,7 +185,7 @@ func mxRoomInvite(room string, user string) error {
UserId: user, UserId: user,
} }
var rep struct{} var rep struct{}
err := mxPostApiCall("/_matrix/client/r0/rooms/" + url.QueryEscape(room) + "/invite", &rq, &rep) err := mxPostApiCall("/_matrix/client/r0/rooms/"+url.QueryEscape(room)+"/invite", &rq, &rep)
return err return err
} }
@ -195,21 +195,21 @@ func mxRoomKick(room string, user string, reason string) error {
Reason: reason, Reason: reason,
} }
var rep struct{} var rep struct{}
err := mxPostApiCall("/_matrix/client/r0/rooms/" + url.QueryEscape(room) + "/kick", &rq, &rep) err := mxPostApiCall("/_matrix/client/r0/rooms/"+url.QueryEscape(room)+"/kick", &rq, &rep)
return err return err
} }
func mxRoomJoinAs(room string, user string) error { func mxRoomJoinAs(room string, user string) error {
rq := struct{}{} rq := struct{}{}
var rep RoomJoinResponse var rep RoomJoinResponse
err := mxPostApiCall("/_matrix/client/r0/rooms/" + url.QueryEscape(room) + "/join?user_id=" + url.QueryEscape(user), &rq, &rep) err := mxPostApiCall("/_matrix/client/r0/rooms/"+url.QueryEscape(room)+"/join?user_id="+url.QueryEscape(user), &rq, &rep)
return err return err
} }
func mxRoomLeaveAs(room string, user string) error { func mxRoomLeaveAs(room string, user string) error {
rq := struct{}{} rq := struct{}{}
var rep struct{} var rep struct{}
err := mxPostApiCall("/_matrix/client/r0/rooms/" + url.QueryEscape(room) + "/leave?user_id=" + url.QueryEscape(user), &rq, &rep) err := mxPostApiCall("/_matrix/client/r0/rooms/"+url.QueryEscape(room)+"/leave?user_id="+url.QueryEscape(user), &rq, &rep)
return err return err
} }
@ -224,7 +224,7 @@ func mxSendAs(room string, event_type string, content map[string]interface{}, us
} }
func mxSendMessageAs(room string, typ string, body string, user string) error { func mxSendMessageAs(room string, typ string, body string, user string) error {
content := map[string]interface{} { content := map[string]interface{}{
"msgtype": typ, "msgtype": typ,
"body": body, "body": body,
} }
@ -241,14 +241,14 @@ func mxPutStateAs(room string, event_type string, key string, content map[string
} }
func mxRoomNameAs(room string, name string, as_user string) error { func mxRoomNameAs(room string, name string, as_user string) error {
content := map[string]interface{} { content := map[string]interface{}{
"name": name, "name": name,
} }
return mxPutStateAs(room, "m.room.name", "", content, as_user) return mxPutStateAs(room, "m.room.name", "", content, as_user)
} }
func mxRoomTopicAs(room string, topic string, as_user string) error { func mxRoomTopicAs(room string, topic string, as_user string) error {
content := map[string]interface{} { content := map[string]interface{}{
"topic": topic, "topic": topic,
} }
return mxPutStateAs(room, "m.room.topic", "", content, as_user) return mxPutStateAs(room, "m.room.topic", "", content, as_user)

5
appservice/server.go
View file

@ -3,14 +3,14 @@ package appservice
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings"
"net/http" "net/http"
"strings"
"github.com/gorilla/mux" "github.com/gorilla/mux"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/connector" "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib"
) )
type Config struct { type Config struct {
@ -21,7 +21,6 @@ type Config struct {
MatrixDomain string MatrixDomain string
} }
var registration *mxlib.Registration var registration *mxlib.Registration
var config *Config var config *Config

1
connector/connector.go
View file

@ -82,6 +82,7 @@ type Handler interface {
} }
type EventType int type EventType int
const ( const (
EVENT_JOIN EventType = iota EVENT_JOIN EventType = iota
EVENT_LEAVE EVENT_LEAVE

8
connector/irc/irc.go
View file

@ -1,10 +1,10 @@
package irc package irc
import ( import (
"time" "fmt"
_ "os" _ "os"
"strings" "strings"
"fmt" "time"
"github.com/lrstanley/girc" "github.com/lrstanley/girc"
@ -31,7 +31,7 @@ func (irc *IRC) SetHandler(h Handler) {
irc.handler = h irc.handler = h
} }
func(irc *IRC) Protocol() string { func (irc *IRC) Protocol() string {
return "irc" return "irc"
} }
@ -85,7 +85,7 @@ func (irc *IRC) Configure(c Configuration) error {
go irc.connectLoop(client) go irc.connectLoop(client)
for i := 0; i < 42; i++ { for i := 0; i < 42; i++ {
time.Sleep(time.Duration(1)*time.Second) time.Sleep(time.Duration(1) * time.Second)
if irc.conn != client { if irc.conn != client {
break break
} }

12
main.go
View file

@ -1,25 +1,25 @@
package main package main
import ( import (
"fmt"
"crypto/rand" "crypto/rand"
"encoding/hex" "encoding/hex"
"encoding/json"
"flag" "flag"
"fmt"
_ "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
_"strings" _ "strings"
_ "time" _ "time"
_ "fmt"
"encoding/json"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/appservice" "git.deuxfleurs.fr/Deuxfleurs/easybridge/appservice"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/connector" "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/irc" "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/irc"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/xmpp" "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/xmpp"
"git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib"
) )
type ConfigAccount struct { type ConfigAccount struct {
@ -29,7 +29,7 @@ type ConfigAccount struct {
} }
type ConfigFile struct { type ConfigFile struct {
HttpBindAddr string`json:"http_bind_addr"` HttpBindAddr string `json:"http_bind_addr"`
Registration string `json:"registration"` Registration string `json:"registration"`
Server string `json:"homeserver_url"` Server string `json:"homeserver_url"`
DbType string `json:"db_type"` DbType string `json:"db_type"`

1
mxlib/api.go
View file

@ -84,4 +84,3 @@ type RoomJoinResponse struct {
type RoomSendResponse struct { type RoomSendResponse struct {
EventId string `json:"event_id"` EventId string `json:"event_id"`
} }