diff --git a/app/libraries/database.py b/app/libraries/database.py index 0263b07..761e353 100644 --- a/app/libraries/database.py +++ b/app/libraries/database.py @@ -33,13 +33,13 @@ class Database(): self.__create_config(self) self.__write_config(self) - def find_follower(self, follower, account): + def find_follower(self, account): now = datetime.now() found = False - select_sql = "select from followers where follower=(%s) and account=(%s)" + select_sql = "select from followers where account=(%s)" conn = None @@ -49,23 +49,23 @@ class Database(): cur = conn.cursor() - print(f'Searching follower {follower}...') + print(f'Searching follower {account}...') - cur.execute(select_sql, (follower, account)) + cur.execute(select_sql, (account,)) row = cur.fetchone() if row != None: - print(f'follower {follower} is already in the database.') + print(f'follower {account} is already in the database.') found = True else: - print(f'follower {follower} not found! Adding it...') + print(f'follower {account} not found! Adding it...') - self.save_follower(follower, account) + self.save_follower(account) cur.close() @@ -79,11 +79,11 @@ class Database(): conn.close() - def save_follower(self, follower, account): + def save_follower(self, account): now = datetime.now() - insert_sql = "INSERT INTO followers(follower, account, updated_at) VALUES(%s,%s,%s) ON CONFLICT DO NOTHING" + insert_sql = "INSERT INTO followers(account, updated_at) VALUES(%s,%s) ON CONFLICT DO NOTHING" conn = None @@ -93,9 +93,9 @@ class Database(): cur = conn.cursor() - print(f'Writing follower {follower}...') + print(f'Writing follower {account}...') - cur.execute(insert_sql, (follower, account, now)) + cur.execute(insert_sql, (account, now)) conn.commit() @@ -291,7 +291,7 @@ class Database(): db = self.followers_db table = "followers" - sql = "create table "+table+" (follower varchar(50) PRIMARY KEY, account varchar(100), updated_at timestamptz)" + sql = "create table "+table+" (account varchar(100) PRIMARY KEY, updated_at timestamptz)" self.__create_table(self, table, sql) table = "total" diff --git a/followers.py b/followers.py index 4a5cd51..61efdbf 100644 --- a/followers.py +++ b/followers.py @@ -58,7 +58,7 @@ if __name__ == '__main__': for follower in followers: - db.find_follower(follower.username, follower.acct) + db.find_follower(follower.acct) last_local, last_remote = db.last_total()