Salastil/Sneedchat-Discord-Bridge-Go
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Releases 6 Activity

Restore functionality of edits, deletes and boundedmap uses UUID now
All checks were successful
Build & Release / build-latest (push) Successful in 9m50s
Details
Build & Release / version-release (push) Has been skipped
Details

Browse Source
This commit is contained in:
Salastil
2026-02-28 21:26:45 -05:00
parent 4b455eb58e
commit 85de6d175f
4 changed files with 65 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
discord/bridge.go
View File

@@ -186,8 +186,9 @@ func (b *Bridge) onDiscordMessageCreate(s *discordgo.Session, m *discordgo.Messa
if m.ReferencedMessage != nil { if m.ReferencedMessage != nil {
refDiscordID := parseMessageID(m.ReferencedMessage.ID) refDiscordID := parseMessageID(m.ReferencedMessage.ID)
if sneedIDInt, ok := b.discordToSneed.Get(refDiscordID); ok { if sneedUUIDVal, ok := b.discordToSneed.Get(strconv.Itoa(refDiscordID)); ok {
if uname, ok2 := b.sneedUsernames.Get(sneedIDInt.(int)); ok2 { sneedUUID := sneedUUIDVal.(string)
if uname, ok2 := b.sneedUsernames.Get(sneedUUID); ok2 {
contentText = fmt.Sprintf("@%s, %s", uname.(string), contentText) contentText = fmt.Sprintf("@%s, %s", uname.(string), contentText)
} }
} }
@@ -289,14 +290,14 @@ func (b *Bridge) onDiscordMessageEdit(s *discordgo.Session, m *discordgo.Message
return return
} }
discordID := parseMessageID(m.ID) discordID := parseMessageID(m.ID)
sneedIDInt, ok := b.discordToSneed.Get(discordID) sneedUUIDVal, ok := b.discordToSneed.Get(strconv.Itoa(discordID))
if !ok { if !ok {
return return
} }
sneedID := sneedIDInt.(int) sneedUUID := sneedUUIDVal.(string)
payload := map[string]interface{}{"id": sneedID, "message": strings.TrimSpace(m.Content)} payload := map[string]interface{}{"uuid": sneedUUID, "message": strings.TrimSpace(m.Content)}
data, _ := json.Marshal(payload) data, _ := json.Marshal(payload)
log.Printf("↩️ Discord edit -> Sneedchat (sneed_id=%d)", sneedID) log.Printf("↩️ Discord edit -> Sneedchat (sneed_uuid=%s)", sneedUUID)
b.sneed.Send(fmt.Sprintf("/edit %s", string(data))) b.sneed.Send(fmt.Sprintf("/edit %s", string(data)))
} }
@@ -305,12 +306,13 @@ func (b *Bridge) onDiscordMessageDelete(s *discordgo.Session, m *discordgo.Messa
return return
} }
discordID := parseMessageID(m.ID) discordID := parseMessageID(m.ID)
sneedIDInt, ok := b.discordToSneed.Get(discordID) sneedUUIDVal, ok := b.discordToSneed.Get(strconv.Itoa(discordID))
if !ok { if !ok {
return return
} }
log.Printf("↩️ Discord delete -> Sneedchat (sneed_id=%d)", sneedIDInt.(int)) sneedUUID := sneedUUIDVal.(string)
b.sneed.Send(fmt.Sprintf("/delete %d", sneedIDInt.(int))) log.Printf("↩️ Discord delete -> Sneedchat (sneed_uuid=%s)", sneedUUID)
b.sneed.Send(fmt.Sprintf("/delete %s", sneedUUID))
} }
func (b *Bridge) onSneedMessage(msg map[string]interface{}) { func (b *Bridge) onSneedMessage(msg map[string]interface{}) {
@@ -348,17 +350,17 @@ func (b *Bridge) onSneedMessage(msg map[string]interface{}) {
log.Printf("✅ Sent Sneedchat → Discord: %s", username) log.Printf("✅ Sent Sneedchat → Discord: %s", username)
if sent != nil { if sent != nil {
if mid, ok := msg["message_id"].(int); ok && mid > 0 { if uuid, ok := msg["message_uuid"].(string); ok && uuid != "" {
discordMsgID := parseMessageID(sent.ID) discordMsgID := parseMessageID(sent.ID)
b.sneedToDiscord.Set(mid, discordMsgID) b.sneedToDiscord.Set(uuid, discordMsgID)
b.discordToSneed.Set(discordMsgID, mid) b.discordToSneed.Set(strconv.Itoa(discordMsgID), uuid)
b.sneedUsernames.Set(mid, username) b.sneedUsernames.Set(uuid, username)
} }
} }
} }
func (b *Bridge) handleSneedEdit(sneedID int, newContent string) { func (b *Bridge) handleSneedEdit(sneedUUID string, newContent string) {
discordIDInt, ok := b.sneedToDiscord.Get(sneedID) discordIDInt, ok := b.sneedToDiscord.Get(sneedUUID)
if !ok { if !ok {
return return
} }
@@ -371,11 +373,11 @@ func (b *Bridge) handleSneedEdit(sneedID int, newContent string) {
log.Printf("❌ Failed to edit Discord message id=%d: %v", discordID, err) log.Printf("❌ Failed to edit Discord message id=%d: %v", discordID, err)
return return
} }
log.Printf("✏️ Edited Discord (webhook) message id=%d (sneed_id=%d)", discordID, sneedID) log.Printf("✏️ Edited Discord (webhook) message id=%d (sneed_uuid=%s)", discordID, sneedUUID)
} }
func (b *Bridge) handleSneedDelete(sneedID int) { func (b *Bridge) handleSneedDelete(sneedUUID string) {
discordIDInt, ok := b.sneedToDiscord.Get(sneedID) discordIDInt, ok := b.sneedToDiscord.Get(sneedUUID)
if !ok { if !ok {
return return
} }
@@ -386,10 +388,10 @@ func (b *Bridge) handleSneedDelete(sneedID int) {
log.Printf("❌ Failed to delete Discord message id=%d: %v", discordID, err) log.Printf("❌ Failed to delete Discord message id=%d: %v", discordID, err)
return return
} }
log.Printf("🗑️ Deleted Discord (webhook) message id=%d (sneed_id=%d)", discordID, sneedID) log.Printf("🗑️ Deleted Discord (webhook) message id=%d (sneed_uuid=%s)", discordID, sneedUUID)
b.sneedToDiscord.Delete(sneedID) b.sneedToDiscord.Delete(sneedUUID)
b.discordToSneed.Delete(discordID) b.discordToSneed.Delete(strconv.Itoa(discordID))
b.sneedUsernames.Delete(sneedID) b.sneedUsernames.Delete(sneedUUID)
} }
func (b *Bridge) onSneedConnect() { func (b *Bridge) onSneedConnect() {
@@ -575,11 +577,11 @@ func (b *Bridge) recentOutboundIter() []map[string]interface{} {
return res return res
} }
func (b *Bridge) mapDiscordSneed(discordID, sneedID int, username string) { func (b *Bridge) mapDiscordSneed(sneedUUID string, discordID int, username string) {
b.discordToSneed.Set(discordID, sneedID) b.discordToSneed.Set(strconv.Itoa(discordID), sneedUUID)
b.sneedToDiscord.Set(sneedID, discordID) b.sneedToDiscord.Set(sneedUUID, discordID)
b.sneedUsernames.Set(sneedID, username) b.sneedUsernames.Set(sneedUUID, username)
log.Printf("Mapped sneed_id=%d <-> discord_id=%d (username='%s')", sneedID, discordID, username) log.Printf("Mapped sneed_uuid=%s <-> discord_id=%d (username='%s')", sneedUUID, discordID, username)
} }
func (b *Bridge) sendUploadStatusMessage(channelID, mention string, attachmentCount int) (*discordgo.Message, error) { func (b *Bridge) sendUploadStatusMessage(channelID, mention string, attachmentCount int) (*discordgo.Message, error) {
@@ -629,7 +631,7 @@ func (b *Bridge) awaitSneedConfirmation(discordID int, channelID, statusMessageI
for { for {
select { select {
case <-ticker.C: case <-ticker.C:
if _, ok := b.discordToSneed.Get(discordID); ok { if _, ok := b.discordToSneed.Get(strconv.Itoa(discordID)); ok {
desc := "Delivered to Sneedchat." desc := "Delivered to Sneedchat."
b.editUploadStatusMessage(channelID, statusMessageID, b.uploadStatusTitle("complete"), desc, UploadStatusColorSuccess) b.editUploadStatusMessage(channelID, statusMessageID, b.uploadStatusTitle("complete"), desc, UploadStatusColorSuccess)
b.scheduleUploadStatusDeletion(channelID, statusMessageID, UploadStatusCleanupDelay) b.scheduleUploadStatusDeletion(channelID, statusMessageID, UploadStatusCleanupDelay)

58
sneed/client.go
View File

@@ -58,13 +58,13 @@ type Client struct {
messageEditDates *utils.BoundedMap messageEditDates *utils.BoundedMap
OnMessage func(map[string]interface{}) OnMessage func(map[string]interface{})
OnEdit func(int, string) OnEdit func(string, string)
OnDelete func(int) OnDelete func(string)
OnConnect func() OnConnect func()
OnDisconnect func() OnDisconnect func()
recentOutboundIter func() []map[string]interface{} recentOutboundIter func() []map[string]interface{}
mapDiscordSneed func(int, int, string) mapDiscordSneed func(string, int, string)
bridgeUserID int bridgeUserID int
bridgeUsername string bridgeUsername string
@@ -367,23 +367,14 @@ func (c *Client) handleIncoming(raw string) {
log.Printf("📦 payload: msgs=%d msg=%v del=%v", len(payload.Messages), payload.Message != nil, payload.Delete != nil) log.Printf("📦 payload: msgs=%d msg=%v del=%v", len(payload.Messages), payload.Message != nil, payload.Delete != nil)
} }
if payload.Delete != nil { for _, uuid := range payload.Delete {
var ids []int if uuid == "" {
switch v := payload.Delete.(type) { continue
case float64:
ids = []int{int(v)}
case []interface{}:
for _, x := range v {
if fid, ok := x.(float64); ok {
ids = append(ids, int(fid))
}
}
} }
for _, id := range ids { c.messageEditDates.Delete(uuid)
c.messageEditDates.Delete(id) c.removeFromProcessed(uuid)
if c.OnDelete != nil { if c.OnDelete != nil {
c.OnDelete(id) c.OnDelete(uuid)
}
} }
} }
@@ -418,10 +409,10 @@ func (c *Client) processMessage(m SneedMessage) {
editDate := m.MessageEditDate editDate := m.MessageEditDate
deleted := m.Deleted || m.IsDeleted deleted := m.Deleted || m.IsDeleted
if deleted { if deleted {
c.messageEditDates.Delete(m.MessageID) c.messageEditDates.Delete(uuid)
c.removeFromProcessed(uuid) c.removeFromProcessed(uuid)
if c.OnDelete != nil { if c.OnDelete != nil {
c.OnDelete(m.MessageID) c.OnDelete(uuid)
} }
return return
} }
@@ -438,7 +429,7 @@ func (c *Client) processMessage(m SneedMessage) {
if ts, ok := entry["ts"].(time.Time); ok { if ts, ok := entry["ts"].(time.Time); ok {
if content == messageText && now.Sub(ts) <= OutboundMatchWindow { if content == messageText && now.Sub(ts) <= OutboundMatchWindow {
if discordID, ok := entry["discord_id"].(int); ok { if discordID, ok := entry["discord_id"].(int); ok {
c.mapDiscordSneed(discordID, m.MessageID, username) c.mapDiscordSneed(uuid, discordID, username)
entry["mapped"] = true entry["mapped"] = true
break break
} }
@@ -447,16 +438,16 @@ func (c *Client) processMessage(m SneedMessage) {
} }
} }
c.addToProcessed(uuid) c.addToProcessed(uuid)
c.messageEditDates.Set(m.MessageID, editDate) c.messageEditDates.Set(uuid, editDate)
return return
} }
if c.isProcessed(uuid) { if c.isProcessed(uuid) {
if prev, exists := c.messageEditDates.Get(m.MessageID); exists { if prev, exists := c.messageEditDates.Get(uuid); exists {
if editDate > prev.(int) { if editDate > prev.(int) {
c.messageEditDates.Set(m.MessageID, editDate) c.messageEditDates.Set(uuid, editDate)
if c.OnEdit != nil { if c.OnEdit != nil {
c.OnEdit(m.MessageID, messageText) c.OnEdit(uuid, messageText)
} }
} }
} }
@@ -464,15 +455,16 @@ func (c *Client) processMessage(m SneedMessage) {
} }
c.addToProcessed(uuid) c.addToProcessed(uuid)
c.messageEditDates.Set(m.MessageID, editDate) c.messageEditDates.Set(uuid, editDate)
if c.OnMessage != nil { if c.OnMessage != nil {
c.OnMessage(map[string]interface{}{ c.OnMessage(map[string]interface{}{
"username": username, "username": username,
"content": messageText, "content": messageText,
"message_id": m.MessageID, "message_uuid": uuid,
"author_id": userID, "message_id": m.MessageID,
"raw": m, "author_id": userID,
"raw": m,
}) })
} }
} }
@@ -522,7 +514,7 @@ func (c *Client) SetOutboundIter(f func() []map[string]interface{}) {
c.recentOutboundIter = f c.recentOutboundIter = f
} }
func (c *Client) SetMapDiscordSneed(f func(int, int, string)) { func (c *Client) SetMapDiscordSneed(f func(string, int, string)) {
c.mapDiscordSneed = f c.mapDiscordSneed = f
} }

2
sneed/types.go
View File

@@ -14,5 +14,5 @@ type SneedMessage struct {
type SneedPayload struct { type SneedPayload struct {
Messages []SneedMessage `json:"messages"` Messages []SneedMessage `json:"messages"`
Message *SneedMessage `json:"message"` Message *SneedMessage `json:"message"`
Delete interface{} `json:"delete"` Delete []string `json:"delete"`
} }

18
utils/boundedmap.go
View File

@@ -7,24 +7,24 @@ import (
type BoundedMap struct { type BoundedMap struct {
mu sync.RWMutex mu sync.RWMutex
data map[int]interface{} data map[string]interface{}
timestamps map[int]time.Time timestamps map[string]time.Time
maxSize int maxSize int
maxAge time.Duration maxAge time.Duration
keys []int keys []string
} }
func NewBoundedMap(maxSize int, maxAge time.Duration) *BoundedMap { func NewBoundedMap(maxSize int, maxAge time.Duration) *BoundedMap {
return &BoundedMap{ return &BoundedMap{
data: make(map[int]interface{}), data: make(map[string]interface{}),
timestamps: make(map[int]time.Time), timestamps: make(map[string]time.Time),
maxSize: maxSize, maxSize: maxSize,
maxAge: maxAge, maxAge: maxAge,
keys: make([]int, 0, maxSize), keys: make([]string, 0, maxSize),
} }
} }
func (bm *BoundedMap) Set(key int, value interface{}) { func (bm *BoundedMap) Set(key string, value interface{}) {
bm.mu.Lock() bm.mu.Lock()
defer bm.mu.Unlock() defer bm.mu.Unlock()
if _, ok := bm.data[key]; ok { if _, ok := bm.data[key]; ok {
@@ -50,14 +50,14 @@ func (bm *BoundedMap) Set(key int, value interface{}) {
} }
} }
func (bm *BoundedMap) Get(key int) (interface{}, bool) { func (bm *BoundedMap) Get(key string) (interface{}, bool) {
bm.mu.RLock() bm.mu.RLock()
defer bm.mu.RUnlock() defer bm.mu.RUnlock()
v, ok := bm.data[key] v, ok := bm.data[key]
return v, ok return v, ok
} }
func (bm *BoundedMap) Delete(key int) { func (bm *BoundedMap) Delete(key string) {
bm.mu.Lock() bm.mu.Lock()
defer bm.mu.Unlock() defer bm.mu.Unlock()
delete(bm.data, key) delete(bm.data, key)