Merge branch 'main' into travis/authed-default

t2bot · Dec 17, 2024 · 598d3d1 · 598d3d1
2 parents 2c558a6 + a99c200
commit 598d3d1
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 1 deletion.
diff --git a/assets/providers.json b/assets/providers.json
@@ -98,6 +98,23 @@
             }
         ]
     },
+    {
+        "provider_name": "afreecaTV",
+        "provider_url": "https://www.sooplive.co.kr",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://vod.sooplive.co.kr/player/",
+                    "https://v.afree.ca/ST/",
+                    "https://vod.sooplive.co.kr/ST/",
+                    "https://vod.sooplive.co.kr/PLAYER/STATION/",
+                    "https://play.sooplive.co.kr/"
+                ],
+                "url": "https://openapi.sooplive.co.kr/oembed/embedinfo",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "Altium LLC",
         "provider_url": "https://altium.com",
@@ -415,6 +432,16 @@
             }
         ]
     },
+    {
+        "provider_name": "Bitchute",
+        "provider_url": "https://bitchute.com/",
+        "endpoints": [
+            {
+                "url": "https://api.bitchute.com/oembed/",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "Blackfire.io",
         "provider_url": "https://blackfire.io",
@@ -2272,6 +2299,20 @@
             }
         ]
     },
+    {
+        "provider_name": "Linkstackz",
+        "provider_url": "https://www.linkstackz.com/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://linkstackz.com/irf/*",
+                    "https://linkstackz.com/post/*"
+                ],
+                "url": "https://api.linkstackz.com/oembed",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "Livestream",
         "provider_url": "https://livestream.com/",
@@ -2290,6 +2331,20 @@
             }
         ]
     },
+    {
+        "provider_name": "Loom",
+        "provider_url": "https://www.loom.com/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://loom.com/i/*",
+                    "https://loom.com/share/*"
+                ],
+                "url": "https://www.loom.com/v1/oembed",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "LottieFiles",
         "provider_url": "https://lottiefiles.com/",
@@ -3385,6 +3440,19 @@
             }
         ]
     },
+    {
+        "provider_name": "sbedit",
+        "provider_url": "https://sbedit.net",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://sbedit.net/*"
+                ],
+                "url": "https://sbedit.net/oembed/",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "Screen9",
         "provider_url": "http://www.screen9.com/",
@@ -3957,6 +4025,19 @@
             }
         ]
     },
+    {
+        "provider_name": "The DAM consultants",
+        "provider_url": "https://hubspot-media-bridge.thedamconsultants.com/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://hubspot-media-bridge.thedamconsultants.com/*"
+                ],
+                "url": "https://hubspot-media-bridge.thedamconsultants.com/oembed/",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "The New York Times",
         "provider_url": "https://www.nytimes.com",
@@ -4419,6 +4500,23 @@
             }
         ]
     },
+    {
+        "provider_name": "Vizdom",
+        "provider_url": "https://vizdom.dev",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://vizdom.dev/link/*"
+                ],
+                "url": "https://vizdom.dev/api/v1/oembed",
+                "discovery": true,
+                "formats": [
+                    "xml",
+                    "json"
+                ]
+            }
+        ]
+    },
     {
         "provider_name": "Vizydrop",
         "provider_url": "https://vizydrop.com",
@@ -4530,6 +4628,21 @@
             }
         ]
     },
+    {
+        "provider_name": "Webcrumbs",
+        "provider_url": "https://webcrumbs.org/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https://share.webcrumbs.org/*",
+                    "https://tools.webcrumbs.org/*",
+                    "https://www.webcrumbs.org/*"
+                ],
+                "url": "http://share.webcrumbs.org/",
+                "discovery": true
+            }
+        ]
+    },
     {
         "provider_name": "wecandeo",
         "provider_url": "https://www.wecandeo.com/",

diff --git a/pgo_media_repo.pprof b/pgo_media_repo.pprof
diff --git a/test/test_internals/deps_synapse.go b/test/test_internals/deps_synapse.go
@@ -113,7 +113,7 @@ func MakeSynapse(domainName string, depNet *NetworkDep, signingKeyFilePath strin
 	}
 	synContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
-			Image:        "ghcr.io/element-hq/synapse:v1.110.0",
+			Image:        "ghcr.io/element-hq/synapse:v1.116.0",
 			ExposedPorts: []string{"8008/tcp"},
 			Mounts: []testcontainers.ContainerMount{
 				testcontainers.BindMount(f.Name(), "/data/homeserver.yaml"),