Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fae731e
feat: add github_token in config
whopiyush Feb 21, 2020
8b127b5
feat: add authorization header if present
whopiyush Feb 21, 2020
5aa1f00
fix: add a missing comma
whopiyush Feb 21, 2020
0ea0a90
Update bot.py
Taaku18 May 27, 2020
e0387a4
Bumped versions in requirements, unstable
Taaku18 Jun 7, 2020
faee71a
Merge branch 'master' into discordpy-bump
Taaku18 Jun 7, 2020
fd61637
Implement teams in metadata
Taaku18 Jun 7, 2020
67ef0a3
Use event_type for raw reaction update, rename owner_ids -> bot_owner…
Taaku18 Jun 7, 2020
48314e1
Channel delete no longer show warnings and threads get closed properl…
Taaku18 Jun 7, 2020
04e15ef
Use auditlog for message delete event to decrease error rate
Taaku18 Jun 7, 2020
f98354c
Slight error fix
Taaku18 Jun 7, 2020
9a92a74
Add skeleton for dpy dump update
Taaku18 Jun 7, 2020
6bf3064
disable eval config
Taaku18 Jun 7, 2020
a7b155b
Plugins change
Taaku18 Jun 8, 2020
3dc80b7
Merge branch 'discordpy-bump' into feature(plugins)-support-private-r…
Taaku18 Jun 9, 2020
fcacfb6
Add to changelog and bump version
Taaku18 Jun 9, 2020
3da9d68
Merge pull request #2767 from kyb3r/feature(plugins)-support-private-…
Taaku18 Jun 9, 2020
3eaec9b
Merge pull request #2799 from kyb3r/windows-proactor-eventloop-quickfix
Taaku18 Jun 9, 2020
691f916
Bump version for windows plugins support
Taaku18 Jun 9, 2020
ac44377
Black format
Taaku18 Jun 9, 2020
1537298
Add additional database support potentials
Taaku18 Jun 9, 2020
491d07a
Update app.json
Taaku18 Jun 9, 2020
f6957c4
Update Pipfile
Taaku18 Jun 10, 2020
c12a16e
Add pip to pipfile, apparently theres a dependency problem?
Taaku18 Jun 10, 2020
f51a7fb
Rollback py version for heroku
Taaku18 Jun 10, 2020
a27f8bc
dpy 1.3.4
Taaku18 Jul 9, 2020
86f959c
Use py 3.7.8
Taaku18 Jul 9, 2020
53a5176
Freeze into requirements.txt
Taaku18 Jul 9, 2020
e849892
Dont use pipenv in procfile
Taaku18 Jul 9, 2020
494abba
Done
Taaku18 Jul 9, 2020
178ea9c
Dump 3.5.0
Taaku18 Jul 9, 2020
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add to changelog and bump version
  • Loading branch information
Taaku18 committed Jun 9, 2020
commit fcacfb6071f3d18c4a1a3265ea42bd48e75ceaa7
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.
however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugins developer, note the "BREAKING" section.


# v3.5.0dev3
# v3.5.0dev4

### Added

- A confirmation when you manually delete a thread message embed.
- Config var `enable_eval` defaults true, set `enable_eval=no` to disable the eval command. (GH #2803)
- Added `?plugins reset` command to completely reset everything related to plugins. This will fix some problems caused by broken plugins in the file system.
- Support private GitHub repos for plugins (thanks to @officialpiyush pr#2767)

### Changed

Expand Down
2 changes: 1 addition & 1 deletion bot.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "3.5.0-dev3"
__version__ = "3.5.0-dev4"


import asyncio
Expand Down
7 changes: 4 additions & 3 deletions cogs/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,12 @@ async def download_plugin(self, plugin, force=False):
if plugin.cache_path.exists() and not force:
plugin_io = plugin.cache_path.open("rb")
logger.debug("Loading cached %s.", plugin.cache_path)

else:
headers = {}
if self.bot.config.get("github_token") is not None:
headers["Authorization"] = f"token {self.bot.config.get('github_token')}"
github_token = self.bot.config.get("github_token")
if github_token is not None:
headers["Authorization"] = f"token {github_token}"

async with self.bot.session.get(plugin.url, headers=headers) as resp:
logger.debug("Downloading %s.", plugin.url)
raw = await resp.read()
Expand Down