connector: don't use Part IDs

Signed-off-by: Sumner Evans <[email protected]>
mautrix · Nov 21, 2024 · dd64cfb · dd64cfb
1 parent 22f4473
commit dd64cfb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git a/pkg/connector/telegram.go b/pkg/connector/telegram.go
@@ -238,7 +238,6 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
 							{
-								ID:      networkid.PartID("create-notice"),
 								Type:    event.EventMessage,
 								Content: &event.MessageEventContent{MsgType: event.MsgNotice, Body: "Created the group"},
 							},
@@ -277,7 +276,6 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
 							{
-								ID:      networkid.PartID("create-notice"),
 								Type:    event.EventMessage,
 								Content: &event.MessageEventContent{MsgType: event.MsgNotice, Body: "Created the group"},
 							},
@@ -305,7 +303,7 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 				ConvertMessageFunc: func(ctx context.Context, portal *bridgev2.Portal, intent bridgev2.MatrixAPI, data any) (*bridgev2.ConvertedMessage, error) {
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
-							{ID: networkid.PartID("ttl-change"), Type: event.EventMessage, Content: content},
+							{Type: event.EventMessage, Content: content},
 						},
 					}, nil
 				},
@@ -343,7 +341,6 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
 							{
-								ID:      networkid.PartID("call"),
 								Type:    event.EventMessage,
 								Content: &event.MessageEventContent{MsgType: event.MsgNotice, Body: body.String()},
 							},
@@ -369,7 +366,6 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
 							{
-								ID:      networkid.PartID("call"),
 								Type:    event.EventMessage,
 								Content: &event.MessageEventContent{MsgType: event.MsgNotice, Body: body.String()},
 							},
@@ -411,7 +407,6 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
 							{
-								ID:   networkid.PartID("call-invite"),
 								Type: event.EventMessage,
 								Content: &event.MessageEventContent{
 									MsgType:       event.MsgNotice,
@@ -436,7 +431,6 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, channels map[in
 					return &bridgev2.ConvertedMessage{
 						Parts: []*bridgev2.ConvertedMessagePart{
 							{
-								ID:   networkid.PartID("call-scheduled"),
 								Type: event.EventMessage,
 								Content: &event.MessageEventContent{
 									MsgType: event.MsgNotice,
@@ -1130,7 +1124,6 @@ func (t *TelegramClient) onPhoneCall(ctx context.Context, e tg.Entities, update
 			return &bridgev2.ConvertedMessage{
 				Parts: []*bridgev2.ConvertedMessagePart{
 					{
-						ID:      networkid.PartID("call"),
 						Type:    event.EventMessage,
 						Content: &event.MessageEventContent{MsgType: event.MsgNotice, Body: body.String()},
 					},

diff --git a/pkg/connector/tomatrix.go b/pkg/connector/tomatrix.go
@@ -59,7 +59,6 @@ func (c *TelegramClient) mediaToMatrix(ctx context.Context, portal *bridgev2.Por
 		return nil, nil, nil, nil
 	case tg.MessageMediaUnsupportedTypeID:
 		return &bridgev2.ConvertedMessagePart{
-			ID:   networkid.PartID("unsupported_media"),
 			Type: event.EventMessage,
 			Content: &event.MessageEventContent{
 				MsgType: event.MsgNotice,
@@ -86,7 +85,6 @@ func (c *TelegramClient) mediaToMatrix(ctx context.Context, portal *bridgev2.Por
 	case tg.MessageMediaStoryTypeID, tg.MessageMediaInvoiceTypeID, tg.MessageMediaGiveawayTypeID, tg.MessageMediaGiveawayResultsTypeID:
 		// TODO: support these properly
 		return &bridgev2.ConvertedMessagePart{
-			ID:   networkid.PartID("story"),
 			Type: event.EventMessage,
 			Content: &event.MessageEventContent{
 				MsgType: event.MsgNotice,
@@ -126,7 +124,6 @@ func (c *TelegramClient) convertToMatrix(ctx context.Context, portal *bridgev2.P
 
 		cm.Parts = []*bridgev2.ConvertedMessagePart{
 			{
-				ID:      networkid.PartID("caption"),
 				Type:    event.EventMessage,
 				Content: content,
 			},
@@ -243,7 +240,6 @@ func (c *TelegramClient) convertMediaRequiringUpload(ctx context.Context, portal
 		Int("msg_id", msgID).
 		Logger()
 	eventType := event.EventMessage
-	var partID networkid.PartID
 	var content event.MessageEventContent
 	var telegramMediaID int64
 	var isSticker, isVideoGif bool
@@ -295,7 +291,6 @@ func (c *TelegramClient) convertMediaRequiringUpload(ctx context.Context, portal
 	// Determine the filename and some other information
 	switch msgMedia := msgMedia.(type) {
 	case *tg.MessageMediaPhoto:
-		partID = networkid.PartID("photo")
 		content.MsgType = event.MsgImage
 		if disappearingSetting != nil {
 			content.Body = "disappearing_image"
@@ -311,7 +306,6 @@ func (c *TelegramClient) convertMediaRequiringUpload(ctx context.Context, portal
 		}
 		telegramMediaID = document.GetID()
 
-		partID = networkid.PartID("document")
 		content.MsgType = event.MsgFile
 
 		extraInfo := map[string]any{}
@@ -466,7 +460,6 @@ func (c *TelegramClient) convertMediaRequiringUpload(ctx context.Context, portal
 	}
 
 	return &bridgev2.ConvertedMessagePart{
-		ID:      partID,
 		Type:    eventType,
 		Content: &content,
 		Extra:   extra,
@@ -493,7 +486,6 @@ func (c *TelegramClient) convertContact(media tg.MessageMediaClass) *bridgev2.Co
 	}
 
 	return &bridgev2.ConvertedMessagePart{
-		ID:      networkid.PartID("contact"),
 		Type:    event.EventMessage,
 		Content: &content,
 		Extra: map[string]any{
@@ -553,7 +545,6 @@ func convertLocation(media tg.MessageMediaClass) (*bridgev2.ConvertedMessagePart
 	}
 
 	return &bridgev2.ConvertedMessagePart{
-		ID:   networkid.PartID("location"),
 		Type: event.EventMessage,
 		Content: &event.MessageEventContent{
 			MsgType:       event.MsgLocation,
@@ -578,7 +569,6 @@ func convertPoll(media tg.MessageMediaClass) *bridgev2.ConvertedMessagePart {
 	}
 
 	return &bridgev2.ConvertedMessagePart{
-		ID:   networkid.PartID("poll"),
 		Type: event.EventMessage,
 		Content: &event.MessageEventContent{
 			MsgType:       event.MsgText,
@@ -643,7 +633,6 @@ func convertDice(media tg.MessageMediaClass) *bridgev2.ConvertedMessagePart {
 	}
 
 	return &bridgev2.ConvertedMessagePart{
-		ID:   networkid.PartID("dice"),
 		Type: event.EventMessage,
 		Content: &event.MessageEventContent{
 			MsgType:       event.MsgText,
@@ -664,7 +653,6 @@ func convertGame(media tg.MessageMediaClass) *bridgev2.ConvertedMessagePart {
 	// TODO (PLAT-25562) provide a richer experience for the game
 	game := media.(*tg.MessageMediaGame)
 	return &bridgev2.ConvertedMessagePart{
-		ID:   networkid.PartID("game"),
 		Type: event.EventMessage,
 		Content: &event.MessageEventContent{
 			MsgType: event.MsgText,