Fix bug and publish version 1.1.0

Author: Matin-B

.gitignore

@@ -0,0 +1,137 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+videos/
+photos/
+
+
+# VSCode
+.vscode/
+vscode/

TwiGram.egg-info/PKG-INFO

@@ -1,10 +1,13 @@
 Metadata-Version: 2.1
 Name: TwiGram
-Version: 1.0.2
+Version: 1.1.0
 Summary: Simple python package for download tweet from Twitter
+Home-page: UNKNOWN
 Author: Matin Baloochestani (Matin-B)
 Author-email: MatiinBaloochestani@Gmail.com
+License: UNKNOWN
 Keywords: python,twitter
+Platform: UNKNOWN
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
@@ -43,3 +46,4 @@ from twigram import download
 # Get tweet information from Twitter
 download("https://twitter.com/i/status/1481722124855169028", show_size=True)
 ```
+

setup.py

@@ -7,7 +7,7 @@
 with codecs.open(os.path.join(here, "README.md"), encoding="utf-8") as fh:
     long_description = "\n" + fh.read()
 
-VERSION = '1.0.2'
+VERSION = '1.1.0'
 DESCRIPTION = 'Simple python package for download tweet from Twitter'
 LONG_DESCRIPTION = 'Simple python package for download tweet from Twitter'
 

twigram/__pycache__/twitter.cpython-39.pyc

@@ -1,3 +1,4 @@
+import contextlib
 import requests
 import re
 
@@ -41,7 +42,7 @@ def check_content_size(url):
     }
 
 
-def edit_tweet_text(tweet_text: str, entities: dict) -> str:
+def edit_tweet_text(tweet_text: str, entities: dict, parent: dict) -> str:
     """
     Replace expended urls with their short version
     
@@ -54,16 +55,16 @@ def edit_tweet_text(tweet_text: str, entities: dict) -> str:
     :return: The tweet text with the media url removed.
     """
     urls = entities.get("urls")
-    user_mentions = entities.get("user_mentions")
     for url in urls:
         expanded_url = url.get("expanded_url")
         shorted_url = url.get("url")
         tweet_text = tweet_text.replace(shorted_url, expanded_url)
-    """
-    for user in user_mentions:
-        screen_name = user.get("screen_name")
-        tweet_text = tweet_text.replace(f"@{screen_name}", "", 1)
-    """
+    with contextlib.suppress(AttributeError):
+        in_reply_to_screen_name = parent.get("in_reply_to_screen_name")
+        tweet_text = tweet_text.replace(f"@{in_reply_to_screen_name}", "")
+    with contextlib.suppress(AttributeError):
+        parent_user_screen_name = parent.get("user").get("screen_name")
+        tweet_text = tweet_text.replace(f"@{parent_user_screen_name}", "")
     try:
         media_url = entities.get("media")[0].get("url")
         return tweet_text.replace(f"{media_url}", "").strip()
@@ -95,7 +96,8 @@ def text_tweet_handler(data: dict) -> dict:
 
     tweet_text = data.get("text")
     entities = data.get("entities")
-    tweet_text = edit_tweet_text(tweet_text, entities)
+    parent = data.get("parent")
+    tweet_text = edit_tweet_text(tweet_text, entities, parent)
 
     tweet_url = f"https://twitter.com/{owner_username}/status/{tweet_id_str}/"
     return {
@@ -141,7 +143,8 @@ def gif_tweet_handler(data: dict) -> dict:
 
     tweet_text = data.get("text")
     entities = data.get("entities")
-    tweet_text = edit_tweet_text(tweet_text, entities)
+    parent = data.get("parent")
+    tweet_text = edit_tweet_text(tweet_text, entities, parent)
 
     tweet_url = f"https://twitter.com/{owner_username}/status/{tweet_id_str}/"
     return {
@@ -229,7 +232,8 @@ def video_tweet_handler(data: dict, show_size: bool = False) -> dict:
 
     tweet_text = data.get("text")
     entities = data.get("entities")
-    tweet_text = edit_tweet_text(tweet_text, entities)
+    parent = data.get("parent")
+    tweet_text = edit_tweet_text(tweet_text, entities, parent)
 
     tweet_url = f"https://twitter.com/{owner_username}/status/{tweet_id_str}/"
     return {
@@ -279,7 +283,8 @@ def album_tweet_handler(data: dict) -> dict:
 
     tweet_text = data.get("text")
     entities = data.get("entities")
-    tweet_text = edit_tweet_text(tweet_text, entities)
+    parent = data.get("parent")
+    tweet_text = edit_tweet_text(tweet_text, entities, parent)
 
     tweet_url = f"https://twitter.com/{owner_username}/status/{tweet_id_str}/"
     return {
@@ -329,7 +334,8 @@ def photo_tweet_handler(data: dict) -> dict:
 
     tweet_text = data.get("text")
     entities = data.get("entities")
-    tweet_text = edit_tweet_text(tweet_text, entities)
+    parent = data.get("parent")
+    tweet_text = edit_tweet_text(tweet_text, entities, parent)
 
     tweet_url = f"https://twitter.com/{owner_username}/status/{tweet_id_str}/"
     return {