nitro/apollyon-ms4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release bytebuf to prevent leaks, use new logger.

Browse Source
This commit is contained in:
Mike 2020-05-10 18:54:55 +02:00
parent 2eb36ec13a
commit b6c58a0448
2 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/org/krews/apollyon/incoming/CameraRoomPictureEvent.java
View File

@ -10,6 +10,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream; import io.netty.buffer.ByteBufInputStream;
import javafx.scene.Camera; import javafx.scene.Camera;
import org.krews.apollyon.ftp.FTPUploadService; import org.krews.apollyon.ftp.FTPUploadService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -18,8 +20,9 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.IllegalArgumentException; import java.lang.IllegalArgumentException;
public class CameraRoomPictureEvent extends MessageHandler public class CameraRoomPictureEvent extends MessageHandler {
{ private static final Logger LOGGER = LoggerFactory.getLogger(CameraRoomPictureEvent.class);
@Override @Override
public void handle() { public void handle() {
if (!this.client.getHabbo().hasPermission("acc_camera")) { if (!this.client.getHabbo().hasPermission("acc_camera")) {
@ -38,42 +41,47 @@ public class CameraRoomPictureEvent extends MessageHandler
if (image == null) if (image == null)
return; return;
this.packet.readString();
this.packet.readString();
this.packet.readInt();
this.packet.readInt();
int timestamp = Emulator.getIntUnixTimestamp();
String URL = this.client.getHabbo().getHabboInfo().getId() + "_" + timestamp + ".png";
String URL_small = this.client.getHabbo().getHabboInfo().getId() + "_" + timestamp + "_small.png";
String base = Emulator.getConfig().getValue("camera.url");
String json = Emulator.getConfig().getValue("camera.extradata").replace("%timestamp%", timestamp + "").replace("%room_id%", room.getId() + "").replace("%url%", base + URL);
this.client.getHabbo().getHabboInfo().setPhotoURL(base + URL);
this.client.getHabbo().getHabboInfo().setPhotoTimestamp(timestamp);
this.client.getHabbo().getHabboInfo().setPhotoRoomId(room.getId());
this.client.getHabbo().getHabboInfo().setPhotoJSON(json);
CameraPurchaseEvent lol = new CameraPurchaseEvent();
lol.lastRanTimestamps.put(this.client.getHabbo(), Emulator.getIntUnixTimestamp());
try { try {
if(Emulator.getConfig().getInt("ftp.enabled") == 1) { this.packet.readString();
byte[] imageBytes = new byte[image.readableBytes()]; this.packet.readString();
image.readBytes(imageBytes); this.packet.readInt();
FTPUploadService.uploadImage(imageBytes, Emulator.getConfig().getValue("imager.location.output.camera") + URL); this.packet.readInt();
FTPUploadService.uploadImage(imageBytes, Emulator.getConfig().getValue("imager.location.output.camera") + URL_small); int timestamp = Emulator.getIntUnixTimestamp();
}
else {
BufferedImage theImage = ImageIO.read(new ByteBufInputStream(image));
ImageIO.write(theImage, "png", new File(Emulator.getConfig().getValue("imager.location.output.camera") + URL));
ImageIO.write(theImage, "png", new File(Emulator.getConfig().getValue("imager.location.output.camera") + URL_small));
}
} catch (IOException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
System.out.println("[Apollyon] You are using a Habbo.swf that has not been patched to work with Apollyon. Please read the read me on a guide to patching your swf, or download a prepatched one on our git at:");
System.out.println("[Apollyon] https://git.krews.org/morningstar/apollyon");
}
this.client.sendResponse(new CameraURLComposer(URL)); String URL = this.client.getHabbo().getHabboInfo().getId() + "_" + timestamp + ".png";
String URL_small = this.client.getHabbo().getHabboInfo().getId() + "_" + timestamp + "_small.png";
String base = Emulator.getConfig().getValue("camera.url");
String json = Emulator.getConfig().getValue("camera.extradata").replace("%timestamp%", timestamp + "").replace("%room_id%", room.getId() + "").replace("%url%", base + URL);
this.client.getHabbo().getHabboInfo().setPhotoURL(base + URL);
this.client.getHabbo().getHabboInfo().setPhotoTimestamp(timestamp);
this.client.getHabbo().getHabboInfo().setPhotoRoomId(room.getId());
this.client.getHabbo().getHabboInfo().setPhotoJSON(json);
CameraPurchaseEvent lol = new CameraPurchaseEvent();
lol.lastRanTimestamps.put(this.client.getHabbo(), Emulator.getIntUnixTimestamp());
try {
if(Emulator.getConfig().getInt("ftp.enabled") == 1) {
byte[] imageBytes = new byte[image.readableBytes()];
image.readBytes(imageBytes);
FTPUploadService.uploadImage(imageBytes, Emulator.getConfig().getValue("imager.location.output.camera") + URL);
FTPUploadService.uploadImage(imageBytes, Emulator.getConfig().getValue("imager.location.output.camera") + URL_small);
}
else {
BufferedImage theImage = ImageIO.read(new ByteBufInputStream(image));
ImageIO.write(theImage, "png", new File(Emulator.getConfig().getValue("imager.location.output.camera") + URL));
ImageIO.write(theImage, "png", new File(Emulator.getConfig().getValue("imager.location.output.camera") + URL_small));
}
} catch (IOException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
LOGGER.error("[Apollyon] You are using a Habbo.swf that has not been patched to work with Apollyon. Please read the read me on a guide to patching your swf, or download a prepatched one on our git at:");
LOGGER.error("[Apollyon] https://git.krews.org/morningstar/apollyon");
}
this.client.sendResponse(new CameraURLComposer(URL));
} finally {
image.release();
}
} }
} }

54
src/main/java/org/krews/apollyon/incoming/CameraRoomThumbnailEvent.java
View File

@ -8,6 +8,8 @@ import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream; import io.netty.buffer.ByteBufInputStream;
import org.krews.apollyon.ftp.FTPUploadService; import org.krews.apollyon.ftp.FTPUploadService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -15,8 +17,8 @@ import java.awt.image.DataBufferByte;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
public class CameraRoomThumbnailEvent extends MessageHandler public class CameraRoomThumbnailEvent extends MessageHandler {
{ private static final Logger LOGGER = LoggerFactory.getLogger(CameraRoomThumbnailEvent.class);
@Override @Override
public void handle() { public void handle() {
@ -43,29 +45,33 @@ public class CameraRoomThumbnailEvent extends MessageHandler
if(image == null) if(image == null)
return; return;
this.packet.readString();
this.packet.readString();
this.packet.readInt();
this.packet.readInt();
try { try {
if(Emulator.getConfig().getInt("ftp.enabled") == 1) { this.packet.readString();
byte[] imageBytes = new byte[image.readableBytes()]; this.packet.readString();
image.readBytes(imageBytes); this.packet.readInt();
FTPUploadService.uploadImage(imageBytes, Emulator.getConfig().getValue("imager.location.output.thumbnail") + room.getId() + ".png"); this.packet.readInt();
}
else {
BufferedImage theImage = null;
theImage = ImageIO.read(new ByteBufInputStream(image));
ImageIO.write(theImage, "png", new File(Emulator.getConfig().getValue("imager.location.output.thumbnail") + room.getId() + ".png"));
}
} catch (IOException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
System.out.println("[Apollyon] You are using a Habbo.swf that has not been patched to work with Apollyon. Please read the read me on a guide to patching your swf, or download a prepatched one on our git at:");
System.out.println("[Apollyon] https://git.krews.org/morningstar/apollyon");
}
this.client.sendResponse(new CameraRoomThumbnailSavedComposer()); try {
if(Emulator.getConfig().getInt("ftp.enabled") == 1) {
byte[] imageBytes = new byte[image.readableBytes()];
image.readBytes(imageBytes);
FTPUploadService.uploadImage(imageBytes, Emulator.getConfig().getValue("imager.location.output.thumbnail") + room.getId() + ".png");
}
else {
BufferedImage theImage = null;
theImage = ImageIO.read(new ByteBufInputStream(image));
ImageIO.write(theImage, "png", new File(Emulator.getConfig().getValue("imager.location.output.thumbnail") + room.getId() + ".png"));
}
} catch (IOException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
LOGGER.error("[Apollyon] You are using a Habbo.swf that has not been patched to work with Apollyon. Please read the read me on a guide to patching your swf, or download a prepatched one on our git at:");
LOGGER.error("[Apollyon] https://git.krews.org/morningstar/apollyon");
}
this.client.sendResponse(new CameraRoomThumbnailSavedComposer());
} finally {
image.release();
}
} }
} }