From cf8ce93e34ab543fdc9e4df83aa4583128c2ddc0 Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Mon, 21 Mar 2022 18:42:04 -0400
Subject: add token safety pin

---
 .../guides/python-guides/keeping-tokens-safe.md    |  21 +++++++++++++++++++++
 .../resources/guides/python-guides/token-reset.png | Bin 0 -> 132625 bytes
 2 files changed, 21 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/token-reset.png

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
new file mode 100644
index 00000000..8e283d70
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -0,0 +1,21 @@
+---
+title: Keeping Discord Bot Tokens Safe
+description: How to keep your bot tokens safe and safety measures you can take.
+---
+It's **very** important to keep a bot token safe, primarily because anyone who has the bot token can do whatever they want with the bot -- such as destroying servers your bot has been added to and getting your bot banned from the API.
+
+# How to Avoid Leaking your Token
+To help prevent leaking your token, you should ensure that you don't upload it to an open source program/website, such as replit and github, as they show your code publicly. The best practice for storing tokens is generally utilising .env files ([click here](https://vcokltfre.dev/tips/tokens/.) for more information on storing tokens safely)
+
+# What should I do if my token does get leaked?
+
+If for whatever reason your token gets leaked, you should immediately follow these steps:
+- Go to the list of [Discord Bot Applications](https://discord.com/developers/applications) you have and select the bot application that had the token leaked.
+- Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
+- Press the Regenerate (2) option to regen your bot token.
+![token_reset.png](token-reset.png)
+
+Following these steps will create a new token for your bot, making it secure again and terminating any connections from the leaked token.
+
+# Summary
+Make sure you keep your token secure by storing it safely, not sending it to anyone you don't trust, and regenerating your token if it does get leaked.
\ No newline at end of file
diff --git a/pydis_site/apps/content/resources/guides/python-guides/token-reset.png b/pydis_site/apps/content/resources/guides/python-guides/token-reset.png
new file mode 100644
index 00000000..bd672b93
Binary files /dev/null and b/pydis_site/apps/content/resources/guides/python-guides/token-reset.png differ
-- 
cgit v1.2.3


From 9ba4891e6e47f7f498eafa61e4a1d5e301f2426a Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Mon, 21 Mar 2022 18:59:26 -0400
Subject: fixing image not appearing

---
 .../guides/python-guides/keeping-tokens-safe.md        |   3 ++-
 .../resources/guides/python-guides/token-reset.png     | Bin 132625 -> 0 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 pydis_site/apps/content/resources/guides/python-guides/token-reset.png

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index 8e283d70..e37039d1 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -13,7 +13,8 @@ If for whatever reason your token gets leaked, you should immediately follow the
 - Go to the list of [Discord Bot Applications](https://discord.com/developers/applications) you have and select the bot application that had the token leaked.
 - Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
 - Press the Regenerate (2) option to regen your bot token.
-![token_reset.png](token-reset.png)
+
+![Steps to Take to Reset your Discord Bot](https://cdn.discordapp.com/attachments/343944376055103488/845290595793764392/regen_token.png)
 
 Following these steps will create a new token for your bot, making it secure again and terminating any connections from the leaked token.
 
diff --git a/pydis_site/apps/content/resources/guides/python-guides/token-reset.png b/pydis_site/apps/content/resources/guides/python-guides/token-reset.png
deleted file mode 100644
index bd672b93..00000000
Binary files a/pydis_site/apps/content/resources/guides/python-guides/token-reset.png and /dev/null differ
-- 
cgit v1.2.3


From 306a906c850324a4a31a62d82d5348a18f3f2e5e Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Sat, 2 Apr 2022 12:16:13 -0400
Subject: Update
 pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md

Co-authored-by: Xithrius <15021300+Xithrius@users.noreply.github.com>
---
 .../apps/content/resources/guides/python-guides/keeping-tokens-safe.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index e37039d1..6b5dae34 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -12,7 +12,7 @@ To help prevent leaking your token, you should ensure that you don't upload it t
 If for whatever reason your token gets leaked, you should immediately follow these steps:
 - Go to the list of [Discord Bot Applications](https://discord.com/developers/applications) you have and select the bot application that had the token leaked.
 - Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
-- Press the Regenerate (2) option to regen your bot token.
+- Press the Regenerate option to regen your bot token.
 
 ![Steps to Take to Reset your Discord Bot](https://cdn.discordapp.com/attachments/343944376055103488/845290595793764392/regen_token.png)
 
-- 
cgit v1.2.3


From 27baeb887cf14fb641635379bc80cd917a0f0a2d Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Wed, 20 Apr 2022 20:58:06 -0400
Subject: change image to accurately reflect current system

---
 .../apps/content/resources/guides/python-guides/keeping-tokens-safe.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index e37039d1..f85b02d8 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -14,7 +14,7 @@ If for whatever reason your token gets leaked, you should immediately follow the
 - Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
 - Press the Regenerate (2) option to regen your bot token.
 
-![Steps to Take to Reset your Discord Bot](https://cdn.discordapp.com/attachments/343944376055103488/845290595793764392/regen_token.png)
+![Steps to Take to Reset your Discord Bot](https://cdn.discordapp.com/attachments/859123972884922418/966502706258784366/unknown.png)
 
 Following these steps will create a new token for your bot, making it secure again and terminating any connections from the leaked token.
 
-- 
cgit v1.2.3


From 828c7cb512fb859f577870abe2fdeaf070e4e2fb Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Wed, 20 Apr 2022 21:06:10 -0400
Subject: used wrong image

---
 .../apps/content/resources/guides/python-guides/keeping-tokens-safe.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index 272ad45a..1789bdf1 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -14,7 +14,7 @@ If for whatever reason your token gets leaked, you should immediately follow the
 - Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
 - Press the Regenerate option to regen your bot token.
 
-![Steps to Take to Reset your Discord Bot](https://cdn.discordapp.com/attachments/859123972884922418/966502706258784366/unknown.png)
+![Steps to Take to Reset your Discord Bot](https://media.discordapp.net/attachments/859123972884922418/966504639421894697/bot_application.jpg?width=1348&height=671)
 
 Following these steps will create a new token for your bot, making it secure again and terminating any connections from the leaked token.
 
-- 
cgit v1.2.3


From b7cef2771a784615c1b6e7f0fba9545e7f17e881 Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Sat, 23 Apr 2022 12:35:34 -0400
Subject: Update
 pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md

Co-authored-by: Bluenix <bluenixdev@gmail.com>
---
 .../apps/content/resources/guides/python-guides/keeping-tokens-safe.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index 1789bdf1..3eac783e 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -12,7 +12,7 @@ To help prevent leaking your token, you should ensure that you don't upload it t
 If for whatever reason your token gets leaked, you should immediately follow these steps:
 - Go to the list of [Discord Bot Applications](https://discord.com/developers/applications) you have and select the bot application that had the token leaked.
 - Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
-- Press the Regenerate option to regen your bot token.
+- Press the Regenerate button to regenerate your bot token and invalidate the old one.
 
 ![Steps to Take to Reset your Discord Bot](https://media.discordapp.net/attachments/859123972884922418/966504639421894697/bot_application.jpg?width=1348&height=671)
 
-- 
cgit v1.2.3


From c14887951f50700d009b273c3530ae517f6e820a Mon Sep 17 00:00:00 2001
From: Shom770 <82843611+Shom770@users.noreply.github.com>
Date: Sat, 23 Apr 2022 12:49:51 -0400
Subject: bluenix's changes

---
 .../guides/python-guides/keeping-tokens-safe.md        |  13 ++++++++++---
 .../static/images/content/regenerating_token.jpg       | Bin 0 -> 180570 bytes
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 pydis_site/static/images/content/regenerating_token.jpg

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index 3eac783e..8e9f7075 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -2,10 +2,16 @@
 title: Keeping Discord Bot Tokens Safe
 description: How to keep your bot tokens safe and safety measures you can take.
 ---
-It's **very** important to keep a bot token safe, primarily because anyone who has the bot token can do whatever they want with the bot -- such as destroying servers your bot has been added to and getting your bot banned from the API.
+It's **very** important to keep a bot token safe, 
+primarily because anyone who has the bot token can do whatever they want with the bot -- 
+such as destroying servers your bot has been added to and getting your bot banned from the API.
 
 # How to Avoid Leaking your Token
-To help prevent leaking your token, you should ensure that you don't upload it to an open source program/website, such as replit and github, as they show your code publicly. The best practice for storing tokens is generally utilising .env files ([click here](https://vcokltfre.dev/tips/tokens/.) for more information on storing tokens safely)
+To help prevent leaking your token, 
+you should ensure that you don't upload it to an open source program/website, 
+such as replit and github, as they show your code publicly. 
+The best practice for storing tokens is generally utilising .env files
+([click here](https://vcokltfre.dev/tips/tokens/.) for more information on storing tokens safely).
 
 # What should I do if my token does get leaked?
 
@@ -14,9 +20,10 @@ If for whatever reason your token gets leaked, you should immediately follow the
 - Select the Bot (1) tab on the left-hand side, next to a small image of a puzzle piece. After doing so you should see a small section named TOKEN (under your bot USERNAME and next to his avatar image)
 - Press the Regenerate button to regenerate your bot token and invalidate the old one.
 
-![Steps to Take to Reset your Discord Bot](https://media.discordapp.net/attachments/859123972884922418/966504639421894697/bot_application.jpg?width=1348&height=671)
+![Steps to Take to Reset your Discord Bot](/static/images/content/regenerating_token.jpg)
 
 Following these steps will create a new token for your bot, making it secure again and terminating any connections from the leaked token.
+The old token will stop working though, so make sure to replace the old token with the new one in your code if you haven't already.
 
 # Summary
 Make sure you keep your token secure by storing it safely, not sending it to anyone you don't trust, and regenerating your token if it does get leaked.
\ No newline at end of file
diff --git a/pydis_site/static/images/content/regenerating_token.jpg b/pydis_site/static/images/content/regenerating_token.jpg
new file mode 100644
index 00000000..7b2588dc
Binary files /dev/null and b/pydis_site/static/images/content/regenerating_token.jpg differ
-- 
cgit v1.2.3


From d50028d6b92909a39139007f0f3bcd7c90a88420 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Sat, 13 Aug 2022 06:08:22 +0200
Subject: Add Tags To Content Listings

Adds bot tags to the content page, as well as a model to go along with
it.

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 pydis_site/apps/content/migrations/0001_initial.py |  23 ++++
 pydis_site/apps/content/migrations/__init__.py     |   0
 pydis_site/apps/content/models/__init__.py         |   0
 pydis_site/apps/content/models/tag.py              |  17 +++
 pydis_site/apps/content/resources/tags/_info.yml   |   3 +
 pydis_site/apps/content/utils.py                   | 125 ++++++++++++++++++++-
 pydis_site/apps/content/views/page_category.py     |   9 +-
 pydis_site/templates/content/listing.html          |  10 +-
 pydis_site/templates/content/page.html             |   2 +-
 9 files changed, 177 insertions(+), 12 deletions(-)
 create mode 100644 pydis_site/apps/content/migrations/0001_initial.py
 create mode 100644 pydis_site/apps/content/migrations/__init__.py
 create mode 100644 pydis_site/apps/content/models/__init__.py
 create mode 100644 pydis_site/apps/content/models/tag.py
 create mode 100644 pydis_site/apps/content/resources/tags/_info.yml

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/migrations/0001_initial.py b/pydis_site/apps/content/migrations/0001_initial.py
new file mode 100644
index 00000000..15e3fc95
--- /dev/null
+++ b/pydis_site/apps/content/migrations/0001_initial.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.0.6 on 2022-08-13 00:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('last_updated', models.DateTimeField(auto_now=True, help_text='The date and time this data was last fetched.')),
+                ('name', models.CharField(help_text="The tag's name.", max_length=50, primary_key=True, serialize=False)),
+                ('body', models.TextField(help_text='The content of the tag.')),
+                ('url', models.URLField(help_text='The URL to this tag on GitHub.')),
+            ],
+        ),
+    ]
diff --git a/pydis_site/apps/content/migrations/__init__.py b/pydis_site/apps/content/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pydis_site/apps/content/models/__init__.py b/pydis_site/apps/content/models/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pydis_site/apps/content/models/tag.py b/pydis_site/apps/content/models/tag.py
new file mode 100644
index 00000000..1437b96a
--- /dev/null
+++ b/pydis_site/apps/content/models/tag.py
@@ -0,0 +1,17 @@
+from django.db import models
+
+
+class Tag(models.Model):
+    """A tag from the python-discord server."""
+
+    last_updated = models.DateTimeField(
+        help_text="The date and time this data was last fetched.",
+        auto_now=True,
+    )
+    name = models.CharField(
+        help_text="The tag's name.",
+        primary_key=True,
+        max_length=50,
+    )
+    body = models.TextField(help_text="The content of the tag.")
+    url = models.URLField(help_text="The URL to this tag on GitHub.")
diff --git a/pydis_site/apps/content/resources/tags/_info.yml b/pydis_site/apps/content/resources/tags/_info.yml
new file mode 100644
index 00000000..054125ec
--- /dev/null
+++ b/pydis_site/apps/content/resources/tags/_info.yml
@@ -0,0 +1,3 @@
+title: Tags
+description: Useful snippets that are often used in the server.
+icon: fas fa-tags
diff --git a/pydis_site/apps/content/utils.py b/pydis_site/apps/content/utils.py
index d3f270ff..a4252284 100644
--- a/pydis_site/apps/content/utils.py
+++ b/pydis_site/apps/content/utils.py
@@ -1,14 +1,26 @@
+import datetime
+import functools
+import tarfile
+import tempfile
+from io import BytesIO
 from pathlib import Path
-from typing import Dict, Tuple
 
 import frontmatter
+import httpx
 import markdown
 import yaml
 from django.http import Http404
+from django.utils import timezone
 from markdown.extensions.toc import TocExtension
 
+from pydis_site import settings
+from .models.tag import Tag
 
-def get_category(path: Path) -> Dict[str, str]:
+TAG_URL_BASE = "https://github.com/python-discord/bot/tree/main/bot/resources/tags"
+TAG_CACHE_TTL = datetime.timedelta(hours=1)
+
+
+def get_category(path: Path) -> dict[str, str]:
     """Load category information by name from _info.yml."""
     if not path.is_dir():
         raise Http404("Category not found.")
@@ -16,7 +28,7 @@ def get_category(path: Path) -> Dict[str, str]:
     return yaml.safe_load(path.joinpath("_info.yml").read_text(encoding="utf-8"))
 
 
-def get_categories(path: Path) -> Dict[str, Dict]:
+def get_categories(path: Path) -> dict[str, dict]:
     """Get information for all categories."""
     categories = {}
 
@@ -27,8 +39,111 @@ def get_categories(path: Path) -> Dict[str, Dict]:
     return categories
 
 
-def get_category_pages(path: Path) -> Dict[str, Dict]:
+@functools.cache
+def get_tags_static() -> list[Tag]:
+    """
+    Fetch tag information in static builds.
+
+    This will return a cached value, so it should only be used for static builds.
+    """
+    return fetch_tags()
+
+
+def fetch_tags() -> list[Tag]:
+    """
+    Fetch tag data from the GitHub API.
+
+    The entire repository is downloaded and extracted locally because
+    getting file content would require one request per file, and can get rate-limited.
+    """
+    if settings.GITHUB_TOKEN:
+        headers = {"Authorization": f"token {settings.GITHUB_TOKEN}"}
+    else:
+        headers = {}
+
+    tar_file = httpx.get(
+        f"{settings.GITHUB_API}/repos/python-discord/bot/tarball",
+        follow_redirects=True,
+        timeout=settings.TIMEOUT_PERIOD,
+        headers=headers,
+    )
+    tar_file.raise_for_status()
+
+    tags = []
+    with tempfile.TemporaryDirectory() as folder:
+        with tarfile.open(fileobj=BytesIO(tar_file.content)) as repo:
+            included = []
+            for file in repo.getmembers():
+                if "/bot/resources/tags" in file.path:
+                    included.append(file)
+            repo.extractall(folder, included)
+
+        for tag_file in Path(folder).rglob("*.md"):
+            tags.append(Tag(
+                name=tag_file.name.removesuffix(".md"),
+                body=tag_file.read_text(encoding="utf-8"),
+                url=f"{TAG_URL_BASE}/{tag_file.name}"
+            ))
+
+    return tags
+
+
+def get_tags() -> list[Tag]:
+    """Return a list of all tags visible to the application, from the cache or API."""
+    if settings.STATIC_BUILD:
+        last_update = None
+    else:
+        last_update = (
+            Tag.objects.values_list("last_updated", flat=True)
+            .order_by("last_updated").first()
+        )
+
+    if last_update is None or timezone.now() >= (last_update + TAG_CACHE_TTL):
+        # Stale or empty cache
+        if settings.STATIC_BUILD:
+            tags = get_tags_static()
+        else:
+            tags = fetch_tags()
+            Tag.objects.exclude(name__in=[tag.name for tag in tags]).delete()
+            for tag in tags:
+                tag.save()
+
+        return tags
+    else:
+        # Get tags from database
+        return Tag.objects.all()
+
+
+def get_tag(name: str) -> Tag:
+    """Return a tag by name."""
+    tags = get_tags()
+    for tag in tags:
+        if tag.name == name:
+            return tag
+
+    raise Tag.DoesNotExist()
+
+
+def get_category_pages(path: Path) -> dict[str, dict]:
     """Get all page names and their metadata at a category path."""
+    # Special handling for tags
+    if path == Path(__file__).parent / "resources/tags":
+        tags = {}
+        for tag in get_tags():
+            content = frontmatter.parse(tag.body)[1]
+            if len(content) > 100:
+                # Trim the preview to a maximum of 100 visible characters
+                # This causes some markdown to break, but we ignore that
+                content = content[:100] + "..."
+
+            tags[tag.name] = {
+                "title": tag.name,
+                "description": markdown.markdown(content),
+                "icon": "fas fa-tag"
+            }
+
+        return {name: tags[name] for name in sorted(tags)}
+
     pages = {}
 
     for item in path.glob("*.md"):
@@ -39,7 +154,7 @@ def get_category_pages(path: Path) -> Dict[str, Dict]:
     return pages
 
 
-def get_page(path: Path) -> Tuple[str, Dict]:
+def get_page(path: Path) -> tuple[str, dict]:
     """Get one specific page."""
     if not path.is_file():
         raise Http404("Page not found.")
diff --git a/pydis_site/apps/content/views/page_category.py b/pydis_site/apps/content/views/page_category.py
index 356eb021..01ce8402 100644
--- a/pydis_site/apps/content/views/page_category.py
+++ b/pydis_site/apps/content/views/page_category.py
@@ -1,4 +1,3 @@
-import typing as t
 from pathlib import Path
 
 import frontmatter
@@ -25,7 +24,7 @@ class PageOrCategoryView(TemplateView):
 
         return super().dispatch(request, *args, **kwargs)
 
-    def get_template_names(self) -> t.List[str]:
+    def get_template_names(self) -> list[str]:
         """Checks if the view uses the page template or listing template."""
         if self.page_path.is_file():
             template_name = "content/page.html"
@@ -36,7 +35,7 @@ class PageOrCategoryView(TemplateView):
 
         return [template_name]
 
-    def get_context_data(self, **kwargs) -> t.Dict[str, t.Any]:
+    def get_context_data(self, **kwargs) -> dict[str, any]:
         """Assign proper context variables based on what resource user requests."""
         context = super().get_context_data(**kwargs)
 
@@ -73,7 +72,7 @@ class PageOrCategoryView(TemplateView):
         return context
 
     @staticmethod
-    def _get_page_context(path: Path) -> t.Dict[str, t.Any]:
+    def _get_page_context(path: Path) -> dict[str, any]:
         page, metadata = utils.get_page(path)
         return {
             "page": page,
@@ -84,7 +83,7 @@ class PageOrCategoryView(TemplateView):
         }
 
     @staticmethod
-    def _get_category_context(path: Path) -> t.Dict[str, t.Any]:
+    def _get_category_context(path: Path) -> dict[str, any]:
         category = utils.get_category(path)
         return {
             "categories": utils.get_categories(path),
diff --git a/pydis_site/templates/content/listing.html b/pydis_site/templates/content/listing.html
index ef0ef919..eeb6b5e2 100644
--- a/pydis_site/templates/content/listing.html
+++ b/pydis_site/templates/content/listing.html
@@ -1,6 +1,8 @@
+{# Base navigation screen for resources #}
 {% extends 'content/base.html' %}
 
 {% block page_content %}
+    {# Nested Categories #}
     {% for category, data in categories.items %}
         <div class="box" style="max-width: 800px;">
             <span class="icon is-size-4 is-medium">
@@ -13,6 +15,8 @@
             <p class="is-italic">{{ data.description }}</p>
         </div>
     {% endfor %}
+
+    {# Single Pages #}
     {% for page, data in pages.items %}
         <div class="box" style="max-width: 800px;">
             <span class="icon is-size-4 is-medium">
@@ -21,7 +25,11 @@
             <a href="{% url "content:page_category" location=path|add:page %}">
                 <span class="is-size-4 has-text-weight-bold">{{ data.title }}</span>
             </a>
-            <p class="is-italic">{{ data.description }}</p>
+            {% if "tags" in location %}
+                <p class="is-italic">{{ data.description | safe }}</p>
+            {% else %}
+                <p class="is-italic">{{ data.description }}</p>
+            {% endif %}
         </div>
     {% endfor %}
 {% endblock %}
diff --git a/pydis_site/templates/content/page.html b/pydis_site/templates/content/page.html
index 759286f6..625c01f1 100644
--- a/pydis_site/templates/content/page.html
+++ b/pydis_site/templates/content/page.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet"
       href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.1/styles/atom-one-dark.min.css">
     <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.1/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
+    <script>hljs.highlightAll();</script>
 {% endblock %}
 
 {% block page_content %}
-- 
cgit v1.2.3


From 20a7264d4e7f88f690b592199a9bedc691e7f9a8 Mon Sep 17 00:00:00 2001
From: Rohan Shah <57906961+rshah713@users.noreply.github.com>
Date: Tue, 30 Aug 2022 20:10:45 -0400
Subject: Fix grammar in contributing guide (#771)

---
 pydis_site/apps/content/resources/guides/pydis-guides/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
index 6231fe87..2822d046 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing.md
@@ -119,7 +119,7 @@ As mentioned in the Contributing Guidelines, we have a simple style guide for ou
 [**Style Guide**](./style-guide/)
 
 ### 4. Create an issue
-The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have something that you want to implement open a new issue to present your idea. Otherwise you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel on Discord.
+The first step to any new contribution is an issue describing a problem with the current codebase or proposing a new feature. All the open issues are viewable on the GitHub repositories, for instance here is the [issues page for Sir Lancebot](https://github.com/python-discord/sir-lancebot/issues). If you have something that you want to implement open a new issue to present your idea. Otherwise, you can browse the unassigned issues and ask to be assigned to one that you're interested in, either in the comments on the issue or in the [`#dev-contrib`](https://discord.gg/2h3qBv8Xaa) channel on Discord.
 
 [**How to write a good issue**](./issues/)
 
-- 
cgit v1.2.3


From 9c816143fe58595c7ff4e810e350c229bfb1e1c2 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Sun, 21 Aug 2022 23:12:04 +0400
Subject: Upgrade To 3.10

All dependencies and code are already ready for 3.10, all that's
necessary is to update the number.

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 .github/workflows/lint-test.yaml                                       | 2 +-
 Dockerfile                                                             | 2 +-
 .../apps/content/resources/guides/pydis-guides/contributing/bot.md     | 2 +-
 .../apps/content/resources/guides/pydis-guides/contributing/site.md    | 2 +-
 .../content/resources/guides/pydis-guides/contributing/style-guide.md  | 3 ---
 pyproject.toml                                                         | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 0e3f121c..168a8383 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -19,7 +19,7 @@ jobs:
         uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1
         with:
           dev: true
-          python_version: '3.9'
+          python_version: '3.10'
 
       # Start the database early to give it a chance to get ready before
       # we start running tests.
diff --git a/Dockerfile b/Dockerfile
index 1d50e11d..454e58d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/chrislovering/python-poetry-base:3.9-slim
+FROM ghcr.io/chrislovering/python-poetry-base:3.10-slim
 
 # Allow service to handle stops gracefully
 STOPSIGNAL SIGQUIT
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index ad446cc8..633289f2 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -507,7 +507,7 @@ You can start several services together: `docker-compose up web snekbox redis`.
 ##### Setting Up a Development Environment
 The bot's code is Python code like any other. To run it locally, you will need the right version of Python with the necessary packages installed:
 
-1. Make sure you have [Python 3.9](https://www.python.org/downloads/) installed. It helps if it is your system's default Python version.
+1. Make sure you have [Python 3.10](https://www.python.org/downloads/) installed. It helps if it is your system's default Python version.
 2. [Install Poetry](https://github.com/python-poetry/poetry#installation).
 3. [Install the dependencies](../installing-project-dependencies).
 
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
index 520e41ad..9786698b 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/site.md
@@ -9,7 +9,7 @@ You should have already forked the [`site`](https://github.com/python-discord/si
 
 ### Requirements
 
-- [Python 3.9](https://www.python.org/downloads/)
+- [Python 3.10](https://www.python.org/downloads/)
 - [Poetry](https://python-poetry.org/docs/#installation)
     - `pip install poetry`
 - [Git](https://git-scm.com/downloads)
diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md
index 4dba45c8..b26c467c 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/style-guide.md
@@ -202,6 +202,3 @@ def foo(input_1: int, input_2: dict[str, int]) -> bool:
 This tells us that `foo` accepts an `int` and a `dict`, with `str` keys and `int` values, and returns a `bool`.
 
 In previous examples, we have purposely omitted annotations to keep focus on the specific points they represent.
-
-> **Note:** if the project is running Python 3.8 or below you have to use `typing.Dict` instead of `dict`, but our three main projects are all >=3.9.
-> See [PEP 585](https://www.python.org/dev/peps/pep-0585/) for more information.
diff --git a/pyproject.toml b/pyproject.toml
index ec8091e4..1f78ef2d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ authors = ["Python Discord <info@pythondiscord.com>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "3.9.*"
+python = "3.10.*"
 django = "4.0"  # 4.1 blocked by upstream bug, wait for 4.1.1: https://code.djangoproject.com/ticket/33919
 django-environ = "0.9.0"
 django-filter = "22.1"
-- 
cgit v1.2.3


From 5377fc16bd752a65f49757b7b806308236dd2d04 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Sat, 16 Jul 2022 23:58:02 +0100
Subject: Add info about working with snekbox 3.11 on bot

---
 .../content/resources/guides/pydis-guides/contributing/bot.md  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
index 633289f2..02316bca 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md
@@ -88,6 +88,7 @@ urls:
 
     # Snekbox
     snekbox_eval_api: "http://localhost:8060/eval"
+    snekbox_311_eval_api: "http://localhost:8065/eval"
 
 ##### <<  Replace the following � characters with the channel IDs in your test server  >> #####
 #  This assumes the template was used: https://discord.new/zmHtscpYN9E3
@@ -481,10 +482,14 @@ You are now almost ready to run the Python bot. The simplest way to do so is wit
 In your `config.yml` file:
 
 * Set `urls.site` to `"web:8000"`.
-* If you wish to work with snekbox set `urls.snekbox_eval_api` to `"http://snekbox:8060/eval"`.
+* If you wish to work with snekbox set the following:
+    * `urls.snekbox_eval_api` to `"http://snekbox:8060/eval"`
+    * `urls.snekbox_311_eval_api` to `"http://snekbox-311:8060/eval"`.
 
 Assuming you have Docker installed **and running**, enter the cloned repo in the command line and type `docker-compose up`.
 
+If working with snekbox you can run `docker-compose --profile 3.10 up` to also start up a 3.10 snekbox container, in addition to the default 3.11 container!
+
 After pulling the images and building the containers, your bot will start. Enter your server and type `!help` (or whatever prefix you chose instead of `!`).
 
 Your bot is now running, but this method makes debugging with an IDE a fairly involved process. For additional running methods, continue reading the following sections.
@@ -494,12 +499,13 @@ The advantage of this method is that you can run the bot's code in your preferre
 
 * Append the following line to your `.env` file: `BOT_API_KEY=badbot13m0n8f570f942013fc818f234916ca531`.
 * In your `config.yml` file, set `urls.site` to `"localhost:8000"`. If you wish to keep using `web:8000`, then [COMPOSE_PROJECT_NAME](../docker/#compose-project-names) has to be set.
-* To work with snekbox, set `urls.snekbox_eval_api` to `"http://localhost:8060/eval"`
+* To work with snekbox, set `urls.snekbox_eval_api` to `"http://localhost:8060/eval"` and `urls.snekbox_311_eval_api` to `"http://localhost:8065/eval"`
 
 You will need to start the services separately, but if you got the previous section with Docker working, that's pretty simple:
 
 * `docker-compose up web` to start the site container. This is required.
 * `docker-compose up snekbox` to start the snekbox container. You only need this if you're planning on working on the snekbox cog.
+* `docker-compose up snekbox-311` to start the snekbox 3.11 container. You only need this if you're planning on working on the snekbox cog.
 * `docker-compose up redis` to start the Redis container. You only need this if you're not using fakeredis. For more info refer to [Working with Redis](#optional-working-with-redis).
 
 You can start several services together: `docker-compose up web snekbox redis`.
-- 
cgit v1.2.3


From 6bde7d973e4b156b644ed1b4bcdab6d61be43ff2 Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 25 Oct 2022 06:46:09 +0200
Subject: Update off-topic etiquette to reflect server size (#785)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With more than 350k members, saying that we have “tens of thousands of members” seems like an understatement.
---
 .../apps/content/resources/guides/pydis-guides/off-topic-etiquette.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/off-topic-etiquette.md b/pydis_site/apps/content/resources/guides/pydis-guides/off-topic-etiquette.md
index f8031834..5e785cd9 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/off-topic-etiquette.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/off-topic-etiquette.md
@@ -5,7 +5,7 @@ icon: fab fa-discord
 ---
 
 ## Why do we need off-topic etiquette?
-Everyone wants to have good conversations in our off-topic channels, but with tens of thousands of members, this might mean different things to different people.
+Everyone wants to have good conversations in our off-topic channels, but with hundreds of thousands of members, this might mean different things to different people.
 To facilitate the best experience for everyone, here are some guidelines on conversation etiquette.
 
 ## Three things you shouldn't do
-- 
cgit v1.2.3


From 45a47e5f1c791ae3ae31e6b295716eaffae7bb56 Mon Sep 17 00:00:00 2001
From: Xithrius <xithrius@gmail.com>
Date: Sat, 12 Nov 2022 20:05:25 -0800
Subject: Appeased the formatter

---
 .../resources/guides/python-guides/keeping-tokens-safe.md    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
index 8e9f7075..9d523b4b 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/keeping-tokens-safe.md
@@ -2,14 +2,14 @@
 title: Keeping Discord Bot Tokens Safe
 description: How to keep your bot tokens safe and safety measures you can take.
 ---
-It's **very** important to keep a bot token safe, 
-primarily because anyone who has the bot token can do whatever they want with the bot -- 
+It's **very** important to keep a bot token safe,
+primarily because anyone who has the bot token can do whatever they want with the bot --
 such as destroying servers your bot has been added to and getting your bot banned from the API.
 
 # How to Avoid Leaking your Token
-To help prevent leaking your token, 
-you should ensure that you don't upload it to an open source program/website, 
-such as replit and github, as they show your code publicly. 
+To help prevent leaking your token,
+you should ensure that you don't upload it to an open source program/website,
+such as replit and github, as they show your code publicly.
 The best practice for storing tokens is generally utilising .env files
 ([click here](https://vcokltfre.dev/tips/tokens/.) for more information on storing tokens safely).
 
@@ -26,4 +26,4 @@ Following these steps will create a new token for your bot, making it secure aga
 The old token will stop working though, so make sure to replace the old token with the new one in your code if you haven't already.
 
 # Summary
-Make sure you keep your token secure by storing it safely, not sending it to anyone you don't trust, and regenerating your token if it does get leaked.
\ No newline at end of file
+Make sure you keep your token secure by storing it safely, not sending it to anyone you don't trust, and regenerating your token if it does get leaked.
-- 
cgit v1.2.3


From 0d59f046eac4a73f82885c84269ac02edf3d2bfe Mon Sep 17 00:00:00 2001
From: Xithrius <xithrius@gmail.com>
Date: Sat, 12 Nov 2022 20:25:45 -0800
Subject: Migrated from #discord-bot pin

---
 .../guides/python-guides/fix-ssl-certificate.md    |  23 +++++++++++++++++++++
 .../images/content/fix-ssl-certificate/pem.png     | Bin 0 -> 45703 bytes
 2 files changed, 23 insertions(+)
 create mode 100644 pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md
 create mode 100644 pydis_site/static/images/content/fix-ssl-certificate/pem.png

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md b/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md
new file mode 100644
index 00000000..ea141838
--- /dev/null
+++ b/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md
@@ -0,0 +1,23 @@
+---
+title: Fixing an SSL Certificate Verification Error.
+description: A guide on fixing verification of an SSL certificate.
+---
+
+We're fixing the error Python specifies as [ssl.SSLCertVerificationError](https://docs.python.org/3/library/ssl.html#ssl.SSLCertVerificationError).
+
+# How to fix SSL Certificate issue on Windows
+
+Firstly, try updating your OS, wouldn't hurt to try.
+
+Now, if you're still having an issue, you would need to download the certificate for the SSL.
+
+The SSL Certificate, Sectigo (cert vendor) provides a download link of [certificate](https://crt.sh/?id=2835394). You should find it in the bottom left corner, where it's saying Download Certificate: *PEM*.
+
+A picture where to find the certificate in the website is:
+![location of certificate](/static/images/content/fix-ssl-certificate/pem.png)
+
+You have to setup the certificate yourself. To do that you can just click on it, or if that doesn't work, refer to [this link](https://portal.threatpulse.com/docs/sol/Solutions/ManagePolicy/SSL/ssl_chrome_cert_ta.htm)
+
+# How to fix SSL Certificate issue on Mac
+
+Navigate to your `Applications/Python 3.x/` folder and double-click the `Install Certificates.command` to fix this.
diff --git a/pydis_site/static/images/content/fix-ssl-certificate/pem.png b/pydis_site/static/images/content/fix-ssl-certificate/pem.png
new file mode 100644
index 00000000..d63d018d
Binary files /dev/null and b/pydis_site/static/images/content/fix-ssl-certificate/pem.png differ
-- 
cgit v1.2.3


From f4b3a0d006a07dd6f32c6105021f39c56ddfeadd Mon Sep 17 00:00:00 2001
From: Xithrius <xithrius@gmail.com>
Date: Sat, 12 Nov 2022 20:55:26 -0800
Subject: Made stuff and things even better

---
 .../guides/python-guides/fix-ssl-certificate.md     |   4 ++--
 .../images/content/fix-ssl-certificate/pem.png      | Bin 13988 -> 11619 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md b/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md
index ea141838..096e3a90 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/fix-ssl-certificate.md
@@ -1,5 +1,5 @@
 ---
-title: Fixing an SSL Certificate Verification Error.
+title: Fixing an SSL Certificate Verification Error
 description: A guide on fixing verification of an SSL certificate.
 ---
 
@@ -11,7 +11,7 @@ Firstly, try updating your OS, wouldn't hurt to try.
 
 Now, if you're still having an issue, you would need to download the certificate for the SSL.
 
-The SSL Certificate, Sectigo (cert vendor) provides a download link of [certificate](https://crt.sh/?id=2835394). You should find it in the bottom left corner, where it's saying Download Certificate: *PEM*.
+The SSL Certificate, Sectigo (cert vendor) provides a download link of an [SSL certificate](https://crt.sh/?id=2835394). You should find it in the bottom left corner, shown below:
 
 A picture where to find the certificate in the website is:
 ![location of certificate](/static/images/content/fix-ssl-certificate/pem.png)
diff --git a/pydis_site/static/images/content/fix-ssl-certificate/pem.png b/pydis_site/static/images/content/fix-ssl-certificate/pem.png
index cb902bb3..face520f 100644
Binary files a/pydis_site/static/images/content/fix-ssl-certificate/pem.png and b/pydis_site/static/images/content/fix-ssl-certificate/pem.png differ
-- 
cgit v1.2.3


From f1ed4a68c49af1706f60156e2793e96294a851a8 Mon Sep 17 00:00:00 2001
From: Robin <74519799+Robin5605@users.noreply.github.com>
Date: Sun, 20 Nov 2022 21:55:28 -0600
Subject: Delete vps-services.md (#799)

---
 .../resources/guides/python-guides/vps-services.md | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 pydis_site/apps/content/resources/guides/python-guides/vps-services.md

(limited to 'pydis_site/apps/content/resources')

diff --git a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md b/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
deleted file mode 100644
index 0acd3e55..00000000
--- a/pydis_site/apps/content/resources/guides/python-guides/vps-services.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: VPS Services
-description: On different VPS services
----
-
-If you need to run your bot 24/7 (with no downtime), you should consider using a virtual private server (VPS). This is a list of VPS services that are sufficient for running Discord bots.
-
-* Europe
-    * [netcup](https://www.netcup.eu/)
-        * Germany & Austria data centres.
-        * Great affiliate program.
-    * [Yandex Cloud](https://cloud.yandex.ru/)
-        * Vladimir, Ryazan, and Moscow region data centres.
-    * [Scaleway](https://www.scaleway.com/)
-        * France data centre.
-    * [Time 4 VPS](https://www.time4vps.eu/)
-        * Lithuania data centre.
-* US
-    * [GalaxyGate](https://galaxygate.net/)
-        * New York data centre.
-        * Great affiliate program.
-* Global
-    * [Linode](https://www.linode.com/)
-    * [Digital Ocean](https://www.digitalocean.com/)
-    * [OVHcloud](https://www.ovhcloud.com/)
-    * [Vultr](https://www.vultr.com/)
-
----
-# Free hosts
-There are no reliable free options for VPS hosting. If you would rather not pay for a hosting service, you can consider self-hosting.
-Any modern hardware should be sufficient for running a bot. An old computer with a few GB of ram could be suitable, or a Raspberry Pi.
-- 
cgit v1.2.3