0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

accept peering requests based on prefs

Browse source
This commit is contained in:
j 2016-01-17 18:42:56 +05:30
commit 954491759e
4 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
oml/node/nodeapi.py
View file

@ -6,6 +6,7 @@ from changelog import Changelog
from user.models import User
from websocket import trigger_event
import state
import settings
import logging
logger = logging.getLogger(__name__)
@ -26,10 +27,11 @@ def api_pullChanges(remote_id, user_id=None, from_=None, to=None):
def api_requestPeering(user_id, username, message):
user = User.get_or_create(user_id)
if not user.info:
user.info = {}
if not user.peered:
if user.pending == 'sent':
pref = settings.preferences.get('receivedRequests')
if pref == 'reject':
return True
if user.pending == 'sent' or pref == 'accept':
user.info['message'] = message
user.update_peering(True, username)
user.update_name()
@ -40,6 +42,8 @@ def api_requestPeering(user_id, username, message):
user.update_name()
user.save()
trigger_event('peering.request', user.json())
if user.peered:
state.nodes.queue('add', user.id, True)
return True
return False
@ -47,13 +51,11 @@ def api_acceptPeering(user_id, username, message):
user = User.get(user_id)
logger.debug('incoming acceptPeering event: pending: %s', user.pending)
if user and user.pending == 'sent':
if not user.info:
user.info = {}
user.info['username'] = username
user.info['message'] = message
user.update_name()
user.update_peering(True, username)
state.nodes.queue('add', user.id)
state.nodes.queue('add', user.id, True)
trigger_event('peering.accept', user.json())
return True
elif user and user.peered:
@ -63,8 +65,6 @@ def api_acceptPeering(user_id, username, message):
def api_rejectPeering(user_id, message):
user = User.get(user_id)
if user:
if not user.info:
user.info = {}
user.info['message'] = message
user.update_peering(False)
trigger_event('peering.reject', user.json())