From 62980d76bd1e7e1115d80a4d205af5ffcdefb1c7 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 22 Jun 2025 17:39:13 -0400 Subject: [PATCH] move some helpers --- irc/handlers.go | 20 -------------------- irc/metadata.go | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/irc/handlers.go b/irc/handlers.go index e090f3f5..878d5eb5 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -3367,26 +3367,6 @@ func metadataSubsHandler(client *Client, subcommand string, params []string, rb return false } -func playMetadataList(rb *ResponseBuffer, nick, target string, values map[string]string) { - batchId := rb.StartNestedBatch("metadata", target) - defer rb.EndNestedBatch(batchId) - - for key, val := range values { - visibility := "*" - rb.Add(nil, rb.session.client.server.name, RPL_KEYVALUE, nick, target, key, visibility, val) - } -} - -func playMetadataVerbBatch(rb *ResponseBuffer, target string, values map[string]string) { - batchId := rb.StartNestedBatch("metadata", target) - defer rb.EndNestedBatch(batchId) - - for key, val := range values { - visibility := "*" - rb.Add(nil, rb.session.client.server.name, "METADATA", target, key, visibility, val) - } -} - // REHASH func rehashHandler(server *Server, client *Client, msg ircmsg.Message, rb *ResponseBuffer) bool { nick := client.Nick() diff --git a/irc/metadata.go b/irc/metadata.go index 713c7eae..762d6a99 100644 --- a/irc/metadata.go +++ b/irc/metadata.go @@ -106,6 +106,26 @@ func syncChannelMetadata(server *Server, rb *ResponseBuffer, channel *Channel) { } } +func playMetadataList(rb *ResponseBuffer, nick, target string, values map[string]string) { + batchId := rb.StartNestedBatch("metadata", target) + defer rb.EndNestedBatch(batchId) + + for key, val := range values { + visibility := "*" + rb.Add(nil, rb.session.client.server.name, RPL_KEYVALUE, nick, target, key, visibility, val) + } +} + +func playMetadataVerbBatch(rb *ResponseBuffer, target string, values map[string]string) { + batchId := rb.StartNestedBatch("metadata", target) + defer rb.EndNestedBatch(batchId) + + for key, val := range values { + visibility := "*" + rb.Add(nil, rb.session.client.server.name, "METADATA", target, key, visibility, val) + } +} + var validMetadataKeyRegexp = regexp.MustCompile("^[a-z0-9_./-]+$") func metadataKeyIsEvil(key string) bool {