about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Fix stanza_get_child_by_name_and_ns() if no nameMichael Vetter2019-11-121-1/+3
| | | | Fix bug introduced in 68af0aad65d243e654866eac5a7cd728ee293aa0.
* Merge /chlog and /grlog commands into /loggingMichael Vetter2019-11-126-56/+67
| | | | | | | Instead of `/chlog on` we now have `/logging chat on`. Instead of `/grlog on` we now have `/logging group on`. Fix https://github.com/profanity-im/profanity/issues/1224
* Merge pull request #1222 from mdosch/masterMichael Vetter2019-11-081-0/+82
|\ | | | | Add (experimental) solarized-light theme
| * Add (experimental) solarized-light themeMartin Dosch2019-11-081-0/+82
| | | | | | | | | | | | | | | | | | This theme should (when finished) look well with the solarized-light color scheme. It is still very rough and needs a lot of polishing but I will try to improve it when I find time. Otherwise it might be start for someone using solarized-light to improve it.
* | _handle_groupchat(): get correct origin-id stanzaMichael Vetter2019-11-083-2/+22
|/ | | | | | | | | | | | | | | | | | The problem is that in _handle_groupchat() we look for STANZA_NS_STABLE_ID which will result in origin-id or stanza-id. It seems like prosody servers send origin-id first, so this worked in all my tests. But actually we cannot be sure of the order. So far we stopped after the first element was found. I only found xmpp_stanza_get_child_by_ns() and xmpp_stanza_get_child_by_name() in libstrophe. But we need a combination of both. So I created stanza_get_child_by_name_and_ns() for Profanity. I need to remember to upstream this to libstrophe later (if they really don't have such a function). Fix https://github.com/profanity-im/profanity/issues/1223
* cmd_room: don't check arguments twiceMichael Vetter2019-11-081-13/+4
|
* Fix setting of status messageMichael Vetter2019-11-072-2/+6
| | | | | | | | | Seems this actually never worked. Now it does. `/status set online "This is my text"` `/status set away bye` `/status set away`
* Merge state commands (online, away) into statusMichael Vetter2019-11-064-141/+113
| | | | | | | | | | | | Before we had `/online`, `/away`, `/dnd`, `/chat`, `/xa`. These commands are no longer available. We have `/status set online` etc now. Before `/status` was used to get the status of a contact. This now moved to `/status get`. Regards https://github.com/profanity-im/profanity/issues/1116
* Fix formatting for invite command helpMichael Vetter2019-11-051-1/+1
|
* Add cons_titlebar_setting stubMichael Vetter2019-11-051-1/+1
| | | | and remove encwarn one.
* Merge /invite, /invites and /decline commandsMichael Vetter2019-11-055-86/+86
| | | | | | | | | | `/invite <contact>` became `/invite send <contact>. `/invites` became `/invite list`. `/decline` became `/invite decline`. Accept is still done via `/join`. Regards https://github.com/profanity-im/profanity/issues/1116
* Add `/titlebar show presence` commandMichael Vetter2019-11-053-0/+13
| | | | | | | Additionally to `/presence titlebar on` we now allow the setting via /titlebar show|hide presence` since it's about the titlebar. Regards https://github.com/profanity-im/profanity/issues/1116
* Display resource information in `/titlebar`Michael Vetter2019-11-051-0/+6
|
* Add `/titlebar show resource` commandMichael Vetter2019-11-053-3/+10
| | | | | | | | | | | Additionally to `/resource titlebar on` we now allow the setting via /titlebar show|hide resource` since it's about the titlebar. But makes sense to have it in `/resource` too because there is `/resource message on|off` too. And this one doesnt have an setting of it's own. Regards https://github.com/profanity-im/profanity/issues/1116
* Move /encwarn command into /titlebarMichael Vetter2019-11-056-58/+49
| | | | | | Instead of `/encwarn on|off` we now have `/titlebar show|hide encwarn`. Regards https://github.com/profanity-im/profanity/issues/1116
* Add my GitHub Sponsors URLMichael Vetter2019-11-051-1/+1
|
* Fix add_history usage in down arrow handlerMichael Vetter2019-11-051-4/+1
| | | | | | | | | | | | | | [Programming with GNU History](http://www.math.utah.edu/docs/info/hist_2.html) mentions using_history(). Chet, maintainer of readline told me about it. (Thanks Chet!) Seems like we need to call this so that the history offset is at the right end of the list. I assume it's called in the linehandler automatically. Fix https://github.com/profanity-im/profanity/issues/200
* Store current input line in historyMichael Vetter2019-11-051-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regards https://github.com/profanity-im/profanity/issues/200 This doesn't work yet. And I have no idea why. Weird behaviour: - start profanity - type 'ASDF' - ctrl+arrow down -> text vanishes (like intended) - arrow up -> nothing happens (intended is that the last history item [ASDF] appears) - type 'ABC' - press enter - arrow up -> ABC appears - enter - type 'UUU' - ctrl+arrow down - type 'ZZZ' - enter - arrow up - ZZZ appears - arrow up - UUU appears So in the latter case we added to history and deleted from the input line and then immediately entered new text and pressed enter, to add this to the history too. When we do this the not sent text succesfully was stored in history.
* Move `tls show` to titlebar commandMichael Vetter2019-11-054-23/+72
| | | | | | | | | | | Previously we had `/tls show on|off` to manipulate the UI setting for the title bar. To decide whether to show TLS info there or not. This should go into `/titlebar`. Now we have `/titlebar show|hide tls` for this. Regards https://github.com/profanity-im/profanity/issues/1116
* Initialize ProfBufEntry->id correctlyMichael Vetter2019-11-011-1/+5
|
* Move id from DeliveryReceipt to ProfBuffEntry structMichael Vetter2019-11-013-26/+24
| | | | | | | | | | | | | | | | | XEP-0184: Message Delivery Receipts, *requires* the id attribute. Generally this is not the case. For this reason the id was only present in the DeliveryReceipt struct since it was only used for XEP-0184. For https://github.com/profanity-im/profanity/issues/660 XEP-0313 MAM and https://github.com/profanity-im/profanity/issues/805 XEP-0308 Last Message Correction we will also need the id. So in preparation for further work let's move the id to the general ProfBuffEntry. We will need to adapt code so that we actually always write the ID if we receive one.
* Remove not needed if blocksMichael Vetter2019-11-011-9/+2
|
* Don't override ProfMessage Id with origin-idMichael Vetter2019-10-315-22/+46
| | | | | | | | | | Profanity sends the same value for both. Other clients might not. Safe both since we could need them later. Once we implement Last Message Correction we will need the regular id. If we override it with origin-id and another client chooses to not use the same value for id and origin-id then we can't interpret the id sent with the LMC request correctly.
* Replace sent_messages list with algoMichael Vetter2019-10-314-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For OMEMO we had a list with our sent messages. It was used so that we don't decrypt our own messages in MUCs that come in via reflection. Recently for https://github.com/profanity-im/profanity/pull/1209 we started to use origin-id and use an algorithm so we can detect our own sent messages via checking origin-id. Profanity uses the same id for the message ID and origin-id. With 06f300a42c4c627b6f1817bd48d92f083ffd9883 we added the message_is_sent_by_us() function. We implemented XEP-0359 this way to fix https://github.com/profanity-im/profanity/issues/1201 so that we don't log our own messages in MUCs twice. We can now check whether the message was sent by us using this function and can get rid of the list. Probably we could also put many parts of the sv_ev_room_message() function inside (else) part of `if (!(g_strcmp0(mynick, message->jid->resourcepart) == 0 && message_is_sent_by_us(message))) {`. Have to look more closely whether any of this needs to be run in case the message actually comes from us.
* Merge pull request #1217 from aszlig/omemo-check-element-namesMichael Vetter2019-10-301-0/+8
|\ | | | | omemo: Check stanza names when iterating nodes
| * omemo: Check stanza names when iterating nodesaszlig2019-10-291-0/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some clients (eg. PSI) are sending the stanzas delimited by whitespace text nodes, which will fail while looping through the <prekeys/> children and also print weird errors when iterating through the <list/> of devices. When debugging this, I was looking at the XML of Gajim and PSI and first was somehow confused why Profanity printed "OMEMO: received device without ID" while the XML looked identical (minus the actual IDs and the JIDs of course). However, Gajim was sending the XML without whitespace nodes in between and PSI did not, so for example the following (with the relevant whitespace nodes marked with X): <message type="headline" to="..." from="..."> <event xmlns="http://jabber.org/protocol/pubsub#event"> <items type="headline" node="eu.siacs.conversations.axolotl.devicelist"> <item id="..."> <list xmlns="eu.siacs.conversations.axolotl"> X <device id="..."/> X <device id="..."/> X </list> </item> </items> </event> <delay xmlns="urn:xmpp:delay" stamp="..." from="..."/> </message> ... would result in three times the "OMEMO: received device without ID" error, because we actually have three XML text nodes here that obviously don't have an "id" attribute. Now since the <list/> children above aren't really a problem and only annoying, text nodes in the <prekeys/> stanza actually cause omemo_start_device_session_handle_bundle to return failure. I've fixed this by explicitly matching the stanza names we are interested in, skipping everything else. Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @devhell
* Put ifdef around tray.h functionsMichael Vetter2019-10-292-9/+8
| | | | Only define in case we built with GTK support.
* Remove not neede gtk_init() in tray.cMichael Vetter2019-10-291-1/+0
| | | | gtk_init_check() already has that functionality.
* Remove commentsMichael Vetter2019-10-291-6/+0
|
* Merge pull request #1216 from profanity-im/feature/issue-156-clipboardMichael Vetter2019-10-297-5/+179
|\ | | | | Paste command
| * Dont use clipboard_init yetMichael Vetter2019-10-292-1/+4
| | | | | | | | | | | | For now we initialize gtk in tray_init(). Should maybe use a general function and check in tray_init and clipboard_init whether gtk was already initialized.
| * Send clipboard via /pasteMichael Vetter2019-10-291-2/+34
| | | | | | | | | | | | New command `/paste` that sends the clipboard in MUC, Chat etc windows. Fix https://github.com/profanity-im/profanity/issues/156
| * Adjust tray configure switch to also include clipboardMichael Vetter2019-10-292-5/+7
| | | | | | | | General GTK.
| * Add clipboard featureMichael Vetter2019-10-295-0/+137
|/ | | | | Use GTK to take the text from the clipboard. Add `/paste` command which pastes this text now to console window.
* Update chat_log_pgp_msg_out() usageMichael Vetter2019-10-291-6/+6
| | | | Fix build
* Adjust message stubs in unit testsMichael Vetter2019-10-291-4/+4
|
* Two carbon logging changesMichael Vetter2019-10-291-27/+38
| | | | | | | | | | | | | Add resourcepart to the outgoing carbon that is logged, so we use the correct filenames for MUC PMs. Dont log incoming carbons of MUC PMs as a workaround to faulty server behaviour. See https://wiki.xmpp.org/web/Multi-Session_Nicks#Private_Messages under 'Client-side workaround behavior'. Regards https://github.com/profanity-im/profanity/issues/1214
* Also log sv_ev_delayed_private_messageMichael Vetter2019-10-291-0/+1
|
* Set mucuser in carbon caseMichael Vetter2019-10-291-0/+8
| | | | | | | | | | | Also we initialize mucuser properly. Now in case of a carbon of a MUC PM we sv_ev_incoming_carbon() which calls _sv_ev_incoming_plain() and then we log it via chat_log_msg_in() in there. But we also get the sv_ev_incoming_private_message() and call chat_log_msg_in() in there too. So the incoming message get's logged twice.
* Actually log MUC PM messagesMichael Vetter2019-10-285-28/+33
| | | | | | | | | | If I'm not mistaken MUC PMs have not been logged at all if there was no other client sending carbons. This should add MUC PM logging functionality. We still need to make sure carbons log to the same file. Regards https://github.com/profanity-im/profanity/issues/1214
* Remove not neede freeMichael Vetter2019-10-251-1/+0
| | | | It's in the def == NULL case. So will always be noop.
* Remove /leave commandMichael Vetter2019-10-222-27/+0
| | | | | | We have `/close` which does the same and more. Regards https://github.com/profanity-im/profanity/issues/1116
* Make forest theme more readableMichael Vetter2019-10-221-1/+2
|
* Adjust stub for connection_get_profanity_identifierMichael Vetter2019-10-221-1/+1
|
* Make prof_identifier constMichael Vetter2019-10-221-1/+1
|
* Display ownership of connection_get_profanity_identifierMichael Vetter2019-10-222-2/+2
|
* Dont allow new issuesMichael Vetter2019-10-221-0/+4
|
* Use UUID in origin-id and idMichael Vetter2019-10-222-11/+11
| | | | | Let's use UUID to have a more random string then just 10 alphanumeric values.
* Change default text colors to default (#1213)Martin2019-10-221-8/+8
| | | | | | | | Change default themes text color Using "default" instead of white makes the default better readable when using a black/dark font on white/light background. May fix #535
* Make sure date vars are initializedMichael Vetter2019-10-211-3/+3
|
9bfdde6e4ec89d9d02a5d6e88ae12f79'>^
d1349dd6 ^

1fc1d8af ^
d1349dd6 ^









d326f24d ^
2cd8e80b ^
6bbc5d0b ^
d1349dd6 ^
d326f24d ^
b52ca53f ^
d1349dd6 ^
d326f24d ^
b52ca53f ^
d1349dd6 ^

d326f24d ^
d1349dd6 ^



d326f24d ^
d1349dd6 ^






d326f24d ^
d1349dd6 ^







d326f24d ^
d1349dd6 ^


d326f24d ^
d1349dd6 ^




d326f24d ^
d1349dd6 ^







d326f24d ^
d1349dd6 ^





d326f24d ^
d1349dd6 ^



d326f24d ^
90d33dc9 ^



d326f24d ^
90d33dc9 ^





d326f24d ^
90d33dc9 ^



d1349dd6 ^
d326f24d ^
d1349dd6 ^

90d33dc9 ^
d1349dd6 ^




90d33dc9 ^
741e82fc ^
bed9a2c7 ^





741e82fc ^
90d33dc9 ^
d1349dd6 ^



90d33dc9 ^
d1349dd6 ^



90d33dc9 ^
d1349dd6 ^





90d33dc9 ^
d1349dd6 ^





50f9f94b ^
90d33dc9 ^
d1349dd6 ^
92e12036 ^
d1349dd6 ^

90d33dc9 ^
d1349dd6 ^







90d33dc9 ^


d1349dd6 ^
90d33dc9 ^






d1349dd6 ^





90d33dc9 ^

d1349dd6 ^




90d33dc9 ^
d1349dd6 ^




741e82fc ^
90d33dc9 ^
d1349dd6 ^






741e82fc ^
6bbc5d0b ^





741e82fc ^


d1349dd6 ^
90d33dc9 ^
d1349dd6 ^
90d33dc9 ^

d1349dd6 ^











741e82fc ^
a667eb0b ^

90d33dc9 ^


d1349dd6 ^




90d33dc9 ^
d1349dd6 ^







90d33dc9 ^
d1349dd6 ^












06cddc6b ^

90d33dc9 ^
d1349dd6 ^



0cb11571 ^
d1349dd6 ^
06cddc6b ^

90d33dc9 ^
d1349dd6 ^
90d33dc9 ^
d1349dd6 ^









90d33dc9 ^
d1349dd6 ^













6cb04c09 ^
90d33dc9 ^
f78e2771 ^
90d33dc9 ^
d1349dd6 ^







90d33dc9 ^

d1349dd6 ^















90d33dc9 ^
d1349dd6 ^









90d33dc9 ^
d1349dd6 ^





50f9f94b ^
90d33dc9 ^
d1349dd6 ^

90d33dc9 ^
d1349dd6 ^









90d33dc9 ^
6cb04c09 ^
7352a91b ^
90d33dc9 ^
d1349dd6 ^






90d33dc9 ^

d1349dd6 ^



90d33dc9 ^
d1349dd6 ^






90d33dc9 ^
d1349dd6 ^





d326f24d ^
d1349dd6 ^
b52ca53f ^
d1349dd6 ^








d326f24d ^
d1349dd6 ^







d326f24d ^


4525eb4b ^
d326f24d ^
e087f6d4
d1349dd6 ^
d3f9d547 ^
6bd78b38 ^
d326f24d ^
e087f6d4
4525eb4b ^

d326f24d ^
4525eb4b ^

4525eb4b ^


f78e2771 ^


e087f6d4

c3ec4181 ^
d326f24d ^
c3ec4181 ^
d1349dd6 ^



b6d1143c ^
d1349dd6 ^

c3ec4181 ^
d1349dd6 ^


e087f6d4

b6d1143c ^
d1349dd6 ^
c3ec4181 ^
f78e2771 ^

d1349dd6 ^
f78e2771 ^
d1349dd6 ^


f78e2771 ^

d1349dd6 ^

b52ca53f ^
d326f24d ^
d1349dd6 ^



f78e2771 ^

d1349dd6 ^
f78e2771 ^
d1349dd6 ^
e087f6d4
d1349dd6 ^



d326f24d ^
d1349dd6 ^











6bd78b38 ^

d1349dd6 ^









d326f24d ^

d1349dd6 ^
86559293 ^
d1349dd6 ^
c3ec4181 ^
d1349dd6 ^




6d7ee048 ^
d1349dd6 ^
e087f6d4
d1349dd6 ^


e087f6d4
d1349dd6 ^









b6d1143c ^

c3ec4181 ^
d1349dd6 ^
e087f6d4
d1349dd6 ^



d3f9d547 ^
1fc1d8af ^
d1349dd6 ^


b6d1143c ^
1a6a3318 ^
d326f24d ^
d1349dd6 ^




















b6d1143c ^
a735f5ad ^



b52ca53f ^
a735f5ad ^

d326f24d ^
a735f5ad ^

d326f24d ^
a735f5ad ^











d1349dd6 ^


d326f24d ^
d1349dd6 ^





























d326f24d ^


4525eb4b ^
d326f24d ^
e087f6d4
d1349dd6 ^
d3f9d547 ^
d1349dd6 ^

e087f6d4
4525eb4b ^

d326f24d ^
4525eb4b ^

b6d1143c ^
4525eb4b ^
d326f24d ^
4525eb4b ^



e087f6d4

a735f5ad ^












e087f6d4
d1349dd6 ^

c3ec4181 ^
d1349dd6 ^


d326f24d ^

d1349dd6 ^



c3ec4181 ^
d1349dd6 ^































d326f24d ^
d1349dd6 ^









d326f24d ^


d1349dd6 ^

1fc1d8af ^
d1349dd6 ^



c3ec4181 ^

d326f24d ^
c3ec4181 ^
d1349dd6 ^





c3ec4181 ^
d1349dd6 ^

c3ec4181 ^
d1349dd6 ^


b52ca53f ^
d1349dd6 ^

d326f24d ^
d1349dd6 ^

e087f6d4
d326f24d ^
d1349dd6 ^











d1349dd6 ^

c3ec4181 ^

d1349dd6 ^
e087f6d4
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992