watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle 400 init response and add ping command. Fixes #87

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-24 22:39:12 +03:00
parent b9ce4d7ab4
commit 44a0fc65b8
4 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
matrix.go
View File

@ -118,7 +118,7 @@ func (mx *MatrixHandler) HandleMembership(evt *mautrix.Event) {
}
user := mx.bridge.GetUserByMXID(types.MatrixUserID(evt.Sender))
if user == nil || !user.Whitelisted || !user.IsLoggedIn() {
if user == nil || !user.Whitelisted || !user.IsConnected() {
return
}
@ -135,7 +135,7 @@ func (mx *MatrixHandler) HandleMembership(evt *mautrix.Event) {
func (mx *MatrixHandler) HandleRoomMetadata(evt *mautrix.Event) {
user := mx.bridge.GetUserByMXID(types.MatrixUserID(evt.Sender))
if user == nil || !user.Whitelisted || !user.IsLoggedIn() || !user.Connected {
if user == nil || !user.Whitelisted || !user.IsConnected() {
return
}
@ -190,9 +190,9 @@ func (mx *MatrixHandler) HandleMessage(evt *mautrix.Event) {
}
}
if !user.IsLoggedIn() {
if !user.HasSession() {
return
} else if !user.Connected {
} else if !user.IsConnected() {
msg := format.RenderMarkdown(fmt.Sprintf("\u26a0 You are not connected to WhatsApp, so your message was not bridged. " +
"Use `%s reconnect` to reconnect.", mx.bridge.Config.Bridge.CommandPrefix))
msg.MsgType = mautrix.MsgNotice
@ -218,9 +218,9 @@ func (mx *MatrixHandler) HandleRedaction(evt *mautrix.Event) {
return
}
if !user.IsLoggedIn() {
if !user.HasSession() {
return
} else if !user.Connected {
} else if !user.IsConnected() {
msg := format.RenderMarkdown(fmt.Sprintf("[%[1]s](https://matrix.to/#/%[1]s): \u26a0 " +
"You are not connected to WhatsApp, so your redaction was not bridged. " +
"Use `%[2]s reconnect` to reconnect.", user.MXID, mx.bridge.Config.Bridge.CommandPrefix))