sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into notification-read-api

Browse Source
This commit is contained in:
tamaina
2022-03-15 22:06:04 +09:00
parent 917cc1d8fa c0bf7cd871
commit 45116b4133
29 changed files with 108 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/package.json
View File

@@ -19,7 +19,7 @@
"@elastic/elasticsearch": "7.11.0",
"@koa/cors": "3.1.0",
"@koa/multer": "3.0.0",
"@koa/router": "10.1.1",
"@koa/router": "9.0.1",
"@sinonjs/fake-timers": "9.1.1",
"@syuilo/aiscript": "0.11.1",
"@types/bcryptjs": "2.4.2",

2
packages/backend/src/misc/download-url.ts
View File

@@ -6,7 +6,7 @@ import { httpAgent, httpsAgent, StatusError } from './fetch.js';
import config from '@/config/index.js';
import chalk from 'chalk';
import Logger from '@/services/logger.js';
import * as IPCIDR from 'ip-cidr';
import IPCIDR from 'ip-cidr';
import PrivateIp from 'private-ip';
const pipeline = util.promisify(stream.pipeline);

2
packages/backend/src/remote/activitypub/misc/ld-signature.ts
View File

@@ -1,5 +1,5 @@
import * as crypto from 'node:crypto';
import * as jsonld from 'jsonld';
import jsonld from 'jsonld';
import { CONTEXTS } from './contexts.js';
import fetch from 'node-fetch';
import { httpAgent, httpsAgent } from '@/misc/fetch.js';

2
packages/backend/src/server/file/send-drive-file.ts
View File

@@ -2,7 +2,7 @@ import * as fs from 'node:fs';
import { fileURLToPath } from 'node:url';
import { dirname } from 'node:path';
import Koa from 'koa';
import * as send from 'koa-send';
import send from 'koa-send';
import rename from 'rename';
import * as tmp from 'tmp';
import { serverLogger } from '../index.js';

2
packages/backend/src/services/validate-email-for-account.ts
View File

@@ -1,4 +1,4 @@
import validateEmail from 'deep-email-validator';
import { validate as validateEmail } from 'deep-email-validator';
import { UserProfiles } from '@/models/index.js';
export async function validateEmailForAccount(emailAddress: string): Promise<{

8
packages/backend/yarn.lock
View File

@@ -128,10 +128,10 @@
resolved "https://registry.yarnpkg.com/@koa/multer/-/multer-3.0.0.tgz#439777949f28097d7b329c0b4ce3048074c862f8"
integrity sha512-y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw==
"@koa/router@10.1.1":
version "10.1.1"
resolved "https://registry.yarnpkg.com/@koa/router/-/router-10.1.1.tgz#8e5a85c9b243e0bc776802c0de564561e57a5f78"
integrity sha512-ORNjq5z4EmQPriKbR0ER3k4Gh7YGNhWDL7JBW+8wXDrHLbWYKYSJaOJ9aN06npF5tbTxe2JBOsurpJDAvjiXKw==
"@koa/router@9.0.1":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@koa/router/-/router-9.0.1.tgz#4090a14223ea7e78aa13b632761209cba69acd95"
integrity sha512-OI+OU49CJV4px0WkIMmayBeqVXB/JS1ZMq7UoGlTZt6Y7ijK7kdeQ18+SEHHJPytmtI1y6Hf8XLrpxva3mhv5Q==
dependencies:
debug "^4.1.1"
http-errors "^1.7.3"