Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

essential-actions

Clone or download

Merge remote-tracking branch 'origin/master'

Download Browse

# Conflicts: # twitch/twitch-chat-connect/pom.xml

+293 −76
Debayan Sutradhar (rnayabed) 2021-06-19 10:51
Debayan Sutradhar (rnayabed) 2021-06-19 10:51
176c77fa0c97f3896c982c13ae21f46dafe71c1a
git #essential-actions/176c77fa0c97f3896c982c13ae21f46dafe71c1a

Modified Files

List
Side by side diff
D Dependencies/Java-Twirk-0.6.3.jar
Binary files 'a/Dependencies/Java-Twirk-0.6.3.jar' and /dev/null differ
A Dependencies/twitch-api-java-0.7.1.jar
Binary files /dev/null and b/Dependencies/twitch-api-java-0.7.1.jar differ
M build.bat
+4 −0
--- 'a/build.bat'
+++ b/build.bat
@@ -172,6 +172,10 @@ move target\twitch-subs-only-*.jar ..\..
cd ..\slow-mode
CALL mvn clean -Dmaven.test.skip package
move target\twitch-slow-mode-*.jar ..\..\%FOLD%\twitch-slow-mode.jar
+
+cd ..\emote-only
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-emote-only-*.jar ..\..\%FOLD%\twitch-emote-only.jar
popd
if "%quit%" == "true" (EXIT /B 0)
M build.sh
+3 −0
--- 'a/build.sh'
+++ b/build.sh
@@ -119,6 +119,9 @@ twitch() {
cd ../slow-mode && mvn clean -Dmaven.test.skip package
mv target/twitch-slow-mode-*.jar ../../$FOLD/twitch-slow-mode.jar
+ cd ../emote-only && mvn clean -Dmaven.test.skip package
+ mv target/twitch-emote-only-*.jar ../../$FOLD/twitch-emote-only.jar
+
popd || exit
}
M twitch/add-stream-marker/pom.xml
+4 −4
--- 'a/twitch/add-stream-marker/pom.xml'
+++ b/twitch/add-stream-marker/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/add-stream-marker/src/main/java/module-info.java
+1 −1
--- 'a/twitch/add-stream-marker/src/main/java/module-info.java'
+++ b/twitch/add-stream-marker/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.addstreammar
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with addstreammarker.AddStreamMarkerAction;
}
M twitch/clear-chat/pom.xml
+4 −4
--- 'a/twitch/clear-chat/pom.xml'
+++ b/twitch/clear-chat/pom.xml
@@ -14,7 +14,7 @@
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -66,9 +66,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/clear-chat/src/main/java/module-info.java
+1 −1
--- 'a/twitch/clear-chat/src/main/java/module-info.java'
+++ b/twitch/clear-chat/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.clearchatact
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with clearchat.ClearChatAction;
}
A twitch/emote-only/pom.xml
+81 −0
--- /dev/null
+++ b/twitch/emote-only/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.stream-pi</groupId>
+ <artifactId>twitch-emote-only</artifactId>
+ <version>1.0.0</version>
+
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+ <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
+ <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <release>11</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.stream-pi</groupId>
+ <artifactId>util</artifactId>
+ <version>${streamPiUtilVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.stream-pi</groupId>
+ <artifactId>action-api</artifactId>
+ <version>${streamPiActionApiVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.stream-pi</groupId>
+ <artifactId>twitch-chat-connect</artifactId>
+ <version>${streamPiTwitchChatConnectVersion}</version>
+ </dependency>
+ </dependencies>
+
+</project>
A twitch/emote-only/src/main/java/emote_only/EmoteOnlyAction.java
+126 −0
--- /dev/null
+++ b/twitch/emote-only/src/main/java/emote_only/EmoteOnlyAction.java
@@ -0,0 +1,126 @@
+package emote_only;
+
+import com.gikk.twirk.Twirk;
+import com.gikk.twirk.TwirkBuilder;
+import com.gikk.twirk.events.TwirkListener;
+import com.gikk.twirk.types.roomstate.Roomstate;
+import com.stream_pi.action_api.actionproperty.property.Property;
+import com.stream_pi.action_api.actionproperty.property.Type;
+import com.stream_pi.action_api.externalplugin.ToggleAction;
+import com.stream_pi.util.exception.MinorException;
+import com.stream_pi.util.version.Version;
+import connect.chat.TwitchChatCredentials;
+
+public class EmoteOnlyAction extends ToggleAction
+{
+
+ private final String channelNameKey = "channel_name_eo";
+
+ private Twirk twirk;
+
+ public EmoteOnlyAction()
+ {
+ setName("Toggle Emote-Only Chat");
+ setCategory("Twitch Chat");
+ setVisibilityInServerSettingsPane(false);
+ setAuthor("j4ckofalltrades");
+ setVersion(new Version(1, 0, 0));
+ setHelpLink("https://github.com/stream-pi/essentialactions#twitch-chat-integration");
+ }
+
+
+ @Override
+ public void initProperties() throws MinorException
+ {
+ Property channelName = new Property(channelNameKey, Type.STRING);
+ channelName.setDisplayName("Channel Name");
+ channelName.setDefaultValueStr("channel_name");
+ channelName.setCanBeBlank(false);
+
+ addClientProperties(channelName);
+ }
+
+ @Override
+ public void onToggleOn() throws MinorException
+ {
+ try
+ {
+ connectToChannel();
+ twirk.channelMessage("/emoteonly");
+ } catch (Exception ex)
+ {
+ setCurrentStatus(false);
+ throw new MinorException("Failed to enable emote-only mode.", "Please try again.");
+ }
+ }
+
+ @Override
+ public void onToggleOff() throws MinorException
+ {
+ try
+ {
+ connectToChannel();
+ twirk.channelMessage("/emoteonlyoff");
+ } catch (Exception ex)
+ {
+ setCurrentStatus(true);
+ throw new MinorException("Failed to disable emote-only mode.", "Please try again.");
+ }
+ }
+
+ private void connectToChannel() throws Exception
+ {
+ if (twirk != null)
+ {
+ if (!twirk.isConnected())
+ {
+ twirk.connect();
+ }
+
+ return;
+ }
+
+ final TwitchChatCredentials.ChatCredentials credentials = TwitchChatCredentials.getCredentials();
+ credentials.ensureCredentialsInitialized();
+ final String channel = getClientProperties().getSingleProperty(channelNameKey).getStringValue();
+
+ try
+ {
+ twirk = new TwirkBuilder(channel, credentials.getNickname(), credentials.getOauthToken()).build();
+ twirk.addIrcListener(new TwirkListener()
+ {
+ @Override
+ public void onRoomstate(Roomstate roomstate)
+ {
+ try
+ {
+ setCurrentStatus(roomstate.getEmoteOnlyMode() == 1);
+ } catch (MinorException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ twirk.connect();
+ } catch (Exception ex)
+ {
+ throw new MinorException("Failed to connect to Twitch",
+ String.format("Could not connect to '%s' channel.", channel));
+ }
+ }
+
+ @Override
+ public void onShutDown() throws MinorException
+ {
+ if (twirk != null)
+ {
+ try
+ {
+ twirk.disconnect();
+ } catch (Exception ex)
+ {
+ throw new MinorException("Twitch connection error", "Please try again.");
+ }
+ }
+ }
+}
A twitch/emote-only/src/main/java/module-info.java
+9 −0
--- /dev/null
+++ b/twitch/emote-only/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module com.stream_pi.twitch.emoteonlyaction {
+ requires com.stream_pi.util;
+ requires com.stream_pi.action_api;
+
+ requires com.stream_pi.twitchchatconnectaction;
+ requires twitch.api.java;
+
+ provides com.stream_pi.action_api.externalplugin.ExternalPlugin with emote_only.EmoteOnlyAction;
+}
M twitch/host-channel/pom.xml
+4 −4
--- 'a/twitch/host-channel/pom.xml'
+++ b/twitch/host-channel/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/host-channel/src/main/java/module-info.java
+1 −1
--- 'a/twitch/host-channel/src/main/java/module-info.java'
+++ b/twitch/host-channel/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.hostchannela
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with hostchannel.HostChannelAction;
}
M twitch/raid-channel/pom.xml
+4 −4
--- 'a/twitch/raid-channel/pom.xml'
+++ b/twitch/raid-channel/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/raid-channel/src/main/java/module-info.java
+1 −1
--- 'a/twitch/raid-channel/src/main/java/module-info.java'
+++ b/twitch/raid-channel/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.raidchannela
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with raidchannel.RaidChannelAction;
}
M twitch/send-channel-msg/pom.xml
+4 −4
--- 'a/twitch/send-channel-msg/pom.xml'
+++ b/twitch/send-channel-msg/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/send-channel-msg/src/main/java/module-info.java
+1 −1
--- 'a/twitch/send-channel-msg/src/main/java/module-info.java'
+++ b/twitch/send-channel-msg/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.sendchannelm
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with sendchannelmsg.SendChannelMessageAction;
}
M twitch/set-color/pom.xml
+4 −4
--- 'a/twitch/set-color/pom.xml'
+++ b/twitch/set-color/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/set-color/src/main/java/module-info.java
+1 −1
--- 'a/twitch/set-color/src/main/java/module-info.java'
+++ b/twitch/set-color/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.setcoloracti
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setcolor.SetColorAction;
}
M twitch/slow-mode/pom.xml
+4 −4
--- 'a/twitch/slow-mode/pom.xml'
+++ b/twitch/slow-mode/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/slow-mode/src/main/java/module-info.java
+1 −1
--- 'a/twitch/slow-mode/src/main/java/module-info.java'
+++ b/twitch/slow-mode/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.slowmodeacti
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with slow_mode.SlowModeAction;
}
M twitch/start-commercial/pom.xml
+4 −4
--- 'a/twitch/start-commercial/pom.xml'
+++ b/twitch/start-commercial/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/start-commercial/src/main/java/module-info.java
+1 −1
--- 'a/twitch/start-commercial/src/main/java/module-info.java'
+++ b/twitch/start-commercial/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.startcommerc
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with startcommercial.StartCommercialAction;
}
M twitch/subs-only/pom.xml
+4 −4
--- 'a/twitch/subs-only/pom.xml'
+++ b/twitch/subs-only/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/subs-only/src/main/java/module-info.java
+1 −1
--- 'a/twitch/subs-only/src/main/java/module-info.java'
+++ b/twitch/subs-only/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.subsonlyacti
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with subs_only.SubsOnlyAction;
}
M twitch/twitch-chat-connect/pom.xml
+4 −10
--- 'a/twitch/twitch-chat-connect/pom.xml'
+++ b/twitch/twitch-chat-connect/pom.xml
@@ -12,7 +12,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -56,9 +56,9 @@
<dependencies>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
@@ -68,10 +68,4 @@
</dependency>
</dependencies>
-<pluginRepositories>
- <pluginRepository>
- <id>sonatype-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- </pluginRepository>
- </pluginRepositories>
</project>
M twitch/twitch-chat-connect/src/main/java/connect/chat/TwitchChatCredentials.java
+4 −4
--- 'a/twitch/twitch-chat-connect/src/main/java/connect/chat/TwitchChatCredentials.java'
+++ b/twitch/twitch-chat-connect/src/main/java/connect/chat/TwitchChatCredentials.java
@@ -1,7 +1,6 @@
package connect.chat;
import com.stream_pi.util.exception.MinorException;
-import com.stream_pi.util.exception.StreamPiException;
public final class TwitchChatCredentials
{
@@ -31,10 +30,11 @@ public final class TwitchChatCredentials
final String twitchChatOauthToken = oauthToken;
boolean isTokenInitialized = twitchChatOauthToken != null && !twitchChatOauthToken.isEmpty();
- if (!isNicknameInitialized && !isTokenInitialized) {
+ if (!isNicknameInitialized && !isTokenInitialized)
+ {
throw new MinorException(
- "Twitch Chat config uninitialized\n"+
- "Please check that the Twitch Chat plugin configuration is correct.");
+ "Twitch Chat config uninitialized\n" +
+ "Please check that the Twitch Chat plugin configuration is correct.");
}
}
M twitch/twitch-chat-connect/src/main/java/module-info.java
+1 −1
--- 'a/twitch/twitch-chat-connect/src/main/java/module-info.java'
+++ b/twitch/twitch-chat-connect/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitchchatconnectac
requires com.stream_pi.action_api;
requires com.stream_pi.util;
- requires Java.Twirk;
+ requires twitch.api.java;
exports connect.chat;
M twitch/unhost/pom.xml
+4 −4
--- 'a/twitch/unhost/pom.xml'
+++ b/twitch/unhost/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/unhost/src/main/java/module-info.java
+1 −1
--- 'a/twitch/unhost/src/main/java/module-info.java'
+++ b/twitch/unhost/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.unhostaction
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with unhost.UnhostAction;
}
M twitch/unhost/src/main/java/unhost/UnhostAction.java
+1 −1
--- 'a/twitch/unhost/src/main/java/unhost/UnhostAction.java'
+++ b/twitch/unhost/src/main/java/unhost/UnhostAction.java
@@ -30,7 +30,7 @@ public class UnhostAction extends Normal
public void initProperties() throws MinorException
{
Property channel = new Property(channelNameKey, Type.STRING);
- channel.setDisplayName("Channel");
+ channel.setDisplayName("Host Channel");
channel.setDefaultValueStr("channel_name");
channel.setCanBeBlank(false);
M twitch/unraid/pom.xml
+4 −4
--- 'a/twitch/unraid/pom.xml'
+++ b/twitch/unraid/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/unraid/src/main/java/module-info.java
+1 −1
--- 'a/twitch/unraid/src/main/java/module-info.java'
+++ b/twitch/unraid/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.unraidaction
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with unraid.UnraidAction;
}
M twitch/whisper/pom.xml
+4 −4
--- 'a/twitch/whisper/pom.xml'
+++ b/twitch/whisper/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>11</maven.compiler.target>
<streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
<streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
- <javaTwirkVersion>0.6.3</javaTwirkVersion>
+ <twitchApiVersion>0.7.1</twitchApiVersion>
</properties>
<repositories>
@@ -63,9 +63,9 @@
</dependency>
<dependency>
- <groupId>com.github.gikkman</groupId>
- <artifactId>Java-Twirk</artifactId>
- <version>${javaTwirkVersion}</version>
+ <groupId>com.github.j4ckofalltrades</groupId>
+ <artifactId>twitch-api-java</artifactId>
+ <version>${twitchApiVersion}</version>
</dependency>
<dependency>
M twitch/whisper/src/main/java/module-info.java
+1 −1
--- 'a/twitch/whisper/src/main/java/module-info.java'
+++ b/twitch/whisper/src/main/java/module-info.java
@@ -3,7 +3,7 @@ module com.stream_pi.twitch.whisperactio
requires com.stream_pi.action_api;
requires com.stream_pi.twitchchatconnectaction;
- requires Java.Twirk;
+ requires twitch.api.java;
provides com.stream_pi.action_api.externalplugin.ExternalPlugin with whisper.WhisperAction;
}