Added clean() to remove illegal characters for key

pull/5/head
Lasse Edfast 5 years ago
parent 05ac36757b
commit 63bc1bd557
  1. 12
      facebook/classes.py
  2. 4
      facebook/helpers.py

@ -11,7 +11,7 @@ from robobrowser import RoboBrowser
from arangodb import db from arangodb import db
from config import * from config import *
from helpers import sleep_, update_cookie from helpers import sleep_, update_cookie, clean
class User: class User:
@ -34,7 +34,7 @@ class User:
db.insert_document( db.insert_document(
self.collection, self.collection,
{ {
"_key": self.username, "_key": clean(self.username),
"url": self.url, "url": self.url,
"name": self.name, "name": self.name,
"profile_pictures": self.profile_pictures, "profile_pictures": self.profile_pictures,
@ -197,7 +197,7 @@ class Friend:
db.insert_document( db.insert_document(
self.collection, self.collection,
{ {
"_key": self.username, "_key": clean(self.username),
"url": url_bas + self.url, "url": url_bas + self.url,
"name": self.name, "name": self.name,
}, },
@ -215,10 +215,10 @@ class Reaction:
self.type = False self.type = False
def get_dict(self): def get_dict(self):
key = str(self.picture_id) + "_" + str(self.user_name_friend) key = clean(str(self.picture_id) + "_" + str(self.user_name_friend))
return { return {
"_to": "members/" + str(self.user), "_to": "members/" + clean(str(self.user)),
"_from": "members/" + str(self.user_name_friend), "_from": "members/" + clean(str(self.user_name_friend)),
"_key": key, "_key": key,
"_id": "picture_reactions/" + key, "_id": "picture_reactions/" + key,
"picture": self.picture_id, "picture": self.picture_id,

@ -2,6 +2,7 @@ import pickle
import random import random
from datetime import datetime from datetime import datetime
from time import sleep from time import sleep
import re
from arangodb import db from arangodb import db
@ -71,3 +72,6 @@ def write_error(nr, e="", traceback="", soup="", user="", url="", url_name=""):
) )
except Exception as e: except Exception as e:
print(e) print(e)
def clean(string):
return ''.join(re.findall('[A-Za-z0-9-:.@()+,=;$!*\s]+', string))
Loading…
Cancel
Save