summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-01-20 02:40:13 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-01-20 02:40:13 +0900
commit53937e09a0bef968dfd6d5b0f2580de876685aa0 (patch)
tree1667b98456299f7af857b60e389e6ceaa15acf1a
parentrefactor(server): use insert instead of save (diff)
downloadsharkey-53937e09a0bef968dfd6d5b0f2580de876685aa0.tar.gz
sharkey-53937e09a0bef968dfd6d5b0f2580de876685aa0.tar.bz2
sharkey-53937e09a0bef968dfd6d5b0f2580de876685aa0.zip
feat(server): store mime type of webpublic
-rw-r--r--packages/backend/migration/1642613870898-drive-file-webpublic-type.js13
-rw-r--r--packages/backend/src/models/entities/drive-file.ts5
-rw-r--r--packages/backend/src/services/drive/add-file.ts2
3 files changed, 20 insertions, 0 deletions
diff --git a/packages/backend/migration/1642613870898-drive-file-webpublic-type.js b/packages/backend/migration/1642613870898-drive-file-webpublic-type.js
new file mode 100644
index 0000000000..e10c2ac2d2
--- /dev/null
+++ b/packages/backend/migration/1642613870898-drive-file-webpublic-type.js
@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class driveFileWebpublicType1642613870898 {
+ name = 'driveFileWebpublicType1642613870898'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "drive_file" ADD "webpublicType" character varying(128)`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "webpublicType"`);
+ }
+}
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index 0af52d7cc0..cec86880f5 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -101,6 +101,11 @@ export class DriveFile {
})
public webpublicUrl: string | null;
+ @Column('varchar', {
+ length: 128, nullable: true,
+ })
+ public webpublicType: string | null;
+
@Index({ unique: true })
@Column('varchar', {
length: 256, nullable: true,
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 1153cf7375..6ac4f6d11d 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -101,6 +101,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
file.accessKey = key;
file.thumbnailAccessKey = thumbnailKey;
file.webpublicAccessKey = webpublicKey;
+ file.webpublicType = alts.webpublic?.type ?? null;
file.name = name;
file.type = type;
file.md5 = hash;
@@ -135,6 +136,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
file.accessKey = accessKey;
file.thumbnailAccessKey = thumbnailAccessKey;
file.webpublicAccessKey = webpublicAccessKey;
+ file.webpublicType = alts.webpublic?.type ?? null;
file.name = name;
file.type = type;
file.md5 = hash;