From 905f4b8e62fde7bbf9cad7159ffe180b5bba4340 Mon Sep 17 00:00:00 2001
From: Dan <14043624+delivrance@users.noreply.github.com>
Date: Sat, 15 Dec 2018 21:40:44 +0100
Subject: [PATCH] Refactor Voice and Audio

---
 .../client/types/messages_and_media/audio.py  | 48 ++++++++++++++-----
 .../client/types/messages_and_media/voice.py  | 38 +++++++++++----
 2 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/pyrogram/client/types/messages_and_media/audio.py b/pyrogram/client/types/messages_and_media/audio.py
index 37f91992..3f2b3c20 100644
--- a/pyrogram/client/types/messages_and_media/audio.py
+++ b/pyrogram/client/types/messages_and_media/audio.py
@@ -16,7 +16,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
+from struct import pack
+
+from pyrogram.api import types
 from pyrogram.api.core import Object
+from .photo_size import PhotoSize
+from ...ext.utils import encode
 
 
 class Audio(Object):
@@ -53,18 +58,10 @@ class Audio(Object):
 
     ID = 0xb0700006
 
-    def __init__(
-            self,
-            file_id: str,
-            duration: int,
-            thumb=None,
-            file_name: str = None,
-            mime_type: str = None,
-            file_size: int = None,
-            date: int = None,
-            performer: str = None,
-            title: str = None
-    ):
+    def __init__(self, file_id: str, duration: int, *,
+                 thumb=None, file_name: str = None, mime_type: str = None, file_size: int = None, date: int = None,
+                 performer: str = None, title: str = None,
+                 client=None, raw=None):
         self.file_id = file_id
         self.thumb = thumb
         self.file_name = file_name
@@ -74,3 +71,30 @@ class Audio(Object):
         self.duration = duration
         self.performer = performer
         self.title = title
+
+        self._client = client
+        self._raw = raw
+
+    @staticmethod
+    def parse(client, audio: types.Document, audio_attributes: types.DocumentAttributeAudio, file_name: str) -> "Audio":
+        return Audio(
+            file_id=encode(
+                pack(
+                    "<iiqq",
+                    9,
+                    audio.dc_id,
+                    audio.id,
+                    audio.access_hash
+                )
+            ),
+            duration=audio_attributes.duration,
+            performer=audio_attributes.performer,
+            title=audio_attributes.title,
+            mime_type=audio.mime_type,
+            file_size=audio.size,
+            thumb=PhotoSize.parse(client, audio.thumb),
+            file_name=file_name,
+            date=audio.date,
+            client=client,
+            raw=audio
+        )
diff --git a/pyrogram/client/types/messages_and_media/voice.py b/pyrogram/client/types/messages_and_media/voice.py
index d838cf59..da9d6d51 100644
--- a/pyrogram/client/types/messages_and_media/voice.py
+++ b/pyrogram/client/types/messages_and_media/voice.py
@@ -16,7 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
+from pyrogram.api import types
 from pyrogram.api.core import Object
+from ...ext.utils import encode
+from struct import pack
 
 
 class Voice(Object):
@@ -44,17 +47,36 @@ class Voice(Object):
 
     ID = 0xb0700009
 
-    def __init__(
-            self,
-            file_id: str,
-            duration: int,
-            waveform: bytes = None,
-            mime_type: str = None,
-            file_size: int = None,
-            date: int = None):
+    def __init__(self, file_id: str, duration: int, *,
+                 waveform: bytes = None, mime_type: str = None, file_size: int = None, date: int = None,
+                 client=None, raw=None):
         self.file_id = file_id
         self.duration = duration
         self.waveform = waveform
         self.mime_type = mime_type
         self.file_size = file_size
         self.date = date
+
+        self._client = client
+        self._raw = raw
+
+    @staticmethod
+    def parse(client, voice: types.Document, attributes: types.DocumentAttributeAudio) -> "Voice":
+        return Voice(
+            file_id=encode(
+                pack(
+                    "<iiqq",
+                    3,
+                    voice.dc_id,
+                    voice.id,
+                    voice.access_hash
+                )
+            ),
+            duration=attributes.duration,
+            mime_type=voice.mime_type,
+            file_size=voice.size,
+            waveform=attributes.waveform,
+            date=voice.date,
+            client=client,
+            raw=voice
+        )