Skip to content

Cleanup linkify regex patterns (efficiency) #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Lee-Carre wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Cleanup linkify regex patterns (efficiency) #90

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
860faf3
Cleanup linkify regex patterns (efficiency)
Lee-Carre Feb 24, 2022
967881b
Re-enable needed linkify regex capture groups for special handling
Lee-Carre Feb 24, 2022
9bb17f6
Refine linkify regex patterns (efficiency)
Lee-Carre Feb 24, 2022
2215a96
Refine Wikipedia URL matching
Lee-Carre Feb 24, 2022
fe28921
Allow matching FQDNs in image regex patterns
Lee-Carre Feb 24, 2022
6b27999
Refine pattern for generic catch-all image URL
Lee-Carre Feb 24, 2022
4173cf6
Refine (further) Wiki image URL patterns
Lee-Carre Feb 24, 2022
f11bb74
Refine (minorly) regex pattern character set members
Lee-Carre Feb 24, 2022
9cc8716
Refine regex patterns character sets
Lee-Carre Feb 24, 2022
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
18 changes: 9 additions & 9 deletions app/js/linkify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import anchorme from 'anchorme';

const IMAGE_HOSTING_REGEX = {
imgur: /(http(s)?:\/\/)?(i\.)?imgur\.com\/\w+\.(jpg|png)/i,
framapic: /(http(s)?:\/\/)?(www\.)?framapic\.org\/(random\?i=)?\w+\/\w+(\.(jpg|jpeg|png))?/i,
westnordost: /https:\/\/westnordost\.de\/p\/[0-9]+\.jpg/i,
wikimedia: /http(?:s)?:\/\/upload\.wikimedia\.org\/wikipedia\/(.+?)\/(?:thumb\/)?(\w\/\w\w)\/(.+?\.(?:jpg|jpeg|png))(?:\/.+?\.(?:jpg|jpeg|png))?/i,
commons: /http(?:s)?:\/\/commons\.wikimedia\.org\/wiki\/File:(.+?\.(?:jpg|jpeg|png|svg))/i,
openstreetmap: /http(?:s)?:\/\/wiki\.openstreetmap\.org\/wiki\/File:(.+?\.(?:jpg|jpeg|png|svg))/i,
mapillary: /http(?:s)?:\/\/(?:www\.)?mapillary\.com\/map\/im\/(\w+)/i,
all: /(http(s)?:\/\/)?(www\.)?.+\.(jpg|jpeg|png)/i
imgur: /(?:https?:\/\/)?(?:i\.)?imgur\.com\.?\/\w+\.(?:jpe?g|png|webp)/i,
framapic: /(?:https?:\/\/)?(?:www\.)?framapic\.org\.?\/(?:random\?i=)?\w+\/\w+(?:\.(?:jpe?g|png|webp))?/i,
westnordost: /(?:https?:\/\/)?(?:www\.)?westnordost\.de\.?\/p\/[0-9]+\.(?:jpe?g|webp)/i,
wikimedia: /(?:https?:\/\/)?upload\.wikimedia\.org\.?\/wikipedia\/([^\/]+)\/(?:thumb\/)?(([0-9a-fA-F])\/\3[0-9a-fA-F])\/([\w\-\%\.]+?\.(?:jpe?g|png|svg|webp))(?:\/[0-9]{3,}px-\4(?:\.(?:jpe?g|png|webp))?)?/i,
commons: /(?:https?:\/\/)?commons\.(?:m\.)?wikimedia\.org\.?\/wiki\/File:([\w\-\%\.]+?\.(?:jpe?g|png|svg|webp))/i,
openstreetmap: /(?:https?:\/\/)?wiki\.openstreetmap\.org\.?\/wiki\/File:([\w\-\%\.]+?\.(?:jpe?g|png|svg|webp))/i,
mapillary: /(?:https?:\/\/)?(?:www\.)?mapillary\.com\.?\/map\/im\/(\w+)/i,
all: /(?:https?:\/\/)?(?:www\.)?(?:[\w\-]+\.)*(?:[\w\-]+)\.(?:[a-z]{2,})\.?\/(?:[\w\/\%]+)\.(gif|tiff?|jpe?g|[pm]ng|svg|webp)/i
};

const IMAGE_HOSTING_ADDITIONAL_FORMATTING = {
wikimedia: 'https://upload.wikimedia.org/wikipedia/$1/thumb/$2/$3/300px-$3',
wikimedia: 'https://upload.wikimedia.org/wikipedia/$1/thumb/$2/$4/300px-$4',
commons: 'https://commons.wikimedia.org/wiki/Special:FilePath/$1?width=300',
openstreetmap: 'https://wiki.openstreetmap.org/wiki/Special:FilePath/$1?width=300',
mapillary: 'https://images.mapillary.com/$1/thumb-320.jpg'
Expand Down