summaryrefslogtreecommitdiff
path: root/src/server/api/service
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-06-18 14:43:56 +0900
committerGitHub <noreply@github.com>2018-06-18 14:43:56 +0900
commit5d3943ffa8cb4090c5c111397e266d255cc2212b (patch)
tree46f692fb21005bdc89499ea012c2436e8a2e90c0 /src/server/api/service
parentNew translations ja.yml (Spanish) (diff)
parentyatta (diff)
downloadmisskey-5d3943ffa8cb4090c5c111397e266d255cc2212b.tar.gz
misskey-5d3943ffa8cb4090c5c111397e266d255cc2212b.tar.bz2
misskey-5d3943ffa8cb4090c5c111397e266d255cc2212b.zip
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/server/api/service')
-rw-r--r--src/server/api/service/github.ts6
-rw-r--r--src/server/api/service/twitter.ts4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index cd9760a36d..9024740a96 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -11,7 +11,7 @@ const handler = new EventEmitter();
let bot: IUser;
-const post = async text => {
+const post = async (text: string) => {
if (bot == null) {
const account = await User.findOne({
usernameLower: config.github_bot.username.toLowerCase()
@@ -25,7 +25,7 @@ const post = async text => {
}
}
- createNote(bot, { text });
+ createNote(bot, { text, visibility: 'home' });
};
// Init router
@@ -90,7 +90,7 @@ handler.on('push', event => {
case 'refs/heads/master':
const pusher = event.pusher;
const compare = event.compare;
- const commits = event.commits;
+ const commits: any[] = event.commits;
post([
`Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
commits.reverse().map(commit => `・[?[${commit.id.substr(0, 7)}](${commit.url})] ${commit.message.split('\n')[0]}`).join('\n'),
diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts
index 284ae7ee22..8c35509cce 100644
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -49,7 +49,7 @@ router.get('/disconnect/twitter', async ctx => {
ctx.body = `Twitterの連携を解除しました :v:`;
// Publish i updated event
- event(user._id, 'i_updated', await pack(user, user, {
+ event(user._id, 'meUpdated', await pack(user, user, {
detail: true,
includeSecrets: true
}));
@@ -174,7 +174,7 @@ if (config.twitter == null) {
ctx.body = `Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました!`;
// Publish i updated event
- event(user._id, 'i_updated', await pack(user, user, {
+ event(user._id, 'meUpdated', await pack(user, user, {
detail: true,
includeSecrets: true
}));