OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-13 05:00:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Media Proxy を実装 (#5649)

Browse source 
* Media Proxy を実装

* サンプルを追加
This commit is contained in:
和風ドレッシング 2019-12-20 01:54:28 +09:00 committed by syuilo
parent cbbdc98744
commit 9bc07c1a1c
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.config/example.yml
View file

@ -140,3 +140,6 @@ autoAdmin: true
#proxySmtp: http://127.0.0.1:3128 # use HTTP/1.1 CONNECT #proxySmtp: http://127.0.0.1:3128 # use HTTP/1.1 CONNECT
#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4 #proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
# Media Proxy
#mediaProxy: http://127.0.0.1:3000

2
src/config/types.ts
View file

@ -52,6 +52,8 @@ export type Source = {
host: string; host: string;
port: number; port: number;
}; };
mediaProxy?: string;
}; };
/** /**

7
src/models/repositories/drive-file.ts
View file

@ -6,6 +6,7 @@ import { toPuny } from '../../misc/convert-host';
import { ensure } from '../../prelude/ensure'; import { ensure } from '../../prelude/ensure';
import { awaitAll } from '../../prelude/await-all'; import { awaitAll } from '../../prelude/await-all';
import { SchemaType } from '../../misc/schema'; import { SchemaType } from '../../misc/schema';
import config from '../../config';
export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>; export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>;
@ -22,7 +23,11 @@ export class DriveFileRepository extends Repository<DriveFile> {
} }
public getPublicUrl(file: DriveFile, thumbnail = false): string | null { public getPublicUrl(file: DriveFile, thumbnail = false): string | null {
return thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.url); let url = thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.url);
if (file.src !== null && file.userHost !== null && config.mediaProxy !== null) {
url = `${config.mediaProxy}/${thumbnail ? 'thumbnail' : ''}?url=${file.src}`;
}
return url;
} }
public async clacDriveUsageOf(user: User['id'] | User): Promise<number> { public async clacDriveUsageOf(user: User['id'] | User): Promise<number> {