jmap_contact: rename "nickName" property to "nickname"

Signed-off-by: Robert Stepanek <[email protected]>
cyrusimap · Aug 10, 2023 · 4bb5d40 · 4bb5d40
1 parent e220477
commit 4bb5d40
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/cassandane/tiny-tests/JMAPContacts/card-copy b/cassandane/tiny-tests/JMAPContacts/card-copy
@@ -141,7 +141,7 @@ sub test_card_copy
                 id => $cardId,
                 addressBookId => "Default",
 #                avatar => JSON::null,
-                nickNames => { n1 => { '@type' => 'NickName', name => "xxxxx" } }
+                nicknames => { n1 => { '@type' => 'Nickname', name => "xxxxx" } }
             },
         }
     },
@@ -160,7 +160,7 @@ sub test_card_copy
         }, 'R2'],
     ]);
     $self->assert_str_equals('foo bar', $res->[0][1]{list}[0]{name}{full});
-    $self->assert_str_equals('xxxxx', $res->[0][1]{list}[0]{nickNames}{n1}{name});
+    $self->assert_str_equals('xxxxx', $res->[0][1]{list}[0]{nicknames}{n1}{name});
 #    $self->assert_null($res->[0][1]{list}[0]{avatar});
 return;
     my $other3Jmap = Mail::JMAPTalk->new(

diff --git a/cassandane/tiny-tests/JMAPContacts/card-query b/cassandane/tiny-tests/JMAPContacts/card-query
@@ -28,7 +28,7 @@ sub test_card_query
                         surname => 'aaa'
                     }
                 },
-                nickNames => {
+                nicknames => {
                     'n1' => {
                         name => "foo"
                     }
@@ -176,7 +176,7 @@ sub test_card_query
                         },
                     ]
                 },
-                nickNames => {
+                nicknames => {
                     'n1' => {
                         name => "bam"
                     }

diff --git a/cassandane/tiny-tests/JMAPContacts/card-query-shared b/cassandane/tiny-tests/JMAPContacts/card-query-shared
@@ -50,7 +50,7 @@ sub test_card_query_shared
                         surname => 'aaa'
                     }
                 },
-                nickNames => {
+                nicknames => {
                     'n1' => {
                         name => "foo"
                     }
@@ -198,7 +198,7 @@ sub test_card_query_shared
                         },
                     ]
                 },
-                nickNames => {
+                nicknames => {
                     'n1' => {
                         name => "bam"
                     }

diff --git a/cassandane/tiny-tests/JMAPContacts/card-set-create-nicknames b/cassandane/tiny-tests/JMAPContacts/card-set-create-nicknames
@@ -30,9 +30,9 @@ sub test_card_set_create_nicknames
                     version => '1.0',
                     uid => $id,
                     name => { full => 'John Doe' },
-                    nickNames => {
+                    nicknames => {
                         k391 => {
-                            '@type' => 'NickName',
+                            '@type' => 'Nickname',
                             name => 'Johnny'
                         }
                     }

diff --git a/cassandane/tiny-tests/JMAPContacts/card-set-update b/cassandane/tiny-tests/JMAPContacts/card-set-update
@@ -30,9 +30,9 @@ sub test_card_set_update
                     version => '1.0',
                     uid => $id,
                     name => { full => 'John Doe' },
-                    nickNames => {
+                    nicknames => {
                         k391 => {
-                            '@type' => 'NickName',
+                            '@type' => 'Nickname',
                             name => 'Johnny'
                         }
                     }
@@ -47,9 +47,9 @@ sub test_card_set_update
         ['ContactCard/set', {
             update => {
                 $id => {
-                    'nickNames/k391/name' => 'Johnny Boy',
-                    'nickNames/foo' => {
-                        '@type' => 'NickName',
+                    'nicknames/k391/name' => 'Johnny Boy',
+                    'nicknames/foo' => {
+                        '@type' => 'Nickname',
                         name => 'Doey'
                     }
                 }
@@ -73,7 +73,7 @@ sub test_card_set_update
         ['ContactCard/set', {
             update => {
                 $id => {
-                    'nickNames/k391' => JSON::null
+                    'nicknames/k391' => JSON::null
                 }
             }
          }, "R2"]

diff --git a/cassandane/tiny-tests/JMAPContacts/cardgroup-query b/cassandane/tiny-tests/JMAPContacts/cardgroup-query
@@ -27,7 +27,7 @@ sub test_cardgroup_query
                         surname => 'aaa'
                     }
                 },
-                nickNames => {
+                nicknames => {
                     'n1' => {
                         name => "foo"
                     }
@@ -166,7 +166,7 @@ sub test_cardgroup_query
                         },
                     ]
                 },
-                nickNames => {
+                nicknames => {
                     'n1' => {
                         name => "bam"
                     }

diff --git a/imap/jmap_contact.c b/imap/jmap_contact.c
@@ -5608,7 +5608,7 @@ static const jmap_property_t card_props[] = {
         0
     },
     {
-        "nickNames",
+        "nicknames",
         NULL,
         0
     },
@@ -6540,7 +6540,7 @@ static void jsprop_from_vcard(vcardproperty *prop, json_t *obj,
     }
 
     case VCARD_NICKNAME_PROPERTY: {
-        json_t *nicks = json_object_get_vanew(obj, "nickNames", "{}");
+        json_t *nicks = json_object_get_vanew(obj, "nicknames", "{}");
         vcardstrarray *names = vcardproperty_get_nickname(prop);
         size_t i;
 
@@ -7898,7 +7898,7 @@ static int card_filter_match(void *vf, void *rock)
                                     f->text, &cfrock->cached_termsets) ||
         !card_filter_match_namecomp(card, "suffix", f->suffix,
                                     f->text, &cfrock->cached_termsets) ||
-        !card_filter_match_listprop(card, "nickNames", NULL,
+        !card_filter_match_listprop(card, "nicknames", NULL,
                                     name_vals, f->nickName,
                                     f->text, &cfrock->cached_termsets) ||
         !card_filter_match_listprop(card, "titles", "title",
@@ -10222,9 +10222,9 @@ static int _jscard_to_vcard(struct jmap_req *req,
             }
             record_is_dirty |= _jsname_to_vcard(&parser, jval, &l10n, card);
         }
-        else if (!strcmp(mykey, "nickNames")) {
+        else if (!strcmp(mykey, "nicknames")) {
             record_is_dirty |= _jsmultiobject_to_card(&parser, jval,
-                                                      mykey, "NickName",
+                                                      mykey, "Nickname",
                                                       &_jsnickname_to_vcard,
                                                       WANT_PROPID_FLAG,
                                                       pref_param_props, &l10n,