Mercurial > libervia-backend
annotate libervia/cli/cmd_message.py @ 4316:1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
rel 451
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sat, 28 Sep 2024 15:57:31 +0200 |
| parents | 472a938a46e3 |
| children |
| rev | line source |
|---|---|
| 3137 | 1 #!/usr/bin/env python3 |
| 2 | |
| 815 | 3 |
|
4075
47401850dec6
refactoring: rename `libervia.frontends.jp` to `libervia.cli`
Goffi <goffi@goffi.org>
parents:
4074
diff
changeset
|
4 # Libervia CLI |
| 3479 | 5 # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) |
| 815 | 6 |
| 7 # This program is free software: you can redistribute it and/or modify | |
| 8 # it under the terms of the GNU Affero General Public License as published by | |
| 9 # the Free Software Foundation, either version 3 of the License, or | |
| 10 # (at your option) any later version. | |
| 11 | |
| 12 # This program is distributed in the hope that it will be useful, | |
| 13 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 # GNU Affero General Public License for more details. | |
| 16 | |
| 17 # You should have received a copy of the GNU Affero General Public License | |
| 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 | |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
20 from pathlib import Path |
| 2708 | 21 import sys |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
22 |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
23 from twisted.python import filepath |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
24 |
|
4071
4b842c1fb686
refactoring: renamed `sat` package to `libervia.backend`
Goffi <goffi@goffi.org>
parents:
4037
diff
changeset
|
25 from libervia.backend.core.i18n import _ |
|
4b842c1fb686
refactoring: renamed `sat` package to `libervia.backend`
Goffi <goffi@goffi.org>
parents:
4037
diff
changeset
|
26 from libervia.backend.tools.common import data_format |
|
4b842c1fb686
refactoring: renamed `sat` package to `libervia.backend`
Goffi <goffi@goffi.org>
parents:
4037
diff
changeset
|
27 from libervia.backend.tools.common.ansi import ANSI as A |
|
4b842c1fb686
refactoring: renamed `sat` package to `libervia.backend`
Goffi <goffi@goffi.org>
parents:
4037
diff
changeset
|
28 from libervia.backend.tools.utils import clean_ustr |
|
4075
47401850dec6
refactoring: rename `libervia.frontends.jp` to `libervia.cli`
Goffi <goffi@goffi.org>
parents:
4074
diff
changeset
|
29 from libervia.cli import base |
|
47401850dec6
refactoring: rename `libervia.frontends.jp` to `libervia.cli`
Goffi <goffi@goffi.org>
parents:
4074
diff
changeset
|
30 from libervia.cli.constants import Const as C |
|
4074
26b7ed2817da
refactoring: rename `sat_frontends` to `libervia.frontends`
Goffi <goffi@goffi.org>
parents:
4071
diff
changeset
|
31 from libervia.frontends.tools import jid |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
32 |
| 0 | 33 |
| 817 | 34 __commands__ = ["Message"] |
| 393 | 35 |
|
4308
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
36 RECIPIENTS_ARGS = ["to", "cc", "bcc"] |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
37 REPLY_ARGS = ["reply-to", "reply-room"] |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
38 |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
39 |
|
1828
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
40 class Send(base.CommandBase): |
| 817 | 41 def __init__(self, host): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
42 super(Send, self).__init__(host, "send", help=_("send a message to a contact")) |
| 817 | 43 |
| 44 def add_parser_options(self): | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
45 self.parser.add_argument( |
| 3028 | 46 "-l", "--lang", type=str, default="", help=_("language of the message") |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
47 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
48 self.parser.add_argument( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
49 "-s", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
50 "--separate", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
51 action="store_true", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
52 help=_( |
| 3028 | 53 "separate xmpp messages: send one message per line instead of one " |
| 54 "message alone." | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
55 ), |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
56 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
57 self.parser.add_argument( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
58 "-n", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
59 "--new-line", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
60 action="store_true", |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
61 help=_("add a new line at the beginning of the input"), |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
62 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
63 self.parser.add_argument( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
64 "-S", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
65 "--subject", |
| 3028 | 66 help=_("subject of the message"), |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
67 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
68 self.parser.add_argument( |
|
3411
f30b238d9c45
jp: follow best practices and use a dash (`-`) instead of underscore (`_`) for long options.
Goffi <goffi@goffi.org>
parents:
3356
diff
changeset
|
69 "-L", "--subject-lang", type=str, default="", help=_("language of subject") |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
70 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
71 self.parser.add_argument( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
72 "-t", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
73 "--type", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
74 choices=C.MESS_TYPE_STANDARD + (C.MESS_TYPE_AUTO,), |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
75 default=C.MESS_TYPE_AUTO, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
76 help=_("type of the message"), |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
77 ) |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
78 self.parser.add_argument( |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
79 "-e", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
80 "--encrypt", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
81 metavar="ALGORITHM", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
82 help=_("encrypt message using given algorithm"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
83 ) |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
84 self.parser.add_argument( |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
85 "--encrypt-noreplace", |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
86 action="store_true", |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
87 help=_("don't replace encryption algorithm if an other one is already used"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
88 ) |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
89 self.parser.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
90 "-a", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
91 "--attach", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
92 dest="attachments", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
93 action="append", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
94 metavar="FILE_PATH", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
95 help=_("add a file as an attachment"), |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
96 ) |
|
4308
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
97 |
|
4316
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
98 self.parser.add_argument( |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
99 "-k", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
100 "--keyword", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
101 dest="keywords", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
102 action="append", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
103 help=_("add keyword to message"), |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
104 ) |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
105 |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
106 self.parser.add_argument( |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
107 "-H", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
108 "--header", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
109 dest="headers", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
110 action="append", |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
111 nargs=2, |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
112 metavar=("NAME", "VALUE"), |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
113 help=_("add header metadata"), |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
114 ) |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
115 |
|
4308
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
116 addressing_group = self.parser.add_argument_group( |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
117 "addressing commands", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
118 description="Commands to add addressing metadata, and/or to send message to " |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
119 "multiple recipients." |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
120 ) |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
121 for arg_name in RECIPIENTS_ARGS: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
122 addressing_group.add_argument( |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
123 f"--{arg_name}", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
124 nargs="+", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
125 action="append", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
126 metavar=("JID", "DESCRIPTION"), |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
127 help=f'extra "{arg_name.upper()}" recipient(s), may be used several ' |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
128 'times', |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
129 ) |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
130 for arg_name in REPLY_ARGS: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
131 addressing_group.add_argument( |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
132 f"--{arg_name}", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
133 nargs="+", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
134 action="append", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
135 metavar=("JID", "DESCRIPTION"), |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
136 help=f'ask to reply to this JID, may be used several ' |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
137 'times', |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
138 ) |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
139 addressing_group.add_argument( |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
140 "--no-reply", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
141 action="store_true", |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
142 help="flag this message as not requiring replies" |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
143 ) |
|
2081
2265d9df4cfb
jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
144 syntax = self.parser.add_mutually_exclusive_group() |
| 3028 | 145 syntax.add_argument("-x", "--xhtml", action="store_true", help=_("XHTML body")) |
| 146 syntax.add_argument("-r", "--rich", action="store_true", help=_("rich body")) | |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
147 self.parser.add_argument("jid", help=_("the destination jid")) |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
148 |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
149 async def send_stdin(self, dest_jid): |
| 817 | 150 """Send incomming data on stdin to jabber contact |
|
1828
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
151 |
|
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
152 @param dest_jid: destination jid |
|
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
153 """ |
| 817 | 154 header = "\n" if self.args.new_line else "" |
| 3040 | 155 # FIXME: stdin is not read asynchronously at the moment |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
156 stdin_lines = [stream for stream in sys.stdin.readlines()] |
|
2081
2265d9df4cfb
jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
157 extra = {} |
|
1963
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1960
diff
changeset
|
158 if self.args.subject is None: |
|
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1960
diff
changeset
|
159 subject = {} |
|
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1960
diff
changeset
|
160 else: |
|
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1960
diff
changeset
|
161 subject = {self.args.subject_lang: self.args.subject} |
| 817 | 162 |
|
2081
2265d9df4cfb
jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
163 if self.args.xhtml or self.args.rich: |
| 3028 | 164 key = "xhtml" if self.args.xhtml else "rich" |
|
2081
2265d9df4cfb
jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
165 if self.args.lang: |
| 3040 | 166 key = f"{key}_{self.args.lang}" |
| 3028 | 167 extra[key] = clean_ustr("".join(stdin_lines)) |
|
2081
2265d9df4cfb
jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
168 stdin_lines = [] |
|
2265d9df4cfb
jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
169 |
|
4316
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
170 if self.args.headers: |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
171 extra["headers"] = dict(self.args.headers) |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
172 |
|
4308
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
173 addresses = {} |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
174 for arg_name in RECIPIENTS_ARGS + [a.replace("-", "_") for a in REPLY_ARGS]: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
175 values = getattr(self.args, arg_name) |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
176 if values: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
177 for value in values: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
178 address_jid = value[0] |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
179 address_desc = " ".join(value[1:]).strip() |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
180 address = {"jid": address_jid} |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
181 if address_desc: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
182 address["desc"] = address_desc |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
183 addresses.setdefault(arg_name.replace("_", ""), []).append(address) |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
184 |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
185 if self.args.no_reply: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
186 addresses["noreply"] = True |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
187 |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
188 if addresses: |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
189 extra["addresses"] = addresses |
|
472a938a46e3
cli (message/send): add arguments for message addressing:
Goffi <goffi@goffi.org>
parents:
4270
diff
changeset
|
190 |
|
4316
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
191 if self.args.keywords: |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
192 extra["keywords"] = self.args.keywords |
|
1795bfcc38e7
cli (message/send): add arguments to send keywords and headers:
Goffi <goffi@goffi.org>
parents:
4308
diff
changeset
|
193 |
| 3040 | 194 to_send = [] |
| 195 | |
| 196 error = False | |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
197 |
| 3040 | 198 if self.args.separate: |
| 199 # we send stdin in several messages | |
| 0 | 200 if header: |
| 3040 | 201 # first we sent the header |
| 202 try: | |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
203 await self.host.bridge.message_send( |
| 3040 | 204 dest_jid, |
| 205 {self.args.lang: header}, | |
| 206 subject, | |
| 207 self.args.type, | |
| 208 profile_key=self.profile, | |
| 209 ) | |
| 210 except Exception as e: | |
| 211 self.disp(f"can't send header: {e}", error=True) | |
| 212 error = True | |
| 213 | |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
214 to_send.extend( |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
215 {self.args.lang: clean_ustr(l.replace("\n", ""))} for l in stdin_lines |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
216 ) |
| 3040 | 217 else: |
| 218 # we sent all in a single message | |
| 219 if not (self.args.xhtml or self.args.rich): | |
| 220 msg = {self.args.lang: header + clean_ustr("".join(stdin_lines))} | |
| 221 else: | |
| 222 msg = {} | |
| 223 to_send.append(msg) | |
| 224 | |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
225 if self.args.attachments: |
|
4023
78b5f356900c
component AP gateway: handle attachments
Goffi <goffi@goffi.org>
parents:
3925
diff
changeset
|
226 attachments = extra[C.KEY_ATTACHMENTS] = [] |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
227 for attachment in self.args.attachments: |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
228 try: |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
229 file_path = str(Path(attachment).resolve(strict=True)) |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
230 except FileNotFoundError: |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
231 self.disp("file {attachment} doesn't exists, ignoring", error=True) |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
232 else: |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
233 attachments.append({"path": file_path}) |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
234 |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
235 for idx, msg in enumerate(to_send): |
|
4023
78b5f356900c
component AP gateway: handle attachments
Goffi <goffi@goffi.org>
parents:
3925
diff
changeset
|
236 if idx > 0 and C.KEY_ATTACHMENTS in extra: |
|
3925
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
237 # if we send several messages, we only want to send attachments with the |
|
900bf04d87c8
cli (message/send): new `--attach` argument to send an attachment:
Goffi <goffi@goffi.org>
parents:
3887
diff
changeset
|
238 # first one |
|
4023
78b5f356900c
component AP gateway: handle attachments
Goffi <goffi@goffi.org>
parents:
3925
diff
changeset
|
239 del extra[C.KEY_ATTACHMENTS] |
| 3040 | 240 try: |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
241 await self.host.bridge.message_send( |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
242 dest_jid, |
| 3040 | 243 msg, |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
244 subject, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
245 self.args.type, |
|
3179
84a94b385760
bridge: messageSend's extra is now serialised
Goffi <goffi@goffi.org>
parents:
3137
diff
changeset
|
246 data_format.serialise(extra), |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
247 profile_key=self.host.profile, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
248 ) |
| 3040 | 249 except Exception as e: |
| 250 self.disp(f"can't send message {msg!r}: {e}", error=True) | |
| 251 error = True | |
| 0 | 252 |
| 3040 | 253 if error: |
| 254 # at least one message sending failed | |
| 255 self.host.quit(C.EXIT_BRIDGE_ERRBACK) | |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
256 |
| 3040 | 257 self.host.quit() |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
258 |
| 3040 | 259 async def start(self): |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
260 if self.args.xhtml and self.args.separate: |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
261 self.disp( |
| 3028 | 262 "argument -s/--separate is not compatible yet with argument -x/--xhtml", |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
263 error=True, |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
264 ) |
| 3040 | 265 self.host.quit(C.EXIT_BAD_ARG) |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
266 |
| 3040 | 267 jids = await self.host.check_jids([self.args.jid]) |
|
2740
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
268 jid_ = jids[0] |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
269 |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
270 if self.args.encrypt_noreplace and self.args.encrypt is None: |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
271 self.parser.error("You need to use --encrypt if you use --encrypt-noreplace") |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
272 |
|
8fd8ce5a5855
jp (message/send, encryption): encryption handling:
Goffi <goffi@goffi.org>
parents:
2719
diff
changeset
|
273 if self.args.encrypt is not None: |
| 3040 | 274 try: |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
275 namespace = await self.host.bridge.encryption_namespace_get( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
276 self.args.encrypt |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
277 ) |
| 3040 | 278 except Exception as e: |
| 279 self.disp(f"can't get encryption namespace: {e}", error=True) | |
| 280 self.host.quit(C.EXIT_BRIDGE_ERRBACK) | |
| 281 | |
| 282 try: | |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
283 await self.host.bridge.message_encryption_start( |
| 3040 | 284 jid_, namespace, not self.args.encrypt_noreplace, self.profile |
| 285 ) | |
| 286 except Exception as e: | |
| 287 self.disp(f"can't start encryption session: {e}", error=True) | |
| 288 self.host.quit(C.EXIT_BRIDGE_ERRBACK) | |
| 289 | |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
290 await self.send_stdin(jid_) |
|
1828
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
291 |
|
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
292 |
|
3805
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
293 class Retract(base.CommandBase): |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
294 |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
295 def __init__(self, host): |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
296 super().__init__(host, "retract", help=_("retract a message")) |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
297 |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
298 def add_parser_options(self): |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
299 self.parser.add_argument("message_id", help=_("ID of the message (internal ID)")) |
|
3805
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
300 |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
301 async def start(self): |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
302 try: |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
303 await self.host.bridge.message_retract(self.args.message_id, self.profile) |
|
3805
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
304 except Exception as e: |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
305 self.disp(f"can't retract message: {e}", error=True) |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
306 self.host.quit(C.EXIT_BRIDGE_ERRBACK) |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
307 else: |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
308 self.disp( |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
309 "message retraction has been requested, please note that this is a " |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
310 "request which can't be enforced (see documentation for details)." |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
311 ) |
|
3805
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
312 self.host.quit(C.EXIT_OK) |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
313 |
|
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
314 |
| 2708 | 315 class MAM(base.CommandBase): |
| 316 | |
| 317 def __init__(self, host): | |
| 318 super(MAM, self).__init__( | |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
319 host, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
320 "mam", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
321 use_output=C.OUTPUT_MESS, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
322 use_verbose=True, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
323 help=_("query archives using MAM"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
324 ) |
| 2708 | 325 |
| 326 def add_parser_options(self): | |
| 327 self.parser.add_argument( | |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
328 "-s", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
329 "--service", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
330 default="", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
331 help=_("jid of the service (default: profile's server"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
332 ) |
| 2708 | 333 self.parser.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
334 "-S", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
335 "--start", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
336 dest="mam_start", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
337 type=base.date_decoder, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
338 help=_("start fetching archive from this date (default: from the beginning)"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
339 ) |
| 2708 | 340 self.parser.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
341 "-E", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
342 "--end", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
343 dest="mam_end", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
344 type=base.date_decoder, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
345 help=_("end fetching archive after this date (default: no limit)"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
346 ) |
| 2708 | 347 self.parser.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
348 "-W", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
349 "--with", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
350 dest="mam_with", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
351 help=_("retrieve only archives with this jid"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
352 ) |
| 2708 | 353 self.parser.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
354 "-m", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
355 "--max", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
356 dest="rsm_max", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
357 type=int, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
358 default=20, |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
359 help=_("maximum number of items to retrieve, using RSM (default: 20))"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
360 ) |
|
2819
fd45089b3a92
jp (message/mam): added missing RSM options
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
361 rsm_page_group = self.parser.add_mutually_exclusive_group() |
|
fd45089b3a92
jp (message/mam): added missing RSM options
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
362 rsm_page_group.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
363 "-a", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
364 "--after", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
365 dest="rsm_after", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
366 help=_("find page after this item"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
367 metavar="ITEM_ID", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
368 ) |
|
2819
fd45089b3a92
jp (message/mam): added missing RSM options
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
369 rsm_page_group.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
370 "-b", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
371 "--before", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
372 dest="rsm_before", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
373 help=_("find page before this item"), |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
374 metavar="ITEM_ID", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
375 ) |
|
2819
fd45089b3a92
jp (message/mam): added missing RSM options
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
376 rsm_page_group.add_argument( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
377 "--index", dest="rsm_index", type=int, help=_("index of the page to retrieve") |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
378 ) |
| 2708 | 379 |
| 3040 | 380 async def start(self): |
| 381 extra = {} | |
| 382 if self.args.mam_start is not None: | |
| 383 extra["mam_start"] = float(self.args.mam_start) | |
| 384 if self.args.mam_end is not None: | |
| 385 extra["mam_end"] = float(self.args.mam_end) | |
| 386 if self.args.mam_with is not None: | |
| 387 extra["mam_with"] = self.args.mam_with | |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
388 for suff in ("max", "after", "before", "index"): |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
389 key = "rsm_" + suff |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
390 value = getattr(self.args, key) |
| 3040 | 391 if value is not None: |
| 392 extra[key] = str(value) | |
| 393 try: | |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
394 data, metadata_s, profile = await self.host.bridge.mam_get( |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
395 self.args.service, data_format.serialise(extra), self.profile |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
396 ) |
| 3040 | 397 except Exception as e: |
| 398 self.disp(f"can't retrieve MAM archives: {e}", error=True) | |
| 399 self.host.quit(C.EXIT_BRIDGE_ERRBACK) | |
| 400 | |
|
3356
569f4cf7183b
plugin XEP-0313: fixed `MAMGet` signature
Goffi <goffi@goffi.org>
parents:
3179
diff
changeset
|
401 metadata = data_format.deserialise(metadata_s) |
|
569f4cf7183b
plugin XEP-0313: fixed `MAMGet` signature
Goffi <goffi@goffi.org>
parents:
3179
diff
changeset
|
402 |
| 3040 | 403 try: |
|
4037
524856bd7b19
massive refactoring to switch from camelCase to snake_case:
Goffi <goffi@goffi.org>
parents:
4023
diff
changeset
|
404 session_info = await self.host.bridge.session_infos_get(self.profile) |
| 3040 | 405 except Exception as e: |
| 406 self.disp(f"can't get session infos: {e}", error=True) | |
| 407 self.host.quit(C.EXIT_BRIDGE_ERRBACK) | |
| 408 | |
| 409 # we need to fill own_jid for message output | |
| 3028 | 410 self.host.own_jid = jid.JID(session_info["jid"]) |
| 3040 | 411 |
| 412 await self.output(data) | |
| 413 | |
|
2719
45189c8bd165
jp (message/mam): display metadata when verbose
Goffi <goffi@goffi.org>
parents:
2708
diff
changeset
|
414 # FIXME: metadata are not displayed correctly and don't play nice with output |
|
45189c8bd165
jp (message/mam): display metadata when verbose
Goffi <goffi@goffi.org>
parents:
2708
diff
changeset
|
415 # they should be added to output data somehow |
|
45189c8bd165
jp (message/mam): display metadata when verbose
Goffi <goffi@goffi.org>
parents:
2708
diff
changeset
|
416 if self.verbosity: |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
417 for value in ( |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
418 "rsm_first", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
419 "rsm_last", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
420 "rsm_index", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
421 "rsm_count", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
422 "mam_complete", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
423 "mam_stable", |
|
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
424 ): |
|
2719
45189c8bd165
jp (message/mam): display metadata when verbose
Goffi <goffi@goffi.org>
parents:
2708
diff
changeset
|
425 if value in metadata: |
| 3028 | 426 label = value.split("_")[1] |
|
4270
0d7bb4df2343
Reformatted code base using black.
Goffi <goffi@goffi.org>
parents:
4075
diff
changeset
|
427 self.disp(A.color(C.A_HEADER, label, ": ", A.RESET, metadata[value])) |
|
2719
45189c8bd165
jp (message/mam): display metadata when verbose
Goffi <goffi@goffi.org>
parents:
2708
diff
changeset
|
428 |
| 2708 | 429 self.host.quit() |
| 430 | |
| 431 | |
|
1828
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
432 class Message(base.CommandBase): |
|
3805
33ab258df0de
cli (message/retract): message retractation command:
Goffi <goffi@goffi.org>
parents:
3479
diff
changeset
|
433 subcommands = (Send, Retract, MAM) |
|
1828
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
434 |
|
cb4be663a4a7
jp (message): message is now a subcommand, and the sending command is moved to message/send
Goffi <goffi@goffi.org>
parents:
1766
diff
changeset
|
435 def __init__(self, host): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
436 super(Message, self).__init__( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
437 host, "message", use_profile=False, help=_("messages handling") |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
438 ) |