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

WIP

Browse Source
This commit is contained in:
Brandon Watson 2023-09-03 19:26:53 -05:00
parent 47656ca0bb
commit 48e426dd67
1 changed files with 132 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
user.go
View File

@ -21,6 +21,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/http" "net/http"
"sort"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -345,6 +346,7 @@ func (user *User) Connect() bool {
user.Conn = &conn user.Conn = &conn
user.Conn.StartListening(context.Background(), groupmeext.NewFayeClient(user.log)) user.Conn.StartListening(context.Background(), groupmeext.NewFayeClient(user.log))
user.Conn.AddFullHandler(user) user.Conn.AddFullHandler(user)
user.intPostLogin()
//TODO: typing notification? //TODO: typing notification?
return user.RestoreSession() return user.RestoreSession()
@ -502,46 +504,46 @@ func (user *User) postConnPing() bool {
return true return true
} }
// func (user *User) intPostLogin() { func (user *User) intPostLogin() {
//defer user.syncWait.Done() //defer user.syncWait.Done()
// user.lastReconnection = time.Now().Unix() user.lastReconnection = time.Now().Unix()
// user.Client = groupmeext.NewClient(user.Token) user.Client = groupmeext.NewClient(user.Token)
// if len(user.JID) == 0 { if len(user.GMID) == 0 {
// myuser, err := user.Client.MyUser(context.TODO()) myuser, err := user.Client.MyUser(context.TODO())
// if err != nil { if err != nil {
// log.Fatal(err) //TODO log.Fatal(err) //TODO
// } }
// user.JID = myuser.ID.String() user.GMID = myuser.ID
// } }
// user.Update() user.Update()
// user.tryAutomaticDoublePuppeting() user.tryAutomaticDoublePuppeting()
// user.log.Debugln("Waiting for chat list receive confirmation") user.log.Debugln("Waiting for chat list receive confirmation")
// user.HandleChatList() user.HandleChatList()
// select { select {
// case <-user.chatListReceived: case <-user.chatListReceived:
// user.log.Debugln("Chat list receive confirmation received in PostLogin") user.log.Debugln("Chat list receive confirmation received in PostLogin")
// case <-time.After(time.Duration(user.bridge.Config.Bridge.ChatListWait) * time.Second): case <-time.After(time.Duration(1000 /**user.bridge.Config.Bridge.ChatListWait**/) * time.Second):
// user.log.Warnln("Timed out waiting for chat list to arrive!") user.log.Warnln("Timed out waiting for chat list to arrive!")
// user.postConnPing() user.postConnPing()
// return return
// } }
// if !user.postConnPing() { if !user.postConnPing() {
// user.log.Debugln("Post-connection ping failed, unlocking processing of incoming messages.") user.log.Debugln("Post-connection ping failed, unlocking processing of incoming messages.")
// return return
// } }
// user.log.Debugln("Waiting for portal sync complete confirmation") user.log.Debugln("Waiting for portal sync complete confirmation")
// select { select {
// case <-user.syncPortalsDone: case <-user.syncPortalsDone:
// user.log.Debugln("Post-connection portal sync complete, unlocking processing of incoming messages.") user.log.Debugln("Post-connection portal sync complete, unlocking processing of incoming messages.")
// // TODO this is too short, maybe a per-portal duration? // TODO this is too short, maybe a per-portal duration?
// case <-time.After(time.Duration(user.bridge.Config.Bridge.PortalSyncWait) * time.Second): case <-time.After(time.Duration(1000 /**user.bridge.Config.Bridge.PortalSyncWai**/) * time.Second):
// user.log.Warnln("Timed out waiting for portal sync to complete! Unlocking processing of incoming messages.") user.log.Warnln("Timed out waiting for portal sync to complete! Unlocking processing of incoming messages.")
// } }
// } }
func (user *User) HandleChatList() { func (user *User) HandleChatList() {
chatMap := map[groupme.ID]groupme.Group{} chatMap := map[groupme.ID]groupme.Group{}
@ -588,84 +590,107 @@ func (user *User) HandleChatList() {
go user.syncPortals(false) go user.syncPortals(false)
} }
// Syncs chats & group messages
func (user *User) syncPortals(createAll bool) { func (user *User) syncPortals(createAll bool) {
// user.log.Infoln("Reading chat list") user.log.Infoln("Reading chat list")
// chats := make(ChatList, 0, len(user.GroupList)+len(user.ChatList)) chats := make(ChatList, 0, len(user.GroupList)+len(user.ChatList))
// portalKeys := make([]database.PortalKeyWithMeta, 0, cap(chats)) portalKeys := make([]database.PortalKey, 0, cap(chats))
// for _, group := range user.GroupList { for _, group := range user.GroupList {
// portal := user.bridge.GetPortalByJID(database.GroupPortalKey(group.ID.String())) portal := user.bridge.GetPortalByGMID(database.GroupPortalKey(group.ID))
// chats = append(chats, Chat{ chats = append(chats, Chat{
// Portal: portal, Portal: portal,
// LastMessageTime: uint64(group.UpdatedAt.ToTime().Unix()), LastMessageTime: uint64(group.UpdatedAt.ToTime().Unix()),
// Group: &group, Group: &group,
// }) })
// } }
// for _, dm := range user.ChatList { for _, dm := range user.ChatList {
// portal := user.bridge.GetPortalByJID(database.NewPortalKey(dm.OtherUser.ID.String(), user.JID)) portal := user.bridge.GetPortalByGMID(database.NewPortalKey(dm.OtherUser.ID, user.GMID))
// chats = append(chats, Chat{ chats = append(chats, Chat{
// Portal: portal, Portal: portal,
// LastMessageTime: uint64(dm.UpdatedAt.ToTime().Unix()), LastMessageTime: uint64(dm.UpdatedAt.ToTime().Unix()),
// DM: &dm, DM: &dm,
// }) })
// } }
// for _, chat := range chats { for _, chat := range chats {
//var inCommunity, ok bool //var inCommunity, ok bool
//if inCommunity, ok = existingKeys[chat.Portal.Key]; !ok || !inCommunity { //if inCommunity, ok = existingKeys[chat.Portal.Key]; !ok || !inCommunity {
// inCommunity = user.addPortalToCommunity(chat.Portal) // inCommunity = user.addPortalToCommunity(chat.Portal)
// if chat.Portal.IsPrivateChat() { // if chat.Portal.IsPrivateChat() {
// puppet := user.bridge.GetPuppetByJID(chat.Portal.Key.GMID) // puppet := user.bridge.GetPuppetByGMID(chat.Portal.Key.GMID)
// user.addPuppetToCommunity(puppet) // user.addPuppetToCommunity(puppet)
// } // }
//} //}
// portalKeys = append(portalKeys, database.PortalKeyWithMeta{PortalKey: chat.Portal.Key, InCommunity: inCommunity}) portalKeys = append(portalKeys, chat.Portal.Key)
// } }
// user.log.Infoln("Read chat list, updating user-portal mapping") user.log.Infoln("Read chat list, updating user-portal mapping")
// err := user.SetPortalKeys(portalKeys) err := user.SetPortalKeys(portalKeys)
// if err != nil { if err != nil {
// user.log.Warnln("Failed to update user-portal mapping:", err) user.log.Warnln("Failed to update user-portal mapping:", err)
// } }
// sort.Sort(chats) sort.Sort(chats)
// limit := user.bridge.Config.Bridge.InitialChatSync _ = user.bridge.Config.Bridge.SyncDirectChatList
// if limit < 0 {
// limit = len(chats)
// }
// now := uint64(time.Now().Unix())
// user.log.Infoln("Syncing portals")
// wg := sync.WaitGroup{} user.log.Infoln("Syncing portals")
// for i, chat := range chats {
// if chat.LastMessageTime+user.bridge.Config.Bridge.SyncChatMaxAge < now { wg := sync.WaitGroup{}
// break for i, chat := range chats {
// } wg.Add(1)
// wg.Add(1) go func(chat Chat, i int) {
// go func(chat Chat, i int) { create := (int64(chat.LastMessageTime) >= user.lastReconnection && user.lastReconnection > 0) || i < len(chats)
// create := (chat.LastMessageTime >= user.LastConnection && user.LastConnection > 0) || i < limit if len(chat.Portal.MXID) > 0 || create || createAll {
// if len(chat.Portal.MXID) > 0 || create || createAll { chat.Portal.Sync(user, chat.Group)
// chat.Portal.Sync(user, chat.Group)
//err := chat.Portal.BackfillHistory(user, chat.LastMessageTime) //err := chat.Portal.BackfillHistory(user, chat.LastMessageTime)
// if err != nil { if err != nil {
// chat.Portal.log.Errorln("Error backfilling history:", err) chat.Portal.log.Errorln("Error backfilling history:", err)
}
}
wg.Done()
}(chat, i)
}
wg.Wait()
//TODO: handle leave from groupme side
user.UpdateDirectChats(nil)
user.log.Infoln("Finished syncing portals")
select {
case user.syncPortalsDone <- struct{}{}:
default:
}
}
func (user *User) SetPortalKeys(newKeys []database.PortalKey) error {
//database
//tx := user.db.Begin()
//ans := tx.Where("user_jid = ?", *user.jidPtr()).Delete(UserPortal{})
//
//if ans.Error != nil {
// _ = tx.Rollback()
// return ans.Error
//}
//
//for _, key := range newKeys {
// ans = tx.Create(&UserPortal{
// UserJID: *user.jidPtr(),
// PortalJID: key.JID,
// PortalReceiver: key.Receiver,
// InCommunity: key.InCommunity,
// })
// if ans.Error != nil {
// _ = tx.Rollback()
// return ans.Error
// } // }
//} //}
// wg.Done() println("portalkey transaction complete")
// }(chat, i) return nil
//return tx.Commit().Error
// }
// wg.Wait()
// //TODO: handle leave from groupme side
// user.UpdateDirectChats(nil)
// user.log.Infoln("Finished syncing portals")
// select {
// case user.syncPortalsDone <- struct{}{}:
// default:
// }
} }
func (user *User) getDirectChats() map[id.UserID][]id.RoomID { func (user *User) getDirectChats() map[id.UserID][]id.RoomID {