Merge pull request #22 from jo-so/master

Collection of small fixes and improvements
This commit is contained in:
Tulir Asokan 2018-12-08 01:25:24 +02:00 committed by GitHub
commit 88483fc61f
7 changed files with 80 additions and 27 deletions

View file

@ -19,9 +19,12 @@ package main
import ( import (
"strings" "strings"
"github.com/Rhymen/go-whatsapp"
"maunium.net/go/maulogger" "maunium.net/go/maulogger"
"maunium.net/go/mautrix-appservice" "maunium.net/go/mautrix-appservice"
"maunium.net/go/mautrix-whatsapp/database"
"maunium.net/go/mautrix-whatsapp/types" "maunium.net/go/mautrix-whatsapp/types"
"maunium.net/go/mautrix-whatsapp/whatsapp-ext"
) )
type CommandHandler struct { type CommandHandler struct {
@ -49,7 +52,7 @@ type CommandEvent struct {
// Reply sends a reply to command as notice // Reply sends a reply to command as notice
func (ce *CommandEvent) Reply(msg string) { func (ce *CommandEvent) Reply(msg string) {
_, err := ce.Bot.SendNotice(string(ce.RoomID), msg) _, err := ce.Bot.SendNotice(string(ce.User.ManagementRoom), msg)
if err != nil { if err != nil {
ce.Handler.log.Warnfln("Failed to reply to command from %s: %v", ce.User.MXID, err) ce.Handler.log.Warnfln("Failed to reply to command from %s: %v", ce.User.MXID, err)
} }
@ -74,6 +77,8 @@ func (handler *CommandHandler) Handle(roomID types.MatrixRoomID, user *User, mes
handler.CommandLogout(ce) handler.CommandLogout(ce)
case "help": case "help":
handler.CommandHelp(ce) handler.CommandHelp(ce)
case "import":
handler.CommandImport(ce)
default: default:
ce.Reply("Unknown Command") ce.Reply("Unknown Command")
} }
@ -116,10 +121,53 @@ const cmdHelpHelp = `help - Prints this help`
// CommandHelp handles help command // CommandHelp handles help command
func (handler *CommandHandler) CommandHelp(ce *CommandEvent) { func (handler *CommandHandler) CommandHelp(ce *CommandEvent) {
cmdPrefix := handler.bridge.Config.Bridge.CommandPrefix + " " cmdPrefix := ""
if ce.User.ManagementRoom != ce.RoomID {
cmdPrefix = handler.bridge.Config.Bridge.CommandPrefix + " "
}
ce.Reply(strings.Join([]string{ ce.Reply(strings.Join([]string{
cmdPrefix + cmdHelpHelp, cmdPrefix + cmdHelpHelp,
cmdPrefix + cmdLoginHelp, cmdPrefix + cmdLoginHelp,
cmdPrefix + cmdLogoutHelp, cmdPrefix + cmdLogoutHelp,
cmdPrefix + cmdImportHelp,
}, "\n")) }, "\n"))
} }
const cmdImportHelp = `import JID|contacts - Open up a room for JID or for each WhatsApp contact`
// CommandImport handles import command
func (handler *CommandHandler) CommandImport(ce *CommandEvent) {
// ensure all messages go to the management room
ce.RoomID = ce.User.ManagementRoom
user := ce.User
if ce.Args[0] == "contacts" {
handler.log.Debugln("Importing all contacts of", user)
_, err := user.Conn.Contacts()
if err != nil {
handler.log.Errorln("Error on update of contacts of user", user, ":", err)
return
}
for jid, contact := range user.Conn.Store.Contacts {
if strings.HasSuffix(jid, whatsappExt.NewUserSuffix) {
puppet := user.bridge.GetPuppetByJID(contact.Jid)
puppet.Sync(user, contact)
} else {
portal := user.bridge.GetPortalByJID(database.GroupPortalKey(contact.Jid))
portal.Sync(user, contact)
}
}
ce.Reply("Importing all contacts done")
} else {
jid := ce.Args[0] + whatsappExt.NewUserSuffix
handler.log.Debugln("Importing", jid, "for", user)
puppet := user.bridge.GetPuppetByJID(jid)
contact := whatsapp.Contact { Jid: jid }
puppet.Sync(user, contact)
}
}

View file

@ -185,7 +185,7 @@ func (bridge *Bridge) UpdateBotProfile() {
func (bridge *Bridge) StartUsers() { func (bridge *Bridge) StartUsers() {
for _, user := range bridge.GetAllUsers() { for _, user := range bridge.GetAllUsers() {
go user.Start() go user.Connect(false)
} }
} }

View file

@ -98,7 +98,7 @@ func (mx *MatrixHandler) HandleBotInvite(evt *gomatrix.Event) {
if !hasPuppets { if !hasPuppets {
user := mx.bridge.GetUserByMXID(types.MatrixUserID(evt.Sender)) user := mx.bridge.GetUserByMXID(types.MatrixUserID(evt.Sender))
user.SetManagementRoom(types.MatrixRoomID(resp.RoomID)) user.SetManagementRoom(types.MatrixRoomID(resp.RoomID))
intent.SendNotice(string(user.ManagementRoom), "This room has been registered as your bridge management/status room.") intent.SendNotice(string(user.ManagementRoom), "This room has been registered as your bridge management/status room. Send `help` to get a list of commands.")
mx.log.Debugln(resp.RoomID, "registered as a management room with", evt.Sender) mx.log.Debugln(resp.RoomID, "registered as a management room with", evt.Sender)
} }
} }

View file

@ -258,6 +258,12 @@ func (portal *Portal) UpdateAvatar(user *User, avatar *whatsappExt.ProfilePicInf
} }
} }
if avatar.Status != 0 {
// 401: ???
// 404: ???
return false
}
if portal.Avatar == avatar.Tag { if portal.Avatar == avatar.Tag {
return false return false
} }
@ -316,6 +322,16 @@ func (portal *Portal) UpdateMetadata(user *User) bool {
portal.log.Errorln(err) portal.log.Errorln(err)
return false return false
} }
if metadata.Status != 0 {
// 401: access denied
// 404: group does (no longer) exist
// 500: ??? happens with status@broadcast
// TODO: update the room, e.g. change priority level
// to send messages to moderator
return false
}
portal.SyncParticipants(metadata) portal.SyncParticipants(metadata)
update := false update := false
update = portal.UpdateName(metadata.Name, metadata.NameSetBy) || update update = portal.UpdateName(metadata.Name, metadata.NameSetBy) || update
@ -439,6 +455,11 @@ func (portal *Portal) CreateMatrixRoom(invite []string) error {
return nil return nil
} }
intent := portal.MainIntent()
if err := intent.EnsureRegistered(); err != nil {
return err
}
name := portal.Name name := portal.Name
topic := portal.Topic topic := portal.Topic
isPrivateChat := false isPrivateChat := false
@ -448,7 +469,7 @@ func (portal *Portal) CreateMatrixRoom(invite []string) error {
isPrivateChat = true isPrivateChat = true
} }
resp, err := portal.MainIntent().CreateRoom(&gomatrix.ReqCreateRoom{ resp, err := intent.CreateRoom(&gomatrix.ReqCreateRoom{
Visibility: "private", Visibility: "private",
Name: name, Name: name,
Topic: topic, Topic: topic,

23
user.go
View file

@ -132,12 +132,6 @@ func (user *User) SetSession(session *whatsapp.Session) {
user.Update() user.Update()
} }
func (user *User) Start() {
if user.Connect(false) {
user.Sync()
}
}
func (user *User) Connect(evenIfNoSession bool) bool { func (user *User) Connect(evenIfNoSession bool) bool {
if user.Conn != nil { if user.Conn != nil {
return true return true
@ -210,22 +204,7 @@ func (user *User) Login(roomID types.MatrixRoomID) {
user.JID = strings.Replace(user.Conn.Info.Wid, whatsappExt.OldUserSuffix, whatsappExt.NewUserSuffix, 1) user.JID = strings.Replace(user.Conn.Info.Wid, whatsappExt.OldUserSuffix, whatsappExt.NewUserSuffix, 1)
user.Session = &session user.Session = &session
user.Update() user.Update()
bot.SendNotice(roomID, "Successfully logged in. Synchronizing chats...") bot.SendNotice(roomID, "Successfully logged in. Now, you may ask for `import contacts`.")
go user.Sync()
}
func (user *User) Sync() {
user.log.Debugln("Syncing...")
user.Conn.Contacts()
for jid, contact := range user.Conn.Store.Contacts {
if strings.HasSuffix(jid, whatsappExt.NewUserSuffix) {
puppet := user.bridge.GetPuppetByJID(contact.Jid)
puppet.Sync(user, contact)
} else {
portal := user.bridge.GetPortalByJID(database.GroupPortalKey(contact.Jid))
portal.Sync(user, contact)
}
}
} }
func (user *User) HandleError(err error) { func (user *User) HandleError(err error) {

View file

@ -68,6 +68,7 @@ func (ext *ExtendedConn) HandleJsonMessage(message string) {
msg := JSONMessage{} msg := JSONMessage{}
err := json.Unmarshal([]byte(message), &msg) err := json.Unmarshal([]byte(message), &msg)
if err != nil || len(msg) < 2 { if err != nil || len(msg) < 2 {
ext.jsonParseError(err)
return return
} }

View file

@ -61,6 +61,8 @@ type GroupInfo struct {
GroupCreated int64 `json:"creation"` GroupCreated int64 `json:"creation"`
Status int16 `json:"status"`
Participants []struct { Participants []struct {
JID string `json:"id"` JID string `json:"id"`
IsAdmin bool `json:"isAdmin"` IsAdmin bool `json:"isAdmin"`
@ -93,6 +95,8 @@ func (ext *ExtendedConn) GetGroupMetaData(jid string) (*GroupInfo, error) {
type ProfilePicInfo struct { type ProfilePicInfo struct {
URL string `json:"eurl"` URL string `json:"eurl"`
Tag string `json:"tag"` Tag string `json:"tag"`
Status int16 `json:"status"`
} }
func (ppi *ProfilePicInfo) Download() (io.ReadCloser, error) { func (ppi *ProfilePicInfo) Download() (io.ReadCloser, error) {