From b1ee1d1188011081f7d0027c5954c4287a9f9dcf Mon Sep 17 00:00:00 2001
From: "DESKTOP-JVKHS7I\\Adam" <adsau59@gmail.com>
Date: Fri, 15 May 2020 05:21:55 +0530
Subject: [PATCH] fixed an import which caused crash on hole deplete - now uses
 envions instead of os.path.expand users for config file name - made readme
 smaller

---
 README.md               | 39 +++++++--------------------------------
 fishy/__init__.py       |  2 +-
 fishy/helper/config.py  |  2 +-
 fishy/web/decorators.py |  5 +----
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index b0c0727..9c3692a 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
 # Fishybot ESO
 Auto fishing bot for Elder Scrolls Online. The Bot automatically fishes until the fishing hole disappears.  It can also send a notification to the users phone with the statistics of that fishing hole.
 
-Don't forget to star this repository if you really liked it :)
+It's not a fully automated bot, it does fishing on its own but you will have to move from one hole to another manually (although I was developing a fully automated bot, I didn't get a positive feedback from the community so I discontinued it).
 
-### Demo Video
-<div align="center">
-  <a href="https://www.youtube.com/watch?v=E4Y9BFhCICI"><img src="https://img.youtube.com/vi/E4Y9BFhCICI/0.jpg" alt="IMAGE ALT TEXT"></a>
-</div>
+Botting does violate ESO's terms of service, so technically you could get banned. But this bot doesn't read or write memory from ESO so they won't know you are using a bot. **This software doesn't come with any Liability or Warranty, I am not responsible if you do get banned.**
+
+- Check out the [Showcase Video](https://www.youtube.com/watch?v=THQ66lG4ImU).
+- Chat with us on [Discord](https://discord.gg/V6e2fpc).
+- Support us via [PayPal](https://www.paypal.me/AdamSaudagar) or [Patreon](https://www.patreon.com/AdamSaudagar).
 
 ### How to Install?
 
@@ -16,30 +17,4 @@ Don't forget to star this repository if you really liked it :)
 python -m pip install pip --upgrade
 pip install fishy
 python -m fishy
-```
-
-### FAQs
-Will I get baned using this bot?
-
-> Botting does violate ESO's terms of service, so technically you could get banned. But this bot doesn't read or write memory from ESO so they won't know you are using a bot. **This software doesn't come with any Liability or Warranty, I am not responsible if you do get banned.**
-
-How much automation does this bot provide?
-
-> It's not a fully automated bot, it does fishing on its own but you will have to move from one hole to another manually (although I was developing a fully automated bot, I didn't get a positive feedback from the community so I discontinued it).
-
-Bot doesn't work in full screen.
-
-> Check the full screen box.
-
-The bot catches the fish but doesn't press R to collect it
-
-> Check the Collect R checkbox
-
-### Contact
-If you have any problems or you want to contact me for future ideas or want to collaborate in development you can contact me at the [DefineX Community discord server](https://discord.gg/V6e2fpc).
-
-### Support Me
-If you would like this project to continue its development, please consider supporting me on [Patreon](https://www.patreon.com/AdamSaudagar).  You can make a one time donation on [PayPal](https://www.paypal.me/AdamSaudagar).
-
-### License
-This project is licenced on the MIT License. Check out the full license over [here](https://github.com/adsau59/fishyboteso/blob/master/LICENSE).
\ No newline at end of file
+```
\ No newline at end of file
diff --git a/fishy/__init__.py b/fishy/__init__.py
index 16f45f5..00b55e3 100644
--- a/fishy/__init__.py
+++ b/fishy/__init__.py
@@ -1,2 +1,2 @@
 from fishy.__main__ import main
-__version__ = "0.3.1"
+__version__ = "0.3.2"
diff --git a/fishy/helper/config.py b/fishy/helper/config.py
index 35c623c..6145590 100644
--- a/fishy/helper/config.py
+++ b/fishy/helper/config.py
@@ -6,7 +6,7 @@ import json
 import os
 
 # path to save the configuration file
-filename = os.path.expanduser(r"~/Documents/fishy_config.json")
+filename = os.path.join(os.environ["HOMEDRIVE"], os.environ["HOMEPATH"], "Documents", "fishy_config.json")
 
 
 class Config:
diff --git a/fishy/web/decorators.py b/fishy/web/decorators.py
index 1f4c661..9713d16 100644
--- a/fishy/web/decorators.py
+++ b/fishy/web/decorators.py
@@ -1,15 +1,12 @@
 import logging
 import traceback
-import typing
 from functools import wraps
 
-if typing.TYPE_CHECKING:
-        from fishy.web.web import get_session
-
 
 def uses_session(f):
     @wraps(f)
     def wrapper(*args, **kwargs):
+        from .web import get_session
         if get_session(args[0]) is None:
             logging.error("Couldn't create a session")
             return None