Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-18 12:11:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logic of checking whether non-participants can view order details (#245)

Browse Source 
* Fix logic of checking whether non-participants can view order details

* Fix for no participants to not get lengthy responses on public orders

Co-authored-by: Reckless_Satoshi <reckless.satoshi@protonmail.com>
Co-authored-by: Reckless_Satoshi <90936742+Reckless-Satoshi@users.noreply.github.com>
This commit is contained in:
redphix 2022-09-15 21:17:09 +05:30 committed by GitHub
parent 1ba94b2abc
commit 6fc20424a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/views.py
View File

@ -226,6 +226,7 @@ class OrderView(viewsets.ViewSet):
# WRITE Update last_seen for maker and taker.
# Note down that the taker/maker was here recently, so counterpart knows if the user is paying attention.
data["maker_nick"] = str(order.maker)
if order.maker == request.user:
order.maker_last_seen = timezone.now()
order.save()
@ -241,25 +242,25 @@ class OrderView(viewsets.ViewSet):
data["maker_status"] = Logics.user_activity_status(
order.maker_last_seen)
# 3.b If order is between public and WF2
# 3.b) Non participants can view details (but only if PUB)
if not data["is_participant"] and order.status == Order.Status.PUB:
return Response(data, status=status.HTTP_200_OK)
# 4) If order is between public and WF2
if order.status >= Order.Status.PUB and order.status < Order.Status.WF2:
data["price_now"], data["premium_now"] = Logics.price_and_premium_now(order)
# 3. c) If maker and Public/Paused, add premium percentile
# 4. a) If maker and Public/Paused, add premium percentile
# num similar orders, and maker information to enable telegram notifications.
if data["is_maker"] and order.status in [Order.Status.PUB, Order.Status.PAU]:
data["premium_percentile"] = compute_premium_percentile(order)
data["num_similar_orders"] = len(
Order.objects.filter(currency=order.currency,
status=Order.Status.PUB))
# 4) Non participants can view details (but only if PUB)
elif not data["is_participant"] and order.status != Order.Status.PUB:
return Response(data, status=status.HTTP_200_OK)
# For participants add positions, nicks and status as a message and hold invoices status
data["is_buyer"] = Logics.is_buyer(order, request.user)
data["is_seller"] = Logics.is_seller(order, request.user)
data["maker_nick"] = str(order.maker)
data["taker_nick"] = str(order.taker)
data["status_message"] = Order.Status(order.status).label
data["is_fiat_sent"] = order.is_fiat_sent
@ -269,22 +270,19 @@ class OrderView(viewsets.ViewSet):
# Add whether hold invoices are LOCKED (ACCEPTED)
# Is there a maker bond? If so, True if locked, False otherwise
if order.maker_bond:
data[
"maker_locked"] = order.maker_bond.status == LNPayment.Status.LOCKED
data["maker_locked"] = order.maker_bond.status == LNPayment.Status.LOCKED
else:
data["maker_locked"] = False
# Is there a taker bond? If so, True if locked, False otherwise
if order.taker_bond:
data[
"taker_locked"] = order.taker_bond.status == LNPayment.Status.LOCKED
data["taker_locked"] = order.taker_bond.status == LNPayment.Status.LOCKED
else:
data["taker_locked"] = False
# Is there an escrow? If so, True if locked, False otherwise
if order.trade_escrow:
data[
"escrow_locked"] = order.trade_escrow.status == LNPayment.Status.LOCKED
data["escrow_locked"] = order.trade_escrow.status == LNPayment.Status.LOCKED
else:
data["escrow_locked"] = False