ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

friend notes: replace nbsp from friend names in config keys

Browse Source
This commit is contained in:
Adam
2019-03-11 18:17:16 -04:00
parent 6371a7dd0b
commit d617d1960f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
View File

@@ -167,7 +167,7 @@ public class FriendNotesPlugin extends Plugin
if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message")) if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message"))
{ {
// Friends have color tags // Friends have color tags
setHoveredFriend(Text.removeTags(event.getTarget())); setHoveredFriend(Text.toJagexName(Text.removeTags(event.getTarget())));
// Build "Add Note" or "Edit Note" menu entry // Build "Add Note" or "Edit Note" menu entry
final MenuEntry addNote = new MenuEntry(); final MenuEntry addNote = new MenuEntry();
@@ -197,13 +197,13 @@ public class FriendNotesPlugin extends Plugin
return; return;
} }
//Friends have color tags
final String sanitizedTarget = Text.removeTags(event.getMenuTarget());
// Handle clicks on "Add Note" or "Edit Note" // Handle clicks on "Add Note" or "Edit Note"
if (event.getMenuOption().equals(ADD_NOTE) || event.getMenuOption().equals(EDIT_NOTE)) if (event.getMenuOption().equals(ADD_NOTE) || event.getMenuOption().equals(EDIT_NOTE))
{ {
event.consume(); event.consume();
//Friends have color tags
final String sanitizedTarget = Text.toJagexName(Text.removeTags(event.getMenuTarget()));
final String note = getFriendNote(sanitizedTarget); final String note = getFriendNote(sanitizedTarget);
// Open the new chatbox input dialog // Open the new chatbox input dialog
@@ -234,7 +234,16 @@ public class FriendNotesPlugin extends Plugin
{ {
// Migrate a friend's note to their new display name // Migrate a friend's note to their new display name
final Friend friend = (Friend) nameable; final Friend friend = (Friend) nameable;
migrateFriendNote(friend.getName(), friend.getPrevName()); String name = friend.getName();
String prevName = friend.getPrevName();
if (prevName != null)
{
migrateFriendNote(
Text.toJagexName(name),
Text.toJagexName(prevName)
);
}
} }
} }
@@ -242,7 +251,7 @@ public class FriendNotesPlugin extends Plugin
public void onRemovedFriend(RemovedFriend event) public void onRemovedFriend(RemovedFriend event)
{ {
// Delete a friend's note if they are removed // Delete a friend's note if they are removed
final String displayName = event.getName(); final String displayName = Text.toJagexName(event.getName());
log.debug("Remove friend: '{}'", displayName); log.debug("Remove friend: '{}'", displayName);
setFriendNote(displayName, null); setFriendNote(displayName, null);
} }