V10 (#2826)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update CHANGELOG.md * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update CHANGELOG.md * Update CHANGELOG.md * wip * Update CHANGELOG.md * wip * wip * wip * wip
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
import $ from 'cafy';
|
||||
import * as bcrypt from 'bcryptjs';
|
||||
import User, { ILocalUser } from '../../../../models/user';
|
||||
import { publishUserStream } from '../../../../stream';
|
||||
import { publishMainStream } from '../../../../stream';
|
||||
import generateUserToken from '../../common/generate-native-user-token';
|
||||
|
||||
export const meta = {
|
||||
@ -33,5 +33,5 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
|
||||
res();
|
||||
|
||||
// Publish event
|
||||
publishUserStream(user._id, 'my_token_regenerated');
|
||||
publishMainStream(user._id, 'myTokenRegenerated');
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
|
||||
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack, ILocalUser } from '../../../../models/user';
|
||||
import { publishUserStream } from '../../../../stream';
|
||||
import { publishMainStream } from '../../../../stream';
|
||||
import DriveFile from '../../../../models/drive-file';
|
||||
import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
|
||||
import { IApp } from '../../../../models/app';
|
||||
@ -177,7 +177,7 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a
|
||||
res(iObj);
|
||||
|
||||
// Publish meUpdated event
|
||||
publishUserStream(user._id, 'meUpdated', iObj);
|
||||
publishMainStream(user._id, 'meUpdated', iObj);
|
||||
|
||||
// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
|
||||
if (user.isLocked && ps.isLocked === false) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
import $ from 'cafy';
|
||||
import User, { ILocalUser } from '../../../../models/user';
|
||||
import { publishUserStream } from '../../../../stream';
|
||||
import { publishMainStream } from '../../../../stream';
|
||||
|
||||
export const meta = {
|
||||
requireCredential: true,
|
||||
@ -26,7 +26,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
|
||||
res();
|
||||
|
||||
// Publish event
|
||||
publishUserStream(user._id, 'clientSettingUpdated', {
|
||||
publishMainStream(user._id, 'clientSettingUpdated', {
|
||||
key: name,
|
||||
value
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
import $ from 'cafy';
|
||||
import User, { ILocalUser } from '../../../../models/user';
|
||||
import { publishUserStream } from '../../../../stream';
|
||||
import { publishMainStream } from '../../../../stream';
|
||||
|
||||
export const meta = {
|
||||
requireCredential: true,
|
||||
@ -25,5 +25,5 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
|
||||
|
||||
res();
|
||||
|
||||
publishUserStream(user._id, 'home_updated', home);
|
||||
publishMainStream(user._id, 'homeUpdated', home);
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
import $ from 'cafy';
|
||||
import User, { ILocalUser } from '../../../../models/user';
|
||||
import { publishUserStream } from '../../../../stream';
|
||||
import { publishMainStream } from '../../../../stream';
|
||||
|
||||
export const meta = {
|
||||
requireCredential: true,
|
||||
@ -24,5 +24,5 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
|
||||
|
||||
res();
|
||||
|
||||
publishUserStream(user._id, 'mobile_home_updated', home);
|
||||
publishMainStream(user._id, 'mobileHomeUpdated', home);
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
import $ from 'cafy';
|
||||
import User, { ILocalUser } from '../../../../models/user';
|
||||
import { publishUserStream } from '../../../../stream';
|
||||
import { publishMainStream } from '../../../../stream';
|
||||
|
||||
export const meta = {
|
||||
requireCredential: true,
|
||||
@ -73,7 +73,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
|
||||
//#endregion
|
||||
|
||||
if (widget) {
|
||||
publishUserStream(user._id, 'widgetUpdated', {
|
||||
publishMainStream(user._id, 'widgetUpdated', {
|
||||
id, data
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user