Make claim button use currency to claim (#216)
# Description Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. #201 ## Type of change Please delete options that are not relevant. - [x] New feature (non-breaking change which adds functionality) # How Has This Been Tested? Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration. # Checklist - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that provde my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Reviewed-on: #216 Reviewed-by: VylpesTester <tester@vylpes.com> Co-authored-by: Ethan Lane <ethan@vylpes.com> Co-committed-by: Ethan Lane <ethan@vylpes.com>
This commit is contained in:
parent
dbbfd74c04
commit
fca199d9bd
6 changed files with 33 additions and 9 deletions
13
.env.example
13
.env.example
|
@ -13,23 +13,24 @@ BOT_OWNERID=147392775707426816
|
||||||
BOT_CLIENTID=682942374040961060
|
BOT_CLIENTID=682942374040961060
|
||||||
BOT_ENV=4
|
BOT_ENV=4
|
||||||
BOT_ADMINS=147392775707426816,887272961504071690
|
BOT_ADMINS=147392775707426816,887272961504071690
|
||||||
|
BOT_LOGLEVEL=info
|
||||||
|
|
||||||
ABOUT_FUNDING=
|
ABOUT_FUNDING=
|
||||||
ABOUT_REPO=
|
ABOUT_REPO=
|
||||||
|
|
||||||
DATA_DIR=
|
DATA_DIR=./.temp
|
||||||
|
|
||||||
DB_HOST=
|
DB_HOST=127.0.0.1
|
||||||
DB_PORT=
|
DB_PORT=3301
|
||||||
DB_NAME=
|
DB_NAME=carddrop
|
||||||
DB_AUTH_USER=
|
DB_AUTH_USER=
|
||||||
DB_AUTH_PASS=
|
DB_AUTH_PASS=
|
||||||
DB_SYNC=
|
DB_SYNC=
|
||||||
DB_LOGGING=
|
DB_LOGGING=
|
||||||
DB_DATA_LOCATION=~/.docker
|
DB_DATA_LOCATION=./.temp/database
|
||||||
|
|
||||||
DB_CARD_FILE=:memory:
|
DB_CARD_FILE=:memory:
|
||||||
|
|
||||||
EXPRESS_PORT=3303
|
EXPRESS_PORT=3302
|
||||||
|
|
||||||
GDRIVESYNC_AUTO=true
|
GDRIVESYNC_AUTO=true
|
|
@ -53,12 +53,13 @@ jobs:
|
||||||
DATA_DIR: ${{ secrets.PROD_DATA_DIR }}
|
DATA_DIR: ${{ secrets.PROD_DATA_DIR }}
|
||||||
GDRIVESYNC_AUTO: ${{ vars.PROD_GDRIVESYNC_AUTO }}
|
GDRIVESYNC_AUTO: ${{ vars.PROD_GDRIVESYNC_AUTO }}
|
||||||
EXPRESS_PORT: ${{ secrets.PROD_EXPRESS_PORT }}
|
EXPRESS_PORT: ${{ secrets.PROD_EXPRESS_PORT }}
|
||||||
|
BOT_LOGLEVEL: ${{ vars.PROD_BOT_LOGLEVEL }}
|
||||||
with:
|
with:
|
||||||
host: ${{ secrets.PROD_SSH_HOST }}
|
host: ${{ secrets.PROD_SSH_HOST }}
|
||||||
username: ${{ secrets.PROD_SSH_USER }}
|
username: ${{ secrets.PROD_SSH_USER }}
|
||||||
key: ${{ secrets.PROD_SSH_KEY }}
|
key: ${{ secrets.PROD_SSH_KEY }}
|
||||||
port: ${{ secrets.PROD_SSH_PORT }}
|
port: ${{ secrets.PROD_SSH_PORT }}
|
||||||
envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT
|
envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT,BOT_LOGLEVEL
|
||||||
script: |
|
script: |
|
||||||
source .sshrc \
|
source .sshrc \
|
||||||
&& cd /home/vylpes/apps/card-drop/card-drop_prod \
|
&& cd /home/vylpes/apps/card-drop/card-drop_prod \
|
||||||
|
|
|
@ -53,12 +53,13 @@ jobs:
|
||||||
DATA_DIR: ${{ secrets.STAGE_DATA_DIR }}
|
DATA_DIR: ${{ secrets.STAGE_DATA_DIR }}
|
||||||
GDRIVESYNC_AUTO: ${{ vars.STAGE_GDRIVESYNC_AUTO }}
|
GDRIVESYNC_AUTO: ${{ vars.STAGE_GDRIVESYNC_AUTO }}
|
||||||
EXPRESS_PORT: ${{ secrets.STAGE_EXPRESS_PORT }}
|
EXPRESS_PORT: ${{ secrets.STAGE_EXPRESS_PORT }}
|
||||||
|
BOT_LOGLEVEL: ${{ vars.STAGE_BOT_LOGLEVEL }}
|
||||||
with:
|
with:
|
||||||
host: ${{ secrets.STAGE_SSH_HOST }}
|
host: ${{ secrets.STAGE_SSH_HOST }}
|
||||||
username: ${{ secrets.STAGE_SSH_USER }}
|
username: ${{ secrets.STAGE_SSH_USER }}
|
||||||
key: ${{ secrets.STAGE_SSH_KEY }}
|
key: ${{ secrets.STAGE_SSH_KEY }}
|
||||||
port: ${{ secrets.STAGE_SSH_PORT }}
|
port: ${{ secrets.STAGE_SSH_PORT }}
|
||||||
envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT
|
envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT,BOT_LOGLEVEL
|
||||||
script: |
|
script: |
|
||||||
source .sshrc \
|
source .sshrc \
|
||||||
&& cd /home/vylpes/apps/card-drop/card-drop_stage \
|
&& cd /home/vylpes/apps/card-drop/card-drop_stage \
|
||||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -109,3 +109,4 @@ ormconfig.json
|
||||||
gdrive-credentials.json
|
gdrive-credentials.json
|
||||||
data/
|
data/
|
||||||
*.db
|
*.db
|
||||||
|
.temp/
|
|
@ -7,6 +7,7 @@ import AppLogger from "../client/appLogger";
|
||||||
import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
|
import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
import User from "../database/entities/app/User";
|
||||||
|
|
||||||
export default class Claim extends ButtonEvent {
|
export default class Claim extends ButtonEvent {
|
||||||
public override async execute(interaction: ButtonInteraction) {
|
public override async execute(interaction: ButtonInteraction) {
|
||||||
|
@ -41,6 +42,17 @@ export default class Claim extends ButtonEvent {
|
||||||
|
|
||||||
await inventory.Save(Inventory, inventory);
|
await inventory.Save(Inventory, inventory);
|
||||||
|
|
||||||
|
let user = await User.FetchOneById(User, userId) || new User(userId, 300);
|
||||||
|
|
||||||
|
AppLogger.LogSilly("Button/Claim", `${user.Id} has ${user.Currency} currency`);
|
||||||
|
|
||||||
|
if (!user.RemoveCurrency(10)) {
|
||||||
|
await interaction.reply(`Not enough currency! You need 10 currency, you have ${user.Currency}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await user.Save(User, user);
|
||||||
|
|
||||||
const claim = new eClaim(claimId);
|
const claim = new eClaim(claimId);
|
||||||
claim.SetInventory(inventory);
|
claim.SetInventory(inventory);
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,12 @@ export default class User extends AppBaseEntity {
|
||||||
public UpdateCurrency(currency: number) {
|
public UpdateCurrency(currency: number) {
|
||||||
this.Currency = currency;
|
this.Currency = currency;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RemoveCurrency(amount: number): boolean {
|
||||||
|
if (this.Currency < amount) return false;
|
||||||
|
|
||||||
|
this.Currency -= amount;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue