Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
ptkdev committed Jan 4, 2022
2 parents bad23d3 + 91c98a5 commit df17599
Show file tree
Hide file tree
Showing 30 changed files with 1,775 additions and 1,572 deletions.
2 changes: 1 addition & 1 deletion .all-shieldsrc
Expand Up @@ -102,7 +102,7 @@
"color": "#ea4aaa",
"label": "donate",
"message": "sponsors",
"title": "Donate Github Sponsors",
"title": "Donate GitHub Sponsors",
"style": "for-the-badge",
"logo": "github",
"platform": "shields"
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/beta.yml
@@ -0,0 +1,34 @@
name: Release Beta
on:
push:
branches:
- beta
jobs:
build:
runs-on: ubuntu-latest
if: "!startsWith(github.event.head_commit.message, '[🚀 Release]')"
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.GIT_TOKEN }}
- uses: actions/setup-node@v2
with:
node-version: "16.x"
registry-url: "https://registry.npmjs.org"
- run: git config --global user.name 'Patryk Rzucidlo (@PTKDev)'
- run: git config --global user.email 'support@ptkdev.io'
- run: npm ci
- run: npm run github-workflow-next-version -- --cmd beta
- run: npm run pre-commit
- id: pkgjson
run: chmod +x ./scripts/version.sh && ./scripts/version.sh
- run: git add . && git commit -m "[🚀 Release] v${{ steps.pkgjson.outputs.pkgversion }}" && git push
- run: npm publish --tag beta
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: git fetch --all && git checkout nightly
- run: npm run github-workflow-next-version -- --cmd nightly-next
- run: npm run pre-commit
- id: nextnightly
run: chmod +x ./scripts/version.sh && ./scripts/version.sh
- run: git add . && git commit -m "[🚀 Release] v${{ steps.nextnightly.outputs.pkgversion }}" && git push
46 changes: 46 additions & 0 deletions .github/workflows/main.yml
@@ -0,0 +1,46 @@
name: Release Stable
on:
push:
branches:
- main
jobs:
build:
runs-on: ubuntu-latest
if: "!startsWith(github.event.head_commit.message, '[🚀 Release]')"
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.GIT_TOKEN }}
- uses: actions/setup-node@v2
with:
node-version: "16.x"
registry-url: "https://registry.npmjs.org"
- run: git config --global user.name 'Patryk Rzucidlo (@PTKDev)'
- run: git config --global user.email 'support@ptkdev.io'
- run: npm ci
- run: npm run github-workflow-next-version -- --cmd main
- run: npm run pre-commit
- id: pkgjson
run: chmod +x ./scripts/version.sh && ./scripts/version.sh
- run: git add . && git commit -m "[🚀 Release] v${{ steps.pkgjson.outputs.pkgversion }}" && git push
- run: npm publish --tag latest
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Get current date
id: date
run: echo "::set-output name=date::$(date +'%B %d, %Y')"
- run: npm run github-workflow-changelog
- id: changelog
run: chmod +x ./scripts/changelog_release.sh && ./scripts/changelog_release.sh
- name: Release snapshot
id: release-snapshot
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.pkgjson.outputs.pkgversion }}
release_name: v${{ steps.pkgjson.outputs.pkgversion }}
body: |
### CHANGELOG: v${{ steps.pkgjson.outputs.pkgversion }} (${{ steps.date.outputs.date }})${{ steps.changelog.outputs.changelog }}
draft: false
prerelease: false
31 changes: 31 additions & 0 deletions .github/workflows/nightly.yml
@@ -0,0 +1,31 @@
name: Release Nightly
on:
schedule:
- cron: "30 23 * * *"
push:
branches:
- nightly
jobs:
build:
runs-on: ubuntu-latest
if: "!startsWith(github.event.head_commit.message, '[🚀 Release]') || startsWith(github.event.head_commit.message, '[🚀 Release] Nightly')"
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.GIT_TOKEN }}
ref: nightly
- uses: actions/setup-node@v2
with:
node-version: "16.x"
registry-url: "https://registry.npmjs.org"
- run: git config --global user.name 'Patryk Rzucidlo (@PTKDev)'
- run: git config --global user.email 'support@ptkdev.io'
- run: npm ci
- run: npm run github-workflow-next-version -- --cmd nightly
- id: pkgjson
run: chmod +x ./scripts/version.sh && ./scripts/version.sh
- run: npm run pre-commit
- run: git add . && git commit -m "[🚀 Release] v${{ steps.pkgjson.outputs.pkgversion }}" && git push
- run: npm publish --tag nightly
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -124,5 +124,6 @@ npm-debug.log
/app/configs/config.js
/app/configs/config.ts
/app/configs/config.json
/app/configs/version.json
/dist
/build
14 changes: 10 additions & 4 deletions CHANGELOG.md
@@ -1,14 +1,20 @@
# v0.5.0 (November 21, 2021)
# v0.6.0 (Deecember 04, 2021)

- Porting: from Telegraf to Grammy Framework
- Fix: /about command case-sensitive issue
- Feature: /version command
- Feature: /ral command
- Fix: minor issues

<!-- all-shields/sponsors-badges:START -->

[![Donate Paypal](https://img.shields.io/badge/donate-paypal-005EA6.svg?style=for-the-badge&logo=paypal)](https://www.paypal.me/ptkdev) [![Donate Ko-Fi](https://img.shields.io/badge/donate-ko--fi-29abe0.svg?style=for-the-badge&logo=ko-fi)](https://ko-fi.com/ptkdev) [![Donate Github Sponsors](https://img.shields.io/badge/donate-sponsors-ea4aaa.svg?style=for-the-badge&logo=github)](https://github.com/sponsors/ptkdev) [![Donate Patreon](https://img.shields.io/badge/donate-patreon-F87668.svg?style=for-the-badge&logo=patreon)](https://www.patreon.com/join/ptkdev) [![Donate Bitcoin](https://img.shields.io/badge/BTC-35jQmZCy4nsxoMM3QPFrnZePDVhdKaHMRH-E38B29.svg?style=flat-square&logo=bitcoin)](https://ptk.dev/img/icons/menu/bitcoin_wallet.png) [![Donate Ethereum](https://img.shields.io/badge/ETH-0x8b8171661bEb032828e82baBb0B5B98Ba8fBEBFc-4E8EE9.svg?style=flat-square&logo=ethereum)](https://ptk.dev/img/icons/menu/ethereum_wallet.png)
[![Donate Paypal](https://img.shields.io/badge/donate-paypal-005EA6.svg?style=for-the-badge&logo=paypal)](https://www.paypal.me/ptkdev) [![Donate Ko-Fi](https://img.shields.io/badge/donate-ko--fi-29abe0.svg?style=for-the-badge&logo=ko-fi)](https://ko-fi.com/ptkdev) [![Donate GitHub Sponsors](https://img.shields.io/badge/donate-sponsors-ea4aaa.svg?style=for-the-badge&logo=github)](https://github.com/sponsors/ptkdev) [![Donate Patreon](https://img.shields.io/badge/donate-patreon-F87668.svg?style=for-the-badge&logo=patreon)](https://www.patreon.com/join/ptkdev) [![Donate Bitcoin](https://img.shields.io/badge/BTC-35jQmZCy4nsxoMM3QPFrnZePDVhdKaHMRH-E38B29.svg?style=flat-square&logo=bitcoin)](https://ptk.dev/img/icons/menu/bitcoin_wallet.png) [![Donate Ethereum](https://img.shields.io/badge/ETH-0x8b8171661bEb032828e82baBb0B5B98Ba8fBEBFc-4E8EE9.svg?style=flat-square&logo=ethereum)](https://ptk.dev/img/icons/menu/ethereum_wallet.png)

<!-- all-shields/sponsors-badges:END -->

# v0.5.0 (November 21, 2021)

- Porting: from Telegraf to Grammy Framework
- Fix: /about command case-sensitive issue

# v0.3.0 (November 07, 2021)

- Fix bugs
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -4,7 +4,7 @@

<!-- all-shields/header-badges:START -->

[![v0.5.1](https://img.shields.io/badge/version-v0.5.1-lightgray.svg?style=flat&logo=)](https://github.com/ptkdev/aboutmeinfo-telegram-bot/blob/main/CHANGELOG.md) [![](https://img.shields.io/npm/v/@ptkdev/aboutmeinfo-telegram-bot?color=CC3534&logo=npm)](https://www.npmjs.com/package/@ptkdev/aboutmeinfo-telegram-bot) [![License: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat&logo=license)](https://github.com/ptkdev/aboutmeinfo-telegram-bot/blob/main/LICENSE.md) [![Language: TypeScript](https://img.shields.io/badge/language-typescript-blue.svg?style=flat&logo=typescript)](https://www.typescriptlang.org/) [![Framework: Grammy](https://img.shields.io/badge/powered%20by-grammy-009dca.svg?style=flat&logo=telegram)](https://grammy.dev/) [![ECMAScript: 2019](https://img.shields.io/badge/ES-9-F7DF1E.svg?style=flat&logo=javascript)](https://github.com/tc39/ecma262) [![Discord Server](https://discordapp.com/api/guilds/383373985666301975/embed.png)](https://discord.ptkdev.io)
[![v0.6.0-beta.1](https://img.shields.io/badge/version-v0.6.0--beta.1-lightgray.svg?style=flat&logo=)](https://github.com/ptkdev/aboutmeinfo-telegram-bot/blob/main/CHANGELOG.md) [![](https://img.shields.io/npm/v/@ptkdev/aboutmeinfo-telegram-bot?color=CC3534&logo=npm)](https://www.npmjs.com/package/@ptkdev/aboutmeinfo-telegram-bot) [![License: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat&logo=license)](https://github.com/ptkdev/aboutmeinfo-telegram-bot/blob/main/LICENSE.md) [![Language: TypeScript](https://img.shields.io/badge/language-typescript-blue.svg?style=flat&logo=typescript)](https://www.typescriptlang.org/) [![Framework: Grammy](https://img.shields.io/badge/powered%20by-grammy-009dca.svg?style=flat&logo=telegram)](https://grammy.dev/) [![ECMAScript: 2019](https://img.shields.io/badge/ES-9-F7DF1E.svg?style=flat&logo=javascript)](https://github.com/tc39/ecma262) [![Discord Server](https://discordapp.com/api/guilds/383373985666301975/embed.png)](https://discord.ptkdev.io)

<!-- all-shields/header-badges:END -->

Expand All @@ -16,7 +16,7 @@ About Me Info Bot: Share your social media and links on Telegram
<!-- all-shields/sponsors-badges:START -->

[![Donate Paypal](https://img.shields.io/badge/donate-paypal-005EA6.svg?style=for-the-badge&logo=paypal)](https://www.paypal.me/ptkdev) [![Donate Ko-Fi](https://img.shields.io/badge/donate-ko--fi-29abe0.svg?style=for-the-badge&logo=ko-fi)](https://ko-fi.com/ptkdev) [![Donate Github Sponsors](https://img.shields.io/badge/donate-sponsors-ea4aaa.svg?style=for-the-badge&logo=github)](https://github.com/sponsors/ptkdev) [![Donate Patreon](https://img.shields.io/badge/donate-patreon-F87668.svg?style=for-the-badge&logo=patreon)](https://www.patreon.com/join/ptkdev) [![Donate Bitcoin](https://img.shields.io/badge/BTC-35jQmZCy4nsxoMM3QPFrnZePDVhdKaHMRH-E38B29.svg?style=flat-square&logo=bitcoin)](https://ptk.dev/img/icons/menu/bitcoin_wallet.png) [![Donate Ethereum](https://img.shields.io/badge/ETH-0x8b8171661bEb032828e82baBb0B5B98Ba8fBEBFc-4E8EE9.svg?style=flat-square&logo=ethereum)](https://ptk.dev/img/icons/menu/ethereum_wallet.png)
[![Donate Paypal](https://img.shields.io/badge/donate-paypal-005EA6.svg?style=for-the-badge&logo=paypal)](https://www.paypal.me/ptkdev) [![Donate Ko-Fi](https://img.shields.io/badge/donate-ko--fi-29abe0.svg?style=for-the-badge&logo=ko-fi)](https://ko-fi.com/ptkdev) [![Donate GitHub Sponsors](https://img.shields.io/badge/donate-sponsors-ea4aaa.svg?style=for-the-badge&logo=github)](https://github.com/sponsors/ptkdev) [![Donate Patreon](https://img.shields.io/badge/donate-patreon-F87668.svg?style=for-the-badge&logo=patreon)](https://www.patreon.com/join/ptkdev) [![Donate Bitcoin](https://img.shields.io/badge/BTC-35jQmZCy4nsxoMM3QPFrnZePDVhdKaHMRH-E38B29.svg?style=flat-square&logo=bitcoin)](https://ptk.dev/img/icons/menu/bitcoin_wallet.png) [![Donate Ethereum](https://img.shields.io/badge/ETH-0x8b8171661bEb032828e82baBb0B5B98Ba8fBEBFc-4E8EE9.svg?style=flat-square&logo=ethereum)](https://ptk.dev/img/icons/menu/ethereum_wallet.png)

<!-- all-shields/sponsors-badges:END -->

Expand Down
37 changes: 37 additions & 0 deletions app/configs/config.js.tpl
@@ -0,0 +1,37 @@
module.exports = {
telegram: {
// from @botfather on telegram
token: process.env.BOT_TOKEN || "1234:asdfghjkl",
},

mode: "poll", // or webhook
webhook: {
url: process.env.BOT_WEBHOOK_URL || "https://sample.host.com:8443",
port: process.env.BOT_WEBHOOK_PORT || 8443,
certs_path: process.env.BOT_WEBHOOK_CERTS_PATH || "certs",
self_signed: process.env.BOT_WEBHOOK_SELF_SIGNED || true,
},

// mongodb
database: { URL: process.env.MONGODB || "mongodb://localhost:27017/aboutmeinfodb" },

// Debug
debug: process.env.DEBUG || true,

// LOGS
logger: {
path: {
debug_log: "./logs/debug.log",
error_log: "./logs/errors.log",
},
language: "en", // set language of log type, NOTE: please help with translations! (optional, default en - values: en|it|pl)
colors: true, // enable/disable colors in terminal (optional, default enabled - values: true|enabled or false|disabled)
debug: process.env.DEBUG || true, // enable/disable all logs with method debug (optional, default enabled - values: true|enabled or false|disabled)
info: true, // enable/disable all logs with method info (optional, default enabled - values: true|enabled or false|disabled)
warning: true, // enable/disable all logs with method warning (optional, default enabled - values: true|enabled or false|disabled)
error: true, // enable/disable all logs with method errors (optional, default enabled - values: true|enabled or false|disabled)
sponsor: true, // enable/disable all logs with method sponsor (optional, default enabled - values: true|enabled or false|disabled)
write: false, // write the logs into a file, you need set path values (optional, default disabled - values: true|enabled or false|disabled)
type: "log", // format of logs in files (optional, default log - values: log|json)
},
};
23 changes: 0 additions & 23 deletions app/configs/config.json.tpl

This file was deleted.

2 changes: 2 additions & 0 deletions app/core/bot.ts
Expand Up @@ -22,6 +22,8 @@ import logger from "@app/functions/utils/logger";
await commands.about();
await commands.settings();
await commands.set();
await commands.ral();
await commands.version();
await commands.privacy();
await commands.hears();

Expand Down
2 changes: 1 addition & 1 deletion app/core/token.ts
Expand Up @@ -9,7 +9,7 @@
*
*/
import { Bot } from "grammy";
import configs from "@configs/config.json";
import configs from "@configs/config";

const bot = new Bot(configs.telegram.token);

Expand Down
2 changes: 1 addition & 1 deletion app/functions/api/database/connection.ts
Expand Up @@ -8,7 +8,7 @@
* @license: MIT License
*
*/
import configs from "@configs/config.json";
import configs from "@configs/config";
import Mongoose from "mongoose";
import { logger } from "@app/functions/utils/logger";

Expand Down

0 comments on commit df17599

Please sign in to comment.