ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ge: submit buy limit reset time

Browse Source
This commit is contained in:
Adam
2020-12-25 19:58:22 -05:00
parent 9a322c70d0
commit e3b75c8b7a
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.http.api.ge; package net.runelite.http.api.ge;
import java.time.Instant;
import lombok.Data; import lombok.Data;
import net.runelite.http.api.worlds.WorldType; import net.runelite.http.api.worlds.WorldType;
@@ -43,4 +44,5 @@ public class GrandExchangeTrade
private int slot; private int slot;
private WorldType worldType; private WorldType worldType;
private int seq; private int seq;
private Instant resetTime;
} }

3
http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java
View File

@@ -26,6 +26,7 @@ package net.runelite.http.service.ge;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.io.IOException; import java.io.IOException;
import java.time.Instant;
import java.util.Collection; import java.util.Collection;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -104,6 +105,8 @@ public class GrandExchangeController
trade.setUa(request.getHeader("User-Agent")); trade.setUa(request.getHeader("User-Agent"));
trade.setWorldType(grandExchangeTrade.getWorldType()); trade.setWorldType(grandExchangeTrade.getWorldType());
trade.setSeq(grandExchangeTrade.getSeq()); trade.setSeq(grandExchangeTrade.getSeq());
Instant resetTime = grandExchangeTrade.getResetTime();
trade.setResetTime(resetTime == null ? 0L : resetTime.getEpochSecond());
String json = GSON.toJson(trade); String json = GSON.toJson(trade);
try (Jedis jedis = redisPool.getResource()) try (Jedis jedis = redisPool.getResource())

1
http-service/src/main/java/net/runelite/http/service/ge/Trade.java
View File

@@ -47,4 +47,5 @@ class Trade
private String ua; private String ua;
private WorldType worldType; private WorldType worldType;
private int seq; private int seq;
private long resetTime;
} }

7
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -389,6 +389,8 @@ public class GrandExchangePlugin extends Plugin
BufferedImage itemImage = itemManager.getImage(offer.getItemId(), offer.getTotalQuantity(), shouldStack); BufferedImage itemImage = itemManager.getImage(offer.getItemId(), offer.getTotalQuantity(), shouldStack);
SwingUtilities.invokeLater(() -> panel.getOffersPanel().updateOffer(offerItem, itemImage, offer, slot)); SwingUtilities.invokeLater(() -> panel.getOffersPanel().updateOffer(offerItem, itemImage, offer, slot));
updateLimitTimer(offer);
submitTrade(slot, offer); submitTrade(slot, offer);
updateConfig(slot, offer); updateConfig(slot, offer);
@@ -418,6 +420,7 @@ public class GrandExchangePlugin extends Plugin
grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setWorldType(getGeWorldType());
grandExchangeTrade.setLogin(login); grandExchangeTrade.setLogin(login);
grandExchangeTrade.setSeq(tradeSeq++); grandExchangeTrade.setSeq(tradeSeq++);
grandExchangeTrade.setResetTime(getLimitResetTime(offer.getItemId()));
log.debug("Submitting new trade: {}", grandExchangeTrade); log.debug("Submitting new trade: {}", grandExchangeTrade);
grandExchangeClient.submit(grandExchangeTrade); grandExchangeClient.submit(grandExchangeTrade);
@@ -450,6 +453,7 @@ public class GrandExchangePlugin extends Plugin
grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setWorldType(getGeWorldType());
grandExchangeTrade.setLogin(login); grandExchangeTrade.setLogin(login);
grandExchangeTrade.setSeq(tradeSeq++); grandExchangeTrade.setSeq(tradeSeq++);
grandExchangeTrade.setResetTime(getLimitResetTime(offer.getItemId()));
log.debug("Submitting cancelled: {}", grandExchangeTrade); log.debug("Submitting cancelled: {}", grandExchangeTrade);
grandExchangeClient.submit(grandExchangeTrade); grandExchangeClient.submit(grandExchangeTrade);
@@ -476,6 +480,7 @@ public class GrandExchangePlugin extends Plugin
grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setWorldType(getGeWorldType());
grandExchangeTrade.setLogin(login); grandExchangeTrade.setLogin(login);
grandExchangeTrade.setSeq(tradeSeq++); grandExchangeTrade.setSeq(tradeSeq++);
grandExchangeTrade.setResetTime(getLimitResetTime(offer.getItemId()));
log.debug("Submitting trade: {}", grandExchangeTrade); log.debug("Submitting trade: {}", grandExchangeTrade);
grandExchangeClient.submit(grandExchangeTrade); grandExchangeClient.submit(grandExchangeTrade);
@@ -514,8 +519,6 @@ public class GrandExchangePlugin extends Plugin
savedOffer.setSpent(offer.getSpent()); savedOffer.setSpent(offer.getSpent());
savedOffer.setState(offer.getState()); savedOffer.setState(offer.getState());
setOffer(slot, savedOffer); setOffer(slot, savedOffer);
updateLimitTimer(offer);
} }
} }