mirror of
https://github.com/profanity-im/profanity.git
synced 2024-09-01 19:24:15 -04:00
Merge pull request #1843 from IsaacM88/master
Add ability to disable avatar publishing
This commit is contained in:
commit
faccf24c75
@ -1102,6 +1102,7 @@ cmd_ac_init(void)
|
|||||||
|
|
||||||
avatar_ac = autocomplete_new();
|
avatar_ac = autocomplete_new();
|
||||||
autocomplete_add(avatar_ac, "set");
|
autocomplete_add(avatar_ac, "set");
|
||||||
|
autocomplete_add(avatar_ac, "disable");
|
||||||
autocomplete_add(avatar_ac, "get");
|
autocomplete_add(avatar_ac, "get");
|
||||||
autocomplete_add(avatar_ac, "open");
|
autocomplete_add(avatar_ac, "open");
|
||||||
|
|
||||||
|
@ -2418,25 +2418,29 @@ static const struct cmd_t command_defs[] = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
{ CMD_PREAMBLE("/avatar",
|
{ CMD_PREAMBLE("/avatar",
|
||||||
parse_args, 2, 2, NULL)
|
parse_args, 1, 2, NULL)
|
||||||
CMD_MAINFUNC(cmd_avatar)
|
CMD_MAINFUNC(cmd_avatar)
|
||||||
CMD_TAGS(
|
CMD_TAGS(
|
||||||
CMD_TAG_CHAT)
|
CMD_TAG_CHAT)
|
||||||
CMD_SYN(
|
CMD_SYN(
|
||||||
"/avatar set <path>",
|
"/avatar set <path>",
|
||||||
|
"/avatar disable",
|
||||||
"/avatar get <barejid>",
|
"/avatar get <barejid>",
|
||||||
"/avatar open <barejid>")
|
"/avatar open <barejid>")
|
||||||
CMD_DESC(
|
CMD_DESC(
|
||||||
"Upload avatar for oneself (XEP-0084). "
|
"Upload an avatar for yourself, "
|
||||||
"Download avatar (XEP-0084) for a certain contact. "
|
"disable your avatar, "
|
||||||
"If nothing happens after using this command the user either doesn't have an avatar set at all "
|
"or download a contact's avatar (XEP-0084). "
|
||||||
|
"If nothing happens after using this command, the user either doesn't have an avatar set "
|
||||||
"or doesn't use XEP-0084 to publish it.")
|
"or doesn't use XEP-0084 to publish it.")
|
||||||
CMD_ARGS(
|
CMD_ARGS(
|
||||||
{ "set <path>", "Set avatar to the image at <path>." },
|
{ "set <path>", "Set avatar to the image at <path>." },
|
||||||
|
{ "disable", "Disable avatar publishing; your avatar will not display to others." },
|
||||||
{ "get <barejid>", "Download the avatar. barejid is the JID to download avatar from." },
|
{ "get <barejid>", "Download the avatar. barejid is the JID to download avatar from." },
|
||||||
{ "open <barejid>", "Download avatar and open it with command." })
|
{ "open <barejid>", "Download avatar and open it with command." })
|
||||||
CMD_EXAMPLES(
|
CMD_EXAMPLES(
|
||||||
"/avatar set ~/images/avatar.png",
|
"/avatar set ~/images/avatar.png",
|
||||||
|
"/avatar disable",
|
||||||
"/avatar get thor@valhalla.edda",
|
"/avatar get thor@valhalla.edda",
|
||||||
"/avatar open freyja@vanaheimr.edda") },
|
"/avatar open freyja@vanaheimr.edda") },
|
||||||
|
|
||||||
|
@ -9287,25 +9287,34 @@ gboolean
|
|||||||
cmd_avatar(ProfWin* window, const char* const command, gchar** args)
|
cmd_avatar(ProfWin* window, const char* const command, gchar** args)
|
||||||
{
|
{
|
||||||
if (args[1] == NULL) {
|
if (args[1] == NULL) {
|
||||||
cons_bad_cmd_usage(command);
|
if (g_strcmp0(args[0], "disable") == 0) {
|
||||||
return TRUE;
|
if (avatar_publishing_disable()) {
|
||||||
}
|
cons_show("Avatar publishing disabled. To enable avatar publishing, use '/avatar set <path>'.");
|
||||||
|
} else {
|
||||||
if (g_strcmp0(args[0], "set") == 0) {
|
cons_show("Failed to disable avatar publishing.");
|
||||||
#ifdef HAVE_PIXBUF
|
}
|
||||||
if (avatar_set(args[1])) {
|
} else {
|
||||||
cons_show("Avatar updated successfully");
|
cons_bad_cmd_usage(command);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if (g_strcmp0(args[0], "set") == 0) {
|
||||||
|
#ifdef HAVE_PIXBUF
|
||||||
|
if (avatar_set(args[1])) {
|
||||||
|
cons_show("Avatar updated successfully");
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
cons_show("Profanity has not been built with GDK Pixbuf support enabled which is needed to scale the avatar when uploading.");
|
cons_show("Profanity has not been built with GDK Pixbuf support enabled which is needed to scale the avatar when uploading.");
|
||||||
#endif
|
#endif
|
||||||
} else if (g_strcmp0(args[0], "get") == 0) {
|
} else if (g_strcmp0(args[0], "get") == 0) {
|
||||||
avatar_get_by_nick(args[1], false);
|
avatar_get_by_nick(args[1], false);
|
||||||
} else if (g_strcmp0(args[0], "open") == 0) {
|
} else if (g_strcmp0(args[0], "open") == 0) {
|
||||||
avatar_get_by_nick(args[1], true);
|
avatar_get_by_nick(args[1], true);
|
||||||
} else if (g_strcmp0(args[0], "cmd") == 0) {
|
} else if (g_strcmp0(args[0], "cmd") == 0) {
|
||||||
prefs_set_string(PREF_AVATAR_CMD, args[1]);
|
prefs_set_string(PREF_AVATAR_CMD, args[1]);
|
||||||
cons_show("Avatar cmd set to: %s", args[1]);
|
cons_show("Avatar cmd set to: %s", args[1]);
|
||||||
|
} else {
|
||||||
|
cons_bad_cmd_usage(command);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -150,6 +150,17 @@ avatar_set(const char* path)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
avatar_publishing_disable()
|
||||||
|
{
|
||||||
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
||||||
|
xmpp_stanza_t* iq = stanza_disable_avatar_publish_iq(ctx);
|
||||||
|
iq_send_stanza(iq);
|
||||||
|
xmpp_stanza_release(iq);
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
avatar_get_by_nick(const char* nick, gboolean open)
|
avatar_get_by_nick(const char* nick, gboolean open)
|
||||||
{
|
{
|
||||||
@ -224,6 +235,9 @@ _avatar_metadata_handler(xmpp_stanza_t* const stanza, void* const userdata)
|
|||||||
_avatar_request_item_by_id(from, data);
|
_avatar_request_item_by_id(from, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
cons_show("We couldn't get the user's avatar, possibly because they haven't set one or have disabled avatar publishing. "
|
||||||
|
"During this Profanity session, you will receive future changes to this user's avatar.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,3 +45,4 @@ gboolean avatar_set(const char* path);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
gboolean avatar_publishing_disable();
|
||||||
|
@ -2697,6 +2697,42 @@ stanza_create_avatar_metadata_publish_iq(xmpp_ctx_t* ctx, const char* img_data,
|
|||||||
return iq;
|
return iq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
xmpp_stanza_t*
|
||||||
|
stanza_disable_avatar_publish_iq(xmpp_ctx_t* ctx)
|
||||||
|
{
|
||||||
|
char* id = connection_create_stanza_id();
|
||||||
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
|
||||||
|
free(id);
|
||||||
|
xmpp_stanza_set_attribute(iq, STANZA_ATTR_FROM, connection_get_fulljid());
|
||||||
|
|
||||||
|
xmpp_stanza_t* pubsub = xmpp_stanza_new(ctx);
|
||||||
|
xmpp_stanza_set_name(pubsub, STANZA_NAME_PUBSUB);
|
||||||
|
xmpp_stanza_set_ns(pubsub, STANZA_NS_PUBSUB);
|
||||||
|
|
||||||
|
xmpp_stanza_t* publish = xmpp_stanza_new(ctx);
|
||||||
|
xmpp_stanza_set_name(publish, STANZA_NAME_PUBLISH);
|
||||||
|
xmpp_stanza_set_attribute(publish, STANZA_ATTR_NODE, STANZA_NS_USER_AVATAR_METADATA);
|
||||||
|
|
||||||
|
xmpp_stanza_t* item = xmpp_stanza_new(ctx);
|
||||||
|
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
|
||||||
|
|
||||||
|
xmpp_stanza_t* metadata = xmpp_stanza_new(ctx);
|
||||||
|
xmpp_stanza_set_name(metadata, STANZA_NAME_METADATA);
|
||||||
|
xmpp_stanza_set_ns(metadata, STANZA_NS_USER_AVATAR_METADATA);
|
||||||
|
|
||||||
|
xmpp_stanza_add_child(item, metadata);
|
||||||
|
xmpp_stanza_add_child(publish, item);
|
||||||
|
xmpp_stanza_add_child(pubsub, publish);
|
||||||
|
xmpp_stanza_add_child(iq, pubsub);
|
||||||
|
|
||||||
|
xmpp_stanza_release(metadata);
|
||||||
|
xmpp_stanza_release(item);
|
||||||
|
xmpp_stanza_release(publish);
|
||||||
|
xmpp_stanza_release(pubsub);
|
||||||
|
|
||||||
|
return iq;
|
||||||
|
}
|
||||||
|
|
||||||
xmpp_stanza_t*
|
xmpp_stanza_t*
|
||||||
stanza_create_vcard_request_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const stanza_id)
|
stanza_create_vcard_request_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const stanza_id)
|
||||||
{
|
{
|
||||||
|
@ -418,6 +418,7 @@ void stanza_free_caps(XMPPCaps* caps);
|
|||||||
xmpp_stanza_t* stanza_create_avatar_retrieve_data_request(xmpp_ctx_t* ctx, const char* stanza_id, const char* const item_id, const char* const jid);
|
xmpp_stanza_t* stanza_create_avatar_retrieve_data_request(xmpp_ctx_t* ctx, const char* stanza_id, const char* const item_id, const char* const jid);
|
||||||
xmpp_stanza_t* stanza_create_avatar_data_publish_iq(xmpp_ctx_t* ctx, const char* img_data, gsize len);
|
xmpp_stanza_t* stanza_create_avatar_data_publish_iq(xmpp_ctx_t* ctx, const char* img_data, gsize len);
|
||||||
xmpp_stanza_t* stanza_create_avatar_metadata_publish_iq(xmpp_ctx_t* ctx, const char* img_data, gsize len, int height, int width);
|
xmpp_stanza_t* stanza_create_avatar_metadata_publish_iq(xmpp_ctx_t* ctx, const char* img_data, gsize len, int height, int width);
|
||||||
|
xmpp_stanza_t* stanza_disable_avatar_publish_iq(xmpp_ctx_t* ctx);
|
||||||
xmpp_stanza_t* stanza_create_vcard_request_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const stanza_id);
|
xmpp_stanza_t* stanza_create_vcard_request_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const stanza_id);
|
||||||
xmpp_stanza_t* stanza_create_mam_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const startdate, const char* const enddate, const char* const firstid, const char* const lastid);
|
xmpp_stanza_t* stanza_create_mam_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const startdate, const char* const enddate, const char* const firstid, const char* const lastid);
|
||||||
xmpp_stanza_t* stanza_change_password(xmpp_ctx_t* ctx, const char* const user, const char* const password);
|
xmpp_stanza_t* stanza_change_password(xmpp_ctx_t* ctx, const char* const user, const char* const password);
|
||||||
|
@ -14,3 +14,9 @@ avatar_set(const char* path)
|
|||||||
{
|
{
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
avatar_publishing_disable()
|
||||||
|
{
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user