Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 1 additions and 1 deletions
Showing only changes of commit a6d9a9e1a8 - Show all commits

2
ui/src/utils.ts vendored
View File

@ -210,7 +210,7 @@ export function isMod(modIds: Array<number>, creator_id: number): boolean {
}
const imageRegex = new RegExp(
/(http)?s?:?(\/\/[^"']*\.(?:jpg|jpeg|gif|png|svg))/
/(http)?s?:?(\/\/[^"']*\.(?:jpg|jpeg|gif|png|svg|webp))/
);
const videoRegex = new RegExp(`(http)?s?:?(\/\/[^"']*\.(?:mp4))`);