Fix mimetypes.guess_type (#471)

`mimetypes.guess_type` fails if the url is something like `http://example.com/file.zip?u=10`.
2019-09-08 09:56:27 -04:00
parent a6a3768a38
commit 6bffb66b5e
1 changed files with 3 additions and 2 deletions
--- a/fbchat/_util.py
+++ b/fbchat/_util.py
@@ -193,11 +193,12 @@ def get_files_from_urls(file_urls):
        r = requests.get(file_url)
        # We could possibly use r.headers.get('Content-Disposition'), see
        # https://stackoverflow.com/a/37060758
+        file_name = path.basename(file_url).split("?")[0].split("#")[0]
        files.append(
            (
-                path.basename(file_url).split("?")[0].split("#")[0],
+                file_name,
                r.content,
-                r.headers.get("Content-Type") or mimetypes.guess_type(file_url)[0],
+                r.headers.get("Content-Type") or mimetypes.guess_type(file_name)[0],
            )
        )
    return files