From 7d6afff01c04805dc569525e0d6bd417abaa9b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Thu, 27 Jun 2024 21:53:32 +0200 Subject: [PATCH] relay: add line id in buffer lines sent to clients with weechat protocol --- CHANGELOG.md | 1 + doc/en/weechat_relay_weechat.en.adoc | 3 +++ doc/fr/weechat_relay_weechat.fr.adoc | 3 +++ doc/ja/weechat_relay_weechat.ja.adoc | 4 ++++ doc/sr/weechat_relay_weechat.sr.adoc | 4 ++++ src/plugins/relay/weechat/relay-weechat-protocol.c | 2 +- 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4a875968..135799904 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - relay: add option `addreplace` in commands `/relay` and `/remote` ([#2095](https://github.com/weechat/weechat/issues/2095)) - core: allow buffer id in commands `/buffer` and `/print`, in addition to number and name - relay: enable websocket extension "permessage-deflate" with "api" relay only ([#1549](https://github.com/weechat/weechat/issues/1549)) +- relay: add line id in buffer lines sent to clients with weechat protocol - api: allow NULL value for key in hashtable - doc: rename doc "weechat_relay_protocol" to "weechat_relay_weechat" diff --git a/doc/en/weechat_relay_weechat.en.adoc b/doc/en/weechat_relay_weechat.en.adoc index 7c006d3ff..295661c87 100644 --- a/doc/en/weechat_relay_weechat.en.adoc +++ b/doc/en/weechat_relay_weechat.en.adoc @@ -2042,6 +2042,7 @@ Data sent as hdata: |=== | Name | Type | Description | buffer | pointer | Buffer pointer. +| id | integer | Line identifier. | date | time | Date of message. | date_usec | integer | Microseconds of date. | date_printed | time | Date when WeeChat displayed message. @@ -2062,6 +2063,7 @@ id: '_buffer_line_added' hda: keys: { 'buffer': 'ptr', + 'id': 'int', 'date': 'tim', 'date_usec': 'int', 'date_printed': 'tim', @@ -2077,6 +2079,7 @@ hda: item 1: __path: ['0x4a49600'] buffer: '0x4a715d0' + id: 12 date: 1362728993 date_usec: 902765 date_printed: 1362728993 diff --git a/doc/fr/weechat_relay_weechat.fr.adoc b/doc/fr/weechat_relay_weechat.fr.adoc index 28788fcd1..4fda65863 100644 --- a/doc/fr/weechat_relay_weechat.fr.adoc +++ b/doc/fr/weechat_relay_weechat.fr.adoc @@ -2070,6 +2070,7 @@ Données envoyées dans le hdata : |=== | Nom | Type | Description | buffer | pointeur | Pointeur vers le tampon. +| id | entier | Identifiant de ligne. | date | date/heure | Date du message. | date_usec | entier | Microsecondes de la date. | date_printed | date/heure | Date d'affichage du message. @@ -2091,6 +2092,7 @@ id: '_buffer_line_added' hda: keys: { 'buffer': 'ptr', + 'id': 'int', 'date': 'tim', 'date_usec': 'int', 'date_printed': 'tim', @@ -2106,6 +2108,7 @@ hda: item 1: __path: ['0x4a49600'] buffer: '0x4a715d0' + id: 12 date: 1362728993 date_usec: 902765 date_printed: 1362728993 diff --git a/doc/ja/weechat_relay_weechat.ja.adoc b/doc/ja/weechat_relay_weechat.ja.adoc index e8a1e4a9b..800b0d8bc 100644 --- a/doc/ja/weechat_relay_weechat.ja.adoc +++ b/doc/ja/weechat_relay_weechat.ja.adoc @@ -2078,6 +2078,8 @@ hdata として送られるデータ: |=== | 名前 | 型 | 説明 | buffer | pointer | バッファへのポインタ +// TRANSLATION MISSING +| id | integer | Line identifier. | date | time | メッセージの日付 // TRANSLATION MISSING | date_usec | integer | Microseconds of date. @@ -2101,6 +2103,7 @@ id: '_buffer_line_added' hda: keys: { 'buffer': 'ptr', + 'id': 'int', 'date': 'tim', 'date_used': 'int', 'date_printed': 'tim', @@ -2116,6 +2119,7 @@ hda: item 1: __path: ['0x4a49600'] buffer: '0x4a715d0' + id: 12 date: 1362728993 date_usec: 902765 date_printed: 1362728993 diff --git a/doc/sr/weechat_relay_weechat.sr.adoc b/doc/sr/weechat_relay_weechat.sr.adoc index 45df75f39..0383974fc 100644 --- a/doc/sr/weechat_relay_weechat.sr.adoc +++ b/doc/sr/weechat_relay_weechat.sr.adoc @@ -1941,6 +1941,8 @@ hda: |=== | Име | Тип | Опис | buffer | показивач | Показивач на бафер. +// TRANSLATION MISSING +| id | цео број | Line identifier. | date | време | Датум поруке. | date_usec | цео број | Микросекунде датума. | date_printed | време | Датум када је програм WeeChat приказао поруку. @@ -1961,6 +1963,7 @@ id: '_buffer_line_added' hda: keys: { 'buffer': 'ptr', + 'id': 'int', 'date': 'tim', 'date_usec': 'int', 'date_printed': 'tim', @@ -1976,6 +1979,7 @@ hda: item 1: __path: ['0x4a49600'] buffer: '0x4a715d0' + id: 12 date: 1362728993 date_usec: 902765 date_printed: 1362728993 diff --git a/src/plugins/relay/weechat/relay-weechat-protocol.c b/src/plugins/relay/weechat/relay-weechat-protocol.c index a3668ac4d..79a99e6ba 100644 --- a/src/plugins/relay/weechat/relay-weechat-protocol.c +++ b/src/plugins/relay/weechat/relay-weechat-protocol.c @@ -1120,7 +1120,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data, (unsigned long)ptr_line_data); relay_weechat_msg_add_hdata ( msg, cmd_hdata, - "buffer,date,date_usec,date_printed,date_usec_printed," + "buffer,id,date,date_usec,date_printed,date_usec_printed," "displayed,notify_level,highlight,tags_array," "prefix,message"); relay_weechat_msg_send (ptr_client, msg);