diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index aaeb397..5d84355 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,55 +1,17 @@ -name: Hadder +name: Java CI on: [push] jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.13 - uses: actions/setup-java@v1 - with: - java-version: 1.13 - - name: Build with Maven - run: mvn -B package --file pom.xml + build: - deploy: - runs-on: ubuntu-latest - needs: test - if: github.ref == 'refs/heads/master' - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.13 - uses: actions/setup-java@v1 - with: - java-version: 1.13 - - name: Build Final Jar - run: mvn clean compile assembly:single - - name: Copy folder content recursively to remote - uses: garygrossgarten/github-action-scp@release - with: - local: ./target/Hadder-Build.jar - remote: /home/Bots/Hadder-Build.jar - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - - name: executing remote ssh commands using password - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh - - name: Send Webhook Notification - if: always() - env: - JOB_STATUS: ${{ job.status }} - WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} - HOOK_OS_NAME: ${{ runner.os }} - WORKFLOW_NAME: ${{ github.workflow }} - run: | - git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook - bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL - shell: bash + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.13 + - name: Build with Maven + run: mvn -B package --file pom.xml diff --git a/README.md b/README.md index a78d7e1..40e2235 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,3 @@ # Hadder -The Hadder Discord bot is a multi-purpose Discord Bot. - -[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) - - diff --git a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java index ac79e18..3295f25 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java @@ -15,7 +15,7 @@ public class InviteCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)").build()).queue(); } @Override diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index dcd1bb5..f068b3a 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -142,6 +142,7 @@ public class BotList { try { new OkHttpClient().newCall(discordextremelist).execute().close(); + System.out.println("Successfully posted count to Discord Extreme List!"); } catch (IOException e) { e.printStackTrace(); }