nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-22 23:10:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix photo reporting

Browse Source
This commit is contained in:
Alejandro 2020-01-28 01:36:01 +02:00
parent 4f351b04ee
commit e1595b7044
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sqlupdates/2_3_0-RC-1_TO_2_3_0-RC-2.sql
View File

@ -18,3 +18,6 @@ CREATE TABLE `guild_forum_views` (
`timestamp` int(11) NOT NULL, `timestamp` int(11) NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
); );
ALTER TABLE `support_tickets`
ADD COLUMN `photo_item_id` int(11) NOT NULL DEFAULT -1 AFTER `comment_id`;

9
src/main/java/com/eu/habbo/habbohotel/modtool/ModToolIssue.java
View File

@ -45,6 +45,15 @@ public class ModToolIssue implements ISerialize {
this.modName = set.getString("mod_username"); this.modName = set.getString("mod_username");
this.type = ModToolTicketType.values()[set.getInt("type") - 1]; this.type = ModToolTicketType.values()[set.getInt("type") - 1];
this.category = set.getInt("category"); this.category = set.getInt("category");
this.groupId = set.getInt("group_id");
this.threadId = set.getInt("thread_id");
this.commentId = set.getInt("comment_id");
int photoItemId = set.getInt("photo_item_id");
if (photoItemId != -1) {
this.photoItem = Emulator.getGameEnvironment().getItemManager().loadHabboItem(photoItemId);;
}
if (this.modId <= 0) { if (this.modId <= 0) {
this.modName = ""; this.modName = "";

14
src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java
View File

@ -41,18 +41,12 @@ public class ReportPhotoEvent extends MessageHandler {
if (item == null || !(item instanceof InteractionExternalImage)) return; if (item == null || !(item instanceof InteractionExternalImage)) return;
InteractionExternalImage photoItem = (InteractionExternalImage) item; HabboInfo photoOwner = Emulator.getGameEnvironment().getHabboManager().getHabboInfo(item.getUserId());
String photoCreatorId = new JsonParser().parse(photoItem.getExtradata()).getAsJsonObject().get("u").getAsString(); if (photoOwner == null) return;
if (photoCreatorId == null) return; ModToolIssue issue = new ModToolIssue(this.client.getHabbo().getHabboInfo().getId(), this.client.getHabbo().getHabboInfo().getUsername(), photoOwner.getId(), photoOwner.getUsername(), roomId, "", ModToolTicketType.PHOTO);
issue.photoItem = item;
HabboInfo photoCreator = Emulator.getGameEnvironment().getHabboManager().getHabboInfo(Integer.valueOf(photoCreatorId));
if (photoCreator == null) return;
ModToolIssue issue = new ModToolIssue(this.client.getHabbo().getHabboInfo().getId(), this.client.getHabbo().getHabboInfo().getUsername(), photoCreator.getId(), photoCreator.getUsername(), roomId, "", ModToolTicketType.PHOTO);
issue.photoItem = photoItem;
new InsertModToolIssue(issue).run(); new InsertModToolIssue(issue).run();

3
src/main/java/com/eu/habbo/threading/runnables/InsertModToolIssue.java
View File

@ -14,7 +14,7 @@ public class InsertModToolIssue implements Runnable {
@Override @Override
public void run() { public void run() {
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO support_tickets (state, timestamp, score, sender_id, reported_id, room_id, mod_id, issue, category, group_id, thread_id, comment_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO support_tickets (state, timestamp, score, sender_id, reported_id, room_id, mod_id, issue, category, group_id, thread_id, comment_id, photo_item_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) {
statement.setInt(1, this.issue.state.getState()); statement.setInt(1, this.issue.state.getState());
statement.setInt(2, this.issue.timestamp); statement.setInt(2, this.issue.timestamp);
statement.setInt(3, this.issue.priority); statement.setInt(3, this.issue.priority);
@ -27,6 +27,7 @@ public class InsertModToolIssue implements Runnable {
statement.setInt(10, this.issue.groupId); statement.setInt(10, this.issue.groupId);
statement.setInt(11, this.issue.threadId); statement.setInt(11, this.issue.threadId);
statement.setInt(12, this.issue.commentId); statement.setInt(12, this.issue.commentId);
statement.setInt(13, this.issue.photoItem != null ? this.issue.photoItem.getId() : -1);
statement.execute(); statement.execute();
try (ResultSet key = statement.getGeneratedKeys()) { try (ResultSet key = statement.getGeneratedKeys()) {