Browse Source

reorganize structs

tags/v0.1.0
Jeremy Latt 12 years ago
parent
commit
8f0bd1b07a
2 changed files with 27 additions and 25 deletions
  1. 0
    25
      src/irc/commands.go
  2. 27
    0
      src/irc/message.go

+ 0
- 25
src/irc/commands.go View File

@@ -1,13 +1,5 @@
1 1
 package irc
2 2
 
3
-type Message interface {
4
-	Handle(s *Server, c *Client)
5
-}
6
-
7
-type NickMessage struct {
8
-	nickname string
9
-}
10
-
11 3
 func (m *NickMessage) Handle(s *Server, c *Client) {
12 4
 	if s.nicks[m.nickname] != nil {
13 5
 		c.send <- ErrNickNameInUse(m.nickname)
@@ -21,13 +13,6 @@ func (m *NickMessage) Handle(s *Server, c *Client) {
21 13
 	tryRegister(s, c)
22 14
 }
23 15
 
24
-type UserMessage struct {
25
-	user string
26
-	mode uint8
27
-	unused string
28
-	realname string
29
-}
30
-
31 16
 func (m *UserMessage) Handle(s *Server, c *Client) {
32 17
 	if c.username != "" {
33 18
 		c.send <- ErrAlreadyRegistered(c.Nick())
@@ -37,25 +22,15 @@ func (m *UserMessage) Handle(s *Server, c *Client) {
37 22
 	tryRegister(s, c)
38 23
 }
39 24
 
40
-type QuitMessage struct {
41
-	message string
42
-}
43
-
44 25
 func (m *QuitMessage) Handle(s *Server, c *Client) {
45 26
 	c.send <- MessageError()
46 27
 	delete(s.nicks, c.nick)
47 28
 }
48 29
 
49
-type UnknownMessage struct {
50
-	command string
51
-}
52
-
53 30
 func (m *UnknownMessage) Handle(s *Server, c *Client) {
54 31
 	c.send <- ErrUnknownCommand(c.Nick(), m.command)
55 32
 }
56 33
 
57
-type PingMessage struct {}
58
-
59 34
 func (m *PingMessage) Handle(s *Server, c *Client) {
60 35
 	c.send <- MessagePong()
61 36
 }

+ 27
- 0
src/irc/message.go View File

@@ -0,0 +1,27 @@
1
+package irc
2
+
3
+type Message interface {
4
+	Handle(s *Server, c *Client)
5
+}
6
+
7
+type NickMessage struct {
8
+	nickname string
9
+}
10
+
11
+type UserMessage struct {
12
+	user string
13
+	mode uint8
14
+	unused string
15
+	realname string
16
+}
17
+
18
+
19
+type QuitMessage struct {
20
+	message string
21
+}
22
+
23
+type UnknownMessage struct {
24
+	command string
25
+}
26
+
27
+type PingMessage struct {}

Loading…
Cancel
Save