Merge branch 'master' of https://github.com/discord-python/site

Merge master

6 files changed, 308 insertions, 44 deletions

diff --git a/pysite/views/main/about/channels.py b/pysite/views/main/about/channels.py
new file mode 100644
index 00000000..2e5496f9
--- /dev/null
+++ b/pysite/views/main/about/channels.py
@@ -0,0 +1,7 @@
+from pysite.base_route import TemplateView
+
+
+class ChannelsView(TemplateView):
+    path = "/about/channels"
+    name = "about.channels"
+    template = "main/about/channels.html"
diff --git a/static/style.css b/static/style.css
index 99945624..b404ced3 100644
--- a/static/style.css
+++ b/static/style.css
@@ -200,6 +200,14 @@ tr.thick-bottom-border {
     border-bottom: 3px solid rgb(229, 229, 229) !important;
 }
 
+td.left-border, th.left-border {
+    border-left: 1px solid rgb(229, 229, 229) !important;
+}
+
+td.right-border, th.right-border {
+    border-right: 1px solid rgb(229, 229, 229) !important;
+}
+
 /* Fira Code stuff */
 
 @font-face {
@@ -214,5 +222,8 @@ tr.thick-bottom-border {
 
 .fira-code {
     font-family: 'Fira Code', "monospace", Fallback;
+}
+
+textarea.fira-code {
     line-height: 1.3 !important;
 }
\ No newline at end of file
diff --git a/templates/main/about/channels.html b/templates/main/about/channels.html
new file mode 100644
index 00000000..0ee8df2f
--- /dev/null
+++ b/templates/main/about/channels.html
@@ -0,0 +1,256 @@
+{% extends "main/base.html" %}
+{% block title %}Rules{% endblock %}
+{% block og_title %}Rules{% endblock %}
+{% block og_description %}The server rules, along with an explanation of what happens when they're broken{% endblock %}
+{% block content %}
+    <div class="uk-section">
+        <div class="uk-container uk-container-small">
+            <article class="uk-article">
+                <h1 class="uk-article-title hover-title" id="top">
+                    Channels
+
+                    <a href="#top" class="uk-text-primary" title="Permanent link to this header">
+                        <i class="fas fa-paragraph" data-fa-transform="shrink-8"></i>
+                    </a>
+                </h1>
+                <p class="uk-article-meta">
+                    Keeping things tidy
+                </p>
+
+                <p>
+                    Every channel on the server has a use, and we expect users to keep things relevant to the channel
+                    whenever possible. Below, we've outlined all of the channels a normal user has access to send
+                    messages to, and what they should be used for.
+                </p>
+
+                <h2>Conversation</h2>
+
+                <p>
+                    Channels in this section are designated for discussion and chat, and shouldn't be used for help
+                    requests in most cases.
+                </p>
+
+                <table uk-table class="uk-table-striped uk-table uk-table-divider table-bordered">
+                    <thead>
+                        <tr>
+                            <th>Channel</th>
+                            <th>Info</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="fira-code">#python</td>
+                            <td>
+                                Discussion about the Python programming language and ecosystem
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#off-topic</td>
+                            <td>
+                                Off-topic discussion that doesn't fit in any other channel
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#other-languages</td>
+                            <td>
+                                Discussion about non-Python programming - this is not a channel for non-English
+                                discussion
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#meta</td>
+                            <td>
+                                Discussion and suggestions relating to the Discord server, site, bot, and other
+                                projects of ours
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <h2>Python Help</h2>
+
+                <p>
+                    Channels in this section are strictly on-topic, and designated for asking general Python-related
+                    questions. If you're a beginner or you need some help with your Python, this is probably where you
+                    want to be.
+                </p>
+
+                <p>
+                    Please try to pick a channel that isn't busy when asking your question. If you're not sure
+                    how best to ask a question, take a look at
+                    <a href="{{ url_for("main.info.help") }}">our guide on that subject</a>.
+                </p>
+
+                <h2>Topical Chat/Help</h2>
+
+                <p>
+                    Channels in this section are strictly on-topic, and geared towards specific subjects. They can be
+                    used for either discussion or asking questions - if you need help with one of the specific things
+                    covered here, it's best to ask your question in the relevant channel rather than one of the general
+                    help channels.
+                </p>
+
+                <table uk-table class="uk-table-striped uk-table uk-table-divider table-bordered">
+                    <thead>
+                        <tr>
+                            <th>Channel</th>
+                            <th>Info</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="fira-code">#databases</td>
+                            <td>
+                                Discussion and questions relating to databases - both traditional and document-oriented -
+                                such as SQLite, Postgresql, RethinkDB, Cassandra, Redis and so on
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#data-science</td>
+                            <td>
+                                Discussion and questions relating to machine learning, natural language processing,
+                                statistics and graphing and so on
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#dev-ops</td>
+                            <td>
+                                Discussion and questions relating to devops - for example, deployment and configuration
+                                of services, virtual machines and containers, and the day-to-day running of your
+                                Python-powered services
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#discord-py</td>
+                            <td>
+                                Discussion and questions relating to the
+                                <a href="https://github.com/Rapptz/discord.py">discord.py</a> library for writing
+                                Discord bots in Python - This channel refers specifically to the
+                                <a href="https://discordpy.readthedocs.io/en/async/"><span class="fira-code">async</span> branch of discord.py</a>,
+                                which is currently the stable version but is heavily outdated
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#discord-py-rewrite</td>
+                            <td>
+                                Discussion and questions relating to the
+                                <a href="https://github.com/Rapptz/discord.py">discord.py</a> library for writing
+                                Discord bots in Python - This channel refers specifically to the
+                                <a href="https://discordpy.readthedocs.io/en/rewrite/"><span class="fira-code">rewrite</span> branch of discord.py</a>,
+                                which is the most up-to-date version but is considered to be in beta
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#guis</td>
+                            <td>
+                                Discussion and questions relating to designing and building graphical user interfaces
+                                in Python, and related libraries and tools
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#security</td>
+                            <td>
+                                Discussion and questions relating to cybersecurity, especially in relation to Python
+                                and best practises
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#web-development</td>
+                            <td>
+                                Discussion and questions relating to web development - including Python frameworks
+                                such as Flask and Django, as well as HTML and JavaScript where it relates to the Web
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <h2>Events</h2>
+
+                <p>
+                    Channels in this section are strictly on-topic, and designated for the discussion of Python-related
+                    events - for example, our <a href="{{ url_for("main.jams.index") }}">Code Jams</a>, as well as any
+                    other large, related events that many of our users are partaking in.
+                </p>
+                <p>
+                    If you're part of a related event and you don't see a channel for it here, feel free to ask for one!
+                </p>
+
+                <h2>Special</h2>
+
+                <p>
+                    Channels in this section are designated for special uses, and don't really fit into the other
+                    categories.
+                </p>
+
+                <table uk-table class="uk-table-striped uk-table uk-table-divider table-bordered">
+                    <thead>
+                        <tr>
+                            <th>Channel</th>
+                            <th>Info</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="fira-code">#bot-commands</td>
+                            <td>
+                                A channel specifically for making use of the bots on the server without clogging up
+                                the other channels
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#checkpoint</td>
+                            <td>
+                                Invisible to most users after verifying themselves, this channel is where new
+                                users verify that they accept the rules and
+                                <a href="{{ url_for("main.about.privacy") }}">privacy policy</a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#challenges</td>
+                            <td>
+                                While currently not in use, this channel lists various programming challenges that
+                                one might like to attempt during their learning efforts - we'll be replacing this
+                                with something better later, so stay tuned!
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#show-your-projects</td>
+                            <td>
+                                A listing channel for users to show off their Python-oriented projects - please note
+                                that this is not a discussion channel, and we do not allow postings for communities
+                                or commercial projects - and if possible, we prefer that you post a link to your
+                                source code instead of a website
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#show-your-projects-discussion</td>
+                            <td>
+                                Strictly on-topic discussion relating to projects posted in
+                                <span class="fira-code">#show-your-projects</span> - we prefer that all discussion
+                                relating to personal projects goes here
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <h2>Minecraft</h2>
+
+                <p>
+                    Channels in this section are strictly related to
+                    <a href="{{ url_for("wiki.page", page="minecraft") }}">our Minecraft server</a> - while discussion
+                    is quite laid back, we do not allow users to advertise their own servers and prefer that they
+                    make use of the voice channels here for game-related voice chat.
+                </p>
+
+                <h2>Voice</h2>
+
+                <p>
+                    This section contains all of our general voice channels, as well as a single text channel -
+                    <span class="fira-code">#voice-chat</span>. If you're in a voice channel but can't use a
+                    microphone, you should use this channel to reply to other users using text instead of any
+                    of the other channels.
+                </p>
+            </article>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/main/about/index.html b/templates/main/about/index.html
index 47db8f4e..35fe6ae0 100644
--- a/templates/main/about/index.html
+++ b/templates/main/about/index.html
@@ -14,19 +14,25 @@
                     </a>
                 </h1>
                 <p class="uk-article-meta">
-                    Learn about the server, find links to our Partners, and more!
+                    Learn about the server, find links to our partners, and more!
                 </p>
                 <p>
-                    <strong>Server Partners</strong>
+                    <strong>Channels</strong>
+                    <a href="{{ url_for('main.about.channels') }}"><i class="fas fa-link"></i></a>
+                    <br />
+                    <span class="uk-text-meta">Server channel listings and information</span>
+                </p>
+                <p>
+                    <strong>Partners</strong>
                     <a href="{{ url_for('main.about.partners') }}"><i class="fas fa-link"></i></a>
                     <br />
-                    <span class="uk-text-meta">Links to our Partner servers!</span>
+                    <span class="uk-text-meta">Links to our partnered servers</span>
                 </p>
                 <p>
-                    <strong>Server Rules</strong>
+                    <strong>Rules</strong>
                     <a href="{{ url_for('main.about.rules') }}"><i class="fas fa-link"></i></a>
                     <br />
-                    <span class="uk-text-meta">Rules and infraction information for our server</span>
+                    <span class="uk-text-meta">Rules and infraction information for our community</span>
                 </p>
             </article>
         </div>
diff --git a/templates/main/about/rules.html b/templates/main/about/rules.html
index f042797e..b11f91d9 100644
--- a/templates/main/about/rules.html
+++ b/templates/main/about/rules.html
@@ -28,53 +28,31 @@
                         Follow the <a href="https://discordapp.com/guidelines">Discord community guidelines</a>
                     </li>
                     <li>
+                        Don't intentionally make other people uncomfortable - if someone asks you to stop discussing
+                        something, you should stop
+                    </li>
+                    <li>
                         Be patient both with users asking questions, and the users answering them
                     </li>
                     <li>
+                        We will not help you with anything that might break a law or the terms of service of any other
+                        community, site, service, or otherwise - No piracy, brute-forcing, captcha circumvention,
+                        sneaker bots, or anything else of that nature
+                    </li>
+                    <li>
                         Listen to and respect the staff members - we're here to help, but we're all human beings
                     </li>
                     <li>
-                        All discussion should be kept within the relevant channels for the subject.
-                        <ul>
-                            <li>
-                                General Python help and support requests go to one of the three help channels - pick
-                                the one that is the quietest at the time.
-                            </li>
-                            <li>
-                                The topical channels can be used for help and support requests, but general discussion
-                                about the subjects covered by them should go there also.
-                            </li>
-                            <li>
-                                If you're working with one of the bots, we ask you to specifically do that in
-                                <code>#bot-commands</code>, to keep the other channels clear of bot output.
-                            </li>
-                            <li>
-                                If you're working on a Python project or something directly related to our server, feel
-                                free to post a link to it in <code>#show-your-projects</code>. We prefer links to source
-                                code over websites, but we'll also accept screenshots and videos if you're not yet ready
-                                to release the code.
-                                <ul>
-                                    <li>
-                                        If you or someone else posts a project to <code>#show-your-projects</code>, you may
-                                        discuss it in <code>#show-your-projects-discussion</code>. <code>#show-your-projects</code>
-                                        is intended to be a listing channel, and any discussion there is removed regularly.
-                                    </li>
-                                    <li>
-                                        Please note, we <strong>do not</strong> allow postings for communities (such as
-                                        forums or other Discord servers) or commercial projects.
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
+                        All discussion should be kept within the relevant channels for the subject - See the
+                        <a href="{{ url_for("main.about.channels") }}">channels page</a> for more information
                     </li>
                     <li>
-                        This is an English-speaking server. Please speak English to the best of your ability. Google
-                        translate is fine if you're not sure.
+                        This is an English-speaking server, so please speak English to the best of your ability -
+                        <a href="https://translate.google.com">Google Translate</a> should be fine if you're not sure
                     </li>
                     <li>
-                        Keep all discussions SFW - No <a href="https://www.wikiwand.com/en/Ecchi">ecchi</a>
-                        or <a href="https://www.wikiwand.com/en/Not_safe_for_work">NSFW</a> media. If you wouldn't want
-                        the entire world to know about your interest in it, it doesn't belong on this server.
+                        Keep all discussions safe for work - No gore, nudity, sexual soliciting, references to suicide,
+                        or anything else of that nature
                     </li>
                     <li>
                         We do not allow advertisements for communities or commercial projects - Contact us directly if
@@ -138,7 +116,7 @@
                 <p>
                     While we do discuss more serious matters internally before handing out a punishment, simpler
                     infractions are dealt with directly by individual staffers and the punishment they hand out is left
-                    to their own decision-making.
+                    to their own discretion.
                 </p>
             </article>
         </div>
diff --git a/templates/main/navigation.html b/templates/main/navigation.html
index ea5bac3e..f1db2a90 100644
--- a/templates/main/navigation.html
+++ b/templates/main/navigation.html
@@ -93,12 +93,18 @@
                                 <li><a href="{{ url_for('main.info.resources') }}">Resources</a></li>
                             {% endif %}
 
-                            {% if current_page.startswith("main.about") %}
+                            {% if current_page.startswith("main.about.") %}
                                 <li class="uk-nav-header uk-active"><a href="{{ url_for('main.about.index') }}">About</a></li>
                             {% else %}
                                 <li class="uk-nav-header"><a href="{{ url_for('main.about.index') }}">About</a></li>
                             {% endif %}
 
+                            {% if current_page == "main.about.channels" %}
+                                <li class="uk-active"><a href="{{ url_for('main.about.channels') }}">Channels</a></li>
+                            {% else %}
+                                <li><a href="{{ url_for('main.about.channels') }}">Channels</a></li>
+                            {% endif %}
+
                             {% if current_page == "main.about.partners" %}
                                 <li class="uk-active"><a href="{{ url_for('main.about.partners') }}">Partners</a></li>
                             {% else %}