added support for new 'start-dm' command based on phone or email

Author: trek-boldly-go

commands.go

@@ -0,0 +1,82 @@
+// mautrix-imessage - A Matrix-iMessage puppeting bridge.
+// Copyright (C) 2022 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"maunium.net/go/mautrix/bridge/commands"
+)
+
+var (
+	HelpSectionChatManagement = commands.HelpSection{Name: "Chat management", Order: 11}
+)
+
+type WrappedCommandEvent struct {
+	*commands.Event
+	Bridge *IMBridge
+	User   *User
+	Portal *Portal
+}
+
+func (br *IMBridge) RegisterCommands() {
+	proc := br.CommandProcessor.(*commands.Processor)
+	proc.AddHandlers(
+		cmdStartDm,
+	)
+}
+
+func wrapCommand(handler func(*WrappedCommandEvent)) func(*commands.Event) {
+	return func(ce *commands.Event) {
+		user := ce.User.(*User)
+		var portal *Portal
+		if ce.Portal != nil {
+			portal = ce.Portal.(*Portal)
+		}
+		br := ce.Bridge.Child.(*IMBridge)
+		handler(&WrappedCommandEvent{ce, br, user, portal})
+	}
+}
+
+var cmdStartDm = &commands.FullHandler{
+	Func: wrapCommand(fnStartDm),
+	Name: "start-dm",
+	Help: commands.HelpMeta{
+		Section:     HelpSectionChatManagement,
+		Description: "Creates a new DM with the specified number.",
+	},
+	RequiresPortal: false,
+	RequiresLogin:  false,
+}
+
+func fnStartDm(ce *WrappedCommandEvent) {
+	ce.Bridge.ZLog.Trace().Interface("args", ce.Args).Str("cmd", ce.Command).Msg("fnStartDm")
+
+	_, err := ce.Bridge.WebsocketHandler.StartChat(*&StartDMRequest{
+		Identifier:    ce.RawArgs,
+		Force:         false,
+		ActuallyStart: true,
+	})
+
+	if err != nil {
+		ce.Reply("Failed to start DM: %s", err)
+	} else {
+		ce.Reply("Created!")
+	}
+}
+
+// TODO: potentially add the following commands
+// contact-search (search contact for addresses so they can be used to start a dm)
+// start-group-chat

imessage/bluebubbles/api.go

@@ -1037,12 +1037,18 @@ func (bb *blueBubbles) SendTypingNotification(chatID string, typing bool) error
 
 func (bb *blueBubbles) ResolveIdentifier(identifier string) (string, error) {
 	bb.log.Trace().Str("identifier", identifier).Msg("ResolveIdentifier")
-	return "", ErrNotImplemented
+
+	// if the identifier is a phone number, remove dashes and prepend the +
+	if !strings.Contains(identifier, "@") {
+		identifier = "+" + numericOnly(identifier)
+	}
+
+	return "iMessage;-;" + identifier, nil
 }
 
 func (bb *blueBubbles) PrepareDM(guid string) error {
 	bb.log.Trace().Str("guid", guid).Msg("PrepareDM")
-	return ErrNotImplemented
+	return nil
 }
 
 func (bb *blueBubbles) CreateGroup(users []string) (*imessage.CreateGroupResponse, error) {

main.go

@@ -229,6 +229,9 @@ func (br *IMBridge) Init() {
 	br.IMHandler = NewiMessageHandler(br)
 	br.WebsocketHandler = NewWebsocketCommandHandler(br)
 	br.wsOnConnectWait.Add(1)
+
+	br.CommandProcessor = commands.NewProcessor(&br.Bridge)
+	br.RegisterCommands()
 }
 
 type PingResponse struct {