From 8105a174d533f9462c592bb5a3ac1b7884fe8424 Mon Sep 17 00:00:00 2001 From: timotheyca Date: Sun, 9 Aug 2020 01:26:03 +0300 Subject: [PATCH] missing sssj fix + setup.py --- requirements.txt | 5 +++++ setup.py | 12 ++++++++++++ v25/storage/dbstorage.py | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 requirements.txt create mode 100644 setup.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..0a6bb29 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +requests~=2.24.0 +Flask~=1.1.2 +SQLAlchemy~=1.3.18 +setuptools~=49.2.0 +Werkzeug~=1.0.1 diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..82e27f3 --- /dev/null +++ b/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name='v25', + version='', + packages=['v25', 'v25.web', 'v25.web.client', 'v25.web.server', 'v25.storage', 'v25.messaging'], + url='', + license='', + author='', + author_email='', + description='' +) diff --git a/v25/storage/dbstorage.py b/v25/storage/dbstorage.py index 71e5723..a938222 100644 --- a/v25/storage/dbstorage.py +++ b/v25/storage/dbstorage.py @@ -87,7 +87,7 @@ class DBStorage(AbstractStorage): Msg.sf == subject.vkey.encode(), Msg.st == subject.vkey.encode(), )) - query = query.with_entities(Msg.sf, Msg.st) + query = query.with_entities(Msg.sf, Msg.st).distinct() contacts = set() for sf, st in query: contacts.add(sf)