Преглед на файлове

Set ADDRESS and REAL_NAME property after whois.

Having two separate events means the ordering isn't guaranteed.
Handle everything for 311 numerics in one handler.
pull/103/head
Chris Smith преди 8 години
родител
ревизия
a050ea93fe
променени са 1 файла, в които са добавени 5 реда и са изтрити 8 реда
  1. 5
    8
      irc/src/com/dmdirc/parser/irc/WhoisResponseHandler.java

+ 5
- 8
irc/src/com/dmdirc/parser/irc/WhoisResponseHandler.java Целия файл

65
     void handleStartOfWhois(final NumericEvent event) {
65
     void handleStartOfWhois(final NumericEvent event) {
66
         client = event.getToken()[3];
66
         client = event.getToken()[3];
67
         info.clear();
67
         info.clear();
68
+
69
+        // :server 311 DMDirc User ~Ident host.dmdirc.com * :Real name
70
+        info.put(UserInfoType.ADDRESS,
71
+                event.getToken()[3] + '!' + event.getToken()[4] + '@' + event.getToken()[5]);
72
+        info.put(UserInfoType.REAL_NAME, event.getToken()[7]);
68
     }
73
     }
69
 
74
 
70
     @Handler(condition = "msg.numeric == 318")
75
     @Handler(condition = "msg.numeric == 318")
81
         info.put(UserInfoType.AWAY_MESSAGE, event.getToken()[4]);
86
         info.put(UserInfoType.AWAY_MESSAGE, event.getToken()[4]);
82
     }
87
     }
83
 
88
 
84
-    @Handler(condition = "msg.numeric == 311")
85
-    void handleUserInfo(final NumericEvent event) {
86
-        // :server 311 DMDirc User ~Ident host.dmdirc.com * :Real name
87
-        info.put(UserInfoType.ADDRESS,
88
-                event.getToken()[3] + '!' + event.getToken()[4] + '@' + event.getToken()[5]);
89
-        info.put(UserInfoType.REAL_NAME, event.getToken()[7]);
90
-    }
91
-
92
     @Handler(condition = "msg.numeric == 312")
89
     @Handler(condition = "msg.numeric == 312")
93
     void handleServerInfo(final NumericEvent event) {
90
     void handleServerInfo(final NumericEvent event) {
94
         // :server 312 DMDirc User *.quakenet.org :QuakeNet IRC Server
91
         // :server 312 DMDirc User *.quakenet.org :QuakeNet IRC Server

Loading…
Отказ
Запис