Skip to content

Commit

Permalink
Merge branch 'V3/develop' into hyperlink-and-header
Browse files Browse the repository at this point in the history
  • Loading branch information
Kowlin authored Sep 1, 2024
2 parents af0abb6 + 907a3f7 commit 48d6483
Show file tree
Hide file tree
Showing 200 changed files with 4,423 additions and 3,580 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,43 @@ jobs:
name: build-output
path: ./dist

generate_default_ll_server_config:
name: Generate default application.yml
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Install script's dependencies
run: python -m pip install PyYAML

- name: Generate default application.yml
env:
APP_YML_FILE: "Red-DiscordBot-${{ github.ref_name }}-default-lavalink-application.yml"
run: |
mkdir -p release_assets
python .github/workflows/scripts/get_default_ll_server_config.py "release_assets/$APP_YML_FILE"
- name: Upload default application.yml
uses: actions/upload-artifact@v3
with:
name: ll-default-server-config
path: ./release_assets

release_to_pypi:
needs:
- release_information
- build
- generate_default_ll_server_config
environment: Release
name: Release to PyPI
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write
steps:
- name: Download packaged distributions
Expand All @@ -96,6 +125,18 @@ jobs:
name: build-output
path: dist/

- name: Download default application.yml
uses: actions/download-artifact@v3
with:
name: ll-default-server-config
path: release_assets/

- name: Upload dists to GitHub Release
env:
GITHUB_TOKEN: "${{ github.token }}"
run: |
gh release upload "$GITHUB_REF_NAME" dist/* release_assets/* --repo "$GITHUB_REPOSITORY"
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/scripts/get_default_ll_server_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import sys
from pathlib import Path

import yaml

ROOT_FOLDER = Path(__file__).parents[3].absolute()
AUDIO_FOLDER = ROOT_FOLDER / "redbot/cogs/audio"

# We want to import `redbot.cogs.audio.managed_node` package as if it were top-level package
# so we have to the `redbot/cogs/audio` directory to Python's path.
sys.path.insert(0, str(AUDIO_FOLDER))


def main() -> int:
try:
output_file = sys.argv[1]
except IndexError:
print("Usage:", sys.argv[0], "<output_file>", file=sys.stderr)
return 2

import managed_node

server_config = managed_node.get_default_server_config()
with open(output_file, "w", encoding="utf-8") as fp:
yaml.safe_dump(server_config, fp)

return 0


if __name__ == "__main__":
raise SystemExit(main())
114 changes: 112 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,115 @@
.. Red changelogs
Redbot 3.5.13 (2024-08-27)
==========================

| Thanks to all these amazing people that contributed to this release:
| :ghuser:`aikaterna`, :ghuser:`Guyonsteroids`, :ghuser:`Jackenmen`, :ghuser:`Kowlin`
Read before updating
--------------------

#. Information for Audio users that are using an external Lavalink instance (if you don't know what that is, you should skip this point):

We've updated our default application.yml file and you should update your instance's ``application.yml`` accordingly.
More specifically, we bumped the version of YT source plugin.
`Download Red 3.5.13's default application.yml file <https://github.com/Cog-Creators/Red-DiscordBot/releases/download/3.5.13/Red-DiscordBot-3.5.13-default-lavalink-application.yml>`__

End-user changelog
------------------

Changes
*******

- **Core - Dependencies** - Red's dependencies have been bumped (:issue:`6436`)

Fixes
*****

- **Cogs - Audio** - Updated Audio to support planned changes to Discord API scheduled for November (:issue:`6435`)
- **Cogs - Audio** - Fixed YT live stream detection (:issue:`6435`)
- **Cogs - Audio** - Fixed Red erroneously trying to send a message to a notification channel when one is not set (:issue:`6429`)
- **Cogs - Trivia - Lists** - Fixed spelling of Steven Spielberg's first name in the ``entertainment`` trivia list (:issue:`6434`)

----

Redbot 3.5.12 (2024-08-08)
==========================

| Thanks to all these amazing people that contributed to this release:
| :ghuser:`aikaterna`, :ghuser:`Jackenmen`
Read before updating
--------------------

#. Information for Audio users that are using an external Lavalink instance (if you don't know what that is, you should skip this point):

We've updated our default application.yml file and you should update your instance's ``application.yml`` accordingly.
More specifically, we bumped the version of YT source plugin.
`Download Red 3.5.12's default application.yml file <https://github.com/Cog-Creators/Red-DiscordBot/releases/download/3.5.12/Red-DiscordBot-3.5.12-default-lavalink-application.yml>`__

End-user changelog
------------------

Fixes
*****

- **Cogs - Audio** - Fixed the ``[p]llset secured`` command failing to send the response message (:issue:`6423`)
- **Cogs - Audio** - Fixed some age-restricted YT tracks not playing (:issue:`6424`)

----

Redbot 3.5.11 (2024-08-04)
==========================

| Thanks to all these amazing people that contributed to this release:
| :ghuser:`aikaterna`, :ghuser:`anopem`, :ghuser:`Flame442`, :ghuser:`japandotorg`, :ghuser:`Jackenmen`, :ghuser:`Kowlin`, :ghuser:`palmtree5`, :ghuser:`yamikaitou`
Read before updating
--------------------

#. Information for Audio users that are using an external Lavalink instance (if you don't know what that is, you should skip this point):

We've updated our default application.yml file and you should update your instance's ``application.yml`` accordingly.
More specifically, we bumped the version of YT source plugin and added new plugin configuration.
`Download Red 3.5.11's default application.yml file <https://github.com/Cog-Creators/Red-DiscordBot/releases/download/3.5.11/Red-DiscordBot-3.5.11-default-lavalink-application.yml>`__

End-user changelog
------------------

Changes
*******

- **Core** - Menus sent in ephemeral messages will now be deleted the same way menus in normal messages do (:issue:`6304`)
- **Core - Dependencies** - Red's dependencies have been bumped (:issue:`6417`)

Fixes
*****

- **Core - RPC** - RPC is now forcefully shut down after 2 minutes, if it cannot shutdown gracefully (:issue:`6391`, :issue:`6412`)
- |cool| **Cogs - Audio** - Fixed some of the recent YT playback issues (:issue:`6414`, :issue:`6415`)
- **Cogs - Mutes** - Fixed the cog failing to unmute a user, if they were muted by someone who no longer has permissions to mute that user (:issue:`6376`, :issue:`6411`)
- **Cogs - Streams** - Fixed the viewer count for Twitch streams (:issue:`6413`)

Developer changelog
-------------------

Additions
*********

- **Core - App Commands Package** - Added `app_commands.UserFeedbackCheckFailure` exception allowing the cog creators to return non-default error message when the check fails (:issue:`6397`)

Documentation changes
---------------------

Changes
*******

- Updated instructions for installing the development version of Red in `guide_cog_creation` (:issue:`6408`)
- Updated the contents of the ``red.plist`` file in the `autostart_mac` document to use no resource limitations, same as regular applications (:issue:`6416`)

----

Redbot 3.5.10 (2024-07-10)
==========================

Expand Down Expand Up @@ -53,8 +163,8 @@ Fixes
- **Core** - Fixed command autocompletion not showing any proper result (error message) when bot's global checks (channel/server ignores, allowlist/blocklist) do not pass (:issue:`6374`, :issue:`6375`)
- **Cogs - Audio** - Fixed one of the recent YT playback issues (:issue:`6373`)

Developer changes
-----------------
Developer changelog
-------------------

Changes
*******
Expand Down
2 changes: 2 additions & 0 deletions docs/autostart_mac.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Paste the following and replace the following:
<string>username</string>
<key>InitGroups</key>
<true/>
<key>ProcessType</key>
<string>Interactive</string>
</dict>
</plist>
Expand Down
2 changes: 1 addition & 1 deletion redbot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def _early_init():


# This is bumped automatically by release workflow (`.github/workflows/scripts/bump_version.py`)
_VERSION = "3.5.11.dev1"
_VERSION = "3.5.14.dev1"

__version__, version_info = VersionInfo._get_version()

Expand Down
6 changes: 3 additions & 3 deletions redbot/cogs/admin/locales/id-ID.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions redbot/cogs/alias/locales/id-ID.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions redbot/cogs/audio/core/commands/llset.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ async def validate_input(cog, arg):
if meta[1]:
await ctx.send(
_(
"Heap-size must be less than your system RAM, "
"Heap-size must be less than your system RAM. "
"You currently have {ram_in_bytes} of RAM available."
).format(ram_in_bytes=inline(sizeof_fmt(meta[0])))
)
Expand Down Expand Up @@ -250,7 +250,7 @@ async def command_llset_wsport(
return await self.send_embed_msg(
ctx,
title=_("Setting Not Changed"),
description=_("A port must be between 0 and 65535 "),
description=_("A port must be between 0 and 65535."),
)
await self.config.ws_port.set(port)
await self.send_embed_msg(
Expand Down Expand Up @@ -295,11 +295,14 @@ async def command_llset_secured(self, ctx: commands.Context):
title=_("Setting Changed"),
description=_(
"Unmanaged Lavalink node will no longer connect using the secured "
"{secured_protocol} protocol and wil use {unsecured_protocol} instead .\n\n"
"{secured_protocol} protocol and will use {unsecured_protocol} instead.\n\n"
"Run `{p}{cmd}` for it to take effect."
).format(p=ctx.prefix, cmd=self.command_audioset_restart.qualified_name),
unsecured_protocol=inline("ws://"),
secured_protocol=inline("wss://"),
).format(
p=ctx.prefix,
cmd=self.command_audioset_restart.qualified_name,
unsecured_protocol=inline("ws://"),
secured_protocol=inline("wss://"),
),
)

@command_llset.command(name="info", aliases=["settings"])
Expand Down
Loading

0 comments on commit 48d6483

Please sign in to comment.