diff --git a/alliance_auth/__init__.py b/alliance_auth/__init__.py index 21c0c1b4..fdde87db 100644 --- a/alliance_auth/__init__.py +++ b/alliance_auth/__init__.py @@ -4,5 +4,5 @@ from __future__ import absolute_import, unicode_literals # Django starts so that shared_task will use this app. from .celeryapp import app as celery_app # noqa -__version__ = '1.15.6' +__version__ = '1.15.7' NAME = 'Alliance Auth v%s' % __version__ diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 961252fe..6a9fe920 100644 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -482,7 +482,6 @@ TEAMSPEAK3_PUBLIC_URL = os.environ.get('AA_TEAMSPEAK3_PUBLIC_URL', 'example.com' ###################################### # DISCORD_GUILD_ID - ID of the guild to manage # DISCORD_BOT_TOKEN - oauth token of the app bot user -# DISCORD_INVITE_CODE - invite code to the server # DISCORD_APP_ID - oauth app client ID # DISCORD_APP_SECRET - oauth app secret # DISCORD_CALLBACK_URL - oauth callback url @@ -490,7 +489,6 @@ TEAMSPEAK3_PUBLIC_URL = os.environ.get('AA_TEAMSPEAK3_PUBLIC_URL', 'example.com' ###################################### DISCORD_GUILD_ID = os.environ.get('AA_DISCORD_GUILD_ID', '') DISCORD_BOT_TOKEN = os.environ.get('AA_DISCORD_BOT_TOKEN', '') -DISCORD_INVITE_CODE = os.environ.get('AA_DISCORD_INVITE_CODE', '') DISCORD_APP_ID = os.environ.get('AA_DISCORD_APP_ID', '') DISCORD_APP_SECRET = os.environ.get('AA_DISCORD_APP_SECRET', '') DISCORD_CALLBACK_URL = os.environ.get('AA_DISCORD_CALLBACK_URL', 'http://example.com/discord/callback') diff --git a/docs/installation/services/discord.md b/docs/installation/services/discord.md index 3389cb02..bb43918a 100644 --- a/docs/installation/services/discord.md +++ b/docs/installation/services/discord.md @@ -21,13 +21,6 @@ with a server ID of `120631096835571712` Update settings.py, inputting the server ID as `DISCORD_GUILD_ID` -### Generating an Invite -Still on the Discord site, in your new server, an invite needs to be generated for users to join. If you with for users to initially join a different channel than `#general`, create it and follow the steps below, substituting this channel for `#general`. - -On the left bar under the Text Channels heading, hover over `#general` on the right site. There are two icons, a box with an arrow and a gear. Press the box, then on the bottom left select Advanced Settings. Set the expiration to never, and no limit on uses. Press generate. - -This returns a code that looks like `https://discord.gg/0fmA8MyXV6qt7XAZ`. The part after the last slash, `0fmA8MyXV6qt7XAZ`, is the invite code. Update settings.py, inputting this invite code as `DISCORD_INVITE_CODE` - ### Registering an Application Navigate to the [Discord Developers site.](https://discordapp.com/developers/applications/me) Press the plus sign to create a new application.