profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ghostの設定をDBに保存するように

Browse source
This commit is contained in:
syuilo 2018-11-07 00:44:56 +09:00
parent 87d4452d19
commit 2de48110bb
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
9 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/server/api/endpoints/admin/update-meta.ts
View file

@ -98,17 +98,24 @@ export const meta = {
},
recaptchaSiteKey: {
validator: $.str.optional,
validator: $.str.optional.nullable,
desc: {
'ja-JP': 'reCAPTCHA site key'
}
},
recaptchaSecretKey: {
validator: $.str.optional,
validator: $.str.optional.nullable,
desc: {
'ja-JP': 'reCAPTCHA secret key'
}
},
proxyAccount: {
validator: $.str.optional.nullable,
desc: {
'ja-JP': 'Proxy account username'
}
}
}
};
@ -172,6 +179,10 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
set.recaptchaSecretKey = ps.recaptchaSecretKey;
}
if (ps.proxyAccount !== undefined) {
set.proxyAccount = ps.proxyAccount;
}
await Meta.update({}, {
$set: set
}, { upsert: true });

1
src/server/api/endpoints/meta.ts
View file

@ -85,6 +85,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
if (me && me.isAdmin) {
response.hidedTags = instance.hidedTags;
response.recaptchaSecretKey = instance.recaptchaSecretKey;
response.proxyAccount = instance.proxyAccount;
}
res(response);

8
src/server/api/endpoints/users/lists/push.ts
View file

@ -1,6 +1,6 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import UserList from '../../../../../models/user-list';
import User, { pack as packUser, isRemoteUser, getGhost } from '../../../../../models/user';
import User, { pack as packUser, isRemoteUser, fetchProxyAccount } from '../../../../../models/user';
import { publishUserListStream } from '../../../../../stream';
import ap from '../../../../../remote/activitypub/renderer';
import renderFollow from '../../../../../remote/activitypub/renderer/follow';
@ -71,8 +71,8 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
// このインスタンス内にこのリモートユーザーをフォローしているユーザーがいなくても投稿を受け取るためにダミーのユーザーがフォローしたということにする
if (isRemoteUser(user)) {
const ghost = await getGhost();
const content = ap(renderFollow(ghost, user));
deliver(ghost, content, user.inbox);
const proxy = await fetchProxyAccount();
const content = ap(renderFollow(proxy, user));
deliver(proxy, content, user.inbox);
}
}));