val/jable
1
0
Fork 0
Code Issues Pull Requests Activity

Parse message tags

Browse Source
This commit is contained in:
Val Lorentz
2023-09-10 18:32:40 +02:00
parent 7ed6ff30b9
commit b33e72523c
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jable/client.clj
View File

@ -44,12 +44,18 @@
(write-command (:writer client) command))
(.flush (:writer client)))
(defn parse-tags [s]
(as-> s v
(str/split v #";")
(map #(str/split % #"=" 2) v)
(into {} v)))
(def line-re
#"^(?:@([^ ]+) )?(?::([^ ]+) )?([^ ]+)(?: (.*?))??(?: :(.*))?$")
(defn parse-command [line]
(let [[_ tags source cmd params trailing] (re-matches line-re line)]
{:tags tags
{:tags (if tags (parse-tags tags) {})
:source source
:cmd cmd
:params (let [params (if (empty? params)

28
test/jable/client_test.clj
View File

@ -26,36 +26,40 @@
(deftest parse-command-test
(testing "parsing a command with no param"
(is (= (parse-command "AWAY")
{:tags nil :source nil :cmd "AWAY" :params []})))
{:tags {} :source nil :cmd "AWAY" :params []})))
(testing "parsing a command with one param"
(is (= (parse-command "AWAY reason")
{:tags nil :source nil :cmd "AWAY" :params ["reason"]})))
{:tags {} :source nil :cmd "AWAY" :params ["reason"]})))
(testing "parsing a command with one trailing param"
(is (= (parse-command "AWAY :the reason")
{:tags nil :source nil :cmd "AWAY" :params ["the reason"]})))
{:tags {} :source nil :cmd "AWAY" :params ["the reason"]})))
(testing "parsing a command with two params"
(is (= (parse-command "PRIVMSG #chan :hi")
{:tags nil :source nil :cmd "PRIVMSG" :params ["#chan" "hi"]})))
{:tags {} :source nil :cmd "PRIVMSG" :params ["#chan" "hi"]})))
(testing "parsing a command with one normal param and one trailing param"
(is (= (parse-command "PRIVMSG #chan :hi there")
{:tags nil :source nil :cmd "PRIVMSG" :params ["#chan" "hi there"]})))
{:tags {} :source nil :cmd "PRIVMSG" :params ["#chan" "hi there"]})))
(testing "parsing a command with source"
(is (= (parse-command ":nick!user@host AWAY")
{:tags nil :source "nick!user@host" :cmd "AWAY" :params []})))
{:tags {} :source "nick!user@host" :cmd "AWAY" :params []})))
(testing "parsing a command with a tag"
(is (= (parse-command "@label=abc ACK")
{:tags {"label" "abc"} :source nil :cmd "ACK" :params []})))
(testing "parsing a command with tags"
(is (= (parse-command "@label=abc ACK")
{:tags "label=abc" :source nil :cmd "ACK" :params []})))
(is (= (parse-command "@label=abc;time=123 ACK")
{:tags {"label" "abc", "time", "123"} :source nil :cmd "ACK" :params []})))
(testing "parsing a command with source and tags"
(testing "parsing a command with source and tag"
(is (= (parse-command "@label=abc :nick!user@host AWAY")
{:tags "label=abc" :source "nick!user@host" :cmd "AWAY" :params []})))
{:tags {"label" "abc"} :source "nick!user@host" :cmd "AWAY" :params []})))
(testing "parsing a command with all fields"
(is (= (parse-command "@k1=v1;k2=v2 :server. KICK #chan badperson :reason")
{:tags "k1=v1;k2=v2" :source "server." :cmd "KICK" :params ["#chan" "badperson" "reason"]}))))
(is (= (parse-command "@label=abc;time=123 :server. KICK #chan badperson :reason")
{:tags {"label" "abc", "time", "123"} :source "server." :cmd "KICK" :params ["#chan" "badperson" "reason"]}))))