Skip to content

Commit 1d02b99

Browse files
committed
fixed-conflict
2 parents c67143e + 4280137 commit 1d02b99

File tree

17 files changed

+1040
-405
lines changed

17 files changed

+1040
-405
lines changed

.github/ISSUE_TEMPLATE/bug.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: 🐛 Bug Report
2+
description: File a bug report
3+
title: "[Bug]: "
4+
labels: ["bug", "triage"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report! 🙏🏻
10+
- type: textarea
11+
id: expected-behaviour
12+
attributes:
13+
label: Expected Behaviour 👍
14+
description: Brief descriptiion of behaviour that you expected
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: current-behaviour
19+
attributes:
20+
label: Current Behaviour 👎
21+
description: Brief descriptiion of current behaviour
22+
validations:
23+
required: true
24+
- type: textarea
25+
id: logs
26+
attributes:
27+
label: Relevant log output 🖇️
28+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
29+
render: shell
30+
- type: checkboxes
31+
id: terms
32+
attributes:
33+
label: Code of Conduct
34+
description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
35+
options:
36+
- label: I agree to follow this project's Code of Conduct
37+
required: true

.github/ISSUE_TEMPLATE/feature.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: 🚀 Feature
2+
description: "Submit a proposal for a new feature"
3+
title: "🚀 Feature: "
4+
labels: [feature]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out our feature request form 🙏
10+
- type: textarea
11+
id: feature-description
12+
validations:
13+
required: true
14+
attributes:
15+
label: "🔖 Feature description"
16+
description: "A clear and concise description of what the feature is."
17+
placeholder: "You should add ..."
18+
- type: textarea
19+
id: pitch
20+
validations:
21+
required: true
22+
attributes:
23+
label: "🎤 Pitch"
24+
description: "Please explain why this feature should be implemented and how it would be used. Add examples, if applicable."
25+
placeholder: "In my use-case, ..."
26+
- type: checkboxes
27+
id: no-duplicate-issues
28+
attributes:
29+
label: "👀 Have you spent some time to check if this issue has been raised before?"
30+
description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
31+
options:
32+
- label: "I checked and didn't find similar issue"
33+
required: true

README.md

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,58 @@
77

88
[![Discord chat](https://img.shields.io/discord/847319167949340702?color=blue&label=join%20discord%20server)](https://discord.gg/kBatC2cVJr)
99

10-
## A Branch dedicated to Refactoring whole bot.
10+
## [🤖 Add ](https://discord.com/api/oauth2/authorize?client_id=843553315442130985&permissions=2148002880&scope=bot) **roBOT** to your server!
1111

12+
## 📷 Screenshots of **roBOT** in action.
13+
<p align="center"><img src="https://i.imgur.com/xfEvesZ.png" width="380" height="400"/> <img src="https://i.imgur.com/5gQH96D.png" width="380" height="400"/></p>
14+
<p align="center"><img src="https://i.imgur.com/UnF0Br1.png" width="380" height="400"/> <img src="https://i.imgur.com/WbjWcZP.png" width="380" height="400"/></p>
1215

13-
**You have to join our [discord server](https://discord.gg/qCcNYQu2kE) if you want to contribute to this branch.**\
14-
Otherwise no pull requests will be accepted.
16+
## 💽 Installation
17+
- Make sure you’re logged on to the [Discord](https://discord.com).
18+
- Navigate to the Discord Developer's [Application Page](https://discord.com/developers/applications).
19+
- Click on the `New Application` button.
20+
- Give the Application a Name and click on `Create`.
21+
- Go to the `Bot` Tab and then click `Add Bot`. You will have to confirm by clicking `Yes, do it!`.
22+
- Keep the default settings for Public Bot (checked) and Require OAuth2 Code Grant (unchecked).
23+
- `Copy` the token from 'Bot' Tab. (Don't share it with anybody)
24+
- Go to the `OAuth2` Tab. Then select `Bot` under the `scopes` section.
25+
- Now choose the `Administrator` permission.
26+
- Copy the URL by clicking `Copy` button above the permissions.
27+
- Paste the URL into your browser, choose a server to invite the bot to, and click `Authorize`.(To add the bot, your account needs `Manage Server` permissions.)
28+
- Now you've created the bot user and added it into a server. Now start writing the Python code for the bot.
29+
- Run `pip install -r requirements.txt`
30+
- In the .env file, paste the required keys as:
1531

1632
*Note: This branch has breaking changes*
1733

18-
*For more information related to roBOT: please refer to [README](https://github.com/danger-ahead/roBOT/blob/master/README.md) of master branch.*
34+
`RAPID_API=YOUR_API_KEY` (replace '**YOUR_API_KEY**' with your API key)
35+
36+
`OPEN_WEATHER_TOKEN=YOUR_TOKEN` (replace '**YOUR_TOKEN**' with your API key)
37+
38+
`MONGO=MONGODB_KEY` (replace '**MONGODB_KEY**' with your MongoDB key.)
39+
40+
## 👷‍♀️ Working
41+
### **roBOT** reacts with 👍 or 👎 after each successful or unsuccessful command execution
42+
#### You can use **roBOT** for:
43+
* Channel moderations (looking for offensive words, muting, unmuting, etc)
44+
* Trivia, memes and jokes
45+
* Play games (tossing a coin, rolling a dice, etc)
46+
* Polls
47+
* Cleaning up a channel's chats
48+
* Searching (Wikipedia, DuckDuckGo, movies, music, word meanings, etc)
49+
* Solving Math problems
50+
* Updates on COVID-19 or weather
51+
52+
(the list will only keep expanding 😜)...
53+
### [Full list of commands here](https://github.com/danger-ahead/roBOT/blob/master/docs/COMMANDS.md)
54+
55+
### [Dependencies](https://github.com/danger-ahead/roBOT/blob/master/docs/DEPENDENCIES.md)
56+
57+
## 🤝 Contributions
58+
Contributions are always welcome. Visit our [contributing guidelines](https://github.com/danger-ahead/roBOT/blob/master/docs/CONTRIBUTING.md) before making any contributions.
59+
60+
### [![GitHub contributors](https://img.shields.io/github/contributors/danger-ahead/roBOT)](https://github.com/danger-ahead/roBOT/blob/master/docs/CONTRIBUTORS.md)
61+
62+
## 📄 License
63+
64+
Distributed under the MIT License. See [LICENSE](/LICENSE) for more information.

commands/__init__.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
__all__ = [
2+
"hi_contrib",
3+
"api_commands",
4+
"wiki_search",
5+
"help",
6+
"compliment",
7+
"confess_rank",
8+
"admin_commands",
9+
]

commands/compliment.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
"""
2+
Module containing the functions for _compliment command.
3+
4+
"""
5+
import random
6+
7+
8+
async def comp(discord, message):
9+
compliments = [
10+
"You are more fun than bubble wrap",
11+
"You are the most perfect you there is.",
12+
"You are enough.",
13+
"You are one of the smartest people I know.",
14+
"You look great today.",
15+
"You have the best smile.",
16+
"You light up the whole server.",
17+
"You are doing great.Keep going!",
18+
]
19+
response = random.choice(compliments)
20+
await message.channel.send(response)
21+
await message.author.send(response)

0 commit comments

Comments
 (0)