Feature

Ignore free or paid accounts
UltimaHoarder · Jun 20, 2020 · 6d03e03 · 6d03e03
1 parent 9cb9301
commit 6d03e03
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ Fill in the following:
 * `{"user-agent":"your_user-agent"}`
 
 Optional change:
+* `{"fp":"your_fp"}`
 * `{"app-token":"your_token"}`
 
 
@@ -188,18 +189,30 @@ Open:
 
     Any words you input, the script will ignore any content that contains these words.
 
-[#ignore_unfollowed_accounts](README.md#ignore_unfollowed_accounts):
+[#ignore_type](README.md#ignore_type):
 
     Default = ""
-    a = "all"
-    b = "paid"
-    c = "free"
+    a = "paid"
+    b = "free"
 
-    This setting will not include any paid or free accounts that you've unfollowed in your subscription list.
+    This setting will not include any paid or free accounts in your subscription list.
 
-    Example: "ignore_unfollowed_accounts": "paid"
+    Example: "ignore_type": "paid"
 
-    This choice will not include any unfollowed accounts that you've paid for.
+    This choice will not include any accounts that you've paid for.
+
+[#export_metadata](README.md#export_metadata):
+
+    Default = true
+
+    Set to false if you don't want to save metadata.
+
+[#sort_free_paid_posts](README.md#sort_free_paid_posts):
+
+    Default = true
+
+    Set to false if you want to use the old file structure.
+    If you do set to false, it'll be incompatable.
 
 [#blacklist_name](README.md#blacklist_name):
 
@@ -228,33 +241,34 @@ Before troubleshooting, make sure you're using Python 3.8.
 
 Error: Access Denied /  Auth Loop
 
-    Make sure your cookies and user-agent are correct.
+>Make sure your cookies and user-agent are correct.
 
 AttributeError: type object 'datetime.datetime' has no attribute 'fromisoformat'
 
-    Only works with Python 3.7 and above.
+>Only works with Python 3.7 and above.
 
 I can't see ".settings" folder'
 
-    Make sure you can see hidden files
-    [Windows Tutorial](https://support.microsoft.com/en-gb/help/4028316/windows-view-hidden-files-and-folders-in-windows-10)
-
-    [Mac Tutorial](https://setapp.com/how-to/show-hidden-files-on-mac)
-
-    [Linux] I'm not linking thousands of different distrbutuions
+>Make sure you can see hidden files
+>
+>[Windows Tutorial](https://support.microsoft.com/en-gb/help/4028316/windows-view-hidden-files-and-folders-in-windows-10)
+>
+>[Mac Tutorial](https://setapp.com/how-to/show-hidden-files-on-mac)
+>
+>[Linux](https://www.google.com/)
 
 I'm getting authed into the wrong account
 
-    Enjoy the free content.
+>Enjoy the free content.
 
 I'm using Linux OS and something isn't working.
 
-    Script was built on Windows 10. If you're using Linux you can still submit an issue and I'll try my best to fix it.
+>Script was built on Windows 10. If you're using Linux you can still submit an issue and I'll try my best to fix it.
     
 Do OnlyFans or OnlyFans models know I'm using this script?
 
-    No, but there is identifiable information in the metadata folder which contains your IP address, so don't share it unless you're using a proxy/vpn or just don't care.
+>No, but there is identifiable information in the metadata folder which contains your IP address, so don't share it unless you're using a proxy/vpn or just don't care.
     
 Do you collect session information?
 
-    No. The code is on Github which allows you to audit the codebase yourself. You can use wireshark or any other network analysis program to verify the outgoing connections are respective to the modules you chose.
+>No. The code is on Github which allows you to audit the codebase yourself. You can use wireshark or any other network analysis program to verify the outgoing connections are respective to the modules you chose.
diff --git a/classes/make_config.py b/classes/make_config.py
@@ -55,8 +55,8 @@ def __init__(self, option={}):
                             'date_format', "%d-%m-%Y")
                         self.ignored_keywords = option.get(
                             'ignored_keywords', [])
-                        self.ignore_unfollowed_accounts = option.get(
-                            'ignore_unfollowed_accounts', "")
+                        self.ignore_type = option.get(
+                            'ignore_type', "")
                         self.export_metadata = option.get(
                             'export_metadata', True)
                         self.delete_legacy_metadata = option.get(
@@ -102,8 +102,8 @@ def __init__(self, option={}):
                             'date_format', "%d-%m-%Y")
                         self.ignored_keywords = option.get(
                             'ignored_keywords', [])
-                        self.ignore_unfollowed_accounts = option.get(
-                            'ignore_unfollowed_accounts', "")
+                        self.ignore_type = option.get(
+                            'ignore_type', "")
                         self.export_metadata = option.get(
                             'export_metadata', True)
                         self.blacklist_name = option.get(

diff --git a/extras/OFRenamer/classes/make_config.py b/extras/OFRenamer/classes/make_config.py
@@ -55,8 +55,8 @@ def __init__(self, option={}):
                             'date_format', "%d-%m-%Y")
                         self.ignored_keywords = option.get(
                             'ignored_keywords', [])
-                        self.ignore_unfollowed_accounts = option.get(
-                            'ignore_unfollowed_accounts', "")
+                        self.ignore_type = option.get(
+                            'ignore_type', "")
                         self.export_metadata = option.get(
                             'export_metadata', True)
                         self.delete_legacy_metadata = option.get(
@@ -102,8 +102,8 @@ def __init__(self, option={}):
                             'date_format', "%d-%m-%Y")
                         self.ignored_keywords = option.get(
                             'ignored_keywords', [])
-                        self.ignore_unfollowed_accounts = option.get(
-                            'ignore_unfollowed_accounts', "")
+                        self.ignore_type = option.get(
+                            'ignore_type', "")
                         self.export_metadata = option.get(
                             'export_metadata', True)
                         self.blacklist_name = option.get(

diff --git a/modules/onlyfans.py b/modules/onlyfans.py
@@ -23,7 +23,7 @@
 proxy = None
 date_format = None
 ignored_keywords = None
-ignore_unfollowed_accounts = None
+ignore_type = None
 export_metadata = None
 delete_legacy_metadata = None
 sort_free_paid_posts = None
@@ -32,7 +32,7 @@
 
 
 def assign_vars(config, site_settings, site_name):
-    global json_config, multithreading, proxy, json_settings, auto_choice, j_directory, overwrite_files, date_format, format_path, ignored_keywords, ignore_unfollowed_accounts, export_metadata, delete_legacy_metadata, sort_free_paid_posts, blacklist_name, maximum_length
+    global json_config, multithreading, proxy, json_settings, auto_choice, j_directory, overwrite_files, date_format, format_path, ignored_keywords, ignore_type, export_metadata, delete_legacy_metadata, sort_free_paid_posts, blacklist_name, maximum_length
 
     json_config = config
     json_global_settings = json_config["settings"]
@@ -45,7 +45,7 @@ def assign_vars(config, site_settings, site_name):
     overwrite_files = json_settings["overwrite_files"]
     date_format = json_settings["date_format"]
     ignored_keywords = json_settings["ignored_keywords"]
-    ignore_unfollowed_accounts = json_settings["ignore_unfollowed_accounts"]
+    ignore_type = json_settings["ignore_type"]
     export_metadata = json_settings["export_metadata"]
     delete_legacy_metadata = json_settings["delete_legacy_metadata"]
     sort_free_paid_posts = json_settings["sort_free_paid_posts"]
@@ -791,13 +791,12 @@ def multi(array, session):
             subscribePrice = subscribedByData["subscribePrice"]
             result_date = datetime.fromisoformat(
                 result_date).replace(tzinfo=None).date()
-            if not subscribedBy:
-                if ignore_unfollowed_accounts in ["all", "paid"]:
-                    if price > 0:
-                        continue
-                if ignore_unfollowed_accounts in ["all", "free"]:
-                    if subscribePrice == 0:
-                        continue
+            if ignore_type in ["paid"]:
+                if price > 0:
+                    continue
+            if ignore_type in ["free"]:
+                if subscribePrice == 0:
+                    continue
             results2.append(result)
         return results2
 

diff --git a/modules/starsavn.py b/modules/starsavn.py
@@ -25,14 +25,14 @@
 proxy = None
 date_format = None
 ignored_keywords = None
-ignore_unfollowed_accounts = None
+ignore_type = None
 export_metadata = None
 blacklist_name = None
 maximum_length = None
 
 
 def assign_vars(config, site_settings, site_name):
-    global json_config, multithreading, proxy, json_settings, auto_choice, j_directory, overwrite_files, date_format, format_path, ignored_keywords, ignore_unfollowed_accounts, export_metadata, blacklist_name, maximum_length
+    global json_config, multithreading, proxy, json_settings, auto_choice, j_directory, overwrite_files, date_format, format_path, ignored_keywords, ignore_type, export_metadata, blacklist_name, maximum_length
 
     json_config = config
     json_global_settings = json_config["settings"]
@@ -45,7 +45,7 @@ def assign_vars(config, site_settings, site_name):
     overwrite_files = json_settings["overwrite_files"]
     date_format = json_settings["date_format"]
     ignored_keywords = json_settings["ignored_keywords"]
-    ignore_unfollowed_accounts = json_settings["ignore_unfollowed_accounts"]
+    ignore_type = json_settings["ignore_type"]
     export_metadata = json_settings["export_metadata"]
     blacklist_name = json_settings["blacklist_name"]
     maximum_length = 255