Selaa lähdekoodia

make histserv replies come from histserv, not hostserv

tags/v2.1.0-rc1
Shivaram Lingamneni 4 vuotta sitten
vanhempi
commit
9517adae9d
1 muutettua tiedostoa jossa 9 lisäystä ja 9 poistoa
  1. 9
    9
      irc/histserv.go

+ 9
- 9
irc/histserv.go Näytä tiedosto

@@ -113,19 +113,19 @@ func histservDeleteHandler(server *Server, client *Client, command string, param
113 113
 	if !hasPrivs {
114 114
 		accountName = client.AccountName()
115 115
 		if !(server.Config().History.Retention.AllowIndividualDelete && accountName != "*") {
116
-			hsNotice(rb, client.t("Insufficient privileges"))
116
+			histNotice(rb, client.t("Insufficient privileges"))
117 117
 			return
118 118
 		}
119 119
 	}
120 120
 
121 121
 	err := server.DeleteMessage(target, msgid, accountName)
122 122
 	if err == nil {
123
-		hsNotice(rb, client.t("Successfully deleted message"))
123
+		histNotice(rb, client.t("Successfully deleted message"))
124 124
 	} else {
125 125
 		if hasPrivs {
126
-			hsNotice(rb, fmt.Sprintf(client.t("Error deleting message: %v"), err))
126
+			histNotice(rb, fmt.Sprintf(client.t("Error deleting message: %v"), err))
127 127
 		} else {
128
-			hsNotice(rb, client.t("Could not delete message"))
128
+			histNotice(rb, client.t("Could not delete message"))
129 129
 		}
130 130
 	}
131 131
 }
@@ -143,9 +143,9 @@ func histservExportHandler(server *Server, client *Client, command string, param
143 143
 	pathname := config.getOutputPath(filename)
144 144
 	outfile, err := os.Create(pathname)
145 145
 	if err != nil {
146
-		hsNotice(rb, fmt.Sprintf(client.t("Error opening export file: %v"), err))
146
+		histNotice(rb, fmt.Sprintf(client.t("Error opening export file: %v"), err))
147 147
 	} else {
148
-		hsNotice(rb, fmt.Sprintf(client.t("Started exporting data for account %[1]s to file %[2]s"), cfAccount, filename))
148
+		histNotice(rb, fmt.Sprintf(client.t("Started exporting data for account %[1]s to file %[2]s"), cfAccount, filename))
149 149
 	}
150 150
 
151 151
 	go histservExportAndNotify(server, cfAccount, outfile, filename, client.Nick())
@@ -174,12 +174,12 @@ func histservExportAndNotify(server *Server, cfAccount string, outfile *os.File,
174 174
 func histservPlayHandler(server *Server, client *Client, command string, params []string, rb *ResponseBuffer) {
175 175
 	items, _, err := easySelectHistory(server, client, params)
176 176
 	if err != nil {
177
-		hsNotice(rb, client.t("Could not retrieve history"))
177
+		histNotice(rb, client.t("Could not retrieve history"))
178 178
 		return
179 179
 	}
180 180
 
181 181
 	playMessage := func(timestamp time.Time, nick, message string) {
182
-		hsNotice(rb, fmt.Sprintf("%s <%s> %s", timestamp.Format("15:04:05"), stripMaskFromNick(nick), message))
182
+		histNotice(rb, fmt.Sprintf("%s <%s> %s", timestamp.Format("15:04:05"), stripMaskFromNick(nick), message))
183 183
 	}
184 184
 
185 185
 	for _, item := range items {
@@ -196,7 +196,7 @@ func histservPlayHandler(server *Server, client *Client, command string, params
196 196
 		}
197 197
 	}
198 198
 
199
-	hsNotice(rb, client.t("End of history playback"))
199
+	histNotice(rb, client.t("End of history playback"))
200 200
 }
201 201
 
202 202
 // handles parameter parsing and history queries for /HISTORY and /HISTSERV PLAY

Loading…
Peruuta
Tallenna