Skip to content

Commit f7a8839

Browse files
auuruumauuruum
committed
Revert "Merge branch 'master' into development"
This reverts commit 8f11b73, reversing changes made to 3788ed3.
1 parent 437d99f commit f7a8839

File tree

6 files changed

+84
-135
lines changed

6 files changed

+84
-135
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/workflows/lint.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
on:
2-
push:
3-
pull_request:
4-
5-
jobs:
6-
lint:
7-
name: Lint - Node ${{ matrix.node }}
8-
runs-on: ubuntu-latest
9-
strategy:
10-
matrix:
11-
node: [ 22 ]
12-
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-node@v4
15-
with:
16-
node-version: ${{ matrix.node }}
17-
cache: 'npm'
18-
- run: npm install
19-
- run: npm test
1+
on:
2+
push:
3+
pull_request:
4+
5+
jobs:
6+
lint:
7+
name: Lint - Node ${{ matrix.node }}
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
node: [ 14, 16, 18 ]
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: ${{ matrix.node }}
17+
cache: 'npm'
18+
- run: npm install
19+
- run: npm test

‎docs/installation.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# Installation Documentation
2-
3-
## Required Software
4-
5-
Program | Version | Download | Note
6-
------- | ------- | -------- | ----
7-
`NodeJS` | >= 22.12.0 | [**here**](https://nodejs.org/en/download/) | Since discordjs v14 is used, the version needs to be at least 22.12.0.
8-
`Git` | Any | [**here**](https://git-scm.com/downloads) |  
9-
10-
## Optional Software
11-
To enable step-trace for cargoship and patrol helicopter, [**GraphicsMagick**](http://www.graphicsmagick.org/download.html) needs to be downloaded.
12-
13-
14-
## Clone the repository
15-
16-
Open a terminal (`Git Bash` / `CMD` / `Terminal` / `PowerShell` or similar) and run the following commands:
17-
18-
$ git clone https://github.com/alexemanuelol/rustplusplus.git
19-
$ cd rustplusplus
20-
$ npm install
1+
# Installation Documentation
2+
3+
## Required Software
4+
5+
Program | Version | Download | Note
6+
------- | ------- | -------- | ----
7+
`NodeJS` | >= 16.9 | [**here**](https://nodejs.org/en/download/) | Since discordjs v14 is used, the version needs to be at least 16.9.
8+
`Git` | Any | [**here**](https://git-scm.com/downloads) |  
9+
10+
## Optional Software
11+
To enable step-trace for cargoship and patrol helicopter, [**GraphicsMagick**](http://www.graphicsmagick.org/download.html) needs to be downloaded.
12+
13+
14+
## Clone the repository
15+
16+
Open a terminal (`Git Bash` / `CMD` / `Terminal` / `PowerShell` or similar) and run the following commands:
17+
18+
$ git clone https://github.com/alexemanuelol/rustplusplus.git
19+
$ cd rustplusplus
20+
$ npm install

‎package.json‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
{
2-
"name": "rustplusplus",
3-
"version": "1.22.0",
4-
"description": "A NodeJS Discord Bot that uses the rustplus.js library to utilize the power of the Rust+ Companion App with additional Quality-of-Life features.",
5-
"main": "index.ts",
6-
"scripts": {
7-
"start": "ts-node .",
8-
"preinstall": "npx npm-force-resolutions",
9-
"test": "tsc --noEmit -p ."
10-
},
11-
"repository": {
12-
"type": "git",
13-
"url": "https://github.com/alexemanuelol/rustplusplus.git"
14-
},
15-
"author": "Alexemanuelol",
16-
"license": "SEE LICENSE IN LICENSE",
17-
"bugs": {
18-
"url": "https://github.com/alexemanuelol/rustplusplus/issues"
19-
},
20-
"homepage": "https://github.com/alexemanuelol/rustplusplus#readme",
21-
"dependencies": {
22-
"@discordjs/rest": "^2.5.1",
23-
"@discordjs/voice": "^0.18.0",
24-
"@formatjs/intl": "^2.6.9",
25-
"@liamcottle/push-receiver": "^0.0.4",
26-
"@liamcottle/rustplus.js": "git+https://github.com/alexemanuelol/rustplus.js.git#089cfd3db1b04709911948bce669273139c6a124",
27-
"axios": "^1.3.4",
28-
"colors": "^1.4.0",
29-
"discord-api-types": "^0.38.14",
30-
"discord.js": "^14.21.0",
31-
"ffmpeg-static": "^5.1.0",
32-
"gm": "^1.25.0",
33-
"jimp": "^0.22.7",
34-
"libsodium-wrappers": "^0.7.11",
35-
"lodash": "^4.17.21",
36-
"translate": "^1.4.1",
37-
"ts-node": "^10.9.2",
38-
"typescript": "^5.8.3",
39-
"winston": "^3.8.2"
40-
},
41-
"resolutions": {
42-
"jpeg-js": "0.4.4",
43-
"protobufjs": "7.2.4"
44-
}
1+
{
2+
"name": "rustplusplus",
3+
"version": "1.22.0",
4+
"description": "A NodeJS Discord Bot that uses the rustplus.js library to utilize the power of the Rust+ Companion App with additional Quality-of-Life features.",
5+
"main": "index.ts",
6+
"scripts": {
7+
"start": "ts-node .",
8+
"preinstall": "npx npm-force-resolutions",
9+
"test": "tsc --noEmit -p ."
10+
},
11+
"repository": {
12+
"type": "git",
13+
"url": "https://github.com/alexemanuelol/rustplusplus.git"
14+
},
15+
"author": "Alexemanuelol",
16+
"license": "SEE LICENSE IN LICENSE",
17+
"bugs": {
18+
"url": "https://github.com/alexemanuelol/rustplusplus/issues"
19+
},
20+
"homepage": "https://github.com/alexemanuelol/rustplusplus#readme",
21+
"dependencies": {
22+
"@discordjs/rest": "^1.6.0",
23+
"@discordjs/voice": "^0.16.0",
24+
"@formatjs/intl": "^2.6.9",
25+
"@liamcottle/push-receiver": "^0.0.4",
26+
"@liamcottle/rustplus.js": "git+https://github.com/alexemanuelol/rustplus.js.git#089cfd3db1b04709911948bce669273139c6a124",
27+
"axios": "^1.3.4",
28+
"colors": "^1.4.0",
29+
"discord-api-types": "^0.37.37",
30+
"discord.js": "^14.8.0",
31+
"ffmpeg-static": "^5.1.0",
32+
"gm": "^1.25.0",
33+
"jimp": "^0.22.7",
34+
"libsodium-wrappers": "^0.7.11",
35+
"lodash": "^4.17.21",
36+
"translate": "^1.4.1",
37+
"ts-node": "^10.9.1",
38+
"typescript": "^4.8.2",
39+
"winston": "^3.8.2"
40+
},
41+
"resolutions": {
42+
"jpeg-js": "0.4.4",
43+
"protobufjs": "7.2.4"
44+
}
4545
}

‎src/discordTools/discordEmbeds.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ const DiscordTools = require('./discordTools.js');
2626
const InstanceUtils = require('../util/instanceUtils.js');
2727
const Timer = require('../util/timer');
2828

29-
function isValidUrl(url) {
30-
if (url.startsWith('https') || url.startsWith('http')) return true;
31-
return false;
32-
}
33-
3429
module.exports = {
3530
getEmbed: function (options = {}) {
3631
const embed = new Discord.EmbedBuilder();
@@ -602,7 +597,7 @@ module.exports = {
602597
footer: { text: body.name },
603598
title: data.title,
604599
description: data.message,
605-
thumbnail: (body.img !== '' && isValidUrl(body.img)) ? body.img : 'attachment://rocket.png'
600+
thumbnail: body.img !== '' ? body.img : 'attachment://rocket.png'
606601
});
607602
},
608603

0 commit comments

Comments
 (0)