Apply object display properties when formatting events.

If an object in a formatter tag ({{foo.bar.baz}}) is Displayable,
then we will modify the output based on its display properties.

Currently only supports user links and foreground colours.

This also changes the internal format of nickname links to be
`\u16<nick to link to>\u16<text to show>\u16`, allowing the
link and text to differ. This means if you formatted users
by showing their realname, you could still click them to
open a query.

Closes #424
Closes DMDirc/Plugins#507

src/main/java/com/dmdirc/ui/messages/EventFormatter.java

@@ -22,8 +22,12 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.events.DisplayableEvent;
 
+import com.dmdirc.interfaces.Displayable;
+import com.dmdirc.util.colours.ColourUtils;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -111,13 +115,20 @@ public class EventFormatter {
     private String getReplacement(final Object dataSource, final String tag) {
         final String[] functionParts = tag.split("\\|");
         final String[] dataParts = functionParts[0].split("\\.");
+        final DisplayPropertyMap displayProperties = new DisplayPropertyMap();
 
         Object target = dataSource;
         for (String part : dataParts) {
-            final Optional<Object> result =
-                    propertyManager.getProperty(target, target.getClass(), part);
+            final Optional<Object> result = propertyManager.getProperty(target, target.getClass(), part);
             if (result.isPresent()) {
                 target = result.get();
+
+                // Collate all the display properties for objects as we traverse. More specific ones will
+                // override earlier ones.
+                if (target instanceof Displayable) {
+                    displayProperties.putAll(((Displayable) target).getDisplayProperties());
+                }
+
             } else {
                 return ERROR_STRING;
             }
@@ -128,7 +139,25 @@ public class EventFormatter {
             value = propertyManager.applyFunction(value, functionParts[i]);
         }
 
-        return value;
+        return applyDisplayProperties(displayProperties, value);
+    }
+
+    // TODO: It should be possible for plugins etc to add new ways of applying properties.
+    private String applyDisplayProperties(final DisplayPropertyMap displayProperties, final String value) {
+        final StringBuilder res = new StringBuilder(value);
+
+        displayProperties.get(DisplayProperty.LINK_USER).ifPresent(user -> res
+                .insert(0, StyleApplier.CODE_NICKNAME)
+                .insert(0, user.getNickname())
+                .insert(0, StyleApplier.CODE_NICKNAME)
+                .append(StyleApplier.CODE_NICKNAME));
+
+        displayProperties.get(DisplayProperty.FOREGROUND_COLOUR).ifPresent(colour -> res
+                .insert(0, ColourUtils.getHex(colour))
+                .insert(0, IRCControlCodes.COLOUR_HEX)
+                .append(IRCControlCodes.COLOUR_HEX));
+
+        return res.toString();
     }
 
 }

src/main/java/com/dmdirc/ui/messages/EventPropertyManager.java

@@ -61,10 +61,8 @@ public class EventPropertyManager {
         functions.put("bracketed", s -> Strings.isNullOrEmpty(s) ? "" : " (" + s + ')');
     }
 
-    public <S> Optional<Object> getProperty(final S object, final Class<? extends S> type,
-            final String property) {
-        final String methodName = "get" + property.substring(0, 1).toUpperCase()
-                + property.substring(1);
+    public <S> Optional<Object> getProperty(final S object, final Class<? extends S> type, final String property) {
+        final String methodName = "get" + property.substring(0, 1).toUpperCase() + property.substring(1);
         try {
             final Method method = type.getMethod(methodName);
             // TODO: This is needed for AutoValues, should probably get return types not real types
@@ -77,8 +75,7 @@ public class EventPropertyManager {
 
             return Optional.ofNullable(result);
         } catch (ReflectiveOperationException ex) {
-            LOG.warn(USER_ERROR, "Unable to format event: could not retrieve property {}",
-                    ex.getMessage(), ex);
+            LOG.warn(USER_ERROR, "Unable to format event: could not retrieve property {}", property, ex);
         }
         return Optional.empty();
     }

src/main/java/com/dmdirc/ui/messages/Styliser.java

@@ -333,14 +333,17 @@ public class Styliser implements ConfigChangeListener, StyleApplier {
 
         // Nickname links
         if (string.charAt(0) == CODE_NICKNAME) {
+            int count = 1;
             if (state.isInLink) {
                 maker.endNicknameLink();
             } else {
-                maker.startNicknameLink(readUntilControl(string.substring(1)));
+                int next = string.indexOf(CODE_NICKNAME, 1);
+                maker.startNicknameLink(string.substring(1, next));
+                count += next;
             }
             state.isInLink = !state.isInLink;
 
-            return 1;
+            return count;
         }
 
         // Fixed pitch