aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sokolov <eug-vs@keemail.me>2020-07-05 19:05:29 +0300
committerGitHub <noreply@github.com>2020-07-05 19:05:29 +0300
commitf7fc3b984eb90d282c932dfe38965686122a729c (patch)
tree5d1f8019c8fd019b2fd3813348e7f5745e05fe7a
parent056bfe1fb3aa23ce45f068cf3c138a02293adaa2 (diff)
parent8bd541ccb46658f6ff079c0ab24b3c7f246eb9ec (diff)
downloadwhich-ui-f7fc3b984eb90d282c932dfe38965686122a729c.tar.gz
Merge pull request #66 from which-ecosystem/fix-googledrive
Patch 1.0.2
-rw-r--r--package-lock.json2
-rw-r--r--package.json2
-rw-r--r--src/components/UploadImage/UploadImage.tsx8
3 files changed, 8 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json
index 0f360a2..6402a10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "which",
- "version": "1.0.1",
+ "version": "1.0.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index f3ab8c4..268754c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "which",
- "version": "1.0.1",
+ "version": "1.0.2",
"homepage": "https://ilyayudovin.github.io/which",
"dependencies": {
"@material-ui/core": "^4.10.1",
diff --git a/src/components/UploadImage/UploadImage.tsx b/src/components/UploadImage/UploadImage.tsx
index 5b2f38e..e9f2168 100644
--- a/src/components/UploadImage/UploadImage.tsx
+++ b/src/components/UploadImage/UploadImage.tsx
@@ -25,9 +25,13 @@ const UploadImage: React.FC<PropTypes> = ({ setIsOpen, isOpen, callback }) => {
const handleSubmit = () => {
let result = url;
if (url.startsWith('https://www.instagram.com/')) {
- const lastSlashIndex = url.lastIndexOf('/');
- const baseUrl = url.slice(0, lastSlashIndex);
+ const appendixIndex = url.indexOf('/?utm_source=');
+ const baseUrl = url.slice(0, appendixIndex);
result = `${baseUrl}/media/?size=l`;
+ } else if (url.startsWith('https://drive.google.com/')) {
+ const match = url.match('/d/(.*)/');
+ const fileId = match && match[1];
+ result = `https://drive.google.com/uc?export=view&id=${fileId}`;
}
callback(result || '');
handleClose();