diff --git a/app/common b/app/common
index a0377f7..9094550 160000
--- a/app/common
+++ b/app/common
@@ -1 +1 @@
-Subproject commit a0377f70b5c1531c7e324bc6cae0878fdd958df3
+Subproject commit 9094550d62a0968a1114e5ee56de63623f718828
diff --git a/app/templates/service/subscribers.html b/app/templates/service/subscribers.html
index cab90a5..c8ac25d 100644
--- a/app/templates/service/subscribers.html
+++ b/app/templates/service/subscribers.html
@@ -51,6 +51,9 @@ Activate service | {{ config['PUBLIC_CONFIG'].site.title }}
{{ subscriber.created_date }}
|
+
+ {{ subscriber.exp_date }}
+ |
{{ ['NOT_ACTIVE', 'ACTIVE', 'TRIAL_FINISHED', 'BANNED'][subscriber.status] }}
|
diff --git a/scripts/import_subscribers_from_xtream.py b/scripts/import_subscribers_from_xtream.py
index 8d0042d..523f099 100755
--- a/scripts/import_subscribers_from_xtream.py
+++ b/scripts/import_subscribers_from_xtream.py
@@ -2,6 +2,7 @@
import argparse
import os
import sys
+from datetime import datetime
from mongoengine import connect
import mysql.connector
@@ -54,6 +55,9 @@ if __name__ == '__main__':
new_user = SubscriberUser.make_subscriber(email=sql_entry['username'], password=sql_entry['password'],
country='US')
new_user.status = SubscriberUser.Status.ACTIVE
+ sdate = sql_entry['exp_date']
+ if sdate:
+ new_user.exp_date = datetime.fromtimestamp(sdate)
dev = Device(name='Xtream', max_connections=sql_entry['max_connections'])
new_user.add_device(dev)
# save