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

Merge branch '829-too-many-friends' into 'dev'

Browse Source 
Resolve "Having too many friends will make your account unusable"

See merge request morningstar/Arcturus-Community!316
This commit is contained in:
Beny 2020-10-06 19:00:40 -04:00
commit e6480b00ed
3 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/eu/habbo/messages/incoming/friends/RequestInitFriendsEvent.java
View File

@ -11,9 +11,8 @@ public class RequestInitFriendsEvent extends MessageHandler {
@Override @Override
public void handle() throws Exception { public void handle() throws Exception {
ArrayList<ServerMessage> messages = new ArrayList<>(); ArrayList<ServerMessage> messages = new ArrayList<>();
//
messages.add(new MessengerInitComposer(this.client.getHabbo()).compose()); messages.add(new MessengerInitComposer(this.client.getHabbo()).compose());
messages.add(new FriendsComposer(this.client.getHabbo()).compose()); messages.addAll(FriendsComposer.getMessagesForBuddyList(this.client.getHabbo().getMessenger().getFriends().values()));
this.client.sendResponses(messages); this.client.sendResponses(messages);
} }
} }

2
src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent_BACKUP.java
View File

@ -52,7 +52,7 @@ public class SecureLoginEvent_BACKUP extends MessageHandler {
messages.add(new UserPerksComposer(habbo).compose()); messages.add(new UserPerksComposer(habbo).compose());
messages.add(new SessionRightsComposer().compose()); messages.add(new SessionRightsComposer().compose());
messages.add(new FavoriteRoomsCountComposer(habbo).compose()); messages.add(new FavoriteRoomsCountComposer(habbo).compose());
messages.add(new FriendsComposer(this.client.getHabbo()).compose()); //messages.add(new FriendsComposer(this.client.getHabbo()).compose());
//messages.add(new NewUserIdentityComposer().compose()); //messages.add(new NewUserIdentityComposer().compose());
//messages.add(new UserDataComposer(this.client.getHabbo()).compose()); //messages.add(new UserDataComposer(this.client.getHabbo()).compose());
//messages.add(new SessionRightsComposer().compose()); //messages.add(new SessionRightsComposer().compose());

86
src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java
View File

@ -1,24 +1,28 @@
package com.eu.habbo.messages.outgoing.friends; package com.eu.habbo.messages.outgoing.friends;
import com.eu.habbo.habbohotel.messenger.Messenger;
import com.eu.habbo.habbohotel.messenger.MessengerBuddy; import com.eu.habbo.habbohotel.messenger.MessengerBuddy;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.HabboGender;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
import gnu.trove.set.hash.THashSet;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Map; import java.util.ArrayList;
import java.util.Collection;
public class FriendsComposer extends MessageComposer { public class FriendsComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(FriendsComposer.class); private static final Logger LOGGER = LoggerFactory.getLogger(FriendsComposer.class);
private final Habbo habbo; private final int totalPages;
private final int pageIndex;
private final Collection<MessengerBuddy> friends;
public FriendsComposer(Habbo habbo) { public FriendsComposer(int totalPages, int pageIndex, Collection<MessengerBuddy> friends) {
this.habbo = habbo; this.totalPages = totalPages;
this.pageIndex = pageIndex;
this.friends = friends;
} }
@Override @Override
@ -26,52 +30,54 @@ public class FriendsComposer extends MessageComposer {
try { try {
this.response.init(Outgoing.FriendsComposer); this.response.init(Outgoing.FriendsComposer);
//this.response.appendInt(300); this.response.appendInt(this.totalPages);
//this.response.appendInt(300); this.response.appendInt(this.pageIndex);
//this.response.appendInt(3); //Club level this.response.appendInt(this.friends.size());
this.response.appendInt(this.habbo.hasPermission("acc_infinite_friends") ? Integer.MAX_VALUE : Messenger.MAXIMUM_FRIENDS);
this.response.appendInt(this.habbo.hasPermission("acc_infinite_friends") ? Integer.MAX_VALUE : Messenger.MAXIMUM_FRIENDS);
this.response.appendInt(this.habbo.getMessenger().getFriends().size()/* + (this.habbo.hasPermission("acc_staff_chat") ? 1 : 0)*/);
for (Map.Entry<Integer, MessengerBuddy> row : this.habbo.getMessenger().getFriends().entrySet()) { for (MessengerBuddy row : this.friends) {
this.response.appendInt(row.getKey()); this.response.appendInt(row.getId());
this.response.appendString(row.getValue().getUsername()); this.response.appendString(row.getUsername());
this.response.appendInt(row.getValue().getGender().equals(HabboGender.M) ? 0 : 1); this.response.appendInt(row.getGender().equals(HabboGender.M) ? 0 : 1);
this.response.appendBoolean(row.getValue().getOnline() == 1); this.response.appendBoolean(row.getOnline() == 1);
this.response.appendBoolean(row.getValue().inRoom()); //IN ROOM this.response.appendBoolean(row.inRoom()); //IN ROOM
this.response.appendString(row.getValue().getOnline() == 1 ? row.getValue().getLook() : ""); this.response.appendString(row.getOnline() == 1 ? row.getLook() : "");
this.response.appendInt(0); this.response.appendInt(0);
this.response.appendString(row.getValue().getMotto()); this.response.appendString(row.getMotto());
this.response.appendString(""); this.response.appendString("");
this.response.appendString(""); this.response.appendString("");
this.response.appendBoolean(false); //Offline messaging. this.response.appendBoolean(false); //Offline messaging.
this.response.appendBoolean(false); this.response.appendBoolean(false);
this.response.appendBoolean(false); this.response.appendBoolean(false);
this.response.appendShort(row.getValue().getRelation()); this.response.appendShort(row.getRelation());
} }
/*if(this.habbo.hasPermission("acc_staff_chat"))
{
this.response.appendInt(-1);
this.response.appendString("Staff Chat");
this.response.appendInt(this.habbo.getHabboInfo().getGender().equals(HabboGender.M) ? 0 : 1);
this.response.appendBoolean(true);
this.response.appendBoolean(false); //IN ROOM
this.response.appendString("ADM");
this.response.appendInt(0);
this.response.appendString("");
this.response.appendString("");
this.response.appendString("");
this.response.appendBoolean(true); //Offline messaging.
this.response.appendBoolean(false);
this.response.appendBoolean(false);
this.response.appendShort(0);
}*/
return this.response; return this.response;
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Caught exception", e); LOGGER.error("Caught exception", e);
} }
return null; return null;
} }
public static ArrayList<ServerMessage> getMessagesForBuddyList(Collection<MessengerBuddy> buddies) {
ArrayList<ServerMessage> messages = new ArrayList<ServerMessage>();
THashSet<MessengerBuddy> friends = new THashSet<MessengerBuddy>();
int totalPages = (int)Math.ceil(buddies.size() / 750.0);
int page = 0;
for(MessengerBuddy buddy : buddies) {
friends.add(buddy);
if(friends.size() == 750) {
messages.add(new FriendsComposer(totalPages, page, friends).compose());
friends.clear();
page++;
}
}
if(page == 0 || friends.size() > 0) {
messages.add(new FriendsComposer(totalPages, page, friends).compose());
}
return messages;
}
} }