Skip to content

Commit 6d035bf

Browse files
2Cubed2Cubed
committed
Merge branch 'develop'
2 parents 69db9d2 + f70579c commit 6d035bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+6117
-3764
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## What is the issue?
2+
3+
## How do we reproduce this issue?
4+
5+
## Environment
6+
7+
- [ ] Self-hosted
8+
- [ ] Python 3.5
9+
10+
## Other Information

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## What does this change?
2+
3+
## Requirements
4+
5+
- [ ] Only PG-rated language used (code, commits, etc.)
6+
- [ ] Descriptive commit messages
7+
- [ ] Changes have been tested
8+
- [ ] Changes do not break any existing functionalities

‎.gitignore‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,10 @@ target/
6868
# pyenv
6969
.python-version
7070

71-
# CactusBot private data
72-
config.json
73-
stats.json
74-
data/*.db
75-
data/*.sqlite
76-
7771
# Virtualenv
7872
venv/
73+
74+
# CactusBot private data
75+
/config.py
76+
data/
77+
caches/*.json

‎.travis.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
language: python
22
python:
3-
- "3.4"
4-
- "3.5"
3+
- 3.5
54
branches:
65
only:
76
- master
87
- develop
98
- /^release-v(\d+.){0,2}\d+$/
9+
before_install:
10+
- pip install flake8
11+
- pip install pytest pytest-asyncio --upgrade
1012
install:
11-
- pip install flake8
13+
- pip install -r requirements.txt
14+
env:
15+
- PYTHONPATH=.
1216
before_script:
13-
- "flake8 cactus.py beam.py messages.py models.py"
14-
script: nosetests
17+
- cp config.template.py config.py
18+
script:
19+
- nosetests
20+
- flake8 run.py config.template.py cactusbot/
21+
- pytest tests/
22+
- pytest cactusbot/ --doctest-modules

‎CHANGELOG.md‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
2+
## Added
3+
- Command enable / disable
4+
- Command aliases with `!alias` ([documentation](http://cactusbot.readthedocs.io/en/stable/user/alias.html))
5+
- Command modifiers ([documentation](http://cactusbot.readthedocs.io/en/stable/user/variables.html#modifiers))
6+
- Better `!cactus` command: now with helpfulness!
7+
- Absolutely no easter eggs anywhere...
8+
- `!multi` command ([documentation](http://cactusbot.readthedocs.io/en/stable/user/multi.html))
9+
- Custom `!social` storage ([documentation](http://cactusbot.readthedocs.io/en/stable/user/social.html))
10+
- Better [documenation](http://cactusbot.readthedocs.io/en/stable/)!
11+
12+
## Fixed
13+
- Repeat system
14+
15+
## Changed
16+
- *Every single line of code*
17+
- `!config` command ([documentation](http://cactusbot.readthedocs.io/en/stable/user/config.html))
18+
- Made all variables `%UPPERCASE%`
19+
- "targets" renamed to "variables"
20+
- `!friend` command renamed to `!trust`
21+
22+
## Removed
23+
- v0.3 nonsense™
24+
- `!test` command
25+
26+
## [0.3.6](https://github.com/CactusDev/CactusBot/releases/tag/v0.3.6)
27+
28+
#### Released: October 1st, 2016
29+
30+
### Fixed
31+
- Friend command regex (again)
32+
33+
### Added
34+
- Constellation support
35+
36+
### Removed
37+
- Liveloading
38+
39+
## [0.3.5](https://github.com/CactusDev/CactusBot/releases/tag/v0.3.5)
40+
41+
#### Released: September 2nd, 2016
42+
43+
### Fixed
44+
- `!friend` command regex
45+
- Websocket reconnections
46+
- Deleting own links
47+
48+
### Removed
49+
- Unused statistics
50+
51+
## [0.3.4](https://github.com/CactusDev/CactusBot/releases/tag/v0.3.4)
52+
53+
#### Released: July 31st, 2016
54+
55+
### Fixed
56+
- Beam CSRF token usage.
57+
- Message removal
58+
- `!repeat` command
59+
60+
## [0.3.3](https://github.com/CactusDev/CactusBot/releases/tag/v0.3.3)
61+
62+
#### Released: July 21st, 2016
63+
64+
### Added
65+
- Documentation is in the bot now
66+
67+
### Fixed
68+
- Repeat command
69+
- Cube command crashing when no arguments are present
70+
- Social command
71+
72+
## [0.3.2](https://github.com/CactusDev/CactusBot/releases/tag/v0.3.2)
73+
74+
#### Released: July 16th, 2016
75+
76+
### Added
77+
- User loading into the database on bot start
78+
- Hosting alerts
79+
80+
### Fixed
81+
- Exponential-backoff for chat connections
82+
- Liveloading connection now only happens once
83+
- Follow alerts spam
84+
- `spamprot` command crashing when no arguments are present
85+
- Friend command not allowing for `@`
86+
87+
### Changed
88+
- `silent` is now `quiet`
89+
90+
## [0.3.1](https://github.com/CactusDev/CactusBot/releases/tag/v0.3.1)
91+
92+
#### Released: April 10th, 2016
93+
94+
### Added
95+
- Uptime command
96+
- Multi-message responses using `\n`
97+
- `beam` as a social argument
98+
99+
### Fixed
100+
- Ghost columns in the database
101+
- Autorestart conditions
102+
- `repeat` crash on command removal
103+
- Whispered responses
104+
- Message removal
105+
106+
### Changed
107+
- Command prefix limit to 1
108+
109+
## [0.3.0](https://github.com/CactusDev/CactusBot/releases/tag/v0.3)
110+
111+
#### Released: April 9th, 2016
112+
113+
### Added
114+
- Repeating commands
115+
- Following and subscriptions notifications
116+
- User permissions for custom commands
117+
- Command line arguments for `silent` and `debug`
118+
119+
### Fixed
120+
- Reconnection spam
121+
- Random disconnections
122+
- `!cube`ing emotes
123+
124+
### Changed
125+
- Move from `asyncio` to `tornado`
126+
127+
## [0.2.1](https://github.com/CactusDev/CactusBot/releases/tag/v0.2.1)
128+
129+
#### Released: March 27th, 2016
130+
131+
### Fixed
132+
- Spam protection command
133+
134+
### Disable
135+
- Statistics tracking
136+
137+
### Added
138+
- `autorestart` to config
139+
140+
## [0.2.0](https://github.com/CactusDev/CactusBot/releases/tag/v0.2)
141+
142+
#### Released: March 27th, 2016
143+
144+
### Added
145+
- Command permissions
146+
- Spam protection
147+
148+
### Changed
149+
- Config organizations
150+
151+
## [0.1.0](https://github.com/CactusDev/CactusBot/releases/tag/v0.1)
152+
153+
#### Released: March 5th, 2016
154+
155+
### Added
156+
- Custom commands
157+
- Quotes
158+
- Social command
159+
- Response targets

docs/contributing.md renamed to CONTRIBUTING.md

File renamed without changes.

‎CONTRIBUTORS.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Contributors
2+
3+
## Developers
4+
5+
### CactusDev
6+
- [2Cubed](https://github.com/2Cubed), [@2CubedTech](https://twitter.com/2CubedTech)
7+
- [Innectic](https://github.com/Innectic), [@Innectic](https://twitter.com/Innectic)
8+
- [ParadigmShift3d](https://github.com/RPiAwesomeness), [@ParadigmShift3d](https://twitter.com/ParadigmShift3d)
9+
10+
11+
## Special Thanks
12+
13+
- [artdude543](https://github.com/artdude543), [@artdude543](https://twitter.com/artdude543)
14+
- [ProbablePrime](https://github.com/ProbablePrime), [@ProbablePrime](https://twitter.com/ProbablePrime)
15+
16+
## Community Contributors
17+
18+
- [MysticalMage](https://github.com/mysticalmage) Added follower caching

‎INSTALL.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
2+
## Setup CactusBot:
3+
```
4+
git clone https://github.com/CactusDev/CactusBot
5+
cd CactusBot
6+
pip3 install -r requirements.txt
7+
cp config.template.py config.py
8+
```
9+
10+
Next, open `config.py` with your favorite text editor, and set
11+
`USERNAME` and `PASSWORD` to the bot's credentials, and set `CHANNEL` to your channel's name.
12+
13+
# Usage
14+
15+
## Start RethinkDB:
16+
17+
`rethinkdb`
18+
19+
## Start CactusAPI:
20+
21+
`python run.py`
22+
23+
## Start Sepal:
24+
25+
`npm start`
26+
27+
## Start CactusBot:
28+
29+
`python run.py`

0 commit comments

Comments
 (0)