From 6f93a1fb6a9a99ff725e71e220f1b68b72f32f0d Mon Sep 17 00:00:00 2001
From: HushBugger <hushbugger@airmail.cc>
Date: Tue, 7 Aug 2018 18:24:06 +0200
Subject: [PATCH 1/2] Enable more general Twitter image embedding

You can get Twitter images in different sizes by appending a
size (":thumb", ":large", ":orig", etc.) to the URL. Those weren't
embeddable yet, because they no longer look like ordinary image URLs.

This makes them embeddable.
---
 src/Linkification/Embedding.coffee | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee
index 245f33544..d50e39ff7 100644
--- a/src/Linkification/Embedding.coffee
+++ b/src/Linkification/Embedding.coffee
@@ -419,6 +419,12 @@ Embedding =
           cont
         else
           el
+    ,
+      key: 'TwitterImage'
+      regExp: /^\w+:\/\/pbs\.twimg\.com\/media\/([\w-]{15}\.(?:gif|png|jpg):\w+)/i
+      style: ''
+      el: (a) ->
+        $.el 'div', <%= html('<a target="_blank" href="https://pbs.twimg.com/media/${a.dataset.uid}"><img src="https://pbs.twimg.com/media/${a.dataset.uid}" style="max-width: 80vw; max-height: 80vh;"></a>') %>
     ,
       key: 'VidLii'
       regExp:  /^\w+:\/\/(?:www\.)?vidlii\.com\/watch\?v=(\w{11})/

From 6953519ee1b5980995958cd2600e6a1135b7cb5c Mon Sep 17 00:00:00 2001
From: HushBugger <hushbugger@airmail.cc>
Date: Thu, 4 Oct 2018 20:40:06 +0200
Subject: [PATCH 2/2] Embed all images that have Twitter-style :\w+ prefixes

---
 src/Linkification/Embedding.coffee | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee
index d50e39ff7..9158cdaf4 100644
--- a/src/Linkification/Embedding.coffee
+++ b/src/Linkification/Embedding.coffee
@@ -215,7 +215,7 @@ Embedding =
           src:         a.dataset.href
     ,
       key: 'image'
-      regExp: /^[^?#]+\.(?:gif|png|jpg|jpeg|bmp)(?:[?#]|$)/i
+      regExp: /^[^?#]+\.(?:gif|png|jpg|jpeg|bmp)(?::\w+)?(?:[?#]|$)/i
       style: ''
       el: (a) ->
         $.el 'div', <%= html('<a target="_blank" href="${a.dataset.href}"><img src="${a.dataset.href}" style="max-width: 80vw; max-height: 80vh;"></a>') %>
@@ -419,12 +419,6 @@ Embedding =
           cont
         else
           el
-    ,
-      key: 'TwitterImage'
-      regExp: /^\w+:\/\/pbs\.twimg\.com\/media\/([\w-]{15}\.(?:gif|png|jpg):\w+)/i
-      style: ''
-      el: (a) ->
-        $.el 'div', <%= html('<a target="_blank" href="https://pbs.twimg.com/media/${a.dataset.uid}"><img src="https://pbs.twimg.com/media/${a.dataset.uid}" style="max-width: 80vw; max-height: 80vh;"></a>') %>
     ,
       key: 'VidLii'
       regExp:  /^\w+:\/\/(?:www\.)?vidlii\.com\/watch\?v=(\w{11})/