From 459b54955a1996da383f6570a3129b2e698191c1 Mon Sep 17 00:00:00 2001
From: zhaoYangguang <1163765691@qq.com>
Date: Fri, 14 May 2021 18:34:39 +0800
Subject: [PATCH] add return orgid

---
 commands.go | 10 +++++++++-
 user.go     | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/commands.go b/commands.go
index 9d35cde..a6864e4 100644
--- a/commands.go
+++ b/commands.go
@@ -7,6 +7,7 @@ import (
 	"github.com/kelaresg/matrix-skype/database"
 	skypeExt "github.com/kelaresg/matrix-skype/skype-ext"
 	"math"
+	"maunium.net/go/mautrix/patch"
 
 	"sort"
 	"strconv"
@@ -482,7 +483,14 @@ func (handler *CommandHandler) CommandPing(ce *CommandEvent) {
 		if username == "" {
 			username = ce.User.Conn.UserProfile.Username
 		}
-		ce.Reply("You're logged in as @" + username)
+
+		orgId := ""
+		if patch.ThirdPartyIdEncrypt {
+			orgId = patch.Enc(strings.TrimSuffix(ce.User.JID, skypeExt.NewUserSuffix))
+		} else {
+			orgId = strings.TrimSuffix(ce.User.JID, skypeExt.NewUserSuffix)
+		}
+		ce.Reply("You're logged in as @" + username + ", orgid is " + orgId)
 	}
 }
 
diff --git a/user.go b/user.go
index f3ca29e..891ef88 100644
--- a/user.go
+++ b/user.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	skype "github.com/kelaresg/go-skypeapi"
 	skypeExt "github.com/kelaresg/matrix-skype/skype-ext"
+	"maunium.net/go/mautrix/patch"
 	"sort"
 	//"strconv"
 	"strings"
@@ -333,7 +334,13 @@ func (user *User) Login(ce *CommandEvent, name string, password string) (err err
 	err = user.Conn.Login(name, password)
 	if err != nil {
 		user.log.Errorln("Failed to login:", err)
-		ce.Reply(err.Error())
+		orgId := ""
+		if patch.ThirdPartyIdEncrypt {
+			orgId = patch.Enc(strings.TrimSuffix(user.JID, skypeExt.NewUserSuffix))
+		} else {
+			orgId = strings.TrimSuffix(user.JID, skypeExt.NewUserSuffix)
+		}
+		ce.Reply(err.Error() + ", orgid is " + orgId)
 		return err
 	}
 	username := user.Conn.UserProfile.FirstName
@@ -343,7 +350,14 @@ func (user *User) Login(ce *CommandEvent, name string, password string) (err err
 	if username == "" {
 		username = user.Conn.UserProfile.Username
 	}
-	ce.Reply("Successfully logged in as @" + username)
+
+	orgId := ""
+	if patch.ThirdPartyIdEncrypt {
+		orgId = patch.Enc(strings.TrimSuffix(user.JID, skypeExt.NewUserSuffix))
+	} else {
+		orgId = strings.TrimSuffix(user.JID, skypeExt.NewUserSuffix)
+	}
+	ce.Reply("Successfully logged in as @" + username + ", orgid is " + orgId)
 
 	user.Conn.Subscribes() // subscribe basic event
 	err = user.Conn.Conn.ContactList(user.Conn.UserProfile.Username)