fix: some things

Author: VincentRPS

.gitignore

@@ -10,6 +10,8 @@ docs/crowdin.py
 *.mp3
 *.m4a
 *.wav
+*.mp4
+*.ogg
 *.pcm
 *.png
 *.jpg

discord/errors.py

@@ -60,7 +60,6 @@
     'NoEntryPointError',
     'ExtensionFailed',
     'ExtensionNotFound',
-    'RecordingException',
 )
 
 

discord/sinks/core.py

@@ -85,7 +85,7 @@ def wait_and_stop(self):
         time.sleep(self.seconds)
         if self.finished:
             return
-        self.vc.stop_listening()
+        self.vc.stop_recording()
 
 
 class RawData:

discord/sinks/errors.py

@@ -26,13 +26,15 @@
 
 class SinkException(DiscordException):
     """Raised when a Sink error occurs.
+    
     .. versionadded:: 2.1
     """
 
 
 class RecordingException(SinkException):
     """Exception that's thrown when there is an error while trying to record
     audio from a voice channel.
+    
     .. versionadded:: 2.1
     """
 
@@ -41,34 +43,46 @@ class RecordingException(SinkException):
 
 class MP3SinkError(SinkException):
     """Exception thrown when a exception occurs with :class:`MP3Sink`
+    
     .. versionadded:: 2.1
     """
 
 
 class MP4SinkError(SinkException):
     """Exception thrown when a exception occurs with :class:`MP4Sink`
+    
     .. versionadded:: 2.1
     """
 
 
 class OGGSinkError(SinkException):
     """Exception thrown when a exception occurs with :class:`OGGSink`
+    
     .. versionadded:: 2.1
     """
 
 
 class MKVSinkError(SinkException):
     """Exception thrown when a exception occurs with :class:`MKVSink`
+    
     .. versionadded:: 2.1
     """
 
 
 class WaveSinkError(SinkException):
     """Exception thrown when a exception occurs with :class:`WaveSink`
+    
     .. versionadded:: 2.1
     """
 
 class M4ASinkError(SinkException):
     """Exception thrown when a exception occurs with :class:`M4ASink`
+    
+    .. versionadded:: 2.1
+    """
+
+class MKASinkError(SinkException):
+    """Exception thrown when a exception occurs with :class:`MKAsSink`
+    
     .. versionadded:: 2.1
     """

discord/voice_client.py

@@ -52,9 +52,9 @@
 from . import opus, utils
 from .backoff import ExponentialBackoff
 from .gateway import *
-from .errors import ClientException, ConnectionClosed, RecordingException
+from .errors import ClientException, ConnectionClosed
 from .player import AudioPlayer, AudioSource
-from .sinks import Sink, RawData
+from .sinks import Sink, RawData, RecordingException
 
 from .utils import MISSING
 
@@ -704,13 +704,13 @@ def unpack_audio(self, data):
 
         self.decoder.decode(data)
 
-    def listen(self, sink, callback, *args):
+    def start_recording(self, sink, callback, *args):
         """The bot will begin recording audio from the current voice channel it is in.
         This function uses a thread so the current code line will not be stopped.
         Must be in a voice channel to use.
         Must not be already recording.
 
-        .. versionadded:: 2.0
+        .. versionadded:: 2.1
 
         Parameters
         ----------
@@ -754,12 +754,12 @@ def listen(self, sink, callback, *args):
         )
         t.start()
 
-    def stop_listening(self):
+    def stop_recording(self):
         """Stops the recording.
         Must be already recording.
         Raises
 
-        .. versionadded:: 2.0
+        .. versionadded:: 2.1
 
         ------
         RecordingException
@@ -811,7 +811,7 @@ def recv_audio(self, sink, callback, *args):
             try:
                 data = self.socket.recv(4096)
             except OSError:
-                self.stop_listening()
+                self.stop_recording()
                 continue
 
             self.unpack_audio(data)

docs/api.rst

@@ -4592,24 +4592,81 @@ Select
 
 .. autofunction:: discord.ui.select
 
-Voice Recording
----------------
+Sink Core
+---------
+
+.. autoclass:: discord.sinks.Filters
+    :members:
+
+.. autoclass:: discord.sinks.Sink
+    :members:
+
+.. autoclass:: discord.sinks.AudioData
+    :members:
+
+.. autoclass:: discord.sinks.RawData
+    :members:
+
+
+Sinks
+-----
+
+.. autoclass:: discord.sinks.WaveSink
+    :members:
+
+.. autoclass:: discord.sinks.MP3Sink
+    :members:
 
-.. attributetable:: discord.sink
+.. autoclass:: discord.sinks.MP4Sink
+    :members:
 
-.. autoclass:: discord.sink.Filters
+.. autoclass:: discord.sinks.M4ASink
     :members:
 
-.. autoclass:: discord.sink.Sink
+.. autoclass:: discord.sinks.MKVSink
     :members:
 
-.. autoclass:: discord.sink.AudioData
+.. autoclass:: discord.sinks.MKASink
     :members:
 
-.. autoclass:: discord.sink.RawData
+.. autoclass:: discord.sinks.OGGSink
     :members:
 
 
+Sink Error Reference
+--------------------
+
+.. autoexception:: discord.sinks.WaveSinkError
+
+.. autoexception:: discord.sinks.MP3SinkError
+
+.. autoexception:: discord.sinks.MP4SinkError
+
+.. autoexception:: discord.sinks.M4ASinkError
+
+.. autoexception:: discord.sinks.MKVSinkError
+
+.. autoexception:: discord.sinks.MKASinkError
+
+.. autoexception:: discord.sinks.OGGSinkError
+
+Sink Exception Hierarchy
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. exception_hierarchy::
+
+    - :exc:`DiscordException`
+        - :exc:`SinkException`
+            - :exc:`RecordingException`
+            - :exc:`WaveSinkError`
+            - :exc:`MP3SinkError`
+            - :exc:`MP4SinkError`
+            - :exc:`M4ASinkError`
+            - :exc:`MKVSinkError`
+            - :exc:`MKASinkError`
+            - :exc:`OGGSinkError`
+
+
 Exceptions
 ------------