Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert 96bc17aa10

Browse source
This commit is contained in:
syuilo 2019-02-07 21:02:33 +09:00
parent 27768081e2
commit 5448c22031
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
19 changed files with 125 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/drive/add-file.ts
View file

@ -50,9 +50,8 @@ async function save(path: string, name: string, type: string, hash: string, size
if (type === 'image/webp') ext = '.webp';
}
const baseUrl = config.drive.baseUrl.getOrElse(
`${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`
);
const baseUrl = config.drive.baseUrl
|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
// for original
const key = `${config.drive.prefix}/${uuid.v4()}${ext}`;

2
src/services/drive/upload-from-url.ts
View file

@ -55,7 +55,7 @@ export default async (
const req = request({
url: requestUrl,
proxy: config.proxy.getOrElse(null),
proxy: config.proxy,
timeout: 10 * 1000,
headers: {
'User-Agent': config.user_agent

2
src/services/note/create.ts
View file

@ -500,7 +500,7 @@ async function insertNote(user: IUser, data: Option, tags: string[], emojis: str
}
function index(note: INote) {
if (note.text == null || !config.elasticsearch.isJust()) return;
if (note.text == null || config.elasticsearch == null) return;
es.index({
index: 'misskey',