Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aaronhnsy/discord-ext-lava
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.0
Choose a base ref
...
head repository: aaronhnsy/discord-ext-lava
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Feb 15, 2022

  1. cleanup pyproject.toml

    aaronhnsy committed Feb 15, 2022
    Copy the full SHA
    8cd5809 View commit details

Commits on Feb 16, 2022

  1. Copy the full SHA
    491b0ac View commit details
  2. Copy the full SHA
    18cce0f View commit details
  3. version bump to v0.2.0

    aaronhnsy committed Feb 16, 2022
    Copy the full SHA
    d24f94d View commit details

Commits on Mar 18, 2022

  1. update aiohttp to 3.8.x

    aaronhnsy committed Mar 18, 2022
    Copy the full SHA
    ffd6036 View commit details
  2. version bump to 0.2.1

    aaronhnsy committed Mar 18, 2022
    Copy the full SHA
    6605769 View commit details

Commits on Apr 4, 2022

  1. update pyproject and docs

    aaronhnsy committed Apr 4, 2022
    Copy the full SHA
    5400259 View commit details
  2. Copy the full SHA
    75aeb5b View commit details
  3. version bump to 0.2.2

    aaronhnsy committed Apr 4, 2022
    Copy the full SHA
    3c93f0e View commit details

Commits on Apr 22, 2022

  1. cleanups

    aaronhnsy committed Apr 22, 2022
    Copy the full SHA
    38cf85e View commit details
  2. add workflow

    aaronhnsy committed Apr 22, 2022
    Copy the full SHA
    cf0375b View commit details
  3. rename dead references

    aaronhnsy committed Apr 22, 2022
    Copy the full SHA
    1c16e48 View commit details
  4. Copy the full SHA
    f78c82b View commit details

Commits on Apr 23, 2022

  1. fix player typing

    aaronhnsy committed Apr 23, 2022
    Copy the full SHA
    221d345 View commit details
  2. remove slate.Pool

    aaronhnsy committed Apr 23, 2022
    Copy the full SHA
    d224b17 View commit details
  3. Copy the full SHA
    db83c7b View commit details
  4. update some docs

    aaronhnsy committed Apr 23, 2022
    Copy the full SHA
    a9c7116 View commit details
  5. Copy the full SHA
    b546707 View commit details
  6. docs updates

    aaronhnsy committed Apr 23, 2022
    Copy the full SHA
    914535b View commit details
  7. make parameter per line

    aaronhnsy committed Apr 23, 2022
    Copy the full SHA
    8819eae View commit details

Commits on Apr 24, 2022

  1. update docs

    aaronhnsy committed Apr 24, 2022
    Copy the full SHA
    9cd0886 View commit details
  2. Update README.md

    aaronhnsy committed Apr 24, 2022
    Copy the full SHA
    fa623a9 View commit details

Commits on Apr 28, 2022

  1. add pool back

    aaronhnsy committed Apr 28, 2022
    Copy the full SHA
    708c733 View commit details
  2. fix regressions

    aaronhnsy committed Apr 28, 2022
    Copy the full SHA
    241f782 View commit details

Commits on May 10, 2022

  1. Copy the full SHA
    adb70a1 View commit details
  2. update deps

    aaronhnsy committed May 10, 2022
    Copy the full SHA
    91e8e0f View commit details
  3. rework filters

    add ChannelMix classmethods
    remove BaseFilter
    cleanup
    disambiguate types
    aaronhnsy committed May 10, 2022
    Copy the full SHA
    c8fcdd7 View commit details

Commits on May 11, 2022

  1. Copy the full SHA
    e2ef487 View commit details
  2. re-add missing doc entries

    aaronhnsy committed May 11, 2022
    Copy the full SHA
    e17cd84 View commit details
  3. version bump to v0.3.0

    aaronhnsy committed May 11, 2022
    Copy the full SHA
    de49eac View commit details

Commits on May 15, 2022

  1. rework spotify searching

    aaronhnsy committed May 15, 2022
    Copy the full SHA
    f502524 View commit details
  2. Copy the full SHA
    383ea5a View commit details
  3. version bump to v0.3.1

    aaronhnsy committed May 15, 2022
    Copy the full SHA
    400bf32 View commit details

Commits on Jun 14, 2022

  1. bug: fix spotify url regex

    aaronhnsy committed Jun 14, 2022
    Copy the full SHA
    6135c9f View commit details
  2. Copy the full SHA
    ea211ee View commit details
  3. Copy the full SHA
    cb062d5 View commit details
  4. Copy the full SHA
    c99f679 View commit details
  5. Copy the full SHA
    28c57b1 View commit details
  6. Copy the full SHA
    afe52da View commit details
  7. Copy the full SHA
    f900144 View commit details
  8. Copy the full SHA
    9d2cc16 View commit details
  9. Copy the full SHA
    c3b8a97 View commit details
  10. Copy the full SHA
    0217717 View commit details

Commits on Jun 15, 2022

  1. style: fix formatting

    aaronhnsy committed Jun 15, 2022
    Copy the full SHA
    6b3c665 View commit details
  2. docs: fix wording in install docs (#16)

    2D authored and aaronhnsy committed Jun 15, 2022
    Copy the full SHA
    cf8ad3a View commit details
  3. Copy the full SHA
    9364252 View commit details
  4. add: create CHANGELOG.md

    aaronhnsy committed Jun 15, 2022
    Copy the full SHA
    3bb4814 View commit details
  5. Copy the full SHA
    45c1714 View commit details
  6. Copy the full SHA
    b1a6476 View commit details
  7. Copy the full SHA
    c8677b9 View commit details
Showing with 4,171 additions and 2,942 deletions.
  1. +64 −0 .github/workflows/verify_types.yaml
  2. +3 −1 .gitignore
  3. +5 −9 .readthedocs.yaml
  4. +13 −0 CHANGELOG.md
  5. +7 −23 README.md
  6. +5 −8 {slate → discord/ext/lava}/__init__.py
  7. +17 −19 {slate → discord/ext/lava}/exceptions.py
  8. +525 −0 discord/ext/lava/node.py
  9. +0 −3 {slate → discord/ext/lava}/objects/__init__.py
  10. +9 −28 {slate → discord/ext/lava}/objects/collection.py
  11. +3 −5 {slate → discord/ext/lava}/objects/enums.py
  12. +21 −10 {slate → discord/ext/lava}/objects/events.py
  13. +13 −0 discord/ext/lava/objects/filters/__init__.py
  14. +103 −0 discord/ext/lava/objects/filters/channel_mix.py
  15. +101 −0 discord/ext/lava/objects/filters/distortion.py
  16. +46 −0 discord/ext/lava/objects/filters/equalizer.py
  17. +158 −0 discord/ext/lava/objects/filters/filter.py
  18. +66 −0 discord/ext/lava/objects/filters/karaoke.py
  19. +43 −0 discord/ext/lava/objects/filters/low_pass.py
  20. +42 −0 discord/ext/lava/objects/filters/rotation.py
  21. +49 −0 discord/ext/lava/objects/filters/timescale.py
  22. +43 −0 discord/ext/lava/objects/filters/tremolo.py
  23. +43 −0 discord/ext/lava/objects/filters/vibrato.py
  24. +31 −0 discord/ext/lava/objects/filters/volume.py
  25. +11 −18 {slate → discord/ext/lava}/objects/search.py
  26. +123 −0 discord/ext/lava/objects/track.py
  27. +502 −0 discord/ext/lava/player.py
  28. +198 −0 discord/ext/lava/pool.py
  29. 0 {slate → discord/ext/lava}/py.typed
  30. +491 −0 discord/ext/lava/queue.py
  31. +38 −0 discord/ext/lava/types.py
  32. +159 −0 discord/ext/lava/utils.py
  33. +138 −38 docs/conf.py
  34. +77 −0 docs/extensions/resource_links.py
  35. +0 −49 docs/extensions/resourcelinks.py
  36. BIN docs/images/slate.jpg
  37. +13 −23 docs/index.rst
  38. +3 −3 docs/make.bat
  39. +2 −0 docs/pages/contribution.rst
  40. +50 −0 docs/pages/installation.rst
  41. +225 −0 docs/pages/reference.rst
  42. +5 −0 docs/pages/usage.rst
  43. +0 −10 docs/reference/index.rst
  44. +0 −257 docs/reference/obsidian.rst
  45. +0 −58 docs/reference/slate.rst
  46. +9 −0 docs/static/custom.css
  47. +675 −460 poetry.lock
  48. +42 −64 pyproject.toml
  49. BIN slate.jpg
  50. +0 −440 slate/node.py
  51. +0 −421 slate/objects/filters.py
  52. +0 −52 slate/objects/stats.py
  53. +0 −116 slate/objects/track.py
  54. +0 −412 slate/player.py
  55. +0 −120 slate/pool.py
  56. +0 −227 slate/queue.py
  57. +0 −68 slate/utils.py
64 changes: 64 additions & 0 deletions .github/workflows/verify_types.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Verify Types

on:
push:
branches:
- main
pull_request:
branches:
- main
types:
- opened
- synchronize

jobs:

job:
name: "Verify Types @ Python v${{ matrix.python-version }}"
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python-version: [ "3.10" ]

steps:

# git

- name: "Initialise Environment"
uses: actions/checkout@v3
with:
fetch-depth: 0

# node

- name: "Setup Node v18"
uses: actions/setup-node@v3
with:
node-version: 18

- name: "Install Pyright"
run: |
npm install -g pyright@latest
# python

- name: "Setup Python v${{ matrix.python-version }}"
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: "Install Poetry"
run: |
pipx install poetry
- name: "Install Dependencies"
run: |
poetry env use ${{ matrix.python-version }}
poetry install
- name: "Verify types"
run: |
poetry run pyright
poetry run pyright --ignoreexternal --lib --verifytypes discord.ext.lava
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -2,5 +2,7 @@
*.log*

.idea/
dist/
tests/
dist/
_build/
build/
14 changes: 5 additions & 9 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
version: 2
formats:
- pdf

build:
os: ubuntu-20.04
tools:
python: "3.10"
jobs:
post_install:
- pip install poetry
- poetry config virtualenvs.create false
- poetry install --with docs

sphinx:
configuration: docs/conf.py

python:
install:
- method: pip
path: .
extra_requirements:
- docs
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# v0.5.1

### New Features
- n/a

### Changes
- n/a

### Bug Fixes
- n/a

### Notes
- n/a
30 changes: 7 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,12 @@
![](slate.jpg)

A [lavalink](https://github.com/Frederikam/Lavalink/) and [obsidian](https://github.com/mixtape-bot/obsidian) python wrapper for use with [discord.py's](https://github.com/Rapptz/discord.py) command extension.

## Support
Support for using slate can be found in my [discord server](https://discord.com/invite/w9f6NkQbde) or by opening an issue/discussion on this [GitHub](https://github.com/Axelware/slate).
# discord-ext-lava
A [discord.py](https://github.com/Rapptz/discord.py) extension for [lavaplayer](https://github.com/Walkyst/lavaplayer-fork)-based audio nodes.

## Installation

#### pip
- Latest:
```shell
pip install -U git+https://github.com/Axelware/slate.git@main#egg=slate
```
- Specific version
```shell
pip install -U git+https://github.com/Axelware/slate.git@2021.10.27#egg=slate
pip install discord-ext-lava
```

#### requirements.txt
- Latest:
```text
slate @ git+https://github.com/Axelware/slate.git@main#egg=slate
```
- Specific version:
```text
slate @ git+https://github.com/Axelware/slate.git@2021.10.27#egg=slate
```
## Support
- [Documentation](https://discord-ext-lava.readthedocs.io/)
- [GitHub](https://github.com/Axelware/discord-ext-lava)
- [Discord](https://discord.com/invite/w9f6NkQbde)
13 changes: 5 additions & 8 deletions slate/__init__.py → discord/ext/lava/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Future
from __future__ import annotations

# Standard Library
import logging
from typing import Final, Literal, NamedTuple

# My stuff
from .exceptions import *
from .node import *
from .objects import *
@@ -23,14 +20,14 @@ class VersionInfo(NamedTuple):
serial: int


version_info: Final[VersionInfo] = VersionInfo(major=0, minor=1, micro=0, releaselevel="final", serial=0)
version_info: Final[VersionInfo] = VersionInfo(major=0, minor=5, micro=1, releaselevel="final", serial=0)

__title__: Final[str] = "slate"
__title__: Final[str] = "discord-ext-lava"
__author__: Final[str] = "Axelancerr"
__copyright__: Final[str] = "Copyright 2020-present Axelancerr"
__license__: Final[str] = "MIT"
__version__: Final[str] = "0.1.0"
__version__: Final[str] = "0.5.1"
__maintainer__: Final[str] = "Aaron Hennessey"
__source__: Final[str] = "https://github.com/Axelware/slate"
__source__: Final[str] = "https://github.com/Axelware/discord-ext-lava"

logging.getLogger("slate")
logging.getLogger("discord.ext.lava")
36 changes: 17 additions & 19 deletions slate/exceptions.py → discord/ext/lava/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,62 +1,60 @@
# Future
from __future__ import annotations

# Standard Library
from typing import Any, Literal

# Packages
import aiohttp

# My stuff
from .objects.enums import Source


__all__ = (
"SlateError",
"LavaError",
"NodeAlreadyExists",
"NodeNotFound",
"NoNodesConnected",
"NodeCreationError",
"NodeNotConnected",
"NodeAlreadyConnected",
"NodeConnectionError",
"NodeInvalidPassword",
"InvalidPassword",
"NodeNotConnected",
"HTTPError",
"NoResultsFound",
"SearchFailed"
)


class SlateError(Exception):
class LavaError(Exception):
pass


class NodeNotFound(SlateError):
class NodeAlreadyExists(LavaError):
pass


class NoNodesConnected(SlateError):
class NodeNotFound(LavaError):
pass


class NodeCreationError(SlateError):
class NoNodesConnected(LavaError):
pass


class NodeNotConnected(SlateError):
class NodeAlreadyConnected(LavaError):
pass


class NodeConnectionError(SlateError):
class NodeConnectionError(LavaError):
pass


class NodeInvalidPassword(NodeConnectionError):
class InvalidPassword(NodeConnectionError):
pass


#
class NodeNotConnected(LavaError):
pass


class HTTPError(SlateError):
class HTTPError(LavaError):

def __init__(
self,
@@ -76,7 +74,7 @@ def message(self) -> str:
return self._message


class NoResultsFound(SlateError):
class NoResultsFound(LavaError):

def __init__(
self,
@@ -103,7 +101,7 @@ def type(self) -> str:
return self._type


class SearchFailed(SlateError):
class SearchFailed(LavaError):

def __init__(
self,
Loading