feat(tsl): add gifted placeholder and predicate

iGoodie · Dec 8, 2019 · 9cf7109 · 9cf7109
1 parent afaa14a
commit 9cf7109
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 0 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/command/TwitchSpawnCommand.java b/src/main/java/net/programmer/igoodie/twitchspawn/command/TwitchSpawnCommand.java
@@ -229,6 +229,7 @@ public static int simulateModule(CommandContext<CommandSource> context, String s
                 simulatedEvent.raiderCount = nbt.getInt("raiders");
                 simulatedEvent.viewerCount = nbt.getInt("viewers");
                 simulatedEvent.subscriptionTier = nbt.contains("tier", 3) ? nbt.getInt("tier") : -1;
+                simulatedEvent.gifted = nbt.getBoolean("gifted");
             }
 
             ConfigManager.RULESET_COLLECTION.handleEvent(simulatedEvent);

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tracer/StreamElementsSocketTracer.java b/src/main/java/net/programmer/igoodie/twitchspawn/tracer/StreamElementsSocketTracer.java
@@ -109,6 +109,7 @@ protected void onLiveEvent(Socket socket, CredentialsConfig.Streamer streamer, O
 //        eventArguments.raiderCount = JSONUtils.extractNumberFrom(message, "raiders", 0).intValue(); // Raids aren't supported (?)
         eventArguments.viewerCount = JSONUtils.extractNumberFrom(data, "amount ", 0).intValue();
         eventArguments.subscriptionTier = extractTier(data, "tier");
+        // TODO: add gifted
 
         // Pass the model to the handler
         ConfigManager.RULESET_COLLECTION.handleEvent(eventArguments);

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tracer/StreamlabsSocketTracer.java b/src/main/java/net/programmer/igoodie/twitchspawn/tracer/StreamlabsSocketTracer.java
@@ -104,6 +104,7 @@ protected void onLiveEvent(Socket socket, CredentialsConfig.Streamer streamer, O
             eventArguments.raiderCount = JSONUtils.extractNumberFrom(message, "raiders", 0).intValue();
             eventArguments.viewerCount = JSONUtils.extractNumberFrom(message, "viewers", 0).intValue();
             eventArguments.subscriptionTier = extractTier(message, "sub_plan");
+            eventArguments.gifted = JSONUtils.extractFrom(message, "gifter_twitch_id", String.class, null) != null;
 
             // Pass the model to the handler
             ConfigManager.RULESET_COLLECTION.handleEvent(eventArguments);

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/EventArguments.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/EventArguments.java
@@ -33,6 +33,7 @@ public static EventArguments createRandom(String streamerNickname) {
 
     public int subscriptionMonths;
     public int subscriptionTier = -1; // 0=Prime, 1=T1, 2=T2, 3=T3
+    public boolean gifted;
 
     public int viewerCount;
     public int raiderCount;
@@ -60,6 +61,7 @@ public void randomize(String actorNickname, String message) {
         this.donationCurrency = new String[]{"USD", "TRY", "EUR"}[random.nextInt(3)];
         this.subscriptionMonths = random.nextInt(100 - 1) + 1;
         this.subscriptionTier = random.nextInt(3 + 1);
+        this.gifted = random.nextBoolean();
         this.viewerCount = random.nextInt(100 - 1) + 1;
         this.raiderCount = random.nextInt(100 - 1) + 1;
     }

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/keyword/TSLComparatorSymbol.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/keyword/TSLComparatorSymbol.java
@@ -6,6 +6,8 @@ public enum TSLComparatorSymbol {
 
     IN_RANGE(
             "IN RANGE", InRangeComparator.class),
+    IS(
+            "IS", IsComparator.class),
     PREFIX(
             "PREFIX", PrefixComparator.class),
     POSTFIX(

diff --git a/...main/java/net/programmer/igoodie/twitchspawn/tslanguage/keyword/TSLPredicateProperty.java b/...main/java/net/programmer/igoodie/twitchspawn/tslanguage/keyword/TSLPredicateProperty.java
@@ -33,6 +33,10 @@ public enum TSLPredicateProperty {
             "subscriptionTier",
             "tier", "subscription_tier"
     ),
+    GIFTED(
+            "gifted",
+            "gifted"
+    ),
     VIEWERS(
             "viewerCount",
             "viewers", "viewer_count"

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/predicate/IsComparator.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/predicate/IsComparator.java
@@ -0,0 +1,21 @@
+
+package net.programmer.igoodie.twitchspawn.tslanguage.predicate;
+
+public class IsComparator extends TSLComparator {
+
+    protected String value;
+
+    public IsComparator(String rightHandRaw) {
+        this.value = rightHandRaw;
+    }
+
+    @Override
+    public boolean compare(Object leftHand) {
+        if (leftHand instanceof Boolean)
+            return leftHand.toString().equalsIgnoreCase(value);
+
+        return leftHand instanceof String
+                && value.equalsIgnoreCase((String) leftHand);
+    }
+
+}
diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/util/ExpressionEvaluator.java b/src/main/java/net/programmer/igoodie/twitchspawn/util/ExpressionEvaluator.java
@@ -65,6 +65,9 @@ public static String fromArgs(String expression, EventArguments args) {
         if (expression.equals("tier") && args.subscriptionTier != -1)
             return args.subscriptionTier == 0 ? "Prime" : String.valueOf(args.subscriptionTier);
 
+        if (expression.equals("gifted"))
+            return String.valueOf(args.gifted);
+
         if (expression.equals("viewers") && args.viewerCount != 0)
             return String.valueOf(args.viewerCount);