Finalizing events

Author: TheLimeGlass

src/main/java/me/limeglass/streamelements/api/events/ActivityEvent.java

@@ -2,19 +2,18 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.internals.events.ElementsEvent;
 
 public class ActivityEvent extends ElementsEvent {
 
 	private final String provider, type;
 	private final Instant instant;
-	private final Channel channel;
+	private final String channel;
 
 	/**
 	 * Called when an Activity happens.
 	 */
-	public ActivityEvent(String type, Instant instant, String provider, Channel channel) {
+	public ActivityEvent(String type, Instant instant, String provider, String channel) {
 		this.provider = provider;
 		this.channel = channel;
 		this.instant = instant;
@@ -29,9 +28,9 @@ public String getProvider() {
 	}
 
 	/**
-	 * @return The Channel where the Activity came from.
+	 * @return The Channel ID where the Activity came from.
 	 */
-	public Channel getChannel() {
+	public String getChannel() {
 		return channel;
 	}
 

src/main/java/me/limeglass/streamelements/api/events/CheerEvent.java

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.api.objects.User;
 
 public class CheerEvent extends ActivityEvent {
@@ -14,7 +13,7 @@ public class CheerEvent extends ActivityEvent {
 	/**
 	 * Called when someone cheers.
 	 */
-	public CheerEvent(String type, Instant instant, String provider, Channel channel, Number amount, User user, String message) {
+	public CheerEvent(String type, Instant instant, String provider, String channel, Number amount, User user, String message) {
 		super(type, instant, provider, channel);
 		this.message = message;
 		this.amount = amount;

src/main/java/me/limeglass/streamelements/api/events/FollowEvent.java

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.api.objects.User;
 
 public class FollowEvent extends ActivityEvent {
@@ -12,7 +11,7 @@ public class FollowEvent extends ActivityEvent {
 	/**
 	 * Called when someone follows.
 	 */
-	public FollowEvent(String type, Instant instant, String provider, Channel channel, User user) {
+	public FollowEvent(String type, Instant instant, String provider, String channel, User user) {
 		super(type, instant, provider, channel);
 		this.user = user;
 	}

src/main/java/me/limeglass/streamelements/api/events/HostEvent.java

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.api.objects.User;
 
 public class HostEvent extends ActivityEvent {
@@ -13,7 +12,7 @@ public class HostEvent extends ActivityEvent {
 	/**
 	 * Called when someone hosts.
 	 */
-	public HostEvent(String type, Instant instant, String provider, Channel channel, Number viewers, User user) {
+	public HostEvent(String type, Instant instant, String provider, String channel, Number viewers, User user) {
 		super(type, instant, provider, channel);
 		this.viewers = viewers;
 		this.user = user;

src/main/java/me/limeglass/streamelements/api/events/RedemptionEvent.java

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.api.objects.User;
 
 public class RedemptionEvent extends ActivityEvent {
@@ -14,7 +13,7 @@ public class RedemptionEvent extends ActivityEvent {
 	/**
 	 * Called when someone uses a redemption.
 	 */
-	public RedemptionEvent(String type, Instant instant, String provider, Channel channel, Number amount, String redemption, User user) {
+	public RedemptionEvent(String type, Instant instant, String provider, String channel, Number amount, String redemption, User user) {
 		super(type, instant, provider, channel);
 		this.redemption = redemption;
 		this.amount = amount;

src/main/java/me/limeglass/streamelements/api/events/SubscriberEvent.java

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.api.objects.User;
 
 public class SubscriberEvent extends ActivityEvent {
@@ -16,7 +15,7 @@ public class SubscriberEvent extends ActivityEvent {
 	/**
 	 * Called when someone subscribes.
 	 */
-	public SubscriberEvent(String type, Instant instant, String provider, Channel channel, Number amount, long tier, boolean gifted, User sender, String message, User user) {
+	public SubscriberEvent(String type, Instant instant, String provider, String channel, Number amount, long tier, boolean gifted, User sender, String message, User user) {
 		super(type, instant, provider, channel);
 		this.message = message;
 		this.amount = amount;

src/main/java/me/limeglass/streamelements/api/events/TipEvent.java

@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 
-import me.limeglass.streamelements.api.objects.Channel;
 import me.limeglass.streamelements.api.objects.User;
 
 public class TipEvent extends ActivityEvent {
@@ -14,7 +13,7 @@ public class TipEvent extends ActivityEvent {
 	/**
 	 * Called when someone Donates/Tips.
 	 */
-	public TipEvent(String type, Instant instant, String provider, Channel channel, Number amount, String tipID, String currency, String message, User user) {
+	public TipEvent(String type, Instant instant, String provider, String channel, Number amount, String tipID, String currency, String message, User user) {
 		super(type, instant, provider, channel);
 		this.currency = currency;
 		this.message = message;

src/main/java/me/limeglass/streamelements/internals/events/emitters/EventEmitter.java

@@ -5,14 +5,12 @@
 import org.json.JSONObject;
 
 import io.socket.client.Socket;
-import me.limeglass.streamelements.api.objects.Channel;
-import me.limeglass.streamelements.internals.objects.ChannelImp;
 
 public abstract class EventEmitter extends ElementsEmitter {
 
 	protected String type, provider;
 	protected Instant instant;
-	protected Channel channel;
+	protected String channel;
 
 	public EventEmitter(String type) {
 		super("event");
@@ -44,7 +42,7 @@ public void call(Socket socket, Object... args) {
 		System.out.println("Event: " + object.toString());
 		provider = object.getString("provider");
 		instant = Instant.parse(object.getString("createdAt"));
-		channel = new ChannelImp(Long.parseLong(object.getString("channel")));
+		channel = object.getString("channel");
 		System.out.println("Event: " + object.toString());
 		if (object.getString("type").equalsIgnoreCase(type))
 			call(socket, object.getJSONObject("data"));