mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Filter out 'my' offers from 'available' offers

Browse source
This commit is contained in:
ghubstan 2021-03-08 16:26:16 -03:00
parent 04b52f873e
commit d6c79fca70
No known key found for this signature in database
GPG key ID: E35592D6800A861E
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/bisq/core/api/CoreOffersService.java
View file

@ -55,7 +55,6 @@ import static bisq.core.locale.CurrencyUtil.isCryptoCurrency;
import static bisq.core.offer.OfferPayload.Direction; import static bisq.core.offer.OfferPayload.Direction;
import static bisq.core.offer.OfferPayload.Direction.BUY; import static bisq.core.offer.OfferPayload.Direction.BUY;
import static bisq.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer; import static bisq.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer;
import static java.lang.String.*;
import static java.lang.String.format; import static java.lang.String.format;
import static java.util.Comparator.comparing; import static java.util.Comparator.comparing;
@ -103,6 +102,7 @@ class CoreOffersService {
Offer getOffer(String id) { Offer getOffer(String id) {
return offerBookService.getOffers().stream() return offerBookService.getOffers().stream()
.filter(o -> o.getId().equals(id)) .filter(o -> o.getId().equals(id))
.filter(o -> !o.isMyOffer(keyRing))
.filter(o -> offerFilter.canTakeOffer(o, isApiUser).isValid()) .filter(o -> offerFilter.canTakeOffer(o, isApiUser).isValid())
.findAny().orElseThrow(() -> .findAny().orElseThrow(() ->
new IllegalStateException(format("offer with id '%s' not found", id))); new IllegalStateException(format("offer with id '%s' not found", id)));
@ -118,6 +118,7 @@ class CoreOffersService {
List<Offer> getOffers(String direction, String currencyCode) { List<Offer> getOffers(String direction, String currencyCode) {
return offerBookService.getOffers().stream() return offerBookService.getOffers().stream()
.filter(o -> !o.isMyOffer(keyRing))
.filter(o -> offerMatchesDirectionAndCurrency(o, direction, currencyCode)) .filter(o -> offerMatchesDirectionAndCurrency(o, direction, currencyCode))
.filter(o -> offerFilter.canTakeOffer(o, isApiUser).isValid()) .filter(o -> offerFilter.canTakeOffer(o, isApiUser).isValid())
.sorted(priceComparator(direction)) .sorted(priceComparator(direction))