Check property types

briar.py

@@ -115,7 +115,7 @@ def set_briar_address(actor_json: {}, briar_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']

cwtch.py

@@ -103,7 +103,7 @@ def set_cwtch_address(actor_json: {}, cwtch_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']

discord.py

@@ -62,7 +62,7 @@ def set_discord(actor_json: {}, discord: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()

enigma.py

@@ -86,7 +86,7 @@ def set_enigma_pub_key(actor_json: {}, enigma_pub_key: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']

languages.py

@@ -83,10 +83,12 @@ def set_actor_languages(actor_json: {}, languages_str: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

music.py

@@ -68,10 +68,12 @@ def set_music_site_url(actor_json: {}, music_site_url: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name'].lower()
         if not name_value:
             continue
@@ -89,10 +91,12 @@ def set_music_site_url(actor_json: {}, music_site_url: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

outbox.py

@@ -197,10 +197,12 @@ def _person_receive_update_outbox(base_dir: str, http_prefix: str,
         updatable_attachments = ('PGP', 'OpenPGP', 'Email')
 
         for new_property_value in updated_actor_json['attachment']:
-            name_value = None
+            name_value: str = None
             if new_property_value.get('name'):
+                if isinstance(new_property_value['name'], str):
                     name_value = new_property_value['name']
             elif new_property_value.get('schema:name'):
+                if isinstance(new_property_value['schema:name'], str):
                     name_value = new_property_value['schema:name']
             if not name_value:
                 continue

peertube.py

@@ -79,7 +79,7 @@ def set_peertube(actor_json: {}, peertube: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()

pgp.py

@@ -178,7 +178,7 @@ def get_pgp_fingerprint(actor_json: {}) -> str:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']
@@ -225,7 +225,7 @@ def set_email_address(actor_json: {}, email_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']
@@ -374,7 +374,7 @@ def set_pgp_pub_key(actor_json: {}, pgp_pub_key: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']

pixelfed.py

@@ -102,7 +102,7 @@ def set_pixelfed(actor_json: {}, pixelfed: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()
@@ -125,7 +125,7 @@ def set_pixelfed(actor_json: {}, pixelfed: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']

pronouns.py

@@ -85,7 +85,7 @@ def set_pronouns(actor_json: {}, pronouns: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
             if isinstance(property_value['name'], str):
                 name_value = property_value['name']

ssb.py

@@ -84,10 +84,12 @@ def set_ssb_address(actor_json: {}, ssb_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue
@@ -106,10 +108,12 @@ def set_ssb_address(actor_json: {}, ssb_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

tox.py

@@ -23,10 +23,12 @@ def get_tox_address(actor_json: {}) -> str:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue
@@ -88,10 +90,12 @@ def set_tox_address(actor_json: {}, tox_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue
@@ -110,10 +114,12 @@ def set_tox_address(actor_json: {}, tox_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

utils.py

@@ -181,10 +181,12 @@ def get_actor_languages_list(actor_json: {}) -> []:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue
@@ -1389,8 +1391,10 @@ def get_gender_from_bio(base_dir: str, actor: str, person_cache: {},
                     continue
                 name_value = None
                 if tag.get('name'):
+                    if isinstance(tag['name'], str):
                         name_value = tag['name']
                 if tag.get('schema:name'):
+                    if isinstance(tag['schema:name'], str):
                         name_value = tag['schema:name']
                 if not name_value:
                     continue
@@ -2868,13 +2872,15 @@ def get_actor_property_url(actor_json: {}, property_name: str) -> str:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if not isinstance(property_value, dict):
             print("WARN: Actor attachment is not dict: " + str(property_value))
             continue
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

webapp_utils.py

@@ -311,10 +311,12 @@ def _set_actor_property_url(actor_json: {},
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue
@@ -346,10 +348,12 @@ def _set_actor_property_url(actor_json: {},
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

webfinger.py

@@ -550,10 +550,12 @@ def _webfinger_update_from_profile(wf_json: {}, actor_json: {}) -> bool:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

xmpp.py

@@ -23,10 +23,12 @@ def get_xmpp_address(actor_json: {}) -> str:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name'].lower()
         if not name_value:
             continue
@@ -82,10 +84,12 @@ def set_xmpp_address(actor_json: {}, xmpp_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue
@@ -113,10 +117,12 @@ def set_xmpp_address(actor_json: {}, xmpp_address: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue

youtube.py

@@ -26,10 +26,12 @@ def get_youtube(actor_json: {}) -> str:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name'].lower()
         if not name_value:
             continue
@@ -78,10 +80,12 @@ def set_youtube(actor_json: {}, youtube: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name'].lower()
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name'].lower()
         if not name_value:
             continue
@@ -99,10 +103,12 @@ def set_youtube(actor_json: {}, youtube: str) -> None:
         if not isinstance(property_value, dict):
             print("WARN: actor attachment is not dict: " + str(property_value))
             continue
-        name_value = None
+        name_value: str = None
         if property_value.get('name'):
+            if isinstance(property_value['name'], str):
                 name_value = property_value['name']
         elif property_value.get('schema:name'):
+            if isinstance(property_value['schema:name'], str):
                 name_value = property_value['schema:name']
         if not name_value:
             continue