Merge pull request #213 from beeper/highest/plat-37893

fix: supported reactions not advertised correctly

Author: highesttt

pkg/connector/connector.go

@@ -44,7 +44,7 @@ func (lc *LineConnector) Start(ctx context.Context) error {
 }
 
 func (lc *LineConnector) GetBridgeInfoVersion() (info, capabilities int) {
-	return 1, 1
+	return 1, 2
 }
 
 func (lc *LineConnector) GetCapabilities() *bridgev2.NetworkGeneralCapabilities {

pkg/connector/reaction.go

@@ -5,10 +5,13 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
 
+	"go.mau.fi/util/variationselector"
+
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
@@ -174,6 +177,26 @@ var lineEmojiReactionURLs = map[string]string{
 	"9":          lineSticonURL(lineOriginalEmojiProductID, "211"),
 }
 
+// lineAllowedReactions is the Matrix-facing form of the outbound LINE reaction
+// map. Room capability hashes depend on slice order, so keep this list sorted.
+var lineAllowedReactions = func() []string {
+	reactions := make([]string, 0, len(lineEmojiReactionURLs))
+	for reaction := range lineEmojiReactionURLs {
+		// The send lookup normalizes keycaps to bare digits. Restore their emoji
+		// form before advertising them to clients.
+		if len(reaction) == 1 && reaction[0] >= '0' && reaction[0] <= '9' {
+			reaction += "\u20E3"
+		}
+		reactions = append(reactions, variationselector.Add(reaction))
+	}
+	slices.Sort(reactions)
+	return reactions
+}()
+
+func getLineAllowedReactions() []string {
+	return slices.Clone(lineAllowedReactions)
+}
+
 func lineSticonURL(productID, emojiID string) string {
 	return fmt.Sprintf("https://stickershop.line-scdn.net/sticonshop/v1/sticon/%s/android/%s.png", productID, emojiID)
 }

pkg/connector/reaction_test.go

@@ -1,7 +1,9 @@
 package connector
 
 import (
+	"context"
 	"errors"
+	"slices"
 	"testing"
 	"time"
 
@@ -10,6 +12,53 @@ import (
 	"maunium.net/go/mautrix/event"
 )
 
+func TestCapabilitiesAdvertiseSupportedReactions(t *testing.T) {
+	infoVersion, capabilityVersion := (&LineConnector{}).GetBridgeInfoVersion()
+	if infoVersion != 1 || capabilityVersion != 2 {
+		t.Fatalf("bridge info/capability versions = %d/%d, want 1/2", infoVersion, capabilityVersion)
+	}
+
+	caps := (&LineClient{}).GetCapabilities(context.Background(), nil)
+	if caps.Reaction != event.CapLevelPartialSupport {
+		t.Fatalf("Reaction = %d, want partial support", caps.Reaction)
+	}
+	if caps.ReactionCount != 1 {
+		t.Fatalf("ReactionCount = %d, want 1", caps.ReactionCount)
+	}
+	if len(caps.AllowedReactions) != len(lineEmojiReactionURLs) {
+		t.Fatalf("AllowedReactions has %d entries, want %d", len(caps.AllowedReactions), len(lineEmojiReactionURLs))
+	}
+	if !slices.IsSorted(caps.AllowedReactions) {
+		t.Fatal("AllowedReactions must be sorted so room capability IDs are stable")
+	}
+
+	seen := make(map[string]struct{}, len(caps.AllowedReactions))
+	for _, reaction := range caps.AllowedReactions {
+		if _, duplicate := seen[reaction]; duplicate {
+			t.Fatalf("AllowedReactions contains duplicate %q", reaction)
+		}
+		seen[reaction] = struct{}{}
+		if _, ok := linePaidReactionForMatrixEmoji(reaction); !ok {
+			t.Fatalf("advertised reaction %q is not accepted by the LINE reaction mapper", reaction)
+		}
+	}
+
+	for _, supported := range []string{"\U0001F44D\uFE0F", "9\uFE0F\u20E3"} {
+		if !slices.Contains(caps.AllowedReactions, supported) {
+			t.Fatalf("supported reaction %q is not advertised", supported)
+		}
+	}
+	if slices.Contains(caps.AllowedReactions, "\U0001F625") {
+		t.Fatal("unsupported reaction 😥 must not be advertised")
+	}
+
+	caps.AllowedReactions[0] = "mutated"
+	freshCaps := (&LineClient{}).GetCapabilities(context.Background(), nil)
+	if freshCaps.AllowedReactions[0] == "mutated" {
+		t.Fatal("GetCapabilities returned a shared mutable reaction list")
+	}
+}
+
 func TestNormalizeMatrixReactionKey(t *testing.T) {
 	tests := map[string]string{
 		"9\uFE0F\u20E3": "9",

pkg/connector/userinfo.go

@@ -48,6 +48,8 @@ func (lc *LineClient) GetCapabilities(ctx context.Context, portal *bridgev2.Port
 		MaxTextLength:         5000,
 		Reply:                 event.CapLevelFullySupported,
 		Reaction:              event.CapLevelPartialSupport,
+		ReactionCount:         1,
+		AllowedReactions:      getLineAllowedReactions(),
 		ReadReceipts:          true,
 		Delete:                event.CapLevelFullySupported,
 		DeleteMaxAge:          &jsontime.Seconds{Duration: 24 * time.Hour},