devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Add option to add bookmark name

Browse Source 
`/bookmark add|update` got `name` field.
By default localpart of JID is used (like before) but now we can set the
name ourselves.

Regards https://github.com/profanity-im/profanity/issues/697
This commit is contained in:
Michael Vetter
2020-05-22 14:18:20 +02:00
parent fad296b79e
commit 88c36745fe
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/xmpp/bookmark.c
View File

@@ -95,7 +95,7 @@ bookmark_request(void)
}
gboolean
bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str)
bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str, const char *name)
{
assert(jid != NULL);
@@ -121,6 +121,11 @@ bookmark_add(const char *jid, const char *nick, const char *password, const char
} else {
bookmark->password = NULL;
}
if (name) {
bookmark->password = strdup(name);
} else {
bookmark->password = NULL;
}
if (g_strcmp0(autojoin_str, "on") == 0) {
bookmark->autojoin = TRUE;
@@ -137,7 +142,7 @@ bookmark_add(const char *jid, const char *nick, const char *password, const char
}
gboolean
bookmark_update(const char *jid, const char *nick, const char *password, const char *autojoin_str)
bookmark_update(const char *jid, const char *nick, const char *password, const char *autojoin_str, const char *name)
{
assert(jid != NULL);
@@ -154,6 +159,10 @@ bookmark_update(const char *jid, const char *nick, const char *password, const c
free(bookmark->password);
bookmark->password = strdup(password);
}
if (name) {
free(bookmark->name);
bookmark->name = strdup(name);
}
if (autojoin_str) {
if (g_strcmp0(autojoin_str, "on") == 0) {
bookmark->autojoin = TRUE;
@@ -359,11 +368,17 @@ _send_bookmarks(void)
xmpp_stanza_set_name(conference, STANZA_NAME_CONFERENCE);
xmpp_stanza_set_attribute(conference, STANZA_ATTR_JID, bookmark->barejid);
Jid *jidp = jid_create(bookmark->barejid);
if (jidp->localpart) {
xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, jidp->localpart);
if (bookmark->name) {
// use specified bookmark name
xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, bookmark->name);
} else {
// use localpart of JID by if no name is specified
Jid *jidp = jid_create(bookmark->barejid);
if (jidp->localpart) {
xmpp_stanza_set_attribute(conference, STANZA_ATTR_NAME, jidp->localpart);
}
jid_destroy(jidp);
}
jid_destroy(jidp);
if (bookmark->autojoin) {
xmpp_stanza_set_attribute(conference, STANZA_ATTR_AUTOJOIN, "true");

4
src/xmpp/xmpp.h
View File

@@ -251,8 +251,8 @@ void caps_add_feature(char *feature);
void caps_remove_feature(char *feature);
gboolean caps_jid_has_feature(const char *const jid, const char *const feature);
gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str);
gboolean bookmark_update(const char *jid, const char *nick, const char *password, const char *autojoin_str);
gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str, const char *name);
gboolean bookmark_update(const char *jid, const char *nick, const char *password, const char *autojoin_str, const char *name);
gboolean bookmark_remove(const char *jid);
gboolean bookmark_join(const char *jid);
GList* bookmark_get_list(void);