Bladeren bron

Add a convenience method to get mode + nickname.

Use this in the new formatter to avoid having object hashcodes
all over the damn place.
pull/333/head
Chris Smith 9 jaren geleden
bovenliggende
commit
7806dd4e40

+ 8
- 8
res/com/dmdirc/ui/messages/format.yml Bestand weergeven

@@ -1,24 +1,24 @@
1 1
 ---
2 2
 ChannelModeNoticeEvent:
3
-  format: "-{{client}}:{{prefix}}{{channel.name}}- {{message}}"
3
+  format: "-{{client.modePrefixedNickname}}:{{prefix}}{{channel.name}}- {{message}}"
4 4
   colour: 5
5 5
 ChannelNoticeEvent:
6
-  format: "-{{client}}:{{channel.name}}- {{message}}"
6
+  format: "-{{client.modePrefixedNickname}}:{{channel.name}}- {{message}}"
7 7
   colour: 5
8 8
 ChannelMessageEvent:
9
-  format: "<{{client}}> {{message}}"
9
+  format: "<{{client.modePrefixedNickname}}> {{message}}"
10 10
 ChannelActionEvent:
11
-  format: "* {{client}} {{message}}"
11
+  format: "* {{client.modePrefixedNickname}} {{message}}"
12 12
   colour: 6
13 13
 ChannelSelfMessageEvent:
14
-  format: "<{{client}}> {{message}}"
14
+  format: "<{{client.modePrefixedNickname}}> {{message}}"
15 15
 ChannelSelfActionEvent:
16
-  format: "* {{client}} {{message}}"
16
+  format: "* {{client.modePrefixedNickname}} {{message}}"
17 17
   colour: 6
18 18
 ChannelSelfExternalMessageEvent:
19
-  format: "<{{client}}> {{message}}"
19
+  format: "<{{client.modePrefixedNickname}}> {{message}}"
20 20
 ChannelSelfExternalActionEvent:
21
-  format: "* {{client}} {{message}}"
21
+  format: "* {{client.modePrefixedNickname}} {{message}}"
22 22
   colour: 6
23 23
 
24 24
 # TODO:

+ 5
- 0
src/com/dmdirc/ChannelClient.java Bestand weergeven

@@ -75,6 +75,11 @@ public class ChannelClient implements GroupChatUser {
75 75
         return getUser().getNickname();
76 76
     }
77 77
 
78
+    @Override
79
+    public String getModePrefixedNickname() {
80
+        return getImportantMode() + getNickname();
81
+    }
82
+
78 83
     @Override
79 84
     public Optional<String> getUsername() {
80 85
         return getUser().getUsername();

+ 10
- 2
src/com/dmdirc/interfaces/GroupChatUser.java Bestand weergeven

@@ -49,8 +49,8 @@ public interface GroupChatUser {
49 49
     GroupChat getGroupChat();
50 50
 
51 51
     /**
52
-     * Returns the most important mode that the client holds in its textual
53
-     * form (e.g. o, v, etc)
52
+     * Returns the most important mode that the client holds in its prefix
53
+     * form (e.g. @, +, etc)
54 54
      *
55 55
      * @return The most important mode the client holds, or an empty string
56 56
      */
@@ -71,6 +71,14 @@ public interface GroupChatUser {
71 71
      */
72 72
     String getNickname();
73 73
 
74
+    /**
75
+     * Retrieves the nickname or display name used by this client, with their most important mode
76
+     * prefixed.
77
+     *
78
+     * @return This client's nickname with their important mode prefixed (if any).
79
+     */
80
+    String getModePrefixedNickname();
81
+
74 82
     /**
75 83
      * Retrieves the username or ident used by this client.
76 84
      *

Laden…
Annuleren
Opslaan