release 2.0.3

.github/workflows/dockerimage.yml

@@ -1,17 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: 
-    - master
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag osselbot:$(date +%s)

.github/workflows/dockerpub.yml

@@ -1,20 +0,0 @@
-name: Publish Docker image
-on:
-  release:
-    types: [published]
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to GitHub Packages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: techniclor-creamsicle/osselbot/osselbot
-          tag_with_ref: true

.github/workflows/dockerpub3.yml

@@ -1,20 +0,0 @@
-name: Publish Docker image
-on:
-  release:
-    types: [published]
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to GitHub Packages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: techniclor-creamsicle/osselbot/osselbot
-          tag_with_ref: true

.github/workflows/nodejs.yml

@@ -0,0 +1,29 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

.github/workflows/npmpublish.yml

@@ -0,0 +1,33 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm test
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://npm.pkg.github.com/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.npmrc

@@ -0,0 +1,2 @@
+;setting up my registry
+@technicolor-creamsicle:registry=https://npm.pkg.github.com/

Dockerfile

@@ -1,17 +0,0 @@
-# Use the official image as a parent image.
-FROM node:current-slim
-
-# Set the working directory.
-WORKDIR ./DOCKER
-
-# Copy the file from your host to your current location.
-COPY ./package.json .
-COPY ./package-lock.json .
-# Run the command inside your image filesystem.
-RUN npm install
-
-# Run the specified command within the container.
-CMD [ "npm", "start" ]
-
-# Copy the rest of your app's source code from your host to your image filesystem.
-COPY ./src/ .

README.md

@@ -1,5 +1,3 @@
 # Osselbot
 A bot that is kinda stupid but it works surprisingly well
-
+![Node.js CI](https://github.com/Technicolor-creamsicle/Osselbot/workflows/Node.js%20CI/badge.svg)
-
-![Docker Image CI](https://github.com/Technicolor-creamsicle/Osselbot/workflows/Docker%20Image%20CI/badge.svg)

build.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#logs in as Alex
-cat ~/.GHTOKEN | docker login https://docker.pkg.github.com -u technicolor-creamsicle --password-stdin
-#Builds the package
-docker build --tag osselbot .
-#pushes to github
-docker tag osselbot:latest docker.pkg.github.com/techniclor-creamsicle/osselbot/osselbot:$1
-docker push docker.pkg.github.com/techniclor-creamsicle/osselbot/osselbot:$1
-
-echo build may have passed using version: $1

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
-  "name": "osselbot",
+  "name": "@technicolor-creamsicle/osselbot",
-  "version": "1.1.0",
+  "version": "2.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,26 +1,32 @@
 {
-  "name": "osselbot",
+	"name": "@technicolor-creamsicle/osselbot",
-  "version": "1.1.0",
+	"version": "2.0.3",
-  "description": "Discordbot on Discord.js",
+	"description": "A discord bot on Discord.js",
-  "main": "index.js",
+	"main": "index.js",
-  "dependencies": {
+	"dependencies": {
-    "discord.js": "^12.1.1",
+		"discord.js": "^12.1.1",
-    "n": "^6.4.0",
+		"n": "^6.4.0",
-    "pretty-ms": "^6.0.1"
+		"pretty-ms": "^6.0.1"
-  },
+	},
-  "devDependencies": {},
+	"publishConfig": {
-  "scripts": {
+		"registry": "https://npm.pkg.github.com/"
-    "test": "echo \"Error: no test specified\" && exit 1",
+	},
-    "start": "node ./index.js"
+	"files": [
-  },
+		"/src/"
-  "repository": {
+	],
-    "type": "git",
+	"devDependencies": {},
-    "url": "git+https://github.com/Technicolor-creamsicle/Osselbot.git"
+	"scripts": {
-  },
+		"test": "node ./src/index --TEST",
-  "author": "Alex Technicolor <technicolor@2a03.party> (http://technicolor.2a03.party)",
+		"start": "npm install; node ./src/index.js"
-  "license": "SEE LICENSE IN LICENCE",
+	},
-  "bugs": {
+	"repository": {
-    "url": "https://github.com/Technicolor-creamsicle/Osselbot/issues"
+		"type": "git",
-  },
+		"url": "git+https://github.com/Technicolor-creamsicle/Osselbot.git"
-  "homepage": "https://technicolor.2a03.party/bot"
+	},
+	"author": "Alex Technicolor <technicolor@2a03.party> (http://technicolor.2a03.party)",
+	"license": "SEE LICENSE IN LICENCE",
+	"bugs": {
+		"url": "https://github.com/Technicolor-creamsicle/Osselbot/issues"
+	},
+	"homepage": "https://technicolor.2a03.party/bot"
 }

src/index.js

@@ -152,5 +152,10 @@ client.on("message", async message => {
 	};
 });
 
+if(process.argv.slice(2).includes("--TEST")) {
+	console.log("Test Pass!");
+	process.exit(0);
+};
+
 //Logging in the bot
 client.login(config.token)