commit 0588fd5

Ferass El Hafidi  ·  2024-05-25 10:28:57 +0000 UTC
parent 625e7b7
session: remove "The user" part from whois

Signed-off-by: Ferass El Hafidi <vitali64pmemail@protonmail.com>
1 files changed,  +16, -16
+16, -16
  1@@ -1611,7 +1611,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
  2 		}
  3 		return InfoEvent{
  4 			Prefix:  "User",
  5-			Message: fmt.Sprintf("The user %s %s", nick, text),
  6+			Message: fmt.Sprintf("%s %s", nick, text),
  7 		}, nil
  8 	case rplUnaway:
  9 		return InfoEvent{
 10@@ -1628,7 +1628,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 11 		}
 12 		return InfoEvent{
 13 			Prefix:  "User",
 14-			Message: fmt.Sprintf("The user %s has identified and is registered to the server", nick),
 15+			Message: fmt.Sprintf("%s has identified and is registered to the server", nick),
 16 		}, nil
 17 	case rplWhoisuser:
 18 		var nick, username, host, realname string
 19@@ -1637,7 +1637,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 20 		}
 21 		return InfoEvent{
 22 			Prefix:  "User",
 23-			Message: fmt.Sprintf("The user %s has username %s and host %s (mask %s!%s@%s); their realname is %s", nick, username, host, nick, username, host, realname),
 24+			Message: fmt.Sprintf("%s has username %s and host %s (mask %s!%s@%s); their realname is %s", nick, username, host, nick, username, host, realname),
 25 		}, nil
 26 	case rplWhoisserver:
 27 		var nick, server, serverInfo string
 28@@ -1646,7 +1646,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 29 		}
 30 		return InfoEvent{
 31 			Prefix:  "User",
 32-			Message: fmt.Sprintf("The user %s is connected through the server %s (%s)", nick, server, serverInfo),
 33+			Message: fmt.Sprintf("%s is connected through the server %s (%s)", nick, server, serverInfo),
 34 		}, nil
 35 	case rplWhoisoperator:
 36 		var nick, opertype string
 37@@ -1655,7 +1655,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 38 		}
 39 		return InfoEvent{
 40 			Prefix:  "User",
 41-			Message: fmt.Sprintf("The user %s %s", nick, opertype),
 42+			Message: fmt.Sprintf("%s %s", nick, opertype),
 43 		}, nil
 44 	case rplWhowasuser:
 45 		var nick, username, host, realname string
 46@@ -1664,7 +1664,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 47 		}
 48 		return InfoEvent{
 49 			Prefix:  "User",
 50-			Message: fmt.Sprintf("The user %s was last seen with username %s and host %s (mask %s!%s@%s); their realname was %s", nick, username, host, nick, username, host, realname),
 51+			Message: fmt.Sprintf("%s was last seen with username %s and host %s (mask %s!%s@%s); their realname was %s", nick, username, host, nick, username, host, realname),
 52 		}, nil
 53 	case rplWhoisidle:
 54 		var nick, idleText, signonText string
 55@@ -1681,7 +1681,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 56 		}
 57 		idle := (time.Duration(idleSeconds) * time.Second).String()
 58 		t := time.Unix(signon, 0)
 59-		text := fmt.Sprintf("The user %s was idle for %s; they signed-on on %s", nick, idle, t.Local().Format("January 2 at 15:04"))
 60+		text := fmt.Sprintf("%s was idle for %s; they signed-on on %s", nick, idle, t.Local().Format("January 2 at 15:04"))
 61 		return InfoEvent{
 62 			Prefix:  "User",
 63 			Message: text,
 64@@ -1693,7 +1693,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 65 		}
 66 		return InfoEvent{
 67 			Prefix:  "User",
 68-			Message: fmt.Sprintf("The user %s has joined channels: %s", nick, text),
 69+			Message: fmt.Sprintf("%s has joined channels: %s", nick, text),
 70 		}, nil
 71 	case rplWhoisspecial:
 72 		var nick, text string
 73@@ -1702,7 +1702,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 74 		}
 75 		return InfoEvent{
 76 			Prefix:  "User",
 77-			Message: fmt.Sprintf("The user %s is also: %s", nick, text),
 78+			Message: fmt.Sprintf("%s is also: %s", nick, text),
 79 		}, nil
 80 	case rplList:
 81 		var channel, count, topic string
 82@@ -1748,12 +1748,12 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 83 		if nick != account {
 84 			return InfoEvent{
 85 				Prefix:  "User",
 86-				Message: fmt.Sprintf("The user %s is authenticated as %s", nick, account),
 87+				Message: fmt.Sprintf("%s is authenticated as %s", nick, account),
 88 			}, nil
 89 		} else {
 90 			return InfoEvent{
 91 				Prefix:  "User",
 92-				Message: fmt.Sprintf("The user %s is authenticated", nick),
 93+				Message: fmt.Sprintf("%s is authenticated", nick),
 94 			}, nil
 95 		}
 96 	case rplInvitelist, rplInvexlist:
 97@@ -1784,7 +1784,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
 98 			}
 99 			return InfoEvent{
100 				Prefix:  "User",
101-				Message: fmt.Sprintf("The user %s %s", nick, text),
102+				Message: fmt.Sprintf("%s %s", nick, text),
103 			}, nil
104 		} else if len(msg.Params) >= 4 {
105 			var nick string
106@@ -1793,7 +1793,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
107 			}
108 			return InfoEvent{
109 				Prefix:  "User",
110-				Message: fmt.Sprintf("The user %s is actually using the host %s", nick, msg.Params[len(msg.Params)-2]),
111+				Message: fmt.Sprintf("%s is actually using the host %s", nick, msg.Params[len(msg.Params)-2]),
112 			}, nil
113 		}
114 	case rplExceptlist:
115@@ -1877,7 +1877,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
116 		}
117 		return InfoEvent{
118 			Prefix:  "User",
119-			Message: fmt.Sprintf("The user %s %s", nick, text),
120+			Message: fmt.Sprintf("%s %s", nick, text),
121 		}, nil
122 	case rplWhoismodes:
123 		var nick, text string
124@@ -1886,7 +1886,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
125 		}
126 		return InfoEvent{
127 			Prefix:  "User",
128-			Message: fmt.Sprintf("The user %s %s", nick, text),
129+			Message: fmt.Sprintf("%s %s", nick, text),
130 		}, nil
131 	case rplYoureoper:
132 		var text string
133@@ -1911,7 +1911,7 @@ func (s *Session) handleMessageRegistered(msg Message, playback bool) (Event, er
134 		}
135 		return InfoEvent{
136 			Prefix:  "User",
137-			Message: fmt.Sprintf("The user %s %s", nick, text),
138+			Message: fmt.Sprintf("%s %s", nick, text),
139 		}, nil
140 	case rplHelpstart, rplHelptxt:
141 		var text string