usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from Tosuke/master 

[API] Fix /meta
This commit is contained in:
syuilo⭐️ 2017-01-06 22:51:17 +09:00 committed by GitHub
parent 103be72f3c 2a383e8d53
commit 1af70a5930
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
npm-debug.log npm-debug.log
*.pem *.pem
run.bat run.bat
api-docs.json

7
src/api/endpoints/meta.js
View File

@ -3,7 +3,8 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import Git from 'nodegit'; import prominence from 'prominence';
import git from 'git-last-commit';
/** /**
* Show core info * Show core info
@ -14,11 +15,11 @@ import Git from 'nodegit';
module.exports = (params) => module.exports = (params) =>
new Promise(async (res, rej) => new Promise(async (res, rej) =>
{ {
const repository = await Git.Repository.open(__dirname + '/../../'); const commit = await prominence(git).getLastCommit();
res({ res({
maintainer: config.maintainer, maintainer: config.maintainer,
commit: (await repository.getHeadCommit()).sha(), commit: commit.shortHash,
secure: config.https.enable secure: config.https.enable
}); });
}); });