docs(prof.py): add CommandCallback, TimedCallback, WindowCallback protocols

- Defined callback protocols for register_command, register_timed, win_create.
- Fixed Sphinx callable warnings with proper type hints.

.github/workflows/ci-api-docs.yml

@@ -1,44 +0,0 @@
-name: CI API Docs
-
-on:
-  push:
-    branches: [master]
-    paths:
-      - 'apidocs/**'
-  pull_request:
-    branches: [master]
-    paths:
-      - 'apidocs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test-c-api-docs:
-    runs-on: ubuntu-latest
-    name: Test C API Documentation Generation
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends make doxygen
-      - name: Test C API docs generation
-        run: |
-          cd apidocs/c/
-          doxygen c-prof.conf
-
-  test-python-api-docs:
-    runs-on: ubuntu-latest
-    name: Test Python API Documentation Generation
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends make python3-sphinx
-      - name: Test Python API docs generation
-        run: |
-          cd apidocs/python/
-          sphinx-apidoc -f -o . src && make -j$(nproc) xml SPHINXOPTS="-W --keep-going -n"

.github/workflows/main.yml

@@ -1,18 +1,10 @@
-name: CI Code
+name: CI
 
 on:
   push:
     branches: [master]
-    paths-ignore:
-      - 'docs/**'
-      - 'apidocs/**'
-      - 'README.md'
   pull_request:
     branches: [master]
-    paths-ignore:
-      - 'docs/**'
-      - 'apidocs/**'
-      - 'README.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -91,10 +83,38 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - name: Install dependencies
+      - name: install dependencies
         run: |
           sudo apt update
           sudo apt install -y --no-install-recommends codespell
       - name: Check spelling
         run: |
           codespell
+
+  test-c-api-docs:
+    runs-on: ubuntu-latest
+    name: Test C API Documentation Generation
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends make doxygen
+      - name: Test C API docs generation
+        run: |
+          cd apidocs/c/
+          doxygen c-prof.conf
+
+  test-python-api-docs:
+    runs-on: ubuntu-latest
+    name: Test Python API Documentation Generation
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends make python3-sphinx
+      - name: Test Python API docs generation
+        run: |
+          cd apidocs/python/
+          sphinx-apidoc -f -o . src && make -j$(nproc) xml SPHINXOPTS="-W --keep-going -n"

Dockerfile.arch

@@ -1,9 +1,6 @@
 FROM archlinux
 
-RUN pacman -Syu --noconfirm
-RUN pacman -S --needed --noconfirm reflector && reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist 
-RUN pacman-key --init
-RUN pacman -S --needed --noconfirm \
+RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   autoconf \
   autoconf-archive \
   automake \
@@ -18,7 +15,7 @@ RUN pacman -S --needed --noconfirm \
   gcc \
   git \
   gpgme \
-  gtk3 \
+  gtk2 \
   libgcrypt \
   libmicrohttpd \
   libnotify \

apidocs/c/profhooks.h

@@ -1,247 +1,220 @@
-/** @file profhooks.h
- * @brief C Plugin Hooks for CProof.
- *
- * This header defines optional callback hooks that CProof plugins can implement to
- * handle events such as startup, shutdown, message processing, and presence updates in
- * CProof, a console-based XMPP client. These hooks are called by CProof when the
- * corresponding events occur, allowing plugins to customize behavior. All hooks are
- * optional; plugins can define only the hooks they need, and CProof will automatically
- * invoke them when appropriate.
- *
- * To use these hooks, define the functions in your plugin with the signatures provided
- * in this header. For example, to handle the startup event:
- *
- * @code
- * #include "profhooks.h"
- * void prof_on_start(void) {
- *     // Handle CProof startup
- * }
- * @endcode
- *
- * For additional plugin functionality, such as displaying messages or registering
- * commands, see the CProof API functions in profapi.h.
- *
- * @see profapi.h
- */
-
-/** @mainpage CProof Plugins API and Hooks
- * List of all API functions available to plugins: @ref profapi.h
- * List of all hooks which plugins may implement: @ref profhooks.h
- */
+/** @file
+C Hooks.
+*/
 
 /**
- * Called when a plugin is loaded, either when CProof is started, or when the /plugins load or /plugins install commands are called
- * @param version The version of CProof
- * @param status The package status of CProof, "development" or "release"
- * @param account_name Account name of the currently logged in account, or NULL if not logged in
- * @param fulljid The user's full Jabber ID (barejid and resource) if logged in, NULL otherwise
- */
+Called when a plugin is loaded, either when profanity is started, or when the /plugins load or /plugins install commands are called
+@param version the version of Profanity
+@param status the package status of Profanity, "development" or "release"
+@param account_name account name of the currently logged in account, or NULL if not logged in
+@param fulljid the users full Jabber ID (barejid and resource) if logged in, NULL otherwise
+*/
 void prof_init(const char * const version, const char * const status, const char *const account_name, const char *const fulljid);
 
 /**
- * Called when CProof is started
- */
+Called when Profanity is started
+*/
 void prof_on_start(void);
 
 /**
- * Called when the user quits CProof
- */
+Called when the user quits Profanity
+*/
 void prof_on_shutdown(void);
 
 /**
- * Called when a plugin is unloaded with the /plugins unload command
- */
+Called when a plugin is unloaded with the /plugins unload command
+*/
 void prof_on_unload(void);
 
 /**
- * Called when the user connects with an account
- * @param account_name Account name of the account used for logging in
- * @param fulljid The full Jabber ID (barejid and resource) of the account
- */
+Called when the user connects with an account
+@param account_name account name of the account used for logging in
+@param fulljid the full Jabber ID (barejid and resource) of the account
+*/
 void prof_on_connect(const char * const account_name, const char * const fulljid);
 
 /**
- * Called when the user disconnects an account
- * @param account_name Account name of the account being disconnected
- * @param fulljid The full Jabber ID (barejid and resource) of the account
- */
+Called when the user disconnects an account
+@param account_name account name of the account being disconnected
+@param fulljid the full Jabber ID (barejid and resource) of the account
+*/
 void prof_on_disconnect(const char * const account_name, const char * const fulljid);
 
 /**
- * Called before a chat message is displayed
- * @param barejid Jabber ID of the message sender
- * @param resource Resource of the message sender
- * @param message The received message
- * @return The new message to display, or NULL to preserve the original message
- */
+Called before a chat message is displayed
+@param barejid Jabber ID of the message sender
+@param resource resource of the message sender
+@param message the received message
+@return the new message to display, or NULL to preserve the original message
+*/
 char* prof_pre_chat_message_display(const char * const barejid, const char *const resource, const char *message);
 
 /**
- * Called after a chat message is displayed
- * @param barejid Jabber ID of the message sender
- * @param resource Resource of the message sender
- * @param message The received message
- */
+Called after a chat message is displayed
+@param barejid Jabber ID of the message sender
+@param resource resource of the message sender
+@param message the received message
+*/
 void prof_post_chat_message_display(const char * const barejid, const char *const resource, const char *message);
 
 /**
- * Called before a chat message is sent
- * @param barejid Jabber ID of the message recipient
- * @param message The message to be sent
- * @return The modified or original message to send, or NULL to cancel sending of the message
- */
+Called before a chat message is sent
+@param barejid Jabber ID of the message recipient
+@param message the message to be sent
+@return the modified or original message to send, or NULL to cancel sending of the message
+*/
 char* prof_pre_chat_message_send(const char * const barejid, const char *message);
 
 /**
- * Called after a chat message has been sent
- * @param barejid Jabber ID of the message recipient
- * @param message The sent message
- */
+Called after a chat message has been sent
+@param barejid Jabber ID of the message recipient
+@param message the sent message
+*/
 void prof_post_chat_message_send(const char * const barejid, const char *message);
 
 /**
- * Called before a chat room message is displayed
- * @param barejid Jabber ID of the room
- * @param nick Nickname of message sender
- * @param message The received message
- * @return The new message to display, or NULL to preserve the original message
- */
+Called before a chat room message is displayed
+@param barejid Jabber ID of the room
+@param nick nickname of message sender
+@param message the received message
+@return the new message to display, or NULL to preserve the original message
+*/
 char* prof_pre_room_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
- * Called after a chat room message is displayed
- * @param barejid Jabber ID of the room
- * @param nick Nickname of the message sender
- * @param message The received message
- */
+Called after a chat room message is displayed
+@param barejid Jabber ID of the room
+@param nick nickname of the message sender
+@param message the received message
+*/
 void prof_post_room_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
- * Called before a chat room message is sent
- * @param barejid Jabber ID of the room
- * @param message The message to be sent
- * @return The modified or original message to send, or NULL to cancel sending of the message
- */
+Called before a chat room message is sent
+@param barejid Jabber ID of the room
+@param message the message to be sent
+@return the modified or original message to send, or NULL to cancel sending of the message
+*/
 char* prof_pre_room_message_send(const char * const barejid, const char *message);
 
 /**
- * Called after a chat room message has been sent
- * @param barejid Jabber ID of the room
- * @param message The sent message
- */
+Called after a chat room message has been sent
+@param barejid Jabber ID of the room
+@param message the sent message
+*/
 void prof_post_room_message_send(const char * const barejid, const char *message);
 
 /**
- * Called when the server sends a chat room history message
- * @param barejid Jabber ID of the room
- * @param nick Nickname of the message sender
- * @param message The message to be sent
- * @param timestamp Time the message was originally sent to the room, in ISO8601 format
- */
+Called when the server sends a chat room history message
+@param barejid Jabber ID of the room
+@param nick nickname of the message sender
+@param message the message to be sent
+@param timestamp time the message was originally sent to the room, in ISO8601 format
+*/
 void prof_on_room_history_message(const char * const barejid, const char *const nick, const char *const message, const char *const timestamp);
 
 /**
- * Called before a private chat room message is displayed
- * @param barejid Jabber ID of the room
- * @param nick Nickname of message sender
- * @param message The received message
- * @return The new message to display, or NULL to preserve the original message
- */
+Called before a private chat room message is displayed
+@param barejid Jabber ID of the room
+@param nick nickname of message sender
+@param message the received message
+@return the new message to display, or NULL to preserve the original message
+*/
 char* prof_pre_priv_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
- * Called after a private chat room message is displayed
- * @param barejid Jabber ID of the room
- * @param nick Nickname of the message sender
- * @param message The received message
- */
+Called after a private chat room message is displayed
+@param barejid Jabber ID of the room
+@param nick nickname of the message sender
+@param message the received message
+*/
 void prof_post_priv_message_display(const char * const barejid, const char * const nick, const char *message);
 
 /**
- * Called before a private chat room message is sent
- * @param barejid Jabber ID of the room
- * @param nick Nickname of message recipient
- * @param message The message to be sent
- * @return The modified or original message to send, or NULL to cancel sending of the message
- */
+Called before a private chat room message is sent
+@param barejid Jabber ID of the room
+@param nick nickname of message recipient
+@param message the message to be sent
+@return the modified or original message to send, or NULL to cancel sending of the message
+*/
 char* prof_pre_priv_message_send(const char * const barejid, const char * const nick, const char *message);
 
 /**
- * Called after a private chat room message has been sent
- * @param barejid Jabber ID of the room
- * @param nick Nickname of the message recipient
- * @param message The sent message
- */
+Called after a private chat room message has been sent
+@param barejid Jabber ID of the room
+@param nick nickname of the message recipient
+@param message the sent message
+*/
 void prof_post_priv_message_send(const char * const barejid, const char * const nick, const char *message);
 
 /**
- * Called before an XMPP message stanza is sent
- * @param stanza The stanza to send
- * @return The new stanza to send, or NULL to preserve the original stanza
- */
+Called before an XMPP message stanza is sent
+@param stanza The stanza to send
+@return The new stanza to send, or NULL to preserve the original stanza
+*/
 char* prof_on_message_stanza_send(const char *const stanza);
 
 /**
- * Called when an XMPP message stanza is received
- * @param stanza The stanza received
- * @return 1 if CProof should continue to process the message stanza, 0 otherwise
- */
+Called when an XMPP message stanza is received
+@param stanza The stanza received
+@return 1 if Profanity should continue to process the message stanza, 0 otherwise
+*/
 int prof_on_message_stanza_receive(const char *const stanza);
 
 /**
- * Called before an XMPP presence stanza is sent
- * @param stanza The stanza to send
- * @return The new stanza to send, or NULL to preserve the original stanza
- */
+Called before an XMPP presence stanza is sent
+@param stanza The stanza to send
+@return The new stanza to send, or NULL to preserve the original stanza
+*/
 char* prof_on_presence_stanza_send(const char *const stanza);
 
 /**
- * Called when an XMPP presence stanza is received
- * @param stanza The stanza received
- * @return 1 if CProof should continue to process the presence stanza, 0 otherwise
- */
+Called when an XMPP presence stanza is received
+@param stanza The stanza received
+@return 1 if Profanity should continue to process the presence stanza, 0 otherwise
+*/
 int prof_on_presence_stanza_receive(const char *const stanza);
 
 /**
- * Called before an XMPP iq stanza is sent
- * @param stanza The stanza to send
- * @return The new stanza to send, or NULL to preserve the original stanza
- */
+Called before an XMPP iq stanza is sent
+@param stanza The stanza to send
+@return The new stanza to send, or NULL to preserve the original stanza
+*/
 char* prof_on_iq_stanza_send(const char *const stanza);
 
 /**
- * Called when an XMPP iq stanza is received
- * @param stanza The stanza received
- * @return 1 if CProof should continue to process the iq stanza, 0 otherwise
- */
+Called when an XMPP iq stanza is received
+@param stanza The stanza received
+@return 1 if Profanity should continue to process the iq stanza, 0 otherwise
+*/
 int prof_on_iq_stanza_receive(const char *const stanza);
 
 /**
- * Called when a contact goes offline
- * @param barejid Jabber ID of the contact
- * @param resource The resource being disconnected
- * @param status The status message received with the offline presence, or NULL
- */
+Called when a contact goes offline
+@param barejid Jabber ID of the contact
+@param resource the resource being disconnected
+@param status the status message received with the offline presence, or NULL
+*/
 void prof_on_contact_offline(const char *const barejid, const char *const resource, const char *const status);
 
 /**
- * Called when a presence notification is received from a contact
- * @param barejid Jabber ID of the contact
- * @param resource The resource being disconnected
- * @param presence Presence of the contact, one of "chat", "online", "away", "xa" or "dnd"
- * @param status The status message received with the presence, or NULL
- * @param priority The priority associated with the resource
- */
+Called when a presence notification is received from a contact
+@param barejid Jabber ID of the contact
+@param resource the resource being disconnected
+@param presence presence of the contact, one of "chat", "online", "away", "xa" or "dnd"
+@param status the status message received with the presence, or NULL
+@param priority the priority associated with the resource
+*/
 void prof_on_contact_presence(const char *const barejid, const char *const resource, const char *const presence, const char *const status, const int priority);
 
 /**
- * Called when a chat window is focused
- * @param barejid Jabber ID of the chat window recipient
- */
+Called when a chat window is focused
+@param barejid Jabber ID of the chat window recipient
+*/
 void prof_on_chat_win_focus(const char *const barejid);
 
 /**
- * Called when a chat room window is focused
- * @param barejid Jabber ID of the room
- */
-void prof_on_room_win_focus(const char *const barejid);
+Called when a chat room window is focused
+@param barejid Jabber ID of the room
+*/
+void prof_on_room_win_focus(const char *const barejid);

apidocs/python/conf.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# CProof Python Plugins API documentation build configuration file.
+# Profanity Python Plugins API documentation build configuration file, created by
+# sphinx-quickstart on Thu Mar 17 23:01:31 2016.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
@@ -46,25 +47,25 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'CProof Python Plugins API'
-copyright = u'2025, CProof, based on Profanity by boothj5 et al.'
-author = u'CProof Developers'
+project = u'Profanity Python Plugins API'
+copyright = u'2016 - 2018, boothj5'
+author = u'boothj5'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.15.0'
+version = u'0.5.0'
 # The full version, including alpha/beta/rc tags.
-release = u'0.15.0'
+release = u'0.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'en'
+language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -74,7 +75,7 @@ language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'modules.rst']
+exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -121,7 +122,7 @@ html_theme = 'default'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "CProof Python Plugins"
+html_title = "Profanity Python Plugins"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
@@ -138,7 +139,7 @@ html_title = "CProof Python Plugins"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -201,7 +202,7 @@ html_show_copyright = False
 #html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'CProofPythonPluginsAPIdoc'
+htmlhelp_basename = 'ProfanityPythonPluginsAPIdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -223,8 +224,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'CProofPythonPluginsAPI.tex', u'CProof Python Plugins API Documentation',
-     u'CProof Developers', 'manual'),
+    (master_doc, 'ProfanityPythonPluginsAPI.tex', u'Profanity Python Plugins API Documentation',
+     u'boothj5', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -253,7 +254,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'cproofpythonpluginsapi', u'CProof Python Plugins API Documentation',
+    (master_doc, 'profanitypythonpluginsapi', u'Profanity Python Plugins API Documentation',
      [author], 1)
 ]
 

apidocs/python/index.rst

@@ -1,8 +1,8 @@
-CProof Python Plugins API
-===========================
+Profanity Python Plugins API
+============================
 
-The ``prof`` module describes functions that plugins may call to interact with CProof.
-The ``plugin`` module describes functions that plugins may define to be notified of various events in CProof.
+The ``prof`` module describes functions that plugins may call to interact with Profanity.
+The ``plugin`` module describes functions that plugins may define to be notified of various events in Profanity.
 
 Contents:
 
@@ -11,5 +11,4 @@ Contents:
 
    prof
    plugin
-
-:ref:`genindex`
+* :ref:`genindex`

apidocs/python/src/plugin.py

@@ -3,14 +3,12 @@ The plugin module defines optional callback functions that CProof plugins can
 implement to handle events such as startup, shutdown, message processing, and
 presence updates.
 
-All functions are optional and are called by CProof when the corresponding event
-occurs. You need to define them in your module and they will automatically be used
-for callback events.
-
-To utilize full functionality, such as the ``prof.cons_show`` function, see ``prof``
-documentation and use::
+::
 
     import prof
+
+All functions are optional and are called by CProof when the corresponding event
+occurs. String parameters and return values are Python 3 str types.
 """
 
 # Initialization and Lifecycle
@@ -22,13 +20,18 @@ def prof_init(version: str, status: str, account_name: str | None, fulljid: str
     Called when CProof starts or when the plugin is loaded via the ``/plugins load``
     or ``/plugins install`` commands.
 
-    :param version: The version of CProof (e.g., ``"1.0.0"``).
-    :param status: The package status of CProof (``"development"`` or ``"release"``).
-    :param account_name: The account name of the logged-in user, or None if not logged in.
-    :param fulljid: The full Jabber ID (barejid/resource) of the logged-in user, or None if not logged in.
-    :return: None
+    Args:
+        version: The version of CProof (e.g., ``"1.0.0"``).
+        status: The package status of CProof (``"development"`` or ``"release"``).
+        account_name: The account name of the logged-in user, or None if not logged in.
+        fulljid: The full Jabber ID (barejid/resource) of the logged-in user, or None if not logged in.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_init(version: str, status: str, account_name: str | None, fulljid: str | None) -> None:
                 prof.cons_show(f"MyPlugin for CProof {version} ({status}) has been loaded, account: {account_name}")
@@ -40,9 +43,15 @@ def prof_on_start() -> None:
 
     Use this to perform setup tasks that should occur at application startup.
 
-    :return: None
+    Args:
+        None
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_start() -> None:
                 prof.cons_show("CProof has started...")
@@ -54,9 +63,15 @@ def prof_on_shutdown() -> None:
 
     Use this to perform cleanup tasks before the application exits.
 
-    :return: None
+    Args:
+        None
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_shutdown() -> None:
                 prof.cons_show("CProof is shutting down...")
@@ -68,9 +83,15 @@ def prof_on_unload() -> None:
 
     Use this to clean up plugin-specific resources.
 
-    :return: None
+    Args:
+        None
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_unload() -> None:
                 prof.cons_show("Plugin unloaded")
@@ -80,11 +101,16 @@ def prof_on_unload() -> None:
 def prof_on_connect(account_name: str, fulljid: str) -> None:
     """Called when a user connects to CProof with an account.
 
-    :param account_name: The account name used for login.
-    :param fulljid: The full Jabber ID (barejid/resource) of the connected account.
-    :return: None
+    Args:
+        account_name: The account name used for login.
+        fulljid: The full Jabber ID (barejid/resource) of the connected account.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_connect(account_name: str, fulljid: str) -> None:
                 prof.cons_show(f"Connected as {account_name} ({fulljid})")
@@ -94,11 +120,16 @@ def prof_on_connect(account_name: str, fulljid: str) -> None:
 def prof_on_disconnect(account_name: str, fulljid: str) -> None:
     """Called when a user disconnects an account from CProof.
 
-    :param account_name: The account name being disconnected.
-    :param fulljid: The full Jabber ID (barejid/resource) of the disconnected account.
-    :return: None
+    Args:
+        account_name: The account name being disconnected.
+        fulljid: The full Jabber ID (barejid/resource) of the disconnected account.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_disconnect(account_name: str, fulljid: str) -> None:
                 prof.cons_show(f"Disconnected {account_name} ({fulljid})")
@@ -113,12 +144,17 @@ def prof_pre_chat_message_display(barejid: str, resource: str, message: str) ->
 
     Allows the plugin to modify or cancel the message display.
 
-    :param barejid: The Jabber ID of the message sender (e.g., ``bob@example.com``).
-    :param resource: The sender's resource (e.g., ``laptop``).
-    :param message: The received message.
-    :return: The modified message to display, or None to preserve the original.
+    Args:
+        barejid: The Jabber ID of the message sender (e.g., ``bob@example.com``).
+        resource: The sender's resource (e.g., ``laptop``).
+        message: The received message.
 
-    Example::
+    Returns:
+        str | None: The modified message to display, or None to preserve the original.
+
+    Example:
+
+        ::
 
             def prof_pre_chat_message_display(barejid: str, resource: str, message: str) -> str | None:
                 new_message = f"{message} (from {barejid})"
@@ -131,12 +167,17 @@ def prof_post_chat_message_display(barejid: str, resource: str, message: str) ->
 
     Use this to perform actions after the message is shown.
 
-    :param barejid: The Jabber ID of the message sender (e.g., ``bob@example.com``).
-    :param resource: The sender's resource (e.g., ``laptop``).
-    :param message: The displayed message.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the message sender (e.g., ``bob@example.com``).
+        resource: The sender's resource (e.g., ``laptop``).
+        message: The displayed message.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_post_chat_message_display(barejid: str, resource: str, message: str) -> None:
                 prof.cons_show(f"Displayed message from {barejid}/{resource}: {message}")
@@ -148,11 +189,16 @@ def prof_pre_chat_message_send(barejid: str, message: str) -> str | None:
 
     Allows the plugin to modify or cancel the message.
 
-    :param barejid: The Jabber ID of the recipient (e.g., ``bob@example.com``).
-    :param message: The message to be sent.
-    :return: The modified message to send, or None to cancel sending.
+    Args:
+        barejid: The Jabber ID of the recipient (e.g., ``bob@example.com``).
+        message: The message to be sent.
 
-    Example::
+    Returns:
+        str | None: The modified message to send, or None to cancel sending.
+
+    Example:
+
+        ::
 
             def prof_pre_chat_message_send(barejid: str, message: str) -> str | None:
                 return f"{message} (sent by plugin)"
@@ -164,11 +210,16 @@ def prof_post_chat_message_send(barejid: str, message: str) -> None:
 
     Use this to log or react to sent messages.
 
-    :param barejid: The Jabber ID of the recipient (e.g., ``bob@example.com``).
-    :param message: The sent message.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the recipient (e.g., ``bob@example.com``).
+        message: The sent message.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_post_chat_message_send(barejid: str, message: str) -> None:
                 prof.cons_show(f"Sent to {barejid}: {message}")
@@ -183,12 +234,17 @@ def prof_pre_room_message_display(barejid: str, nick: str, message: str) -> str
 
     Allows the plugin to modify or cancel the message display.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message sender.
-    :param message: The received message.
-    :return: The modified message to display, or None to preserve the original.
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The received message.
 
-    Example::
+    Returns:
+        str | None: The modified message to display, or None to preserve the original.
+
+    Example:
+
+        ::
 
             def prof_pre_room_message_display(barejid: str, nick: str, message: str) -> str | None:
                 return f"{message} (from {nick})"
@@ -200,12 +256,17 @@ def prof_post_room_message_display(barejid: str, nick: str, message: str) -> Non
 
     Use this to perform actions after the message is shown.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message sender.
-    :param message: The displayed message.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The displayed message.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_post_room_message_display(barejid: str, nick: str, message: str) -> None:
                 prof.cons_show(f"Displayed in {barejid} from {nick}: {message}")
@@ -217,11 +278,16 @@ def prof_pre_room_message_send(barejid: str, message: str) -> str | None:
 
     Allows the plugin to modify or cancel the message.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param message: The message to be sent.
-    :return: The modified message to send, or None to cancel sending.
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        message: The message to be sent.
 
-    Example::
+    Returns:
+        str | None: The modified message to send, or None to cancel sending.
+
+    Example:
+
+        ::
 
             def prof_pre_room_message_send(barejid: str, message: str) -> str | None:
                 return f"{message} (sent by plugin)"
@@ -233,11 +299,16 @@ def prof_post_room_message_send(barejid: str, message: str) -> None:
 
     Use this to log or react to sent messages.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param message: The sent message.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        message: The sent message.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_post_room_message_send(barejid: str, message: str) -> None:
                 prof.cons_show(f"Sent to {barejid}: {message}")
@@ -247,13 +318,18 @@ def prof_post_room_message_send(barejid: str, message: str) -> None:
 def prof_on_room_history_message(barejid: str, nick: str, message: str, timestamp: str) -> None:
     """Called when a chat room history message is received from the server.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message sender.
-    :param message: The received message.
-    :param timestamp: The message's original send time in ISO 8601 format (e.g., ``2025-09-10T19:45:00Z``).
-    :return: None
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The received message.
+        timestamp: The message's original send time in ISO 8601 format (e.g., ``2025-09-10T19:45:00Z``).
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_room_history_message(barejid: str, nick: str, message: str, timestamp: str) -> None:
                 prof.cons_show(f"History in {barejid} from {nick} at {timestamp}: {message}")
@@ -268,12 +344,17 @@ def prof_pre_priv_message_display(barejid: str, nick: str, message: str) -> str
 
     Allows the plugin to modify or cancel the message display.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message sender.
-    :param message: The received message.
-    :return: The modified message to display, or None to preserve the original.
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The received message.
 
-    Example::
+    Returns:
+        str | None: The modified message to display, or None to preserve the original.
+
+    Example:
+
+        ::
 
             def prof_pre_priv_message_display(barejid: str, nick: str, message: str) -> str | None:
                 return f"{message} (private from {nick})"
@@ -285,12 +366,17 @@ def prof_post_priv_message_display(barejid: str, nick: str, message: str) -> Non
 
     Use this to perform actions after the message is shown.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message sender.
-    :param message: The displayed message.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The displayed message.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_post_priv_message_display(barejid: str, nick: str, message: str) -> None:
                 prof.cons_show(f"Displayed private in {barejid} from {nick}: {message}")
@@ -302,12 +388,17 @@ def prof_pre_priv_message_send(barejid: str, nick: str, message: str) -> str | N
 
     Allows the plugin to modify or cancel the message.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message recipient.
-    :param message: The message to be sent.
-    :return: The modified message to send, or None to cancel sending.
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message recipient.
+        message: The message to be sent.
 
-    Example::
+    Returns:
+        str | None: The modified message to send, or None to cancel sending.
+
+    Example:
+
+        ::
 
             def prof_pre_priv_message_send(barejid: str, nick: str, message: str) -> str | None:
                 return f"{message} (private to {nick})"
@@ -319,12 +410,17 @@ def prof_post_priv_message_send(barejid: str, nick: str, message: str) -> None:
 
     Use this to log or react to sent messages.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :param nick: The nickname of the message recipient.
-    :param message: The sent message.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message recipient.
+        message: The sent message.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_post_priv_message_send(barejid: str, nick: str, message: str) -> None:
                 prof.cons_show(f"Sent private to {nick} in {barejid}: {message}")
@@ -339,10 +435,15 @@ def prof_on_message_stanza_send(stanza: str) -> str | None:
 
     Allows the plugin to modify or cancel the stanza.
 
-    :param stanza: The XMPP message stanza to send.
-    :return: The modified stanza to send, or None to preserve the original.
+    Args:
+        stanza: The XMPP message stanza to send.
 
-    Example::
+    Returns:
+        str | None: The modified stanza to send, or None to preserve the original.
+
+    Example:
+
+        ::
 
             def prof_on_message_stanza_send(stanza: str) -> str | None:
                 prof.cons_show(f"Sending message stanza: {stanza}")
@@ -355,10 +456,15 @@ def prof_on_message_stanza_receive(stanza: str) -> bool:
 
     Allows the plugin to control whether CProof processes the stanza.
 
-    :param stanza: The received XMPP message stanza.
-    :return: True to allow CProof to process the stanza, False to block processing.
+    Args:
+        stanza: The received XMPP message stanza.
 
-    Example::
+    Returns:
+        bool: True to allow CProof to process the stanza, False to block processing.
+
+    Example:
+
+        ::
 
             def prof_on_message_stanza_receive(stanza: str) -> bool:
                 prof.cons_show(f"Received message stanza: {stanza}")
@@ -371,10 +477,15 @@ def prof_on_presence_stanza_send(stanza: str) -> str | None:
 
     Allows the plugin to modify or cancel the stanza.
 
-    :param stanza: The XMPP presence stanza to send.
-    :return: The modified stanza to send, or None to preserve the original.
+    Args:
+        stanza: The XMPP presence stanza to send.
 
-    Example::
+    Returns:
+        str | None: The modified stanza to send, or None to preserve the original.
+
+    Example:
+
+        ::
 
             def prof_on_presence_stanza_send(stanza: str) -> str | None:
                 prof.cons_show(f"Sending presence stanza: {stanza}")
@@ -387,10 +498,15 @@ def prof_on_presence_stanza_receive(stanza: str) -> bool:
 
     Allows the plugin to control whether CProof processes the stanza.
 
-    :param stanza: The received XMPP presence stanza.
-    :return: True to allow CProof to process the stanza, False to block processing.
+    Args:
+        stanza: The received XMPP presence stanza.
 
-    Example::
+    Returns:
+        bool: True to allow CProof to process the stanza, False to block processing.
+
+    Example:
+
+        ::
 
             def prof_on_presence_stanza_receive(stanza: str) -> bool:
                 prof.cons_show(f"Received presence stanza: {stanza}")
@@ -403,10 +519,15 @@ def prof_on_iq_stanza_send(stanza: str) -> str | None:
 
     Allows the plugin to modify or cancel the stanza.
 
-    :param stanza: The XMPP IQ stanza to send.
-    :return: The modified stanza to send, or None to preserve the original.
+    Args:
+        stanza: The XMPP IQ stanza to send.
 
-    Example::
+    Returns:
+        str | None: The modified stanza to send, or None to preserve the original.
+
+    Example:
+
+        ::
 
             def prof_on_iq_stanza_send(stanza: str) -> str | None:
                 prof.cons_show(f"Sending IQ stanza: {stanza}")
@@ -419,10 +540,15 @@ def prof_on_iq_stanza_receive(stanza: str) -> bool:
 
     Allows the plugin to control whether CProof processes the stanza.
 
-    :param stanza: The received XMPP IQ stanza.
-    :return: True to allow CProof to process the stanza, False to block processing.
+    Args:
+        stanza: The received XMPP IQ stanza.
 
-    Example::
+    Returns:
+        bool: True to allow CProof to process the stanza, False to block processing.
+
+    Example:
+
+        ::
 
             def prof_on_iq_stanza_receive(stanza: str) -> bool:
                 prof.cons_show(f"Received IQ stanza: {stanza}")
@@ -436,12 +562,17 @@ def prof_on_iq_stanza_receive(stanza: str) -> bool:
 def prof_on_contact_offline(barejid: str, resource: str, status: str | None) -> None:
     """Called when a contact goes offline.
 
-    :param barejid: The Jabber ID of the contact (e.g., ``bob@example.com``).
-    :param resource: The resource being disconnected (e.g., ``laptop``).
-    :param status: The status message received with the offline presence, or None.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the contact (e.g., ``bob@example.com``).
+        resource: The resource being disconnected (e.g., ``laptop``).
+        status: The status message received with the offline presence, or None.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_contact_offline(barejid: str, resource: str, status: str | None) -> None:
                 prof.cons_show(f"{barejid}/{resource} went offline: {status or 'No status'}")
@@ -451,14 +582,19 @@ def prof_on_contact_offline(barejid: str, resource: str, status: str | None) ->
 def prof_on_contact_presence(barejid: str, resource: str, presence: str, status: str | None, priority: int) -> None:
     """Called when a presence notification is received from a contact.
 
-    :param barejid: The Jabber ID of the contact (e.g., ``bob@example.com``).
-    :param resource: The resource of the contact (e.g., ``laptop``).
-    :param presence: The contact's presence (``"chat"``, ``"online"``, ``"away"``, ``"xa"``, or ``"dnd"``).
-    :param status: The status message received with the presence, or None.
-    :param priority: The priority associated with the resource.
-    :return: None
+    Args:
+        barejid: The Jabber ID of the contact (e.g., ``bob@example.com``).
+        resource: The resource of the contact (e.g., ``laptop``).
+        presence: The contact's presence (``"chat"``, ``"online"``, ``"away"``, ``"xa"``, or ``"dnd"``).
+        status: The status message received with the presence, or None.
+        priority: The priority associated with the resource.
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_contact_presence(barejid: str, resource: str, presence: str, status: str | None, priority: int) -> None:
                 prof.notify(f"{barejid} is {presence}", 5000, "Presence")
@@ -471,10 +607,15 @@ def prof_on_contact_presence(barejid: str, resource: str, presence: str, status:
 def prof_on_chat_win_focus(barejid: str) -> None:
     """Called when a chat window is focused.
 
-    :param barejid: The Jabber ID of the chat window recipient (e.g., ``bob@example.com``).
-    :return: None
+    Args:
+        barejid: The Jabber ID of the chat window recipient (e.g., ``bob@example.com``).
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_chat_win_focus(barejid: str) -> None:
                 prof.cons_show(f"Focused chat window for {barejid}")
@@ -484,12 +625,17 @@ def prof_on_chat_win_focus(barejid: str) -> None:
 def prof_on_room_win_focus(barejid: str) -> None:
     """Called when a chat room window is focused.
 
-    :param barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
-    :return: None
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
 
-    Example::
+    Returns:
+        None
+
+    Example:
+
+        ::
 
             def prof_on_room_win_focus(barejid: str) -> None:
                 prof.cons_show(f"Focused room window for {barejid}")
     """
-    pass
+    pass

src/command/cmd_defs.c

@@ -139,9 +139,8 @@ static const struct cmd_t command_defs[] = {
               "Show version and license information.")
     },
 
-    // Max args: account + server <s> + port <p> + tls <t> + auth <a> = 9
     { CMD_PREAMBLE("/connect",
-                   parse_args, 0, 9, NULL)
+                   parse_args, 0, 7, NULL)
       CMD_MAINFUNC(cmd_connect)
       CMD_TAGS(
               CMD_TAG_CONNECTION)
@@ -1903,9 +1902,9 @@ static const struct cmd_t command_defs[] = {
       CMD_ARGS(
               { "where", "Show the current log file location." },
               { "rotate on|off", "Rotate log, default on. Does not take effect if you specified a filename yourself when starting Profanity." },
-              { "maxsize <bytes>", "With rotate enabled, specifies the max log size, defaults to 10485760 (10MiB)." },
+              { "maxsize <bytes>", "With rotate enabled, specifies the max log size, defaults to 10485760 (10MB)." },
               { "shared on|off", "Share logs between all instances, default: on. When off, the process id will be included in the log filename. Does not take effect if you specified a filename yourself when starting Profanity." },
-              { "level INFO|DEBUG|WARN|ERROR", "Set the log level. Default is INFO." })
+              {"level INFO|DEBUG|WARN|ERROR", "Set the log level. Default is INFO. Only works with default log file, not with user provided log file during startup via -f." })
     },
 
     { CMD_PREAMBLE("/carbons",

src/command/cmd_funcs.c

@@ -5356,8 +5356,6 @@ cmd_time(ProfWin* window, const char* const command, gchar** args)
             cons_bad_cmd_usage(command);
             return TRUE;
         }
-        if (!set_all)
-            break;
     }
     if (!set_all && n == ARRAY_SIZE(time_prefs)) {
         cons_bad_cmd_usage(command);
@@ -6273,11 +6271,10 @@ cmd_log(ProfWin* window, const char* const command, gchar** args)
     if (strcmp(subcmd, "level") == 0) {
         log_level_t prof_log_level;
         if (log_level_from_string(value, &prof_log_level) == 0) {
-            auto_char char* log_file = strdup(get_log_file_location());
             log_close();
-            log_init(prof_log_level, log_file);
+            log_init(prof_log_level, NULL);
 
-            cons_show("Log level changed to: %s (log file: %s).", value, log_file ? log_file : "[default]");
+            cons_show("Log level changed to: %s.", value);
             return TRUE;
         }
     }

src/log.c

@@ -186,7 +186,7 @@ log_error(const char* const msg, ...)
 }
 
 void
-log_init(log_level_t filter, const char* const log_file)
+log_init(log_level_t filter, char* log_file)
 {
     level_filter = filter;
 

src/log.h

@@ -50,7 +50,7 @@ typedef enum {
     PROF_LEVEL_ERROR
 } log_level_t;
 
-void log_init(log_level_t filter, const char* const log_file);
+void log_init(log_level_t filter, char* log_file);
 log_level_t log_get_filter(void);
 void log_close(void);
 const gchar* get_log_file_location(void);

src/plugins/api.c

@@ -54,7 +54,6 @@
 #include "plugins/settings.h"
 #include "plugins/disco.h"
 #include "ui/ui.h"
-#include "ui/win_types.h"
 #include "ui/window_list.h"
 #include "xmpp/roster_list.h"
 
@@ -206,13 +205,6 @@ api_get_current_recipient(void)
     }
 }
 
-gchar*
-api_get_current_window(void)
-{
-    ProfWin* current = wins_get_current();
-    return win_get_title(current);
-}
-
 char*
 api_get_current_muc(void)
 {

src/plugins/api.h

@@ -46,7 +46,6 @@ void api_notify(const char* message, const char* category, int timeout_ms);
 void api_send_line(char* line);
 
 char* api_get_current_recipient(void);
-gchar* api_get_current_window(void);
 char* api_get_current_muc(void);
 gboolean api_current_win_is_console(void);
 char* api_get_current_nick(void);

src/plugins/c_api.c

@@ -165,12 +165,6 @@ c_api_get_current_recipient(void)
     return api_get_current_recipient();
 }
 
-static char*
-c_api_get_current_window(void)
-{
-    return api_get_current_window();
-}
-
 static char*
 c_api_get_current_muc(void)
 {
@@ -483,7 +477,6 @@ c_api_init(void)
     prof_notify = c_api_notify;
     prof_send_line = c_api_send_line;
     prof_get_current_recipient = c_api_get_current_recipient;
-    prof_get_current_window = c_api_get_current_window;
     prof_get_current_muc = c_api_get_current_muc;
     prof_current_win_is_console = c_api_current_win_is_console;
     prof_get_current_nick = c_api_get_current_nick;

src/plugins/profapi.c

@@ -62,7 +62,6 @@ void (*prof_notify)(const char* message, int timeout_ms, const char* category) =
 void (*prof_send_line)(char* line) = NULL;
 
 char* (*prof_get_current_recipient)(void) = NULL;
-char* (*prof_get_current_window)(void) = NULL;
 char* (*prof_get_current_muc)(void) = NULL;
 int (*prof_current_win_is_console)(void) = NULL;
 char* (*prof_get_current_nick)(void) = NULL;

src/plugins/profapi.h

@@ -71,7 +71,6 @@ void (*prof_notify)(const char* message, int timeout_ms, const char* category);
 void (*prof_send_line)(char* line);
 
 char* (*prof_get_current_recipient)(void);
-char* (*prof_get_current_window)(void);
 char* (*prof_get_current_muc)(void);
 int (*prof_current_win_is_console)(void);
 char* (*prof_get_current_nick)(void);

src/plugins/python_api.c

@@ -415,15 +415,6 @@ python_api_get_current_recipient(PyObject* self, PyObject* args)
     }
 }
 
-static PyObject*
-python_api_get_current_window(PyObject* self, PyObject* args)
-{
-    allow_python_threads();
-    auto_gchar gchar* recipient = api_get_current_window();
-    disable_python_threads();
-    return Py_BuildValue("s", recipient);
-}
-
 static PyObject*
 python_api_get_current_muc(PyObject* self, PyObject* args)
 {
@@ -1539,7 +1530,6 @@ static PyMethodDef apiMethods[] = {
     { "send_line", python_api_send_line, METH_VARARGS, "Send a line of input." },
     { "notify", python_api_notify, METH_VARARGS, "Send desktop notification." },
     { "get_current_recipient", python_api_get_current_recipient, METH_VARARGS, "Return the jid of the recipient of the current window." },
-    { "get_current_window", python_api_get_current_window, METH_VARARGS, "Return title of the current window." },
     { "get_current_muc", python_api_get_current_muc, METH_VARARGS, "Return the jid of the room of the current window." },
     { "get_current_nick", python_api_get_current_nick, METH_VARARGS, "Return nickname in current room." },
     { "get_name_from_roster", python_api_get_name_from_roster, METH_VARARGS, "Return nickname in roster of barejid." },

src/ui/buffer.c

@@ -1,36 +1,40 @@
 /*
  * buffer.c
- *
- * Message buffer implementation for CProof.
- *
- * This module provides an in-memory buffer for managing active chat entries in the
- * console-based XMPP client. Separate from persistent SQLite storage, it holds
- * messages and metadata solely for UI rendering, ensuring responsive scrolling and
- * display without exceeding ncurses pad limits (10k lines). By tracking rendered
- * line counts per entry, it proactively trims content to prevent overflow, enabling
- * seamless integration with ncurses for position-aware rendering.
- *
- * Key features and operations:
- *   - Append/prepend entries (messages) with automatic line-based cleanup.
- *   - Track cumulative lines for overflow prevention and efficient buffer sizing.
- *   - Remove entries by ID or index; mark delivery receipts as received.
- *   - Retrieve entries by index or ID for rendering and history queries.
- *   - Store metadata including timestamps, senders, themes, and ncurses y-positions.
- *
- * CProof. Fork of Profanity (since 2025).
+ * vim: expandtab:ts=4:sts=4:sw=4
  *
  * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
  * Copyright (C) 2019 - 2025 Michael Vetter <jubalh@iodoru.org>
- * Copyright (C) 2025 CProof Developers
  *
- * Licensed under the GNU General Public License, version 3,
- * with the OpenSSL exception. See LICENSE for details.
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
  *
- * vim: expandtab:ts=4:sts=4:sw=4
  */
 
 #include "config.h"
-#include "ui/window_list.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -50,8 +54,15 @@
 #include "ui/window.h"
 #include "ui/buffer.h"
 
+#define MAX_BUFFER_SIZE     200
 #define STRDUP_OR_NULL(str) ((str) ? strdup(str) : NULL)
 
+struct prof_buff_t
+{
+    GSList* entries;
+    int lines;
+};
+
 static void _free_entry(ProfBuffEntry* entry);
 static ProfBuffEntry* _create_entry(const char* show_char, int pad_indent, GDateTime* time, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message, DeliveryReceipt* receipt, const char* const id, int y_start_pos, int y_end_pos);
 static void _buffer_add(ProfBuff buffer, const char* show_char, int pad_indent, GDateTime* time, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message, DeliveryReceipt* receipt, const char* const id, int y_start_pos, int y_end_pos, gboolean append);
@@ -97,24 +108,23 @@ _buffer_add(ProfBuff buffer, const char* show_char, int pad_indent, GDateTime* t
 
     buffer->lines += e->_lines;
 
-    // With 10% margin to ensure overflow prevention
-    while (buffer->lines >= PAD_SIZE - (PAD_SIZE / 10) && g_slist_length(buffer->entries) > 1) {
+    while (g_slist_length(buffer->entries) >= MAX_BUFFER_SIZE) {
         // Delete message from the opposite size to free buffer
         GSList* buffer_entry_to_delete = append ? buffer->entries : g_slist_last(buffer->entries);
         ProfBuffEntry* entry_to_delete = (ProfBuffEntry*)buffer_entry_to_delete->data;
-        // log_debug("(Messages left in buffer: %d) DELETING: %s", g_slist_length(buffer->entries), entry_to_delete->id);
         buffer->lines -= entry_to_delete->_lines;
         _free_entry(entry_to_delete);
         buffer->entries = g_slist_delete_link(buffer->entries, buffer_entry_to_delete);
     }
 
     if (from_jid && y_end_pos == y_start_pos) {
-        // win_redraw will redraw with entries above removed,
-        // it will also recalculate actual size of the message that caused overflow
-        int old_lines = buffer->lines;
-        win_redraw(wins_get_current());
-        log_debug("Ncurses Overflow! From: %s, position: %d, ID: %s, append: %s, used message buffer size: %d, rendered lines: (old: %d/ actual: %d/ max: %d)",
-                  from_jid, y_start_pos, id, append ? "TRUE" : "FALSE", g_slist_length(buffer->entries), old_lines, buffer->lines, PAD_SIZE);
+        log_warning("Ncurses Overflow! From: %s, position: %d, ID: %s, append: %s, used message buffer size: %d, message buffer size: %d, rendered lines buffer size: %d",
+                    from_jid, y_start_pos, id, append ? "TRUE" : "FALSE", g_slist_length(buffer->entries), MAX_BUFFER_SIZE, PAD_SIZE);
+        // At this point we have a message that caused overflow of the render buffer.
+        // Ideally, we want to clean other messages to rerender everything properly. To do so,
+        // first we need to determine the size of the message that we are trying to display,
+        // then we need to print the message.
+        // However, _buffer_add is too late in the code to do this, therefore it has to be done in the win_print_old_history.
     }
 
     buffer->entries = append ? g_slist_append(buffer->entries, e) : g_slist_prepend(buffer->entries, e);

src/ui/buffer.h

@@ -68,12 +68,6 @@ typedef struct prof_buff_entry_t
     char* id;
 } ProfBuffEntry;
 
-struct prof_buff_t
-{
-    GSList* entries;
-    int lines;
-};
-
 typedef struct prof_buff_t* ProfBuff;
 
 ProfBuff buffer_create();

src/ui/window.c

@@ -2003,10 +2003,6 @@ win_redraw(ProfWin* window)
             _win_print_internal(window, e->show_char, e->pad_indent, e->time, e->flags, e->theme_item, e->display_from, e->message, e->receipt);
         }
         e->y_end_pos = getcury(window->layout->win);
-        // Recalculate lines (might be incorrect in case of NCurses overflow)
-        window->layout->buffer->lines -= e->_lines;
-        e->_lines = e->y_end_pos - e->y_start_pos;
-        window->layout->buffer->lines += e->_lines;
     }
 }
 

src/xmpp/connection.c

@@ -312,7 +312,6 @@ iq_reg2_cb(xmpp_conn_t* xmpp_conn, xmpp_stanza_t* stanza, void* userdata)
     goto quit;
 
 quit:
-    log_debug("[CONNDBG] iq_reg2_cb: disconnecting after registration completion");
     xmpp_disconnect(xmpp_conn);
 
     return 0;
@@ -551,7 +550,6 @@ connection_disconnect(void)
     // don't disconnect already disconnected connection,
     // or we get infinite loop otherwise
     if (conn.conn_last_event == XMPP_CONN_CONNECT) {
-        log_debug("[CONNDBG] connection_disconnect: user-initiated disconnect (status=%d)", (int)conn.conn_status);
         conn.conn_status = JABBER_DISCONNECTING;
         xmpp_disconnect(conn.xmpp_conn);
 
@@ -559,7 +557,6 @@ connection_disconnect(void)
             session_process_events();
         }
     } else {
-        log_debug("[CONNDBG] connection_disconnect: already disconnected (last_event=%d)", (int)conn.conn_last_event);
         conn.conn_status = JABBER_DISCONNECTED;
     }
 
@@ -982,7 +979,6 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
 
         connection_get_jid();
         conn.domain = strdup(conn.jid->domainpart);
-        log_debug("conn.domain=%s", conn.jid->domainpart);
 
         connection_clear_data();
         conn.features_by_jid = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)g_hash_table_destroy);
@@ -1022,9 +1018,6 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
     // disconnected
     case XMPP_CONN_DISCONNECT:
         log_debug("Connection handler: XMPP_CONN_DISCONNECT");
-        log_debug("[CONNDBG] disconnect: previous_status=%d error=%d has_stream_error=%s",
-                  (int)conn.conn_status, error,
-                  (stream_error && stream_error->stanza) ? "yes" : "no");
 
         // lost connection for unknown reason
         if (conn.conn_status == JABBER_CONNECTED || conn.conn_status == JABBER_DISCONNECTING) {
@@ -1170,32 +1163,3 @@ connection_get_profanity_identifier(void)
 {
     return prof_identifier;
 }
-
-void
-connection_debug_print_features()
-{
-    log_debug("=== Connection Features ===");
-
-    GHashTableIter iter;
-    gpointer jid_ptr, features_ptr;
-
-    g_hash_table_iter_init(&iter, conn.features_by_jid);
-    while (g_hash_table_iter_next(&iter, &jid_ptr, &features_ptr)) {
-        const char* jid = (const char*)jid_ptr;
-        GHashTable* features = (GHashTable*)features_ptr;
-
-        if (!features || g_hash_table_size(features) == 0) {
-            log_debug("%s:\t(no features)", jid);
-            continue;
-        }
-
-        GList* feature_keys = g_hash_table_get_keys(features);
-        for (GList* l = feature_keys; l != NULL; l = l->next) {
-            const char* feature = (const char*)l->data;
-            log_debug("%s:\t%s", jid, feature);
-        }
-        g_list_free(feature_keys);
-    }
-
-    log_debug("=== End of Features ===");
-}

src/xmpp/iq.c

@@ -1417,8 +1417,6 @@ _manual_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
     return 0;
 }
 
-static gboolean autoping_error_shown = false;
-
 static int
 _autoping_timed_send(xmpp_conn_t* const conn, void* const userdata)
 {
@@ -1427,13 +1425,10 @@ _autoping_timed_send(xmpp_conn_t* const conn, void* const userdata)
     }
 
     if (connection_supports(XMPP_FEATURE_PING) == FALSE) {
-        // TODO: do we need to check it on each autoping call?
-        log_warning("Server doesn't advertise %s feature.", XMPP_FEATURE_PING);
-        if (!autoping_error_shown) {
-            connection_debug_print_features();
-            cons_show_error("Server ping not supported (%s). Check log for details.", XMPP_FEATURE_PING);
-        }
-        autoping_error_shown = 1;
+        log_warning("Server doesn't advertise %s feature, disabling autoping.", XMPP_FEATURE_PING);
+        prefs_set_autoping(0);
+        cons_show_error("Server ping not supported (%s), autoping disabled.", XMPP_FEATURE_PING);
+        return 0;
     }
 
     if (autoping_wait) {
@@ -1504,7 +1499,7 @@ _auto_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
     if (g_strcmp0(errtype, STANZA_TYPE_CANCEL) == 0) {
         log_warning("Server ping (id=%s) error type 'cancel', disabling autoping.", id);
         prefs_set_autoping(0);
-        cons_show_error("Autoping is not supported by the server (stanza cancelled). The feature has been disabled automatically.");
+        cons_show_error("Server ping not supported, autoping disabled.");
         xmpp_timed_handler_delete(connection_get_conn(), _autoping_timed_send);
     }
 
@@ -2520,7 +2515,6 @@ _disco_items_result_handler(xmpp_stanza_t* const stanza)
     GSList* items = NULL;
 
     if ((g_strcmp0(id, "discoitemsreq") != 0) && (g_strcmp0(id, "discoitemsreq_onconnect") != 0)) {
-        log_warning("_disco_items_result_handler: Received unexpected disco id: %s", id);
         return;
     }
 

src/xmpp/session.c

@@ -218,7 +218,6 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
 void
 session_autoping_fail(void)
 {
-    log_debug("[CONNDBG] session_autoping_fail: autoping timeout, triggering lost connection");
     session_lost_connection();
 }
 
@@ -265,14 +264,11 @@ session_process_events(void)
         if ((reconnect_sec != 0) && reconnect_timer) {
             int elapsed_sec = g_timer_elapsed(reconnect_timer, NULL);
             if (elapsed_sec > reconnect_sec) {
-                log_debug("[CONNDBG] session_process_events: auto-reconnect triggered after %d seconds (threshold=%d)",
-                          elapsed_sec, reconnect_sec);
                 session_reconnect_now();
             }
         }
         break;
     case JABBER_RECONNECT:
-        log_debug("[CONNDBG] session_process_events: JABBER_RECONNECT state, calling session_reconnect_now");
         session_reconnect_now();
         break;
     default:
@@ -331,12 +327,12 @@ session_login_success(gboolean secured)
 
     // logged in with account
     if (saved_account.name) {
-        log_debug("[CONNDBG] Connection handler: logged in with account name: %s", saved_account.name);
+        log_debug("Connection handler: logged in with account name: %s", saved_account.name);
         sv_ev_login_account_success(saved_account.name, secured);
 
         // logged in without account, use details to create new account
     } else {
-        log_debug("[CONNDBG] Connection handler: logged in with jid: %s", saved_details.name);
+        log_debug("Connection handler: logged in with jid: %s", saved_details.name);
         accounts_add(saved_details.name, saved_details.altdomain, saved_details.port, saved_details.tls_policy, saved_details.auth_policy);
         accounts_set_jid(saved_details.name, saved_details.jid);
 
@@ -375,11 +371,11 @@ void
 session_login_failed(void)
 {
     if (reconnect_timer == NULL) {
-        log_debug("[CONNDBG] Connection handler: No reconnect timer");
+        log_debug("Connection handler: No reconnect timer");
         sv_ev_failed_login();
         _session_free_internals();
     } else {
-        log_debug("[CONNDBG] Connection handler: Restarting reconnect timer");
+        log_debug("Connection handler: Restarting reconnect timer");
         if (prefs_get_reconnect() != 0) {
             g_timer_start(reconnect_timer);
         }
@@ -393,16 +389,12 @@ session_login_failed(void)
 void
 session_lost_connection(void)
 {
-    log_debug("[CONNDBG] session_lost_connection: connection lost, reconnect_interval=%d",
-              prefs_get_reconnect());
     /* this callback also clears all cached data */
     sv_ev_lost_connection();
     if (prefs_get_reconnect() != 0) {
         assert(reconnect_timer == NULL);
         reconnect_timer = g_timer_new();
-        log_debug("[CONNDBG] session_lost_connection: reconnect timer started");
     } else {
-        log_debug("[CONNDBG] session_lost_connection: auto-reconnect disabled, cleaning up");
         _session_free_internals();
     }
 }

src/xmpp/xmpp.h

@@ -208,8 +208,6 @@ const char* connection_jid_for_feature(const char* const feature);
 
 const char* connection_get_profanity_identifier(void);
 
-void connection_debug_print_features();
-
 char* message_send_chat(const char* const barejid, const char* const msg, const char* const oob_url, gboolean request_receipt, const char* const replace_id);
 char* message_send_chat_otr(const char* const barejid, const char* const msg, gboolean request_receipt, const char* const replace_id);
 char* message_send_chat_pgp(const char* const barejid, const char* const msg, gboolean request_receipt, const char* const replace_id);

tests/unittests/log/stub_log.c

@@ -26,7 +26,7 @@
 #include "log.h"
 
 void
-log_init(log_level_t filter, const char* const log_file)
+log_init(log_level_t filter, char* log_file)
 {
 }
 log_level_t

tests/unittests/test_forced_encryption.c

@@ -1,4 +1,7 @@
-#include "prof_cmocka.h"
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
 #include <glib.h>
 #include "event/client_events.h"
 #include "command/cmd_funcs.h"

tests/unittests/xmpp/stub_xmpp.c

@@ -156,11 +156,6 @@ connection_get_profanity_identifier(void)
     return "profident";
 }
 
-void
-connection_debug_print_features()
-{
-}
-
 jabber_conn_status_t
 connection_register(const char* const altdomain, int port, const char* const tls_policy,
                     const char* const username, const char* const password)