Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Refactor oEmbed previews #10814

Merged
merged 21 commits into from
Sep 21, 2021
Merged

Refactor oEmbed previews #10814

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
84c4a53
Factor out calculating a description from an HTML tree.
clokep Sep 8, 2021
160b2ca
Factor out calculating the expiration timestamp.
clokep Sep 8, 2021
611849d
Factor out pre-caching a related image.
clokep Sep 8, 2021
05076b7
Update test to actually return an image.
clokep Sep 14, 2021
0501d08
Process oEmbed by downloading the result to a file for later processing.
clokep Sep 8, 2021
0c763bf
Assume required properties exist.
clokep Sep 8, 2021
3ffaee6
Newsfragment
clokep Sep 13, 2021
91f5d0c
Merge remote-tracking branch 'origin/develop' into clokep/oembed-impr…
clokep Sep 15, 2021
c98626c
Rename some variables.
clokep Sep 16, 2021
c29713f
Clarify docs more.
clokep Sep 16, 2021
ea0870f
Merge remote-tracking branch 'origin/develop' into clokep/oembed-impr…
clokep Sep 16, 2021
e9cf11f
Use png constant.
clokep Sep 16, 2021
53b733b
Clearer property names.
clokep Sep 16, 2021
86b75fb
Return early in _precache_image_url.
clokep Sep 21, 2021
93c0c25
Fix charset in tests.
clokep Sep 21, 2021
5327053
Clarify when cache_age is None.
clokep Sep 21, 2021
a2a40d7
Cap the amount of time which URL previews will be kept to 24 hours.
clokep Sep 21, 2021
6643b3f
Fix typo.
clokep Sep 21, 2021
1f975d6
Pass raw-bytes to the oEmbed code.
clokep Sep 21, 2021
c31f23b
Clarify comment.
clokep Sep 21, 2021
62b36c0
Re-use a constant.
clokep Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions tests/rest/media/v1/test_url_preview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import json
import os
import re
from binascii import unhexlify

from twisted.internet._resolver import HostResolution
from twisted.internet.address import IPv4Address, IPv6Address
Expand Down Expand Up @@ -576,11 +577,10 @@ def test_oembed_photo(self):
}
oembed_content = json.dumps(result).encode("utf-8")

end_content = (
b"<html><head>"
b"<title>Some Title</title>"
b'<meta property="og:description" content="hi" />'
b"</head></html>"
end_content = unhexlify(
b"89504e470d0a1a0a0000000d4948445200000001000000010806"
b"0000001f15c4890000000a49444154789c63000100000500010d"
b"0a2db40000000049454e44ae426082"
clokep marked this conversation as resolved.
Show resolved Hide resolved
)

channel = self.make_request(
Expand All @@ -606,25 +606,30 @@ def test_oembed_photo(self):

self.pump()

# Ensure a second request is made to the photo URL.
client = self.reactor.tcpClients[1][2].buildProtocol(None)
server = AccumulatingProtocol()
server.makeConnection(FakeTransport(client, self.reactor))
client.makeConnection(FakeTransport(server, self.reactor))
client.dataReceived(
(
b"HTTP/1.0 200 OK\r\nContent-Length: %d\r\n"
b'Content-Type: text/html; charset="utf8"\r\n\r\n'
b'Content-Type: image/png; charset="utf8"\r\n\r\n'
clokep marked this conversation as resolved.
Show resolved Hide resolved
)
% (len(end_content),)
+ end_content
)

self.pump()

# Ensure the URL is what was requested.
self.assertIn(b"/matrixdotorg", server.data)

self.assertEqual(channel.code, 200)
self.assertEqual(
channel.json_body, {"og:title": "Some Title", "og:description": "hi"}
)
self.assertTrue(channel.json_body["og:image"].startswith("mxc://"))
self.assertEqual(channel.json_body["og:image:height"], 1)
self.assertEqual(channel.json_body["og:image:width"], 1)
self.assertTrue(channel.json_body["og:image:type"].startswith("image/png"))

def test_oembed_rich(self):
"""Test an oEmbed endpoint which returns HTML content via the 'rich' type."""
Expand Down