StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-10 12:25:02 +00:00
Code Releases Activity

Fix last update/version in !about

Browse source
This commit is contained in:
Dragory 2020-08-10 01:02:48 +03:00
parent bcfaf1fee3
commit 8e37ca3609
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/plugins/Utility/commands/AboutCmd.ts
View file

@ -6,7 +6,9 @@ import humanizeDuration from "humanize-duration";
import LCL from "last-commit-log";
import path from "path";
import moment from "moment-timezone";
import { getGuildTz } from "../../../utils/timezones";
import { getGuildTz, inGuildTz } from "../../../utils/timezones";
import { rootDir } from "../../../paths";
import { getDateFormat } from "../../../utils/dateFormats";
export const AboutCmd = utilityCmd({
trigger: "about",
@ -20,9 +22,7 @@ export const AboutCmd = utilityCmd({
let lastCommit;
try {
// From project root
// FIXME: Store these paths properly somewhere
const lcl = new LCL(path.resolve(__dirname, "..", "..", ".."));
const lcl = new LCL(rootDir);
lastCommit = await lcl.getLastCommit();
} catch (e) {} // tslint:disable-line:no-empty
@ -30,7 +30,9 @@ export const AboutCmd = utilityCmd({
let version;
if (lastCommit) {
lastUpdate = moment.utc(lastCommit.committer.date, "X").format("LL [at] H:mm z");
lastUpdate = inGuildTz(pluginData, moment.utc(lastCommit.committer.date, "X")).format(
getDateFormat(pluginData, "pretty_datetime"),
);
version = lastCommit.shortHash;
} else {
lastUpdate = "?";