wagtail 6.1.3__py3-none-any.whl → 6.2rc1__py3-none-any.whl

wagtail/documents/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,31 +51,31 @@ msgstr ""
 msgid "Select documents in choosers"
 msgstr ""
 
-#: models.py:25
+#: models.py:26
 msgid "title"
 msgstr ""
 
-#: models.py:26
+#: models.py:27
 msgid "file"
 msgstr ""
 
-#: models.py:27
+#: models.py:28
 msgid "created at"
 msgstr ""
 
-#: models.py:30
+#: models.py:31
 msgid "uploaded by user"
 msgstr ""
 
-#: models.py:38
+#: models.py:39
 msgid "tags"
 msgstr ""
 
-#: models.py:204
+#: models.py:208
 msgid "document"
 msgstr ""
 
-#: models.py:205
+#: models.py:209
 msgid "documents"
 msgstr ""
 

wagtail/documents/locale/sl/LC_MESSAGES/django.po

@@ -252,6 +252,26 @@ msgstr ""
 "Naložen ni še noben dokument. Zakaj ga ne bi <a "
 "href=\"%(wagtaildocs_add_document_url)s\">naložili</a> sedaj?"
 
+#, python-format
+msgid ""
+"<span>%(total)s</span> Document <span class=\"w-sr-only\">created in "
+"%(site_name)s</span>"
+msgid_plural ""
+"<span>%(total)s</span> Documents <span class=\"w-sr-only\">created in "
+"%(site_name)s</span>"
+msgstr[0] ""
+"<span>%(total)s</span> dokument <span class=\"w-sr-only\"> ustvarjen v "
+"%(site_name)s</span>"
+msgstr[1] ""
+"<span>%(total)s</span> dokumenta <span class=\"w-sr-only\">ustvarjena na "
+"%(site_name)s</span>"
+msgstr[2] ""
+"<span>%(total)s</span> dokumenti <span class=\"w-sr-only\">ustvarjeni na "
+"%(site_name)s</span>"
+msgstr[3] ""
+"<span>%(total)s</span> dokumentov <span class=\"w-sr-only\">narejenih v "
+"%(site_name)s</span>"
+
 msgid "Add multiple documents"
 msgstr "Dodaj več dokumentov"
 

wagtail/documents/models.py

@@ -4,6 +4,7 @@ from contextlib import contextmanager
 from mimetypes import guess_type
 
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.core.validators import FileExtensionValidator
 from django.db import models
 from django.dispatch import Signal
@@ -71,7 +72,10 @@ class AbstractDocument(CollectionMember, index.Indexed, models.Model):
         allowed_extensions = getattr(settings, "WAGTAILDOCS_EXTENSIONS", None)
         if allowed_extensions:
             validate = FileExtensionValidator(allowed_extensions)
-            validate(self.file)
+            try:
+                validate(self.file)
+            except ValidationError as e:
+                raise ValidationError({"file": e.messages[0]})
 
     def is_stored_locally(self):
         """

wagtail/documents/static/wagtaildocs/js/document-chooser-modal.js

@@ -1 +1 @@
-(()=>{"use strict";var e,o={4186:(e,o,r)=>{var t=r(1669),n=r.n(t),a=r(2614);class l extends a.C4{ajaxifyLinks(e,o){super.ajaxifyLinks(e,o),n()("a.upload-one-now").on("click",(e=>{const o=n()("#id_collection_id").val();o&&n()("#id_document-chooser-upload-collection").val(o),e.preventDefault()}))}}window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS=new l({searchInputDelay:50,creationFormFileFieldSelector:"#id_document-chooser-upload-file",creationFormTitleFieldSelector:"#id_document-chooser-upload-title",creationFormTabSelector:"#tab-upload",creationFormEventName:"wagtail:documents-upload"}).getOnLoadHandlers();class i extends a.ZZ{onloadHandlers=window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS}window.DocumentChooserModal=i},1669:e=>{e.exports=jQuery}},r={};function t(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={id:e,loaded:!1,exports:{}};return o[e].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}t.m=o,e=[],t.O=(o,r,n,a)=>{if(!r){var l=1/0;for(s=0;s<e.length;s++){for(var[r,n,a]=e[s],i=!0,d=0;d<r.length;d++)(!1&a||l>=a)&&Object.keys(t.O).every((e=>t.O[e](r[d])))?r.splice(d--,1):(i=!1,a<l&&(l=a));if(i){e.splice(s--,1);var c=n();void 0!==c&&(o=c)}}return o}a=a||0;for(var s=e.length;s>0&&e[s-1][2]>a;s--)e[s]=e[s-1];e[s]=[r,n,a]},t.n=e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},t.d=(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,o)=>Object.prototype.hasOwnProperty.call(e,o),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),t.j=884,(()=>{var e={884:0};t.O.j=o=>0===e[o];var o=(o,r)=>{var n,a,[l,i,d]=r,c=0;if(l.some((o=>0!==e[o]))){for(n in i)t.o(i,n)&&(t.m[n]=i[n]);if(d)var s=d(t)}for(o&&o(r);c<l.length;c++)a=l[c],t.o(e,a)&&e[a]&&e[a][0](),e[a]=0;return t.O(s)},r=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];r.forEach(o.bind(null,0)),r.push=o.bind(null,r.push.bind(r))})();var n=t.O(void 0,[321],(()=>t(4186)));n=t.O(n)})();
+(()=>{"use strict";var e,o={4186:(e,o,r)=>{var t=r(1669),n=r.n(t),a=r(2614);class i extends a.C4{ajaxifyLinks(e,o){super.ajaxifyLinks(e,o),n()("a.upload-one-now").on("click",(e=>{const o=n()("#id_collection_id").val();o&&n()("#id_document-chooser-upload-collection").val(o),e.preventDefault()}))}}window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS=new i({searchInputDelay:50,creationFormFileFieldSelector:"#id_document-chooser-upload-file",creationFormTitleFieldSelector:"#id_document-chooser-upload-title",creationFormTabSelector:"#tab-upload",creationFormEventName:"wagtail:documents-upload"}).getOnLoadHandlers();class l extends a.ZZ{onloadHandlers=window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS}window.DocumentChooserModal=l},1669:e=>{e.exports=jQuery}},r={};function t(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={exports:{}};return o[e](a,a.exports,t),a.exports}t.m=o,e=[],t.O=(o,r,n,a)=>{if(!r){var i=1/0;for(u=0;u<e.length;u++){for(var[r,n,a]=e[u],l=!0,d=0;d<r.length;d++)(!1&a||i>=a)&&Object.keys(t.O).every((e=>t.O[e](r[d])))?r.splice(d--,1):(l=!1,a<i&&(i=a));if(l){e.splice(u--,1);var c=n();void 0!==c&&(o=c)}}return o}a=a||0;for(var u=e.length;u>0&&e[u-1][2]>a;u--)e[u]=e[u-1];e[u]=[r,n,a]},t.n=e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},t.d=(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,o)=>Object.prototype.hasOwnProperty.call(e,o),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.j=884,(()=>{var e={884:0};t.O.j=o=>0===e[o];var o=(o,r)=>{var n,a,[i,l,d]=r,c=0;if(i.some((o=>0!==e[o]))){for(n in l)t.o(l,n)&&(t.m[n]=l[n]);if(d)var u=d(t)}for(o&&o(r);c<i.length;c++)a=i[c],t.o(e,a)&&e[a]&&e[a][0](),e[a]=0;return t.O(u)},r=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];r.forEach(o.bind(null,0)),r.push=o.bind(null,r.push.bind(r))})();var n=t.O(void 0,[321],(()=>t(4186)));n=t.O(n)})();

wagtail/documents/static/wagtaildocs/js/document-chooser-telepath.js

@@ -1 +1 @@
-(()=>{"use strict";var e,o={3819:(e,o,r)=>{var t=r(9465);class n extends t.y{chooserModalClass=DocumentChooserModal}window.DocumentChooser=n;class a extends t._{widgetClass=n;chooserModalClass=DocumentChooserModal}window.telepath.register("wagtail.documents.widgets.DocumentChooser",a)},1669:e=>{e.exports=jQuery}},r={};function t(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={id:e,loaded:!1,exports:{}};return o[e].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}t.m=o,e=[],t.O=(o,r,n,a)=>{if(!r){var l=1/0;for(u=0;u<e.length;u++){for(var[r,n,a]=e[u],i=!0,s=0;s<r.length;s++)(!1&a||l>=a)&&Object.keys(t.O).every((e=>t.O[e](r[s])))?r.splice(s--,1):(i=!1,a<l&&(l=a));if(i){e.splice(u--,1);var d=n();void 0!==d&&(o=d)}}return o}a=a||0;for(var u=e.length;u>0&&e[u-1][2]>a;u--)e[u]=e[u-1];e[u]=[r,n,a]},t.n=e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},t.d=(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,o)=>Object.prototype.hasOwnProperty.call(e,o),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),t.j=556,(()=>{var e={556:0};t.O.j=o=>0===e[o];var o=(o,r)=>{var n,a,[l,i,s]=r,d=0;if(l.some((o=>0!==e[o]))){for(n in i)t.o(i,n)&&(t.m[n]=i[n]);if(s)var u=s(t)}for(o&&o(r);d<l.length;d++)a=l[d],t.o(e,a)&&e[a]&&e[a][0](),e[a]=0;return t.O(u)},r=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];r.forEach(o.bind(null,0)),r.push=o.bind(null,r.push.bind(r))})();var n=t.O(void 0,[321],(()=>t(3819)));n=t.O(n)})();
+(()=>{"use strict";var e,o={3819:(e,o,r)=>{var t=r(9465);class n extends t.y{chooserModalClass=DocumentChooserModal}window.DocumentChooser=n;class a extends t._{widgetClass=n;chooserModalClass=DocumentChooserModal}window.telepath.register("wagtail.documents.widgets.DocumentChooser",a)},1669:e=>{e.exports=jQuery}},r={};function t(e){var n=r[e];if(void 0!==n)return n.exports;var a=r[e]={exports:{}};return o[e](a,a.exports,t),a.exports}t.m=o,e=[],t.O=(o,r,n,a)=>{if(!r){var i=1/0;for(d=0;d<e.length;d++){for(var[r,n,a]=e[d],l=!0,s=0;s<r.length;s++)(!1&a||i>=a)&&Object.keys(t.O).every((e=>t.O[e](r[s])))?r.splice(s--,1):(l=!1,a<i&&(i=a));if(l){e.splice(d--,1);var u=n();void 0!==u&&(o=u)}}return o}a=a||0;for(var d=e.length;d>0&&e[d-1][2]>a;d--)e[d]=e[d-1];e[d]=[r,n,a]},t.n=e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},t.d=(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,o)=>Object.prototype.hasOwnProperty.call(e,o),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.j=556,(()=>{var e={556:0};t.O.j=o=>0===e[o];var o=(o,r)=>{var n,a,[i,l,s]=r,u=0;if(i.some((o=>0!==e[o]))){for(n in l)t.o(l,n)&&(t.m[n]=l[n]);if(s)var d=s(t)}for(o&&o(r);u<i.length;u++)a=i[u],t.o(e,a)&&e[a]&&e[a][0](),e[a]=0;return t.O(d)},r=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];r.forEach(o.bind(null,0)),r.push=o.bind(null,r.push.bind(r))})();var n=t.O(void 0,[321],(()=>t(3819)));n=t.O(n)})();

wagtail/documents/static/wagtaildocs/js/document-chooser.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={7023:(e,r,o)=>{var t=o(9465);class n extends t.y{chooserModalClass=DocumentChooserModal}window.DocumentChooser=n,window.DocumentChooser=n},1669:e=>{e.exports=jQuery}},o={};function t(e){var n=o[e];if(void 0!==n)return n.exports;var a=o[e]={id:e,loaded:!1,exports:{}};return r[e].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}t.m=r,e=[],t.O=(r,o,n,a)=>{if(!o){var i=1/0;for(u=0;u<e.length;u++){for(var[o,n,a]=e[u],l=!0,s=0;s<o.length;s++)(!1&a||i>=a)&&Object.keys(t.O).every((e=>t.O[e](o[s])))?o.splice(s--,1):(l=!1,a<i&&(i=a));if(l){e.splice(u--,1);var d=n();void 0!==d&&(r=d)}}return r}a=a||0;for(var u=e.length;u>0&&e[u-1][2]>a;u--)e[u]=e[u-1];e[u]=[o,n,a]},t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var o in r)t.o(r,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),t.j=844,(()=>{var e={844:0};t.O.j=r=>0===e[r];var r=(r,o)=>{var n,a,[i,l,s]=o,d=0;if(i.some((r=>0!==e[r]))){for(n in l)t.o(l,n)&&(t.m[n]=l[n]);if(s)var u=s(t)}for(r&&r(o);d<i.length;d++)a=i[d],t.o(e,a)&&e[a]&&e[a][0](),e[a]=0;return t.O(u)},o=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})();var n=t.O(void 0,[321],(()=>t(7023)));n=t.O(n)})();
+(()=>{"use strict";var e,r={7023:(e,r,o)=>{var t=o(9465);class n extends t.y{chooserModalClass=DocumentChooserModal}window.DocumentChooser=n,window.DocumentChooser=n},1669:e=>{e.exports=jQuery}},o={};function t(e){var n=o[e];if(void 0!==n)return n.exports;var a=o[e]={exports:{}};return r[e](a,a.exports,t),a.exports}t.m=r,e=[],t.O=(r,o,n,a)=>{if(!o){var i=1/0;for(c=0;c<e.length;c++){for(var[o,n,a]=e[c],l=!0,s=0;s<o.length;s++)(!1&a||i>=a)&&Object.keys(t.O).every((e=>t.O[e](o[s])))?o.splice(s--,1):(l=!1,a<i&&(i=a));if(l){e.splice(c--,1);var u=n();void 0!==u&&(r=u)}}return r}a=a||0;for(var c=e.length;c>0&&e[c-1][2]>a;c--)e[c]=e[c-1];e[c]=[o,n,a]},t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var o in r)t.o(r,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.j=844,(()=>{var e={844:0};t.O.j=r=>0===e[r];var r=(r,o)=>{var n,a,[i,l,s]=o,u=0;if(i.some((r=>0!==e[r]))){for(n in l)t.o(l,n)&&(t.m[n]=l[n]);if(s)var c=s(t)}for(r&&r(o);u<i.length;u++)a=i[u],t.o(e,a)&&e[a]&&e[a][0](),e[a]=0;return t.O(c)},o=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})();var n=t.O(void 0,[321],(()=>t(7023)));n=t.O(n)})();

wagtail/documents/tests/test_models.py

@@ -217,8 +217,12 @@ class TestDocumentValidateExtensions(TestCase):
         creation when called full_clean. This specific testcase invalid
         file extension is passed
         """
-        with self.assertRaises(ValidationError):
+        with self.assertRaises(ValidationError) as e:
             self.document_invalid.full_clean()
+        expected_message = (
+            "File extension “doc” is not allowed. Allowed extensions are: pdf."
+        )
+        self.assertEqual(e.exception.message_dict["file"][0], expected_message)
 
     def test_create_doc_valid_extension(self):
         """

wagtail/embeds/apps.py

@@ -11,5 +11,7 @@ class WagtailEmbedsAppConfig(AppConfig):
     default_auto_field = "django.db.models.AutoField"
 
     def ready(self):
+        from . import signal_handlers  # noqa
+
         # Check configuration on startup
         get_finders()

wagtail/embeds/embeds.py

@@ -9,7 +9,18 @@ from .finders import get_finders
 from .models import Embed
 
 
-def get_embed(url, max_width=None, max_height=None, finder=None):
+def get_finder_for_embed(url, max_width=None, max_height=None):
+    for finder in get_finders():
+        if finder.accept(url):
+            kwargs = {}
+            if accepts_kwarg(finder.find_embed, "max_height"):
+                kwargs["max_height"] = max_height
+            return finder.find_embed(url, max_width=max_width, **kwargs)
+
+    raise EmbedUnsupportedProviderException
+
+
+def get_embed(url, max_width=None, max_height=None, finder=get_finder_for_embed):
     embed_hash = get_embed_hash(url, max_width, max_height)
 
     # Check database
@@ -18,19 +29,6 @@ def get_embed(url, max_width=None, max_height=None, finder=None):
     except Embed.DoesNotExist:
         pass
 
-    # Get/Call finder
-    if not finder:
-
-        def finder(url, max_width=None, max_height=None):
-            for finder in get_finders():
-                if finder.accept(url):
-                    kwargs = {}
-                    if accepts_kwarg(finder.find_embed, "max_height"):
-                        kwargs["max_height"] = max_height
-                    return finder.find_embed(url, max_width=max_width, **kwargs)
-
-            raise EmbedUnsupportedProviderException
-
     embed_dict = finder(url, max_width, max_height)
 
     # Make sure width and height are valid integers before inserting into database

wagtail/embeds/finders/__init__.py

@@ -1,3 +1,4 @@
+from functools import lru_cache
 from importlib import import_module
 
 from django.conf import settings
@@ -34,6 +35,7 @@ def _get_config_from_settings():
         ]
 
 
+@lru_cache(maxsize=None)
 def get_finders():
     finders = []
 

wagtail/embeds/finders/facebook.py

@@ -1,5 +1,4 @@
 import json
-import re
 from urllib import request as urllib_request
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlencode
@@ -7,29 +6,25 @@ from urllib.request import Request
 
 from wagtail.embeds.exceptions import EmbedException, EmbedNotFoundException
 
-from .base import EmbedFinder
+from .oembed import OEmbedFinder
 
 
 class AccessDeniedFacebookOEmbedException(EmbedException):
     pass
 
 
-class FacebookOEmbedFinder(EmbedFinder):
-    """
-    An embed finder that supports the authenticated Facebook oEmbed Endpoint.
-    https://developers.facebook.com/docs/plugins/oembed
-    """
-
-    facebook_video = {
+FACEBOOK_PROVIDERS = [
+    # Videos
+    {
         "endpoint": "https://graph.facebook.com/v11.0/oembed_video",
         "urls": [
             r"^https://(?:www\.)?facebook\.com/.+?/videos/.+$",
             r"^https://(?:www\.)?facebook\.com/video\.php\?(?:v|id)=.+$",
             r"^https://fb.watch/.+$",
         ],
-    }
-
-    facebook_post = {
+    },
+    # Posts
+    {
         "endpoint": "https://graph.facebook.com/v11.0/oembed_post",
         "urls": [
             r"^https://(?:www\.)?facebook\.com/.+?/(?:posts|activity)/.+$",
@@ -42,7 +37,15 @@ class FacebookOEmbedFinder(EmbedFinder):
             # Works for posts with a single photo
             r"^https://(?:www\.)?facebook\.com/.+?/photos/.+$",
         ],
-    }
+    },
+]
+
+
+class FacebookOEmbedFinder(OEmbedFinder):
+    """
+    An embed finder that supports the authenticated Facebook oEmbed Endpoint.
+    https://developers.facebook.com/docs/plugins/oembed
+    """
 
     def __init__(self, omitscript=False, app_id=None, app_secret=None):
         # {settings.facebook_APP_ID}|{settings.facebook_APP_SECRET}
@@ -50,26 +53,7 @@ class FacebookOEmbedFinder(EmbedFinder):
         self.app_secret = app_secret
         self.omitscript = omitscript
 
-        self._endpoints = {}
-
-        for provider in [self.facebook_video, self.facebook_post]:
-            patterns = []
-
-            endpoint = provider["endpoint"].replace("{format}", "json")
-
-            for url in provider["urls"]:
-                patterns.append(re.compile(url))
-
-            self._endpoints[endpoint] = patterns
-
-    def _get_endpoint(self, url):
-        for endpoint, patterns in self._endpoints.items():
-            for pattern in patterns:
-                if re.match(pattern, url):
-                    return endpoint
-
-    def accept(self, url):
-        return self._get_endpoint(url) is not None
+        super().__init__(providers=FACEBOOK_PROVIDERS)
 
     def find_embed(self, url, max_width=None, max_height=None):
         # Find provider

wagtail/embeds/finders/instagram.py

@@ -1,5 +1,4 @@
 import json
-import re
 from urllib import request as urllib_request
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlencode
@@ -7,39 +6,43 @@ from urllib.request import Request
 
 from wagtail.embeds.exceptions import EmbedException, EmbedNotFoundException
 
-from .base import EmbedFinder
+from .oembed import OEmbedFinder
 
 
 class AccessDeniedInstagramOEmbedException(EmbedException):
     pass
 
 
-class InstagramOEmbedFinder(EmbedFinder):
+INSTAGRAM_PROVIDER = {
+    "endpoint": "https://graph.facebook.com/v11.0/instagram_oembed",
+    "urls": [
+        r"^https?://(?:www\.)?instagram\.com/p/.+$",
+        r"^https?://(?:www\.)?instagram\.com/tv/.+$",
+        r"^https?://(?:www\.)?instagram\.com/reel/.+$",
+    ],
+}
+
+
+class InstagramOEmbedFinder(OEmbedFinder):
     """
     An embed finder that supports the authenticated Instagram oEmbed Endpoint.
     https://developers.facebook.com/docs/instagram/oembed
     """
 
-    INSTAGRAM_ENDPOINT = "https://graph.facebook.com/v11.0/instagram_oembed"
-    INSTAGRAM_URL_PATTERNS = [
-        r"^https?://(?:www\.)?instagram\.com/p/.+$",
-        r"^https?://(?:www\.)?instagram\.com/tv/.+$",
-        r"^https?://(?:www\.)?instagram\.com/reel/.+$",
-    ]
-
     def __init__(self, omitscript=False, app_id=None, app_secret=None):
         # {settings.INSTAGRAM_APP_ID}|{settings.INSTAGRAM_APP_SECRET}
         self.app_id = app_id
         self.app_secret = app_secret
         self.omitscript = omitscript
 
-    def accept(self, url):
-        for pattern in self.INSTAGRAM_URL_PATTERNS:
-            if re.match(pattern, url):
-                return True
-        return False
+        super().__init__(providers=[INSTAGRAM_PROVIDER])
 
     def find_embed(self, url, max_width=None, max_height=None):
+        # Find provider
+        endpoint = self._get_endpoint(url)
+        if endpoint is None:
+            raise EmbedNotFoundException
+
         params = {"url": url, "format": "json"}
         if max_width:
             params["maxwidth"] = max_width
@@ -49,7 +52,7 @@ class InstagramOEmbedFinder(EmbedFinder):
             params["omitscript"] = "true"
 
         # Configure request
-        request = Request(self.INSTAGRAM_ENDPOINT + "?" + urlencode(params))
+        request = Request(endpoint + "?" + urlencode(params))
         request.add_header("Authorization", f"Bearer {self.app_id}|{self.app_secret}")
 
         # Perform request

wagtail/embeds/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/embeds/signal_handlers.py

@@ -0,0 +1,13 @@
+from django.core.signals import setting_changed
+from django.dispatch import receiver
+
+from .finders import get_finders
+
+
+@receiver(setting_changed)
+def clear_embed_caches(*, setting: str, **kwargs: dict) -> None:
+    """
+    Clear the embed caches when settings change
+    """
+    if setting == "WAGTAILEMBEDS_FINDERS":
+        get_finders.cache_clear()

wagtail/embeds/tests/test_embeds.py

@@ -652,7 +652,7 @@ class TestInstagramOEmbed(TestCase):
     def test_instagram_oembed_return_values(self, urlopen):
         urlopen.return_value = self.dummy_response
         result = InstagramOEmbedFinder(app_id="123", app_secret="abc").find_embed(
-            "https://instagr.am/p/CHeRxmnDSYe/"
+            "https://instagram.com/p/CHeRxmnDSYe/"
         )
         self.assertEqual(
             result,
@@ -671,13 +671,13 @@ class TestInstagramOEmbed(TestCase):
         request = urlopen.call_args[0][0]
         self.assertEqual(
             request.get_full_url(),
-            "https://graph.facebook.com/v11.0/instagram_oembed?url=https%3A%2F%2Finstagr.am%2Fp%2FCHeRxmnDSYe%2F&format=json",
+            "https://graph.facebook.com/v11.0/instagram_oembed?url=https%3A%2F%2Finstagram.com%2Fp%2FCHeRxmnDSYe%2F&format=json",
         )
         self.assertEqual(request.get_header("Authorization"), "Bearer 123|abc")
 
     def test_instagram_request_denied_401(self):
         err = HTTPError(
-            "https://instagr.am/p/CHeRxmnDSYe/",
+            "https://instagram.com/p/CHeRxmnDSYe/",
             code=401,
             msg="invalid credentials",
             hdrs={},
@@ -688,12 +688,12 @@ class TestInstagramOEmbed(TestCase):
             self.assertRaises(
                 AccessDeniedInstagramOEmbedException,
                 InstagramOEmbedFinder().find_embed,
-                "https://instagr.am/p/CHeRxmnDSYe/",
+                "https://instagram.com/p/CHeRxmnDSYe/",
             )
 
     def test_instagram_request_not_found(self):
         err = HTTPError(
-            "https://instagr.am/p/badrequest/",
+            "https://instagram.com/p/badrequest/",
             code=404,
             msg="Not Found",
             hdrs={},
@@ -704,7 +704,7 @@ class TestInstagramOEmbed(TestCase):
             self.assertRaises(
                 EmbedNotFoundException,
                 InstagramOEmbedFinder().find_embed,
-                "https://instagr.am/p/CHeRxmnDSYe/",
+                "https://instagram.com/p/CHeRxmnDSYe/",
             )
 
     def test_instagram_failed_request(self):
@@ -713,7 +713,7 @@ class TestInstagramOEmbed(TestCase):
             self.assertRaises(
                 EmbedNotFoundException,
                 InstagramOEmbedFinder().find_embed,
-                "https://instagr.am/p/CHeRxmnDSYe/",
+                "https://instagram.com/p/CHeRxmnDSYe/",
             )
 
 

wagtail/fields.py

@@ -5,8 +5,13 @@ from django.core.validators import MaxLengthValidator
 from django.db import models
 from django.db.models.fields.json import KeyTransform
 from django.utils.encoding import force_str
+from django.utils.functional import cached_property
 
 from wagtail.blocks import Block, BlockField, StreamBlock, StreamValue
+from wagtail.blocks.definition_lookup import (
+    BlockDefinitionLookup,
+    BlockDefinitionLookupBuilder,
+)
 from wagtail.rich_text import (
     RichTextMaxLengthValidator,
     extract_references_from_rich_text,
@@ -82,34 +87,68 @@ class Creator:
 
 
 class StreamField(models.Field):
-    def __init__(self, block_types, use_json_field=True, **kwargs):
-        # use_json_field no longer has any effect but is recognised to support historical
-        # migrations
+    def __init__(self, block_types, use_json_field=True, block_lookup=None, **kwargs):
+        """
+        Construct a StreamField.
+
+        :param block_types: Either a list of block types that are allowed in this StreamField
+            (as a list of tuples of block name and block instance) or a StreamBlock to use as
+            the top level block (as a block instance or class).
+        :param use_json_field: Ignored, but retained for compatibility with historical migrations.
+        :param block_lookup: Used in migrations to provide a more compact block definition -
+            see ``wagtail.blocks.definition_lookup.BlockDefinitionLookup``. If passed, ``block_types``
+            can contain integer indexes into this lookup table, in place of actual block instances.
+        """
 
         # extract kwargs that are to be passed on to the block, not handled by super
-        block_opts = {}
+        self.block_opts = {}
         for arg in ["min_num", "max_num", "block_counts", "collapsed"]:
             if arg in kwargs:
-                block_opts[arg] = kwargs.pop(arg)
+                self.block_opts[arg] = kwargs.pop(arg)
 
         # for a top-level block, the 'blank' kwarg (defaulting to False) always overrides the
         # block's own 'required' meta attribute, even if not passed explicitly; this ensures
         # that the field and block have consistent definitions
-        block_opts["required"] = not kwargs.get("blank", False)
+        self.block_opts["required"] = not kwargs.get("blank", False)
+
+        # Store the `block_types` and `block_lookup` arguments to be handled in the `stream_block`
+        # property
+        self.block_types_arg = block_types
+        self.block_lookup = block_lookup
 
         super().__init__(**kwargs)
 
-        if isinstance(block_types, Block):
+    @cached_property
+    def stream_block(self):
+        has_block_lookup = self.block_lookup is not None
+        if has_block_lookup:
+            lookup = BlockDefinitionLookup(self.block_lookup)
+
+        if isinstance(self.block_types_arg, Block):
             # use the passed block as the top-level block
-            self.stream_block = block_types
-        elif isinstance(block_types, type):
+            block = self.block_types_arg
+        elif isinstance(self.block_types_arg, int) and has_block_lookup:
+            # retrieve block from lookup table to use as the top-level block
+            block = lookup.get_block(self.block_types_arg)
+        elif isinstance(self.block_types_arg, type):
             # block passed as a class - instantiate it
-            self.stream_block = block_types()
+            block = self.block_types_arg()
         else:
-            # construct a top-level StreamBlock from the list of block types
-            self.stream_block = StreamBlock(block_types)
+            # construct a top-level StreamBlock from the list of block types.
+            # If an integer is found in place of a block instance, and block_lookup is
+            # provided, it will be replaced with the corresponding block definition.
+            child_blocks = []
+
+            for name, child_block in self.block_types_arg:
+                if isinstance(child_block, int) and has_block_lookup:
+                    child_blocks.append((name, lookup.get_block(child_block)))
+                else:
+                    child_blocks.append((name, child_block))
+
+            block = StreamBlock(child_blocks)
 
-        self.stream_block.set_meta_options(block_opts)
+        block.set_meta_options(self.block_opts)
+        return block
 
     @property
     def json_field(self):
@@ -126,8 +165,13 @@ class StreamField(models.Field):
 
     def deconstruct(self):
         name, path, _, kwargs = super().deconstruct()
-        block_types = list(self.stream_block.child_blocks.items())
+        lookup = BlockDefinitionLookupBuilder()
+        block_types = [
+            (name, lookup.add_block(block))
+            for name, block in self.stream_block.child_blocks.items()
+        ]
         args = [block_types]
+        kwargs["block_lookup"] = lookup.get_lookup_as_dict()
         return name, path, args, kwargs
 
     def to_python(self, value):

wagtail/images/__init__.py

@@ -15,7 +15,7 @@ def get_image_model():
     """
     Get the image model from the ``WAGTAILIMAGES_IMAGE_MODEL`` setting.
     Useful for developers making Wagtail plugins that need the image model.
-    Defaults to the standard :class:`~wagtail.images.models.Image` model
+    Defaults to the standard ``wagtail.images.models.Image`` model
     if no custom model is defined.
     """
     from django.apps import apps