1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-16 21:35:24 +00:00

Trim excess whitespace

This commit is contained in:
a1346054 2021-08-26 01:18:10 +00:00
parent 4368a22114
commit a1dc3d1237
20 changed files with 50 additions and 64 deletions

View File

@ -283,7 +283,7 @@ Changes:
* `/roster room use jid` to use the jid of the MUC in the roster list. * `/roster room use jid` to use the jid of the MUC in the roster list.
- Fix decryption failure for messages sent from Converse.js (@paulfariello) (#1253) - Fix decryption failure for messages sent from Converse.js (@paulfariello) (#1253)
- Fix crash when OMEMO key is misconfigured (@paulfariello) (#1239) - Fix crash when OMEMO key is misconfigured (@paulfariello) (#1239)
- Use OMEMO for offline MUC members (@paulfariello) (#1242) - Use OMEMO for offline MUC members (@paulfariello) (#1242)
- Fix OMEMO 1on1 chats with psi+ (@svensp) (#1247) - Fix OMEMO 1on1 chats with psi+ (@svensp) (#1247)
- Save occupants and roster chars (#1244) - Save occupants and roster chars (#1244)
- Add support for downloading user avatars via XEP-0084 (#1240) - Add support for downloading user avatars via XEP-0084 (#1240)
@ -501,7 +501,7 @@ Changes:
- /roster and /occupants panel size settings (% of screen width) - /roster and /occupants panel size settings (% of screen width)
- /account default - Set default account for /connect - /account default - Set default account for /connect
- /account remove - /account remove
- /presence - Show/hide contact presence in titlebar - /presence - Show/hide contact presence in titlebar
- /resource - Override resource during chat, resource display settings - /resource - Override resource during chat, resource display settings
- Improved chat session handling <http://xmpp.org/rfcs/rfc6121.html#message-chat> - Improved chat session handling <http://xmpp.org/rfcs/rfc6121.html#message-chat>
- Lower CPU usage with dynamic input blocking timeout - Lower CPU usage with dynamic input blocking timeout

View File

@ -58,7 +58,7 @@ URL: https://profanity-im.github.io/blog
Repo: https://github.com/profanity-im/blog Repo: https://github.com/profanity-im/blog
### Mailinglist ### Mailinglist
Mailing List: https://lists.notraces.net/mailman/listinfo/profanity Mailing List: https://lists.notraces.net/mailman/listinfo/profanity
### Chatroom ### Chatroom

View File

@ -36,14 +36,14 @@ Themes are specified in ~/.local/share/profanity/plugin_themes
@param group the group name in the themes file @param group the group name in the themes file
@param item the item name within the group @param item the item name within the group
@param def default colour if the theme cannot be found @param def default colour if the theme cannot be found
@param message the message to print @param message the message to print
@return 1 on success, 0 on failure @return 1 on success, 0 on failure
*/ */
int prof_cons_show_themed(const char *const group, const char *const item, const char *const def, const char *const message); int prof_cons_show_themed(const char *const group, const char *const item, const char *const def, const char *const message);
/** /**
Show a message indicating the command has been called incorrectly. Show a message indicating the command has been called incorrectly.
@param cmd the command name with leading slash, e.g. "/say" @param cmd the command name with leading slash, e.g. "/say"
@return 1 on success, 0 on failure @return 1 on success, 0 on failure
*/ */
int prof_cons_bad_cmd_usage(const char *const cmd); int prof_cons_bad_cmd_usage(const char *const cmd);
@ -216,14 +216,14 @@ Show a message in the plugin window.
*/ */
int prof_win_show(PROF_WIN_TAG win, char *message); int prof_win_show(PROF_WIN_TAG win, char *message);
/** /**
Show a message in the plugin window, using the specified theme. Show a message in the plugin window, using the specified theme.
Themes are specified in ~/.local/share/profanity/plugin_themes Themes are specified in ~/.local/share/profanity/plugin_themes
@param tag The {@link PROF_WIN_TAG} of the window to display the message @param tag The {@link PROF_WIN_TAG} of the window to display the message
@param group the group name in the themes file @param group the group name in the themes file
@param key the item name within the group @param key the item name within the group
@param def default colour if the theme cannot be found or NULL @param def default colour if the theme cannot be found or NULL
@param message the message to print @param message the message to print
@return 1 on success, 0 on failure @return 1 on success, 0 on failure
*/ */
int prof_win_show_themed(PROF_WIN_TAG tag, char *group, char *key, char *def, char *message); int prof_win_show_themed(PROF_WIN_TAG tag, char *group, char *key, char *def, char *message);

View File

@ -45,7 +45,7 @@ Called before a chat message is displayed
@param barejid Jabber ID of the message sender @param barejid Jabber ID of the message sender
@param resource resource of the message sender @param resource resource of the message sender
@param message the received message @param message the received message
@return the new message to display, or NULL to preserve the original 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); char* prof_pre_chat_message_display(const char * const barejid, const char *const resource, const char *message);
@ -77,14 +77,14 @@ Called before a chat room message is displayed
@param barejid Jabber ID of the room @param barejid Jabber ID of the room
@param nick nickname of message sender @param nick nickname of message sender
@param message the received message @param message the received message
@return the new message to display, or NULL to preserve the original 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); 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 Called after a chat room message is displayed
@param barejid Jabber ID of the room @param barejid Jabber ID of the room
@param nick nickname of the message sender @param nick nickname of the message sender
@param message the received message @param message the received message
*/ */
void prof_post_room_message_display(const char * const barejid, const char * const nick, const char *message); void prof_post_room_message_display(const char * const barejid, const char * const nick, const char *message);
@ -118,14 +118,14 @@ Called before a private chat room message is displayed
@param barejid Jabber ID of the room @param barejid Jabber ID of the room
@param nick nickname of message sender @param nick nickname of message sender
@param message the received message @param message the received message
@return the new message to display, or NULL to preserve the original 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); 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 Called after a private chat room message is displayed
@param barejid Jabber ID of the room @param barejid Jabber ID of the room
@param nick nickname of the message sender @param nick nickname of the message sender
@param message the received message @param message the received message
*/ */
void prof_post_priv_message_display(const char * const barejid, const char * const nick, const char *message); void prof_post_priv_message_display(const char * const barejid, const char * const nick, const char *message);

View File

@ -80,7 +80,7 @@ def prof_pre_chat_message_display(barejid, resource, message):
:type barejid: str or unicode :type barejid: str or unicode
:type resource: str or unicode :type resource: str or unicode
:type message: str or unicode :type message: str or unicode
:return: the new message to display, or ``None`` to preserve the original message :return: the new message to display, or ``None`` to preserve the original message
:rtype: str or unicode :rtype: str or unicode
""" """
pass pass
@ -132,7 +132,7 @@ def prof_pre_room_message_display(barejid, nick, message):
:type barejid: str or unicode :type barejid: str or unicode
:type nick: str or unicode :type nick: str or unicode
:type message: str or unicode :type message: str or unicode
:return: the new message to display, or ``None`` to preserve the original message :return: the new message to display, or ``None`` to preserve the original message
:rtype: str or unicode :rtype: str or unicode
""" """
pass pass
@ -142,7 +142,7 @@ def prof_post_room_message_display(barejid, nick, message):
"""Called after a chat room message is displayed """Called after a chat room message is displayed
:param barejid: Jabber ID of the room :param barejid: Jabber ID of the room
:param nick: nickname of the message sender :param nick: nickname of the message sender
:param message: the received message :param message: the received message
:type barejid: str or unicode :type barejid: str or unicode
:type nick: str or unicode :type nick: str or unicode
@ -199,7 +199,7 @@ def prof_pre_priv_message_display(barejid, nick, message):
:type barejid: str or unicode :type barejid: str or unicode
:type nick: str or unicode :type nick: str or unicode
:type message: str or unicode :type message: str or unicode
:return: the new message to display, or ``None`` to preserve the original message :return: the new message to display, or ``None`` to preserve the original message
:rtype: str or unicode :rtype: str or unicode
""" """
pass pass
@ -209,7 +209,7 @@ def prof_post_priv_message_display(barejid, nick, message):
"""Called after a private chat room message is displayed """Called after a private chat room message is displayed
:param barejid: Jabber ID of the room :param barejid: Jabber ID of the room
:param nick: nickname of the message sender :param nick: nickname of the message sender
:param message: the received message :param message: the received message
:type barejid: str or unicode :type barejid: str or unicode
:type nick: str or unicode :type nick: str or unicode

View File

@ -9,14 +9,14 @@ Profanity accepts both ``str`` and ``unicode`` objects as string arguments, to a
""" """
def cons_alert(): def cons_alert():
""" """
Highlights the console window in the status bar. Highlights the console window in the status bar.
""" """
pass pass
def cons_show(message): def cons_show(message):
"""Show a message in the console window. """Show a message in the console window.
:param message: the message to print :param message: the message to print
@ -29,7 +29,7 @@ def cons_show(message):
pass pass
def cons_show_themed(group, key, default, message): def cons_show_themed(group, key, default, message):
"""Show a message in the console, using the specified theme.\n """Show a message in the console, using the specified theme.\n
Themes are specified in ``~/.local/share/profanity/plugin_themes`` Themes are specified in ``~/.local/share/profanity/plugin_themes``
@ -49,7 +49,7 @@ def cons_show_themed(group, key, default, message):
pass pass
def cons_bad_cmd_usage(command): def cons_bad_cmd_usage(command):
"""Show a message indicating the command has been called incorrectly. """Show a message indicating the command has been called incorrectly.
:param command: the command name with leading slash, e.g. ``"/say"`` :param command: the command name with leading slash, e.g. ``"/say"``
@ -62,7 +62,7 @@ def cons_bad_cmd_usage(command):
pass pass
def register_command(name, min_args, max_args, synopsis, description, arguments, examples, callback): def register_command(name, min_args, max_args, synopsis, description, arguments, examples, callback):
"""Register a new command, with help information, and callback for command execution.\n """Register a new command, with help information, and callback for command execution.\n
Profanity will do some basic validation when the command is called using the argument range. Profanity will do some basic validation when the command is called using the argument range.
@ -82,7 +82,7 @@ def register_command(name, min_args, max_args, synopsis, description, arguments,
:type arguments: list of list of str or unicode :type arguments: list of list of str or unicode
:type examples: list of str or unicode :type examples: list of str or unicode
:type callback: function :type callback: function
Example: Example:
:: ::
synopsis = [ synopsis = [
@ -100,14 +100,14 @@ def register_command(name, min_args, max_args, synopsis, description, arguments,
"/newcommand action1", "/newcommand action1",
"/newcommand print \\"Test debug message\\"", "/newcommand print \\"Test debug message\\"",
"/newcommand dosomething" "/newcommand dosomething"
] ]
prof.register_command("/newcommand", 1, 2, synopsis, description, args, examples, my_function) prof.register_command("/newcommand", 1, 2, synopsis, description, args, examples, my_function)
""" """
pass pass
def register_timed(callback, interval): def register_timed(callback, interval):
"""Register a function that Profanity will call periodically. """Register a function that Profanity will call periodically.
:param callback: the function to call :param callback: the function to call
@ -132,15 +132,15 @@ def completer_add(key, items):
Examples: Examples:
:: ::
prof.completer_add("/mycommand", [ prof.completer_add("/mycommand", [
"action1", "action1",
"action2", "action2",
"dosomething" "dosomething"
]) ])
prof.completer_add("/mycommand dosomething", [ prof.completer_add("/mycommand dosomething", [
"thing1", "thing1",
"thing2" "thing2"
]) ])
""" """
pass pass
@ -156,7 +156,7 @@ def completer_remove(key, items):
Examples: Examples:
:: ::
prof.completer_remove("/mycommand", [ prof.completer_remove("/mycommand", [
"action1", "action1",
"action2" "action2"
]) ])
@ -196,7 +196,7 @@ def filepath_completer_add(prefix):
pass pass
def send_line(line): def send_line(line):
"""Send a line of input to Profanity to execute. """Send a line of input to Profanity to execute.
:param line: the line to send :param line: the line to send
@ -209,7 +209,7 @@ def send_line(line):
pass pass
def notify(message, timeout, category): def notify(message, timeout, category):
"""Send a desktop notification. """Send a desktop notification.
:param message: the message to display in the notification :param message: the message to display in the notification
@ -226,7 +226,7 @@ def notify(message, timeout, category):
pass pass
def get_current_recipient(): def get_current_recipient():
"""Retrieve the Jabber ID of the current chat recipient, when in a chat window. """Retrieve the Jabber ID of the current chat recipient, when in a chat window.
:return: the Jabber ID of the current chat recipient e.g. ``"buddy@chat.org"``, or ``None`` if not in a chat window. :return: the Jabber ID of the current chat recipient e.g. ``"buddy@chat.org"``, or ``None`` if not in a chat window.
@ -235,7 +235,7 @@ def get_current_recipient():
pass pass
def get_current_muc(): def get_current_muc():
"""Retrieve the Jabber ID of the current room, when in a chat room window. """Retrieve the Jabber ID of the current room, when in a chat room window.
:return: the Jabber ID of the current chat room e.g. ``"metalchat@conference.chat.org"``, or ``None`` if not in a chat room window. :return: the Jabber ID of the current chat room e.g. ``"metalchat@conference.chat.org"``, or ``None`` if not in a chat room window.
@ -244,7 +244,7 @@ def get_current_muc():
pass pass
def get_current_nick(): def get_current_nick():
"""Retrieve the users nickname in a chat room, when in a chat room window. """Retrieve the users nickname in a chat room, when in a chat room window.
:return: the users nickname in the current chat room e.g. ``"eddie"``, or ``None`` if not in a chat room window. :return: the users nickname in the current chat room e.g. ``"eddie"``, or ``None`` if not in a chat room window.
@ -271,7 +271,7 @@ def get_barejid_from_roster(name):
pass pass
def get_current_occupants(): def get_current_occupants():
"""Retrieve nicknames of all occupants in a chat room, when in a chat room window. """Retrieve nicknames of all occupants in a chat room, when in a chat room window.
:return: nicknames of all occupants in the current room or an empty list if not in a chat room window. :return: nicknames of all occupants in the current room or an empty list if not in a chat room window.
@ -307,7 +307,7 @@ def log_debug(message):
pass pass
def log_info(): def log_info():
"""Write to the Profanity log at level ``INFO``. """Write to the Profanity log at level ``INFO``.
:param message: the message to log :param message: the message to log
@ -316,7 +316,7 @@ def log_info():
pass pass
def log_warning(): def log_warning():
"""Write to the Profanity log at level ``WARNING``. """Write to the Profanity log at level ``WARNING``.
:param message: the message to log :param message: the message to log
@ -325,7 +325,7 @@ def log_warning():
pass pass
def log_error(): def log_error():
"""Write to the Profanity log at level ``ERROR``. """Write to the Profanity log at level ``ERROR``.
:param message: the message to log :param message: the message to log
@ -337,7 +337,7 @@ def log_error():
def win_exists(tag): def win_exists(tag):
"""Determine whether or not a plugin window currently exists for the tag. """Determine whether or not a plugin window currently exists for the tag.
:param tag: The tag used when creating the plugin window :param tag: The tag used when creating the plugin window
:type tag: str or unicode :type tag: str or unicode
:return: ``True`` if the window exists, ``False`` otherwise. :return: ``True`` if the window exists, ``False`` otherwise.
:rtype: boolean :rtype: boolean
@ -349,12 +349,12 @@ def win_exists(tag):
pass pass
def win_create(tag, callback): def win_create(tag, callback):
"""Create a plugin window. """Create a plugin window.
:param tag: The tag used to refer to the window :param tag: The tag used to refer to the window
:type tag: str or unicode :type tag: str or unicode
:param callback: function to call when the window receives input :param callback: function to call when the window receives input
:type callback: function :type callback: function
Example: Example:
@ -364,10 +364,10 @@ def win_create(tag, callback):
pass pass
def win_focus(tag): def win_focus(tag):
"""Focus a plugin window. """Focus a plugin window.
:param tag: The tag of the window to focus :param tag: The tag of the window to focus
:type tag: str or unicode :type tag: str or unicode
Example: Example:
@ -377,7 +377,7 @@ def win_focus(tag):
pass pass
def win_show(tag, message): def win_show(tag, message):
"""Show a message in the plugin window. """Show a message in the plugin window.
:param tag: The tag of the window to display the message :param tag: The tag of the window to display the message
@ -392,7 +392,7 @@ def win_show(tag, message):
pass pass
def win_show_themed(tag, group, key, default, message): def win_show_themed(tag, group, key, default, message):
"""Show a message in the plugin window, using the specified theme.\n """Show a message in the plugin window, using the specified theme.\n
Themes are specified in ``~/.local/share/profanity/plugin_themes`` Themes are specified in ``~/.local/share/profanity/plugin_themes``

View File

@ -1,4 +1,3 @@
#!/bin/sh #!/bin/sh
./configure --enable-python-plugins --enable-c-plugins CFLAGS='-g -O0' CXXFLAGS='-g -O0' ./configure --enable-python-plugins --enable-c-plugins CFLAGS='-g -O0' CXXFLAGS='-g -O0'

View File

@ -74,5 +74,3 @@ related to gnupg itself.
## Appendix ## Appendix
* https://xmpp.org/extensions/xep-0373.html - 0.4.0 (2018-07-30) * https://xmpp.org/extensions/xep-0373.html - 0.4.0 (2018-07-30)

View File

@ -19,7 +19,7 @@ BuildRequires: expat-devel
BuildRequires: libotr-devel BuildRequires: libotr-devel
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: sqlite3-devel >= 3.27.0 BuildRequires: sqlite3-devel >= 3.27.0
BuildRequires: libsignal-protocol-c-devel >= 2.3.2 BuildRequires: libsignal-protocol-c-devel >= 2.3.2
Requires: libstrophe Requires: libstrophe
Requires: libcurl Requires: libcurl
Requires: ncurses-libs Requires: ncurses-libs
@ -29,7 +29,7 @@ Requires: expat
Requires: libotr Requires: libotr
Requires: gnutls Requires: gnutls
Requires: sqlite3-devel >= 3.27.0 Requires: sqlite3-devel >= 3.27.0
Requires: libsignal-protocol-c-devel >= 2.3.2 Requires: libsignal-protocol-c-devel >= 2.3.2
%description %description
Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi.

View File

@ -4,4 +4,3 @@ void send_disable_carbons(void **state);
void receive_carbon(void **state); void receive_carbon(void **state);
void receive_self_carbon(void **state); void receive_self_carbon(void **state);
void receive_private_carbon(void **state); void receive_private_carbon(void **state);

View File

@ -4,4 +4,3 @@ void sends_message_to_fulljid_when_received_from_fulljid(void **state);
void sends_subsequent_messages_to_fulljid(void **state); void sends_subsequent_messages_to_fulljid(void **state);
void resets_to_barejid_after_presence_received(void **state); void resets_to_barejid_after_presence_received(void **state);
void new_session_when_message_received_from_different_fulljid(void **state); void new_session_when_message_received_from_different_fulljid(void **state);

View File

@ -3,4 +3,3 @@ void connect_jid_sends_presence_after_receiving_roster(void **state);
void connect_jid_requests_bookmarks(void **state); void connect_jid_requests_bookmarks(void **state);
void connect_bad_password(void **state); void connect_bad_password(void **state);
void connect_shows_presence_updates(void **state); void connect_shows_presence_updates(void **state);

View File

@ -1,4 +1,3 @@
void does_not_send_receipt_request_to_barejid(void **state); void does_not_send_receipt_request_to_barejid(void **state);
void send_receipt_request(void **state); void send_receipt_request(void **state);
void send_receipt_on_request(void **state); void send_receipt_on_request(void **state);

View File

@ -1,2 +1 @@
void rooms_query(void **state); void rooms_query(void **state);

View File

@ -4,4 +4,3 @@ void shows_message_when_software_version_error(void **state);
void display_software_version_result_when_from_domainpart(void **state); void display_software_version_result_when_from_domainpart(void **state);
void show_message_in_chat_window_when_no_resource(void **state); void show_message_in_chat_window_when_no_resource(void **state);
void display_software_version_result_in_chat(void **state); void display_software_version_result_in_chat(void **state);

View File

@ -153,4 +153,3 @@ statusbar.tablen=7
statusbar.show.name=true statusbar.show.name=true
statusbar.show.number=true statusbar.show.number=true
correction.char=+ correction.char=+

View File

@ -144,4 +144,3 @@ titlebar.position=1
mainwin.position=2 mainwin.position=2
statusbar.position=3 statusbar.position=3
inputwin.position=4 inputwin.position=4

View File

@ -140,4 +140,3 @@ titlebar.position=1
mainwin.position=2 mainwin.position=2
statusbar.position=3 statusbar.position=3
inputwin.position=4 inputwin.position=4

View File

@ -62,4 +62,3 @@ titlebar.position=1
mainwin.position=2 mainwin.position=2
statusbar.position=3 statusbar.position=3
inputwin.position=4 inputwin.position=4

View File

@ -78,4 +78,3 @@ roster.room.mention=bold_green
roster.room.trigger=bold_green roster.room.trigger=bold_green
occupants.header=bold_green occupants.header=bold_green
receipt.sent=bold_black receipt.sent=bold_black