address feedback

Author: jason-famedly

client/client.go

@@ -152,7 +152,7 @@ func (c *CSAPI) DownloadContentAuthenticated(t ct.TestLike, mxcUri string) ([]by
 
 // UncheckedDownloadContentAuthenticated makes the raw request for a piece of media and returns the http.Response.
 // Response is unchecked in any way. The existing DownloadContentAuthenticated() should have been a "Must" variant. Rather
-// than refactor that across the code base, this version just uses an explict name
+// than refactor that across the code base, this version just uses an explicit name
 func (c *CSAPI) UncheckedDownloadContentAuthenticated(t ct.TestLike, mxcUri string) *http.Response {
 	t.Helper()
 	origin, mediaId := SplitMxc(mxcUri)
@@ -635,13 +635,15 @@ func (c *CSAPI) MustGenerateOneTimeKeys(t ct.TestLike, otkCount uint) (deviceKey
 
 // MustSetDisplayName sets the global display name for this account or fails the test.
 func (c *CSAPI) MustSetDisplayName(t ct.TestLike, displayname string) {
+	t.Helper()
 	c.MustDo(t, "PUT", []string{"_matrix", "client", "v3", "profile", c.UserID, "displayname"}, WithJSONBody(t, map[string]any{
 		"displayname": displayname,
 	}))
 }
 
 // MustSetDisplayName sets the global display name for this account or fails the test.
 func (c *CSAPI) MustSetProfileAvatar(t ct.TestLike, mxcUri string) {
+	t.Helper()
 	c.MustDo(t, "PUT", []string{"_matrix", "client", "v3", "profile", c.UserID, "avatar_url"}, WithJSONBody(t, map[string]any{
 		"avatar_url": mxcUri,
 	}))

tests/msc3911/cs_api_restricted_media_test.go

@@ -2,7 +2,6 @@ package tests
 
 import (
 	"bytes"
-	"strings"
 	"testing"
 
 	"github.com/matrix-org/complement"
@@ -245,19 +244,9 @@ func TestRestrictedMediaUnstable(t *testing.T) {
 		// it's []byte is available at aliceOriginalProfileBytes
 		// We will reuse that and copy it
 
-		// There seem to be no existing utilities to split an mxc uri into it's components, which is needed for the copy endpoint.
-		// Mxc uri's are formatted as "mxc://server_name/media_id"
-
-		// Cut the "mxc://" off the front
-		existSplitMxc, found := strings.CutPrefix(aliceGlobalProfileAvatarMxcUri, "mxc://")
-		if !found {
-			t.Fatalf("mxc was malformed %s", aliceGlobalProfileAvatarMxcUri)
-		}
-		// Split the remaining into the server name and the media id
-		mxcComponents := strings.Split(existSplitMxc, "/")
-
+		originalOrigin, originalMediaID := client.SplitMxc(aliceGlobalProfileAvatarMxcUri)
 		// Use bob to make the copy. The media should be viewable as it's a global profile
-		res := bob.MustDo(t, "POST", []string{"_matrix", "client", "unstable", "org.matrix.msc3911", "media", "copy", mxcComponents[0], mxcComponents[1]}, client.WithJSONBody(t, map[string]any{}))
+		res := bob.MustDo(t, "POST", []string{"_matrix", "client", "unstable", "org.matrix.msc3911", "media", "copy", originalOrigin, originalMediaID}, client.WithJSONBody(t, map[string]any{}))
 
 		body := client.ParseJSON(t, res)
 		newMxcUri := client.GetJSONFieldStr(t, body, "content_uri")
@@ -267,6 +256,9 @@ func TestRestrictedMediaUnstable(t *testing.T) {
 			t.Fatalf("Media is differing and should be identical")
 		}
 
+		if newMxcUri == aliceGlobalProfileAvatarMxcUri {
+			t.Fatalf("MXC match and should be different")
+		}
 	})
 
 	t.Run("TestMediaCopyNonexistingFile", func(t *testing.T) {