From stefan.kropp at posteo.de Fri Feb 11 14:44:40 2022 From: stefan.kropp at posteo.de (Stefan Kropp) Date: Fri, 11 Feb 2022 13:44:40 +0000 Subject: [profanity] Keybinding Message-ID: <20220211134440.a5g2fdyiy4jlboef@posteo.de> Hello, there are some issues with the keybinding in profanity. Some keybindings are not working for me. I think there are also some things which can be improved, just to be more "power full" on the way how profanity can be used. Example: The key binding of win 1-0 and q-p is nice, but for my daily workflow not really helpful. Maybe we can introduce ESC--Keybindings. # ESC W - Jump to window * Use ESC W 1 to ESC W 0 for Window 1 to 10 * Use ESC W Q to ESC W P for Window 11 to 20 This is the same how it's working now, but with the W-Key just after the ESC. # ESC N - Navigation keys * Use ESC N b - back * Use ESC N n - next * Use ESC N f - flag window # ESC B - JIDs based on configuration * Use ESC B 1 for profanity-muc * Use ESC B 2 for mama * Use ESC B 3 for wife We can add a configuration to let the user choose his own keybindings for JIDs / MUCs. # ESC M - message keys * Use ESC M a - unread message * Use ESC M f - unread flagged message # ESC R - Roster / SubWindow * Use ESC R k - Roster up * Use ESC R j - Roster down # ESC S - Scroll * Use ESC S k - Scroll up * Use ESC S j - Scroll down # Shortcuts - ESC * ESC 1 * ESC 2 * ESC 3 * .... Maybe we can make those ESC-Keys a little bit easier, but it would be very power full, because we are able to bind a lot of keys to functions. Example, Scrolling can be bind for scroll per line, page and in 10 line steps, We may are able to bind keys for status (online, away, xa,..) There is a small patch file included to try those kind of changes. -- Stefan Kropp -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-New-key-binding.patch Type: text/x-diff Size: 6574 bytes Desc: not available URL: From stefan.kropp at posteo.de Mon Feb 14 07:04:06 2022 From: stefan.kropp at posteo.de (Stefan Kropp) Date: Mon, 14 Feb 2022 06:04:06 +0000 Subject: [profanity] XEP-0453: DOAP usage in XMPP Message-ID: <20220214060406.vg2c44ywupv44wfw@posteo.de> Hello, find attached a first version of a doap file. Is there somebody how can check and maintain this file for profanity? For the most XEPs I added 'partial' as status. We should check the status and add a note. -- Stefan Kropp -------------- next part -------------- profanity 2012-02-02 Free console XMPP client written in C Freier XMPP Client f?r die Console geschrieben in C Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi Profanity ist ein Konsolen basierter XMPP Client. Geschrieben in C mit Verwendung von ncurses und libstrophe, inspiriert von Irssi

Linux macOS FreeBSD OpenBSD Android (Termux) complete 2.0 unkown complete 1.4 unkown complete 2.5rc3 unkown Use /disco items and /disco info partial ? ? partial 1.2 ? partial 1.3.0 0.6.0 No multi-step yet. partial 1.15.8 0.7.0 Used for OMEMO partial 2.4 0.11.0 Only password change partial 2.1 ? partial 1.4 ? partial 1.1 ? partial ? ? partial 1.1.1 0.11.0 partial 1.0.1 ? partial 1.2 ? partial 1.3 ? partial 2.0.1 ? partial 2.0 ? partial 1.0 ? partial 1.0 ? partial 1.1 ? partial 0.12.1 ? partial 1.2.0 0.9.0 partial 0.6.1 0.8.0 Only origin-id, no stanza-id yet. partial 1.0.0 ? partial 0.3.2 ? partial 0.2.0 0.11.0 partial 0.3 0.11.0 partial 0.3.0 0.7.0 partial 0.7.0 0.8.0 partial 0.1.0 0.10.0 0.11.1 2021-09-28

From jubalh at iodoru.org Mon Feb 14 11:26:19 2022 From: jubalh at iodoru.org (jubalh at iodoru.org) Date: Mon, 14 Feb 2022 11:26:19 +0100 Subject: [profanity] XEP-0453: DOAP usage in XMPP In-Reply-To: <20220214060406.vg2c44ywupv44wfw@posteo.de> References: <20220214060406.vg2c44ywupv44wfw@posteo.de> Message-ID: <5bd859e236a3df55c29d996411bc85a4@iodoru.org> > find attached a first version of a doap file. Is there somebody > how can check and maintain this file for profanity? Since I maintain already the xeps.hml I'll update the information as well. PRs and a second pair of eyes always welcome. > For the most XEPs I added 'partial' as status. We should check > the status and add a note. I am tracking the status of the XEPs at: https://profanity-im.github.io/xeps.html For myself and the users. Georg told me several months ago about the doap file but I didn't get around to creating one. So I'm happy that you did this! Did you take the information from the page I linked or will I have to double check? Also you forgot to mention: - Why you add this (explanation for what the doap file does, in the commit) - Where you want to add this (how it works, where it is expected to be hosted so that people find it. afaik root of website?) As always: easiest is a pull request so future generations could see all of this. From mwuttke97 at posteo.de Fri Apr 1 21:21:27 2022 From: mwuttke97 at posteo.de (Maxi Wuttke) Date: Fri, 1 Apr 2022 19:21:27 +0000 Subject: [profanity] [PATCH] Fix segfault in /upload and /download Message-ID: Please find attached a patch that fixes a segfault introduced in 3a86b8c29b1ccff7383478e980a7edf3aec3979a. How to reproduce the bug: - Upload a file or download a file using the /upload or /download commands The patch also includes a commit that includes a missing header. -------------- next part -------------- A non-text attachment was scrubbed... Name: fix_http_tls_segfault.patch Type: text/x-patch Size: 2250 bytes Desc: not available URL: From mwuttke97 at posteo.de Sat Apr 2 10:43:36 2022 From: mwuttke97 at posteo.de (Maxi Wuttke) Date: Sat, 2 Apr 2022 08:43:36 +0000 Subject: [profanity] [PATCH] Fix segfault in /upload and /download Message-ID: <35aa61d6-a92b-e621-908f-73f5937049b2@posteo.de> Please find attached a patch that fixes a segfault introduced in 3a86b8c29b1ccff7383478e980a7edf3aec3979a. How to reproduce the bug: - Download or upload a file using the `/url save` or `/sendfile` commands - Segfault happens: `strcmp` called with `null` parameter The patch also includes a commit that includes a missing header. -------------- next part -------------- A non-text attachment was scrubbed... Name: fix_http_tls_segfault.patch Type: text/x-patch Size: 2250 bytes Desc: not available URL: From toogley at nixnet.email Fri Apr 15 13:31:10 2022 From: toogley at nixnet.email (toogley at nixnet.email) Date: Fri, 15 Apr 2022 07:31:10 -0400 Subject: [profanity] OMEMO and disco In-Reply-To: <20210912121939.agohv3kqh35lcv5r@debxwoody.de> Message-ID: Hello, please, when you send patches can you send them inline and add PATCH to your subject so that we know your email contains a patch? Ideally, you would use standard tools for that, for instance git send-email. See for instance: https://git-send-email.io/ Much easier to work with compared to attachments. Thanks. From techmetx11 at disroot.org Mon May 30 02:00:49 2022 From: techmetx11 at disroot.org (Marwan L.) Date: Mon, 30 May 2022 01:00:49 +0100 Subject: [profanity] [PATCH] Add /avatar set for setting your own avatar Message-ID: First patch adds a new subcommand within /avatar that allows you to set your own avatar to a file Second patch fixes a segfault issue when the command is used while Profanity is not connected, and errors out if the file is not an image file -------------- next part -------------- >From 7fd14edec97ff767cecd8e0f0a36f2d52d28b7ae Mon Sep 17 00:00:00 2001 From: Marwan L Date: Sun, 29 May 2022 22:58:50 +0100 Subject: [PATCH 1/2] Added `/avatar set` sub-command for setting your own avatar --- src/command/cmd_defs.c | 11 +++-- src/command/cmd_funcs.c | 2 + src/xmpp/avatar.c | 90 +++++++++++++++++++++++++++++++++++++++++ src/xmpp/avatar.h | 2 +- src/xmpp/stanza.c | 89 ++++++++++++++++++++++++++++++++++++++++ src/xmpp/stanza.h | 2 + 6 files changed, 191 insertions(+), 5 deletions(-) diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index b6053e12..9a86b15e 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2444,17 +2444,20 @@ static struct cmd_t command_defs[] = { CMD_TAG_CHAT) CMD_SYN( "/avatar get ", - "/avatar open ") + "/avatar open ", + "/avatar set ") CMD_DESC( - "Download avatar (XEP-0084) for a certain contact. " + "Download avatar (XEP-0084) for a certain contact, or set your own avatar. " "If nothing happens after using this command the user either doesn't have an avatar set at all " "or doesn't use XEP-0084 to publish it.") CMD_ARGS( { "get ", "Download the avatar. barejid is the JID to download avatar from." }, - { "open ", "Download avatar and open it with command." }) + { "open ", "Download avatar and open it with command." }, + { "set ", "Set the account's avatar to the image file." }) CMD_EXAMPLES( "/avatar get thor at valhalla.edda", - "/avatar open freyja at vanaheimr.edda") }, + "/avatar open freyja at vanaheimr.edda", + "/avatar set flowers.png") }, { "/os", parse_args, 1, 1, &cons_os_setting, diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 9e821ede..10ab6dca 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -9202,6 +9202,8 @@ cmd_avatar(ProfWin* window, const char* const command, gchar** args) } else if (g_strcmp0(args[0], "cmd") == 0) { prefs_set_string(PREF_AVATAR_CMD, args[1]); cons_show("Avatar cmd set to: %s", args[1]); + } else if (g_strcmp0(args[0], "set") == 0) { + avatar_set(args[1]); } return TRUE; diff --git a/src/xmpp/avatar.c b/src/xmpp/avatar.c index b962fcef..3f955fc2 100644 --- a/src/xmpp/avatar.c +++ b/src/xmpp/avatar.c @@ -50,6 +50,7 @@ #include "ui/ui.h" #include "config/files.h" #include "config/preferences.h" +#include "tools/http_upload.h" typedef struct avatar_metadata { @@ -57,9 +58,18 @@ typedef struct avatar_metadata char* id; } avatar_metadata; +typedef struct avatar_set_metadata +{ + char* type; + char* buf; + char* id; + size_t size; +} avatar_set_metadata; + static GHashTable* looking_for = NULL; // contains nicks/barejids from who we want to get the avatar static GHashTable* shall_open = NULL; // contains a list of nicks that shall not just downloaded but also opened +static int _avatar_set_data_handler(xmpp_stanza_t* const stanza, void* const userdata); static void _avatar_request_item_by_id(const char* jid, avatar_metadata* data); static int _avatar_metadata_handler(xmpp_stanza_t* const stanza, void* const userdata); static int _avatar_request_item_result_handler(xmpp_stanza_t* const stanza, void* const userdata); @@ -73,6 +83,17 @@ _free_avatar_data(avatar_metadata* data) } } +static void +_free_avatar_set_data(avatar_set_metadata* data) +{ + if (data) { + g_free(data->buf); + xmpp_free(connection_get_ctx(), data->id); + free(data->type); + free(data); + } +} + void avatar_pep_subscribe(void) { @@ -92,6 +113,75 @@ avatar_pep_subscribe(void) shall_open = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); } +gboolean +avatar_set(const char* const filepath) +{ + gchar* buf; + gsize length; + GError* err; + + xmpp_ctx_t* const ctx = connection_get_ctx(); + avatar_set_metadata* metadata = malloc(sizeof(avatar_set_metadata)); + + if (!metadata) + return FALSE; + + if (!g_file_get_contents(filepath, &buf, &length, &err)) { + log_error("Unable to open avatar file: %s", err->message); + cons_show_error("Unable to open avatar file: %s", err->message); + g_error_free(err); + free(metadata); + return FALSE; + } + + xmpp_sha1_t* hash = xmpp_sha1_new(ctx); + xmpp_sha1_update(hash, (guchar*)buf, length); + xmpp_sha1_final(hash); + + char* hashstr = xmpp_sha1_to_string_alloc(hash); + xmpp_sha1_free(hash); + + metadata->buf = buf; + metadata->size = length; + metadata->id = hashstr; + metadata->type = file_mime_type(filepath); + + char* uid = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_avatar_set_data_request(ctx, uid, hashstr, (guchar*)buf, length); + + // Free function set to NULL, because the data will be freed after another IQ + iq_id_handler_add(uid, _avatar_set_data_handler, NULL, metadata); + + iq_send_stanza(iq); + xmpp_stanza_release(iq); + free(uid); + + return TRUE; +} + +static int +_avatar_set_data_handler(xmpp_stanza_t* const stanza, void* const userdata) +{ + const char* type = xmpp_stanza_get_type(stanza); + + if (!g_strcmp0(type, STANZA_TYPE_RESULT)) { + // The avatar data has been set, now to set the metadata as well + avatar_set_metadata* metadata = (avatar_set_metadata*)userdata; + char* uid = connection_create_stanza_id(); + + xmpp_stanza_t* iq = stanza_create_avatar_set_metadata_request(connection_get_ctx(), uid, metadata->id, metadata->size, metadata->type); + // No response is sent by the server + + cons_show("Avatar is set."); + iq_send_stanza(iq); + xmpp_stanza_release(iq); + free(uid); + return 1; + } + _free_avatar_set_data((avatar_set_metadata*)userdata); + return 1; +} + gboolean avatar_get_by_nick(const char* nick, gboolean open) { diff --git a/src/xmpp/avatar.h b/src/xmpp/avatar.h index 98532917..ebbb77bc 100644 --- a/src/xmpp/avatar.h +++ b/src/xmpp/avatar.h @@ -40,5 +40,5 @@ void avatar_pep_subscribe(void); gboolean avatar_get_by_nick(const char* nick, gboolean open); - +gboolean avatar_set(const char* const filepath); #endif diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index bfb782da..212a4a7c 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -2586,6 +2586,95 @@ stanza_create_avatar_retrieve_data_request(xmpp_ctx_t* ctx, const char* stanza_i return iq; } +xmpp_stanza_t* +stanza_create_avatar_set_data_request(xmpp_ctx_t* ctx, const char* id, const char* hash, const unsigned char* const data, size_t length) +{ + xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id); + + 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, "publish"); + xmpp_stanza_set_attribute(publish, STANZA_ATTR_NODE, STANZA_NS_USER_AVATAR_DATA); + + xmpp_stanza_t* item = xmpp_stanza_new(ctx); + xmpp_stanza_set_name(item, "item"); + xmpp_stanza_set_attribute(item, "id", hash); + + xmpp_stanza_t* data_item = xmpp_stanza_new(ctx); + xmpp_stanza_set_name(data_item, "data"); + xmpp_stanza_set_ns(data_item, STANZA_NS_USER_AVATAR_DATA); + + xmpp_stanza_t* data_text = xmpp_stanza_new(ctx); + gchar* base64 = g_base64_encode(data, length); + xmpp_stanza_set_text(data_text, base64); + g_free(base64); + + xmpp_stanza_add_child(data_item, data_text); + xmpp_stanza_add_child(item, data_item); + xmpp_stanza_add_child(publish, item); + xmpp_stanza_add_child(pubsub, publish); + xmpp_stanza_add_child(iq, pubsub); + + xmpp_stanza_release(data_text); + xmpp_stanza_release(data_item); + xmpp_stanza_release(item); + xmpp_stanza_release(publish); + xmpp_stanza_release(pubsub); + + return iq; +} + +xmpp_stanza_t* +stanza_create_avatar_set_metadata_request(xmpp_ctx_t* ctx, const char* id, const char* const hash, size_t bytes, const char* const type) +{ + gchar* filesize = g_strdup_printf("%zu", bytes); + if (!filesize) + return NULL; + + xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id); + + 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, "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, "item"); + xmpp_stanza_set_attribute(item, "id", hash); + + xmpp_stanza_t* metadata = xmpp_stanza_new(ctx); + xmpp_stanza_set_name(metadata, "metadata"); + xmpp_stanza_set_ns(metadata, STANZA_NS_USER_AVATAR_METADATA); + + xmpp_stanza_t* info = xmpp_stanza_new(ctx); + xmpp_stanza_set_name(info, "info"); + xmpp_stanza_set_attribute(info, "bytes", filesize); + g_free(filesize); + + xmpp_stanza_set_attribute(info, "id", hash); + xmpp_stanza_set_attribute(info, "type", type); + + xmpp_stanza_add_child(metadata, info); + 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(info); + xmpp_stanza_release(metadata); + xmpp_stanza_release(item); + xmpp_stanza_release(publish); + xmpp_stanza_release(pubsub); + + return iq; +} + xmpp_stanza_t* stanza_attach_correction(xmpp_ctx_t* ctx, xmpp_stanza_t* stanza, const char* const replace_id) { diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h index 6e201497..3e214ccf 100644 --- a/src/xmpp/stanza.h +++ b/src/xmpp/stanza.h @@ -409,6 +409,8 @@ XMPPCaps* stanza_parse_caps(xmpp_stanza_t* const stanza); 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_set_data_request(xmpp_ctx_t* ctx, const char* id, const char* hash, const unsigned char* const data, size_t length); +xmpp_stanza_t* stanza_create_avatar_set_metadata_request(xmpp_ctx_t* ctx, const char* id, const char* const hash, size_t bytes, const char* const type); xmpp_stanza_t* stanza_create_mam_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const startdate, 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_register_new_account(xmpp_ctx_t* ctx, const char* const user, const char* const password); -- 2.36.1 -------------- next part -------------- >From cac878a8b82e77dccd064f19de23c5db19be63bb Mon Sep 17 00:00:00 2001 From: Marwan L Date: Mon, 30 May 2022 00:55:26 +0100 Subject: [PATCH 2/2] Fix segfault on using the `/avatar set` command while not connected, also error out if file is not an image --- src/xmpp/avatar.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/xmpp/avatar.c b/src/xmpp/avatar.c index 3f955fc2..10ff9d88 100644 --- a/src/xmpp/avatar.c +++ b/src/xmpp/avatar.c @@ -120,12 +120,25 @@ avatar_set(const char* const filepath) gsize length; GError* err; + if (connection_get_status() != JABBER_CONNECTED) + return FALSE; + xmpp_ctx_t* const ctx = connection_get_ctx(); avatar_set_metadata* metadata = malloc(sizeof(avatar_set_metadata)); if (!metadata) return FALSE; + metadata->type = file_mime_type(filepath); + + // Check if the file is not an image + if (g_ascii_strncasecmp(metadata->type, "image/", 6) != 0) { + log_error("Avatar file is not an image. "); + cons_show_error("Avatar file is not an image. "); + free(metadata); + return FALSE; + } + if (!g_file_get_contents(filepath, &buf, &length, &err)) { log_error("Unable to open avatar file: %s", err->message); cons_show_error("Unable to open avatar file: %s", err->message); @@ -144,8 +157,7 @@ avatar_set(const char* const filepath) metadata->buf = buf; metadata->size = length; metadata->id = hashstr; - metadata->type = file_mime_type(filepath); - + char* uid = connection_create_stanza_id(); xmpp_stanza_t* iq = stanza_create_avatar_set_data_request(ctx, uid, hashstr, (guchar*)buf, length); -- 2.36.1