RabbitLabs/random-bunny
5
0
Fork 0
Code Issues 11 Pull requests 11 Projects 1 Releases 18 Wiki Activity Actions

Merge branch 'hotfix/2.0.2'

Browse source
This commit is contained in:
Ethan Lane 2022-08-24 14:11:50 +01:00
commit 6b2c3a4468
10 changed files with 110 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.drone.yml Normal file
View file

@ -0,0 +1,22 @@
kind: pipeline
name: integration
steps:
- name: build
image: node
commands:
- yarn install --frozen-lockfile
- name: test
image: node
commands:
- yarn test
depends_on:
- build
trigger:
branch:
- develop
- feature/*
- hotfix/*
event:
- push

2
CODE_OF_CONDUCT.md
View file

@ -61,7 +61,7 @@ representative at an online or offline event.
Instances of abusive, harassing, or otherwise unacceptable behavior may be Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at reported to the community leaders responsible for enforcement at
[INSERT CONTACT METHOD]. [helpdesk@vylpes.com](mailto:helpdesk@vylpes.com).
All complaints will be reviewed and investigated promptly and fairly. All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the All community leaders are obligated to respect the privacy and security of the

210
CONTRIBUTING.md
View file

@ -14,6 +14,8 @@ This project and everyone participating in it is governed by the Random Bunny Co
You can ask a question about the project in the `#development` channel in the [Discord Server](https://discord.gg/UyAhAVp). You can ask a question about the project in the `#development` channel in the [Discord Server](https://discord.gg/UyAhAVp).
You can also email with queries and support if you'd prefer at [helpdesk@vylpes.com](mailto:helpdesk@vylpes.com).
## What you should know ## What you should know
### Javascript and Node ### Javascript and Node
@ -69,18 +71,9 @@ Provide more context by answering these questions:
Include details about your configuration and environment: Include details about your configuration and environment:
* **Which version of Random Bunny are you using?** You can get the exact version by running the `about` command. * **Which version of Random Bunny are you using?** You can get the exact version by running the `about` command.
* **Do you have any custom commands added to the commands folder?** If you do, provide information on what the command does, and a link to the command file if it exists.
> **Note:** We do not provide any support on issues caused by custom commands. You are welcome to create an issue if you believe the issue is to do with the base code, but if the error is to do with that custom command we are unable to fix that, you will need to contact the author of that command.
* **What's the name and version of the OS you're using?** * **What's the name and version of the OS you're using?**
* **Are you running Random Bunny in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest? * **Are you running Random Bunny in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest?
* **What version of node do you have installed?** You can get this version by running the `node -v` command in your terminal. * **What version of node do you have installed?** You can get this version by running the `node -v` command in your terminal.
* **What does your `config.json` file look like?**
> **Note:** remember to **not** give out your bot tokens which are inside of the `config.json` file. If you're giving a copy of your configuration remember to delete the tokens from the string and leave the empty.
* **Are you running the bot in live or dev mode?**
### Suggesting Enhancements ### Suggesting Enhancements
@ -90,7 +83,7 @@ When you are creating an enhancement suggestion, please include as many details
#### Before Submitting an Enhancement Suggestion #### Before Submitting an Enhancement Suggestion
* **Check if the feature already exists.** Make sure to check on the latest version and if you can get the desired behaviour using the config options inside of `config.json` * **Check if the feature already exists.** Make sure to check on the latest version
* **Perform a search** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one. * **Perform a search** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
#### How Do I Submit A (Good) Enhancement Suggestion? #### How Do I Submit A (Good) Enhancement Suggestion?
@ -115,15 +108,14 @@ You'll need the following tools:
* Git * Git
* NodeJS * NodeJS
* Yarn
Install and build all of the dependencies using `npm` Install and build all of the dependencies using `npm`
```bash ```bash
cd Random Bunny cd random-bunny
npm install yarn install
cp config.json.template config.json
``` ```
And then use your text editor of choice to fill in the `config.json` file.
#### Build and Run #### Build and Run
@ -132,22 +124,24 @@ If you want to understand how Random Bunny works or want to debug an issue, you'
First, fork the Random Bunny repository so that you can make a pull request. Then, clone your fork locally: First, fork the Random Bunny repository so that you can make a pull request. Then, clone your fork locally:
```bash ```bash
git clone https://gitlab.vylpes.com/<your-gitlab-account>/random-bunny.git git clone https://gitea.vylpes.xyz/<your-gitea-account>/random-bunny.git
# OR
git clone https://codeberg.org/vylpes/random-bunny.git
``` ```
Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork. Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork.
```bash ```bash
cd Random Bunny cd random-bunny
git checkout master git checkout master
git pull https://gitlab.vylpes.com/vylpes/random-bunny.git master git pull https://gitea.vylpes.xyz/vylpes/random-bunny.git master
``` ```
Manage any merge conflicts, commit them, and then push them to your fork. Manage any merge conflicts, commit them, and then push them to your fork.
Go into `Random Bunny` and start the bot in dev mode with `npm run dev` or `node bot dev` Go into `random-bunny` and build the package using `yarn build`.
> **Note:** If you have `nodemon` installed on your system you can use this during development so it auto restarts when you make code changes. Instead of the commands above you can then run `nodemon bot dev`.
#### Pull Requests #### Pull Requests
@ -169,6 +163,14 @@ Please follow these steps to have your contribution considered by maintainers:
While the prerequesites above must be satisifed prior to having your pull reuqest accepted, the reviewer(s) may ask you to complete additional design ork, tests, or other changes before your pull request can be ultimately accepted. While the prerequesites above must be satisifed prior to having your pull reuqest accepted, the reviewer(s) may ask you to complete additional design ork, tests, or other changes before your pull request can be ultimately accepted.
#### Submitting Changes via Email
If you're not within our gitea instance and still like to contribute, you can send us your contributions to [git@vylpes.com](mailto:git@vylpes.com).
For more information on how to do this, see the [git documentation](https://git-scm.com/docs/git-send-email).
#### Submitting Changes via Codeberg
This code is mirrored on codeberg, although main development is done on my self-hosted Gitea instance, feel free to clone and create pull requests on there. I will merge it back into Gitea once accepted.
#### JavaScript Styleguide #### JavaScript Styleguide
All JavaScript code is linted with `eslint`. All JavaScript code is linted with `eslint`.
@ -228,170 +230,4 @@ We won't accept pull requests unless these checks pass. If yours fail, simply fi
* **Arrow body style** should have braces around the body only when needed * **Arrow body style** should have braces around the body only when needed
* **Arrow parameters** should have brackets around them only when needed * **Arrow parameters** should have brackets around them only when needed
* **Arrow spacing** should have a space around the arrow (' => ') * **Arrow spacing** should have a space around the arrow (' => ')
* **No var** should be used, instead use either let or const when appropriate * **No var** should be used, instead use either let or const when appropriate
## How You Can Contribute
### Reporting Bugs
This section guides you through submitting a bug report for Random Bunny. Following these guidelines helps maintainers and the community understand your report. reproduce the behaviour, and find related reports.
When you are creating a bug report, please include as many details as possible.
> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
#### Before Submitting A Bug Report
* **Perform a search** to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one.
#### How You Can Submit A (Good) Bug Report
Bugs are tracked as GitHub issues. After you've determined the bug you're reporting hasn't got a pre-existing **open** issue already, create an issue and provide information from below.
* **Use a clear and descriptive title** for the issue to indentify the problem.
* **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you started Random Bunny (if you're using your own instance), which command exactly you used, and the output which the bot replied with. If its your own instance, provide information on what the terminal output said, if any.
* **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pastable snippets, which you use in those examples. If you're providing snippets in the issue, use Markdown code blocks.
* **Describe the behaviour you observed after following the steps** and point out what exactly is the problem with that behaviour.
* **Explain which behaviour you expected to see instead and why.**
* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
Provide more context by answering these questions:
* **Did the problem start happening recently** (e.g. after updating to a new version of Random Bunny) or was this always a problem?
* If the problem started happening recently, **can you reproduce the problem in an older version of Random Bunny?** What's the most recently version in which the problem doesn't happen? You can download older versions of Random Bunny from the releases page.
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
Include details about your configuration and environment:
* **Which version of Random Bunny are you using?** You can get the exact version by running the `about` command.
* **Do you have any custom commands added to the commands folder?** If you do, provide information on what the command does, and a link to the command file if it exists.
> **Note:** We do not provide any support on issues caused by custom commands. You are welcome to create an issue if you believe the issue is to do with the base code, but if the error is to do with that custom command we are unable to fix that, you will need to contact the author of that command.
* **What's the name and version of the OS you're using?**
* **Are you running Random Bunny in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest?
* **What version of node do you have installed?** You can get this version by running the `node -v` command in your terminal.
* **What does your `config.json` file look like?**
> **Note:** remember to **not** give out your bot tokens which are inside of the `config.json` file. If you're giving a copy of your configuration remember to delete the tokens from the string and leave the empty.
* **Are you running the bot in live or dev mode?**
### Suggesting Enhancements
This section guides you through submitting an enhancement suggestion for Random Bunny, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
When you are creating an enhancement suggestion, please include as many details as possible. Fill out the suggestion with the steps that you imagine you would take if the feature you're requesting existed.
#### Before Submitting an Enhancement Suggestion
* **Check if the feature already exists.** Make sure to check on the latest version and if you can get the desired behaviour using the config options inside of `config.json`
* **Perform a search** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
#### How Do I Submit A (Good) Enhancement Suggestion?
Enhancement suggestions are tracked as GitHub issues. After you've determined the feature doesn't already exist or been suggested before, create an issue on that repository and provide the following information:
* **Use a clear and descriptive title** for the issue to identify the suggestion.
* **Provide a step-by-step description of the suggested enhancement** in as many details as possible.
* **Provide specific examples to demonstrate the steps.** Include copy/pastable snippets which you use in those examples, as Markdown code blocks.
* **Describe the current behaviour** and **explain which behaviour you expected to see instead** and why.
* **Include screnshots and animated GIFs** which help you demonstrate the steps or point out the part of Random Bunny which the suggestion is related to.
* **Explain why this enhancement would be useful** to most Random Bunny users and isn't something that can or should be implemented as a custom command.
* **List some other bots where this enhancement exists.**
* **Specify which version of Random Bunny you're using.** You can get the exact version by running the `about` command.
* **Specify the name and version of the OS you're using.**
### Your First Code Contribution
Unsure where to begin contributing to Random Bunny? You can start by looking through these `good first` and `help wanted` issues
#### Prerequisites
In order to download necessary tools, clone the repository, and install dependencies via `npm` you need network access.
You'll need the following tools:
* Git
* NodeJS
Install and build all of the dependencies using `npm`
```bash
cd Random Bunny
npm install
cp config.json.template config.json
```
And then use your text editor of choice to fill in the `config.json` file.
#### Build and Run
If you want to understand how Random Bunny works or want to debug an issue, you'll want to get the source, build it, and run the tool locally.
First, fork the Random Bunny repository so that you can make a pull request. Then, clone your fork locally:
```bash
git clone https://gitlab.vylpes.com/<your-gitlab-account>/random-bunny.git
```
Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork.
```bash
cd Random Bunny
git checkout master
git pull https://github.com/getgravitysoft/random-bunny.git master
```
Manage any merge conflicts, commit them, and then push them to your fork.
Go into `Random Bunny` and start the bot in dev mode with `npm run dev` or `node bot dev`
> **Note:** If you have `nodemon` installed on your system you can use this during development so it auto restarts when you make code changes. Instead of the commands above you can then run `nodemon bot dev`.
#### Pull Requests
The process described here has several goals:
* Maintain Random Bunny's quality
* Fix problems that are important to users
* Engage the community in working toward the best possible Random Bunny
* Enable a sustainable system for Random Bunny's maintainers to review contributions
Please follow these steps to have your contribution considered by maintainers:
* You mention the issue id which this pull request aims to fix
* After you submit your pull request, verify that all status checks are passing.
> **Note**: If a check fails the pull request it is important that you go and fix these issues, or let us know that you no longer want to work on this issue by commenting on the pull request. Doing this will give you a better chance of having your pull request merged.
* When the checks have passed a maintainer will review your code and ask for any improvements or questions, and will merge it if they are satisifed.
While the prerequesites above must be satisifed prior to having your pull reuqest accepted, the reviewer(s) may ask you to complete additional design ork, tests, or other changes before your pull request can be ultimately accepted.
#### JavaScript Styleguide
All JavaScript code is linted with `eslint`.
* Prefer camelcase for variable names
* Prefer braces `{` to be on the same line
* Prefer no comma `,` dangle
* Prefer arrow function bodies to have brances `{}` only when needed
* Prefer arrow function parameters to have brackets `()` only when needed
* Prefer arrow function arrows `=>` to have a space before and after it
* Prefer `let` and `const` over `var`
As well as eslint's recommended defaults.
Example
```js
function ban (member) {
let reason = "Example reason";
member.ban(reason).then(() => {
// handle then here
}).catch(err => {
// handle error here
});
}

10
package.json
View file

@ -17,7 +17,8 @@
], ],
"dependencies": { "dependencies": {
"glob-parent": "^6.0.0", "glob-parent": "^6.0.0",
"got": "^11.8.3" "got": "^11.8.3",
"linqts": "^1.14.4"
}, },
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
@ -25,8 +26,11 @@
"test": "echo none", "test": "echo none",
"lint": "eslint ." "lint": "eslint ."
}, },
"bugs": "https://github.com/Vylpes/random-bunny/issues", "bugs": {
"homepage": "https://github.com/Vylpes/random-bunny", "url": "https://gitea.vylpes.xyz/RabbitLabs/random-bunny/issues",
"email": "helpdesk@vylpes.com"
},
"homepage": "https://gitea.vylpes.xyz/RabbitLabs/random-bunny",
"funding": "https://ko-fi.com/vylpes", "funding": "https://ko-fi.com/vylpes",
"devDependencies": { "devDependencies": {
"@types/node": "^16.11.11", "@types/node": "^16.11.11",

3
readme.md
View file

@ -53,7 +53,8 @@ The json string which gets returned consists of:
## Links ## Links
* Discord: [Server Link](https://vylpes.xyz/discord) * Discord: [Server Link](https://discord.gg/UyAhAVp)
* Support: [helpdesk@vylpes.com](mailto:helpdesk@vylpes.com)
## License ## License

15
src/contracts/IFetchResult.ts
View file

@ -1,6 +1,13 @@
import IRedditResult from "./IRedditResult";
export default interface IFetchResult { export default interface IFetchResult {
IsSuccess: boolean; data: {
Result?: IRedditResult; archived: boolean,
downs: number,
hidden: boolean,
permalink: string,
subreddit: string,
subreddit_subscribers: number,
title: string,
ups: number,
url: string
}
} }

6
src/contracts/IReturnResult.ts Normal file
View file

@ -0,0 +1,6 @@
import IRedditResult from "./IRedditResult";
export default interface IReturnResult {
IsSuccess: boolean;
Result?: IRedditResult;
}

49
src/index.ts
View file

@ -1,6 +1,8 @@
import IFetchResult from "./contracts/IFetchResult"; import IReturnResult from "./contracts/IReturnResult";
import IRedditResult from "./contracts/IRedditResult"; import IRedditResult from "./contracts/IRedditResult";
import fetch from "got"; import fetch from "got";
import { List } from 'linqts';
import IFetchResult from "./contracts/IFetchResult";
const sortable = [ const sortable = [
'new', 'new',
@ -8,7 +10,7 @@ const sortable = [
'top' 'top'
]; ];
export default async function randomBunny(subreddit: string, sortBy?: string, maxTries = 100): Promise<IFetchResult> { export default async function randomBunny(subreddit: string, sortBy?: string, maxTries = 100): Promise<IReturnResult> {
if (!sortBy || !sortable.includes(sortBy)) sortBy = 'hot'; if (!sortBy || !sortable.includes(sortBy)) sortBy = 'hot';
const result = await fetch(`https://reddit.com/r/${subreddit}/${sortBy}.json`); const result = await fetch(`https://reddit.com/r/${subreddit}/${sortBy}.json`);
@ -27,32 +29,37 @@ export default async function randomBunny(subreddit: string, sortBy?: string, ma
} }
} }
const data = json.data.children; const data: IFetchResult[] = json.data.children;
const size = data.length;
const dataWithImages = new List<IFetchResult>(data)
.Where(x => x!.data.url.includes('.jpg') || x!.data.url.includes('.png'))
.ToArray();
for (let i = 0; i < maxTries; i++) { for (let i = 0; i < maxTries; i++) {
const random = Math.floor((Math.random() * size - 1) + 0); // Between 0 and (size - 1) const random = Math.floor((Math.random() * dataWithImages.length - 1) + 0); // Between 0 and (size - 1)
const randomSelect = data[random].data; const randomSelect = dataWithImages[random];
if (!randomSelect) continue;
const randomData = randomSelect.data;
const redditResult: IRedditResult = { const redditResult: IRedditResult = {
Archived: randomSelect['archived'], Archived: randomData['archived'],
Downs: randomSelect['downs'], Downs: randomData['downs'],
Hidden: randomSelect['hidden'], Hidden: randomData['hidden'],
Permalink: randomSelect['permalink'], Permalink: randomData['permalink'],
Subreddit: randomSelect['subreddit'], Subreddit: randomData['subreddit'],
SubredditSubscribers: randomSelect['subreddit_subscribers'], SubredditSubscribers: randomData['subreddit_subscribers'],
Title: randomSelect['title'], Title: randomData['title'],
Ups: randomSelect['ups'], Ups: randomData['ups'],
Url: randomSelect['url'] Url: randomData['url']
}; };
if (redditResult.Url.includes('.jpg')) { return {
return { IsSuccess: true,
IsSuccess: true, Result: redditResult
Result: redditResult };
};
}
} }
return { return {

4
tsconfig.json
View file

@ -4,7 +4,7 @@
/* Basic Options */ /* Basic Options */
// "incremental": true, /* Enable incremental compilation */ // "incremental": true, /* Enable incremental compilation */
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ "target": "ES2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */ // "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */ // "allowJs": true, /* Allow javascript files to be compiled. */
@ -44,7 +44,7 @@
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
/* Module Resolution Options */ /* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */

11
yarn.lock
View file

@ -538,9 +538,9 @@ glob-parent@^5.1.2:
is-glob "^4.0.1" is-glob "^4.0.1"
glob-parent@^6.0.0: glob-parent@^6.0.0:
version "6.0.0" version "6.0.1"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.0.tgz#f851b59b388e788f3a44d63fab50382b2859c33c" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7"
integrity sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww== integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==
dependencies: dependencies:
is-glob "^4.0.1" is-glob "^4.0.1"
@ -704,6 +704,11 @@ levn@^0.4.1:
prelude-ls "^1.2.1" prelude-ls "^1.2.1"
type-check "~0.4.0" type-check "~0.4.0"
linqts@^1.14.4:
version "1.14.4"
resolved "https://registry.yarnpkg.com/linqts/-/linqts-1.14.4.tgz#0aa0f78fc6be073d7db874e0a0480fda5d06db7d"
integrity sha512-b5sJjG1ZQ8iLSTJV19jWgMLoQicrQVVRkkQN7B/aboU+cf30lgnhIoGM8vEjqPxZFpryDU78PFpuTnfYNIHMeg==
lodash.clonedeep@^4.5.0: lodash.clonedeep@^4.5.0:
version "4.5.0" version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"