curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-22 12:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
syuilo
2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/api/service/github.ts
View File

@@ -9,7 +9,7 @@ module.exports = async (app: express.Application) => {
if (config.github_bot == null) return;
const bot = await User.findOne({
username_lower: config.github_bot.username.toLowerCase()
usernameLower: config.github_bot.username.toLowerCase()
});
if (bot == null) {

10
src/server/api/service/twitter.ts
View File

@@ -128,7 +128,7 @@ module.exports = (app: express.Application) => {
const user = await User.findOne({
host: null,
'account.twitter.user_id': result.userId
'account.twitter.userId': result.userId
});
if (user == null) {
@@ -155,10 +155,10 @@ module.exports = (app: express.Application) => {
}, {
$set: {
'account.twitter': {
access_token: result.accessToken,
access_token_secret: result.accessTokenSecret,
user_id: result.userId,
screen_name: result.screenName
accessToken: result.accessToken,
accessTokenSecret: result.accessTokenSecret,
userId: result.userId,
screenName: result.screenName
}
}
});