Compare commits

...

86 Commits

Author SHA256 Message Date
Ana Guerrero
c5969b0a35 Accepting request 1236595 from KDE:Applications
KDE release gear 24.12.1 (forwarded request 1235746 from krop)

OBS-URL: https://build.opensuse.org/request/show/1236595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=35
2025-01-12 10:18:42 +00:00
Ana Guerrero
6883050530 Accepting request 1230541 from KDE:Applications
KDE release gear 24.12.0 (forwarded request 1230034 from krop)

OBS-URL: https://build.opensuse.org/request/show/1230541
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=34
2024-12-13 21:37:11 +00:00
Ana Guerrero
34585f5c12 Accepting request 1223927 from KDE:Applications
OBS-URL: https://build.opensuse.org/request/show/1223927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=33
2024-11-13 14:31:15 +00:00
Christophe Marin
01e9a813d7 enabled support for KUnifiedPush
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=51
2024-11-13 12:02:29 +00:00
Ana Guerrero
57c3173eff Accepting request 1222417 from KDE:Applications
KDE Release gear 24.08.3 (forwarded request 1221581 from krop)

OBS-URL: https://build.opensuse.org/request/show/1222417
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=32
2024-11-08 10:59:09 +00:00
Christophe Marin
52a96bce1b KDE Release gear 24.08.3
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=49
2024-11-07 12:53:37 +00:00
Ana Guerrero
60bb4f0a74 Accepting request 1218725 from KDE:Applications
- Add upstream change:
  * 0001-Cherry-pick-compatability-changes-for-libquotient-0.patch

OBS-URL: https://build.opensuse.org/request/show/1218725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=31
2024-10-28 14:21:46 +00:00
Christophe Marin
e3bae292c7 - Add upstream change:
* 0001-Cherry-pick-compatability-changes-for-libquotient-0.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=47
2024-10-28 08:00:05 +00:00
Dominique Leuenberger
ec9c89bc42 Accepting request 1206985 from KDE:Applications
KDE Release gear 24.08.2

OBS-URL: https://build.opensuse.org/request/show/1206985
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=30
2024-10-12 11:29:42 +00:00
Christophe Marin
4b285a2774 KDE Release Gear 24.08.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=45
2024-10-10 20:13:28 +00:00
Ana Guerrero
1ee37b0e62 Accepting request 1200516 from KDE:Applications
KDE release gear 24.08.1 (forwarded request 1199910 from krop)

OBS-URL: https://build.opensuse.org/request/show/1200516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=29
2024-09-13 12:32:56 +00:00
Christophe Marin
340f631f4d KDE release gear 24.08.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=43
2024-09-12 11:40:48 +00:00
Ana Guerrero
50f056edad Accepting request 1195518 from KDE:Applications
KDE Release gear 24.08.0 (forwarded request 1194683 from krop)

OBS-URL: https://build.opensuse.org/request/show/1195518
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=28
2024-08-26 20:09:17 +00:00
Christophe Marin
241149069a KDE Release gear 24.08.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=41
2024-08-22 12:51:14 +00:00
Ana Guerrero
410e4d231c Accepting request 1185667 from KDE:Applications
KDE Release Gear 24.05.2 (forwarded request 1184893 from krop)

OBS-URL: https://build.opensuse.org/request/show/1185667
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=27
2024-07-05 17:49:53 +00:00
Christophe Marin
9939d4e236 KDE Release Gear 24.05.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=39
2024-07-04 20:43:01 +00:00
Ana Guerrero
f13a31fa1b Accepting request 1180623 from KDE:Applications
KDE release gear 24.05.1 (forwarded request 1180225 from krop)

OBS-URL: https://build.opensuse.org/request/show/1180623
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=26
2024-06-14 17:01:19 +00:00
Christophe Marin
c47dc4f047 KDE release gear 24.05.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=37
2024-06-13 12:04:23 +00:00
Ana Guerrero
9b32eb9f35 Accepting request 1176412 from KDE:Applications
KDE release 24.05.0 (forwarded request 1175936 from krop)

OBS-URL: https://build.opensuse.org/request/show/1176412
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=25
2024-05-27 09:51:38 +00:00
Christophe Marin
64800542ca KDE release 24.05.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=35
2024-05-23 11:01:00 +00:00
Ana Guerrero
2ec69021aa Accepting request 1167449 from KDE:Applications
KDE Release gear 24.02.2 (forwarded request 1166725 from krop)

OBS-URL: https://build.opensuse.org/request/show/1167449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=24
2024-04-15 18:16:41 +00:00
Christophe Marin
e0abbbd124 KDE Release gear 24.02.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=33
2024-04-12 17:26:02 +00:00
Ana Guerrero
830eabd337 Accepting request 1160345 from KDE:Applications
KDE release gear 24.02.1 (forwarded request 1159650 from krop)

OBS-URL: https://build.opensuse.org/request/show/1160345
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=23
2024-03-22 14:19:55 +00:00
Christophe Marin
9c944f468b KDE release gear 24.02.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=31
2024-03-21 13:55:26 +00:00
Ana Guerrero
b3c931733b Accepting request 1153293 from KDE:Applications
KDE release gear 24.02.0

OBS-URL: https://build.opensuse.org/request/show/1153293
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=22
2024-03-11 14:31:57 +00:00
Christophe Marin
dabf662116 - Update the kquickimageeditor build requirement
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=29
2024-02-29 14:33:19 +00:00
Christophe Marin
e0189e10d5 Remove source URL
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=28
2024-02-26 10:30:09 +00:00
Luca Beltrame
2ecd8649e8 KDE Release Gear 24.02.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=27
2024-02-26 06:52:22 +00:00
Luca Beltrame
e36fd88801 KDE Gear 24.02 RC
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=26
2024-02-23 20:08:56 +00:00
Dominique Leuenberger
43d13b30ef Accepting request 1131969 from KDE:Applications
KDE Release gear 23.08.4 (forwarded request 1131017 from krop)

OBS-URL: https://build.opensuse.org/request/show/1131969
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=21
2023-12-09 21:53:12 +00:00
Christophe Marin
b90e3aed2d KDE Release gear 23.08.4
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=24
2023-12-07 22:53:58 +00:00
Ana Guerrero
a52faffe13 Accepting request 1124676 from KDE:Applications
KDE Release Gear 23.08.3 (forwarded request 1124079 from krop)

OBS-URL: https://build.opensuse.org/request/show/1124676
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=20
2023-11-10 11:32:50 +00:00
Christophe Marin
6a01c8d29c KDE Release Gear 23.08.3
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=22
2023-11-09 14:29:04 +00:00
Ana Guerrero
46f3dd0383 Accepting request 1117414 from KDE:Applications
KDE release gear 23.08.2 (forwarded request 1116778 from krop)

OBS-URL: https://build.opensuse.org/request/show/1117414
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=19
2023-10-12 21:43:51 +00:00
Christophe Marin
6a4bd95bbd KDE release gear 23.08.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=20
2023-10-12 12:22:56 +00:00
Ana Guerrero
367d30ab27 Accepting request 1111291 from KDE:Applications
KDE release gear 23.08.1 (forwarded request 1110807 from krop)

OBS-URL: https://build.opensuse.org/request/show/1111291
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=18
2023-09-15 20:04:18 +00:00
Christophe Marin
10435cfb74 KDE release gear 23.08.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=18
2023-09-14 10:52:27 +00:00
Ana Guerrero
ebb23a1a9e Accepting request 1108774 from KDE:Applications
OBS-URL: https://build.opensuse.org/request/show/1108774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=17
2023-09-04 20:53:04 +00:00
Christophe Marin
68c7bed0cd Accepting request 1108771 from home:Vogtinator:branches:KDE:Applications
- Add some qt5qmlimport runtime deps (boo#1214916)

OBS-URL: https://build.opensuse.org/request/show/1108771
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=16
2023-09-04 07:08:32 +00:00
Ana Guerrero
8048e8a0d1 Accepting request 1105810 from KDE:Applications
KDE Release Gear 23.08.0 (forwarded request 1105409 from krop)

OBS-URL: https://build.opensuse.org/request/show/1105810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=16
2023-08-31 11:45:17 +00:00
Christophe Marin
9800cee161 KDE Release Gear 23.08.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=14
2023-08-24 10:29:34 +00:00
Christophe Marin
8f59c8f4ec OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=13 2023-08-20 14:08:42 +00:00
Christophe Marin
8e6066db55 Release gear 23.08 RC
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=12
2023-08-18 06:26:23 +00:00
Fabian Vogt
5ef77575c9 Accepting request 1097390 from KDE:Applications
KDE release gear 23.04.3 (forwarded request 1097054 from krop)

OBS-URL: https://build.opensuse.org/request/show/1097390
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=15
2023-07-07 13:49:39 +00:00
Christophe Marin
3d5e502143 KDE release gear 23.04.3
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=10
2023-07-06 14:18:42 +00:00
Dominique Leuenberger
62620512ae Accepting request 1091679 from KDE:Applications
KDE Release Gear 23.04.2 (forwarded request 1091225 from krop)

OBS-URL: https://build.opensuse.org/request/show/1091679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=14
2023-06-09 18:39:37 +00:00
Christophe Marin
f1bf8ed390 KDE Release Gear 23.04.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=8
2023-06-08 08:40:02 +00:00
Dominique Leuenberger
a58c8bce6b Accepting request 1086454 from KDE:Applications
KDE Release Gear 23.04.1

OBS-URL: https://build.opensuse.org/request/show/1086454
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=13
2023-05-12 18:36:41 +00:00
Christophe Marin
79f59cf76e KDE Release Gear 23.04.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=6
2023-05-11 10:12:45 +00:00
Dominique Leuenberger
2488fd1a06 Accepting request 1080732 from KDE:Applications
KDE Release Gear 23.04 (forwarded request 1079740 from krop)

OBS-URL: https://build.opensuse.org/request/show/1080732
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=12
2023-04-23 20:47:11 +00:00
Christophe Marin
2c5d9aa78f KDE Release Gear 23.04
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=4
2023-04-20 09:27:11 +00:00
Christophe Marin
d8d84efed1 KDE Release Gear 23.04 RC
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=3
2023-04-03 10:27:07 +00:00
Christophe Marin
53162fbb80 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=2 2023-03-20 08:52:34 +00:00
Christophe Marin
bcb74cc853 osc copypac from project:KDE:Extra package:neochat revision:30
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/neochat?expand=0&rev=1
2023-03-18 18:31:47 +00:00
Dominique Leuenberger
739cf46317 Accepting request 1066066 from KDE:Extra
Update to 23.01.0

OBS-URL: https://build.opensuse.org/request/show/1066066
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=11
2023-02-16 15:56:38 +00:00
Christophe Marin
e907ca863a OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=29 2023-02-15 22:13:33 +00:00
Christophe Marin
3c589f67a0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=28 2023-02-15 21:38:21 +00:00
Christophe Marin
31486f1020 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=27 2023-02-15 21:29:55 +00:00
Dominique Leuenberger
ec935551d8 Accepting request 1060428 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/1060428
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=10
2023-01-23 17:33:47 +00:00
Christophe Marin
fe8d5e238f Accepting request 1060391 from home:tschmitz:branches:KDE:Extra
- update to 22.11:
  * work on end-to-end encryption implementation
  * configuration settings ported to new form components
  * new settings component for managing notifications settings
  * add proxy configuration menu
  * added developer tools for inspecting raw matrix events
  * added confirmation dialog when signing out and when enabling end-to-end encryption
  * rewrite of theaccount switcher
- fix buildrequires, remove redundant requires
- fix permissions of license file

OBS-URL: https://build.opensuse.org/request/show/1060391
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=25
2023-01-23 13:56:27 +00:00
Richard Brown
e28142960e Accepting request 1007108 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/1007108
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=9
2022-09-30 15:58:10 +00:00
Christophe Giboudeaux
76ee7f347b Accepting request 1007106 from home:dirkmueller:Factory
- update to 22.09:
  * implemented support for configuring notifications on a per-room basis. As
    part of his GSoC project, Snehit added a space selector to the room list,
    which allows filtering the room list for rooms included in the selected
    space. James also reworked the timeline layout to make it look nicer when
    the window is very wide. There have also been a ton of other fixes and
    improvements in translations, the layout and the stability of NeoChat.

OBS-URL: https://build.opensuse.org/request/show/1007106
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=23
2022-09-29 20:21:23 +00:00
Dominique Leuenberger
705296d1f3 Accepting request 993234 from KDE:Extra
- Use GCC 10 to build neochat on Leap.

- update to 22.06:
  * Sending of typing notifications can now be disabled.
  * In the room list, the scrollbar will now disappear correctly when it is not needed.
  * On wayland, NeoChat will now raise correctly when clicking on a notification.
  * Several bugs have been fixed that would sometimes cause messages containing
    markdown and/or HTML elements to be sent incorrectly.
  * The quick switcher can now be controlled using the mouse.
  * There is now an option to disable automatic room sidebar opening when
    resizing the window.
  * Creation of custom emojis has been fixed.
  * Editing or replying to the last message using the keyboard shortcuts now
    works correctly.
  * When switching between rooms using the keyboard, the switching direction is
    now correct.

OBS-URL: https://build.opensuse.org/request/show/993234
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=8
2022-08-05 17:51:04 +00:00
Christophe Giboudeaux
9d58f2cc57 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=21 2022-08-05 06:07:34 +00:00
Christophe Giboudeaux
90cc712612 Accepting request 992469 from home:dirkmueller:Factory
- update to 22.06:
  * Sending of typing notifications can now be disabled.
  * In the room list, the scrollbar will now disappear correctly when it is not needed.
  * On wayland, NeoChat will now raise correctly when clicking on a notification.
  * Several bugs have been fixed that would sometimes cause messages containing
    markdown and/or HTML elements to be sent incorrectly.
  * The quick switcher can now be controlled using the mouse.
  * There is now an option to disable automatic room sidebar opening when
    resizing the window.
  * Creation of custom emojis has been fixed.
  * Editing or replying to the last message using the keyboard shortcuts now
    works correctly.
  * When switching between rooms using the keyboard, the switching direction is
    now correct.

OBS-URL: https://build.opensuse.org/request/show/992469
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=20
2022-08-04 17:45:53 +00:00
Dominique Leuenberger
5ffbeb8557 Accepting request 964085 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/964085
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=7
2022-03-22 20:36:52 +00:00
Christophe Giboudeaux
5e02823df7 Accepting request 963877 from home:cgiboudeaux:branches:KDE:Qt5
- Update the QCoro build dependency.

OBS-URL: https://build.opensuse.org/request/show/963877
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=18
2022-03-22 19:32:11 +00:00
Dominique Leuenberger
370d42e992 Accepting request 953174 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/953174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=6
2022-02-10 22:12:14 +00:00
206d66a3fb Accepting request 953033 from home:Vogtinator:branches:KDE:Extra
- Update to 22.02:
  * Implement sharing with Purpose (export)
  * Implement adding labels for account
  * Give settings window a title
  * Reduce minimum height of the window
  * Fix build with qcoro 0.4
  * Fix issues with saveFileAs
  * Changed “Settings” to “Configure NeoChat” in menu
  * Improve toolbar on mobile
  * Improve emoji pane
  * Check if password can be changed
  * Fix image tooltip
  * Adapt list setting pages to new style
  * Allow using ESC to go back to room list
  * Port away from QNetworkConfigurationManager
  * Remove lag when starting user autocompletion
  * Set single window hint in desktop file
  * Make room address selectable
  * Display monochrome icon in tray
  * Fix QuickSwitcher activation
  * Fix Windows/mac build
  * Fix notifications on Android
  * Support raising when we receive a notification
  * Don’t render html in RoomDrawer heading
  * Add support for minimizing to system tray on startup
  * Use non blocking passord reading
  * Add a mobile oriented context menu for the room list
  * Fix loading room settings on mobile
  * Use icon from qrc for system tray icon
  * Adapt to libQuotient API change

OBS-URL: https://build.opensuse.org/request/show/953033
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=17
2022-02-10 12:43:58 +00:00
Dominique Leuenberger
8d7b96186d Accepting request 902906 from KDE:Extra
- Fix build error.
  - Add missig cmark which will not be install with libcmark-devel.

OBS-URL: https://build.opensuse.org/request/show/902906
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=5
2021-06-29 20:43:16 +00:00
ac73a32201 - Fix build error.
- Add missig cmark which will not be install with libcmark-devel.

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=16
2021-06-26 09:40:20 +00:00
Dominique Leuenberger
f97ca40a86 Accepting request 896729 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/896729
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=4
2021-06-02 20:11:58 +00:00
98c434dba6 Accepting request 896716 from home:polslinux:branches:KDE:Extra
- Update to 1.2.0
  * major UI redesign
  * chage page is now using bubbles
  * it's now possible to send custom reactions by replying
    to a comment with /react <message>
  * now supports opening Matrix URI from the web browser

OBS-URL: https://build.opensuse.org/request/show/896716
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=14
2021-06-01 15:09:25 +00:00
Dominique Leuenberger
2c7e37da37 Accepting request 875222 from KDE:Extra
- Update to 1.1.1
  - First launch experience improvements
  - Allow logins to servers requiring SSO
  - Display stickers
  - Allow editing messages
  - Multimodal mode to open a room into a new window
  - New chat commands
  - Better Plasma integration

OBS-URL: https://build.opensuse.org/request/show/875222
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=3
2021-02-26 20:59:44 +00:00
997ba71cb1 - Update to 1.1.1
- First launch experience improvements
  - Allow logins to servers requiring SSO
  - Display stickers
  - Allow editing messages
  - Multimodal mode to open a room into a new window
  - New chat commands
  - Better Plasma integration

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=12
2021-02-25 19:13:29 +00:00
Dominique Leuenberger
f014da6d4f Accepting request 872799 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/872799
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=2
2021-02-16 21:40:12 +00:00
8c5e9185bf Accepting request 872215 from home:sleep_walker:branches:KDE:Extra
- Add missing require libqt5-qtquickcontrols again.

Fixes problem:

QQmlApplicationEngine failed to load component
qrc:/qml/main.qml:286:9: Type RoomPage unavailable
qrc:/imports/NeoChat/Page/RoomPage.qml:564:13: Type ChatTextInput unavailable
qrc:/imports/NeoChat/Component/ChatTextInput.qml:207:25: Type ImageEditorPage unavailable
qrc:/imports/NeoChat/Page/ImageEditorPage.qml:11:1: module "QtQuick.Dialogs" is not installed

Found on PinePhone PHOSH image.

OBS-URL: https://build.opensuse.org/request/show/872215
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=10
2021-02-16 10:41:12 +00:00
Dominique Leuenberger
e95b407a88 Accepting request 864159 from KDE:Extra
New package: neochat, a Matrix client by KDE

OBS-URL: https://build.opensuse.org/request/show/864159
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neochat?expand=0&rev=1
2021-01-20 17:26:52 +00:00
Luca Beltrame
1610127523 Accepting request 864091 from home:wolfi323:branches:KDE:Extra
- Adjust spec file to conform to the KDE team's guidelines
- Update to 1.0.1
  - NeoChat doesn't require a .well-know configuration in the
    server to work.
  - Edited messages won’t show up duplicated anymore.
  - NeoChat now ask for consent to terms and conditions if required
    instead of displaying nothing.
  - Users avatar in the room list are now displayed correctly.
  - Fix image saving
  - Various graphic glitches have been fixed.
- Switch source from invent.kde.org to download.kde.org, because in
  git is not always the newest tar.
- Add language subpackages.
- Add missing require libqt5-qtquickcontrols.
- Change from git version to version 1.0
- Initial package

OBS-URL: https://build.opensuse.org/request/show/864091
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=8
2021-01-18 14:01:32 +00:00
Luca Beltrame
b49e18ab95 Fixup
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=7
2021-01-17 19:06:21 +00:00
Luca Beltrame
563b9b6aaf Fixup
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=6
2021-01-17 13:47:19 +00:00
Luca Beltrame
8306af2542 More dependencies
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=5
2021-01-16 19:54:44 +00:00
Luca Beltrame
965cfe9ce4 One more requires fix
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=4
2021-01-16 17:36:45 +00:00
Luca Beltrame
233280a05e Fix typo in requires
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=3
2021-01-16 17:27:16 +00:00
Luca Beltrame
a40d1349fa Neochat package
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=2
2021-01-16 16:39:09 +00:00
Luca Beltrame
e812aab02f osc copypac from project:KDE:Unstable:Extra package:neochat revision:1
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/neochat?expand=0&rev=1
2021-01-16 10:15:33 +00:00
11 changed files with 0 additions and 627 deletions

View File

@ -1,532 +0,0 @@
From eb802ff91f98204784d87db61a698b4038b7ef84 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Sat, 26 Oct 2024 07:47:15 +0000
Subject: [PATCH] Cherry pick compatability changes for libquotient 0.9
Title
---
src/actionshandler.cpp | 8 ++
src/eventhandler.cpp | 151 +++++++++++++++++++++++------
src/eventhandler.h | 12 ++-
src/models/messagecontentmodel.cpp | 18 +++-
src/models/messageeventmodel.cpp | 5 +
src/neochatroom.cpp | 44 ++++++++-
6 files changed, 199 insertions(+), 39 deletions(-)
diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index e5ddaadbd..c47b780b1 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -91,10 +91,18 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
+#if Quotient_VERSION_MINOR > 8
+ if (event->senderId() == m_room->localMember().id() && event->has<EventContent::TextContent>()) {
+#else
if (event->senderId() == m_room->localMember().id() && event->hasTextContent()) {
+#endif
QString originalString;
if (event->content()) {
+#if Quotient_VERSION_MINOR > 8
+ originalString = event->get<EventContent::TextContent>()->body;
+#else
originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
+#endif
} else {
originalString = event->plainBody();
}
diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp
index 8cad14601..6b02ade67 100644
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -9,6 +9,8 @@
#include <Quotient/eventitem.h>
#include <Quotient/events/encryptionevent.h>
+#include <Quotient/events/event.h>
+#include <Quotient/events/eventcontent.h>
#include <Quotient/events/reactionevent.h>
#include <Quotient/events/redactionevent.h>
#include <Quotient/events/roomavatarevent.h>
@@ -234,10 +236,18 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
{
QString body;
+#if Quotient_VERSION_MINOR > 8
+ if (event.has<EventContent::FileContent>()) {
+#else
if (event.hasFileContent()) {
+#endif
// if filename is given or body is equal to filename,
// then body is a caption
+#if Quotient_VERSION_MINOR > 8
+ QString filename = event.get<EventContent::FileContent>()->originalName;
+#else
QString filename = event.content()->fileInfo()->originalName;
+#endif
QString body = event.plainBody();
if (filename.isEmpty() || filename == body) {
return QString();
@@ -245,8 +255,13 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
return body;
}
+#if Quotient_VERSION_MINOR > 8
+ if (event.has<EventContent::TextContent>() && event.content()) {
+ body = event.get<EventContent::TextContent>()->body;
+#else
if (event.hasTextContent() && event.content()) {
body = static_cast<const EventContent::TextContent *>(event.content())->body;
+#endif
} else {
body = event.plainBody();
}
@@ -461,11 +476,16 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
{
TextHandler textHandler;
+#if Quotient_VERSION_MINOR > 8
+ if (event.has<EventContent::FileContent>()) {
+ QString fileCaption = event.get<EventContent::FileContent>()->originalName;
+#else
if (event.hasFileContent()) {
auto fileCaption = event.content()->fileInfo()->originalName;
+#endif
if (fileCaption.isEmpty()) {
fileCaption = event.plainBody();
- } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
+ } else if (fileCaption != event.plainBody()) {
fileCaption = event.plainBody() + " | "_ls + fileCaption;
}
textHandler.setData(fileCaption);
@@ -473,8 +493,13 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
}
QString body;
+#if Quotient_VERSION_MINOR > 8
+ if (event.has<EventContent::TextContent>() && event.content()) {
+ body = event.get<EventContent::TextContent>()->body;
+#else
if (event.hasTextContent() && event.content()) {
body = static_cast<const EventContent::TextContent *>(event.content())->body;
+#endif
} else {
body = event.plainBody();
}
@@ -655,39 +680,65 @@ QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event)
// Get the file info for the event.
if (event->is<RoomMessageEvent>()) {
auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
+#if Quotient_VERSION_MINOR > 8
+ if (!roomMessageEvent->has<EventContent::FileContentBase>()) {
+#else
if (!roomMessageEvent->hasFileContent()) {
+#endif
return {};
}
- const EventContent::FileInfo *fileInfo;
- fileInfo = roomMessageEvent->content()->fileInfo();
- QVariantMap mediaInfo = getMediaInfoFromFileInfo(fileInfo, eventId, false, false);
+#if Quotient_VERSION_MINOR > 8
+ const auto content = roomMessageEvent->get<EventContent::FileContentBase>();
+ QVariantMap mediaInfo = getMediaInfoFromFileInfo(content.get(), eventId, false, false);
+#else
+ const auto content = static_cast<const EventContent::FileContent *>(roomMessageEvent->content());
+ QVariantMap mediaInfo = getMediaInfoFromFileInfo(content, eventId, false, false);
+#endif
// if filename isn't specifically given, it is in body
// https://spec.matrix.org/latest/client-server-api/#mfile
- mediaInfo["filename"_ls] = (fileInfo->originalName.isEmpty()) ? roomMessageEvent->plainBody() : fileInfo->originalName;
+#if Quotient_VERSION_MINOR > 8
+ mediaInfo["filename"_ls] = content->commonInfo().originalName.isEmpty() ? roomMessageEvent->plainBody() : content->commonInfo().originalName;
+#else
+ mediaInfo["filename"_ls] = (content->fileInfo()->originalName.isEmpty()) ? roomMessageEvent->plainBody() : content->fileInfo()->originalName;
+#endif
return mediaInfo;
} else if (event->is<StickerEvent>()) {
- const EventContent::FileInfo *fileInfo;
-
auto stickerEvent = eventCast<const StickerEvent>(event);
- fileInfo = &stickerEvent->image();
+ auto content = &stickerEvent->image();
- return getMediaInfoFromFileInfo(fileInfo, eventId, false, true);
+ return getMediaInfoFromFileInfo(content, eventId, false, true);
} else {
return {};
}
}
-QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail, bool isSticker) const
+QVariantMap EventHandler::getMediaInfoFromFileInfo(
+#if Quotient_VERSION_MINOR > 8
+ const Quotient::EventContent::FileContentBase *fileContent,
+#else
+ const Quotient::EventContent::TypedBase *fileContent,
+#endif
+ const QString &eventId,
+ bool isThumbnail,
+ bool isSticker) const
{
QVariantMap mediaInfo;
// Get the mxc URL for the media.
- if (!fileInfo->url().isValid() || fileInfo->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+#if Quotient_VERSION_MINOR > 8
+ if (!fileContent->url().isValid() || fileContent->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+#else
+ if (!fileContent->fileInfo()->url().isValid() || fileContent->fileInfo()->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+#endif
mediaInfo["source"_ls] = QUrl();
} else {
- QUrl source = m_room->makeMediaUrl(eventId, fileInfo->url());
+#if Quotient_VERSION_MINOR > 8
+ QUrl source = m_room->makeMediaUrl(eventId, fileContent->url());
+#else
+ QUrl source = m_room->makeMediaUrl(eventId, fileContent->fileInfo()->url());
+#endif
if (source.isValid()) {
mediaInfo["source"_ls] = source;
@@ -696,7 +747,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
}
}
- auto mimeType = fileInfo->mimeType;
+ auto mimeType = fileContent->type();
// Add the MIME type for the media if available.
mediaInfo["mimeType"_ls] = mimeType.name();
@@ -704,45 +755,53 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
mediaInfo["mimeIcon"_ls] = mimeType.iconName();
// Add media size if available.
- mediaInfo["size"_ls] = fileInfo->payloadSize;
+#if Quotient_VERSION_MINOR > 8
+ mediaInfo["size"_ls] = fileContent->commonInfo().payloadSize;
+#else
+ mediaInfo["size"_ls] = static_cast<const EventContent::FileContent *>(fileContent)->fileInfo()->payloadSize;
+#endif
mediaInfo["isSticker"_ls] = isSticker;
// Add parameter depending on media type.
if (mimeType.name().contains(QStringLiteral("image"))) {
- if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileInfo)) {
+ if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileContent)) {
+#if Quotient_VERSION_MINOR > 8
mediaInfo["width"_ls] = castInfo->imageSize.width();
mediaInfo["height"_ls] = castInfo->imageSize.height();
+#else
+ const auto imageInfo = static_cast<const EventContent::ImageInfo *>(castInfo->fileInfo());
+ mediaInfo["width"_ls] = imageInfo->imageSize.width();
+ mediaInfo["height"_ls] = imageInfo->imageSize.height();
+#endif
// TODO: Images in certain formats (e.g. WebP) will be erroneously marked as animated, even if they are static.
mediaInfo["animated"_ls] = QMovie::supportedFormats().contains(mimeType.preferredSuffix().toUtf8());
- if (!isThumbnail) {
- QVariantMap tempInfo;
- auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
- if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
- tempInfo = thumbnailInfo;
+ QVariantMap tempInfo;
+ auto thumbnailInfo = getMediaInfoFromTumbnail(castInfo->thumbnail, eventId);
+ if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
+ tempInfo = thumbnailInfo;
+ } else {
+ QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
+ if (blurhash.isEmpty()) {
+ tempInfo["source"_ls] = QUrl();
} else {
- QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
- if (blurhash.isEmpty()) {
- tempInfo["source"_ls] = QUrl();
- } else {
- tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
- }
+ tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
}
- mediaInfo["tempInfo"_ls] = tempInfo;
}
+ mediaInfo["tempInfo"_ls] = tempInfo;
}
}
if (mimeType.name().contains(QStringLiteral("video"))) {
- if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileInfo)) {
+ if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileContent)) {
mediaInfo["width"_ls] = castInfo->imageSize.width();
mediaInfo["height"_ls] = castInfo->imageSize.height();
mediaInfo["duration"_ls] = castInfo->duration;
if (!isThumbnail) {
QVariantMap tempInfo;
- auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
+ auto thumbnailInfo = getMediaInfoFromTumbnail(castInfo->thumbnail, eventId);
if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
tempInfo = thumbnailInfo;
} else {
@@ -758,7 +817,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
}
}
if (mimeType.name().contains(QStringLiteral("audio"))) {
- if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileInfo)) {
+ if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileContent)) {
mediaInfo["duration"_ls] = castInfo->duration;
}
}
@@ -766,6 +825,38 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
return mediaInfo;
}
+QVariantMap EventHandler::getMediaInfoFromTumbnail(const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId) const
+{
+ QVariantMap thumbnailInfo;
+
+ if (!thumbnail.url().isValid() || thumbnail.url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+ thumbnailInfo["source"_ls] = QUrl();
+ } else {
+ QUrl source = m_room->makeMediaUrl(eventId, thumbnail.url());
+
+ if (source.isValid()) {
+ thumbnailInfo["source"_ls] = source;
+ } else {
+ thumbnailInfo["source"_ls] = QUrl();
+ }
+ }
+
+ auto mimeType = thumbnail.mimeType;
+ // Add the MIME type for the media if available.
+ thumbnailInfo["mimeType"_ls] = mimeType.name();
+
+ // Add the MIME type icon if available.
+ thumbnailInfo["mimeIcon"_ls] = mimeType.iconName();
+
+ // Add media size if available.
+ thumbnailInfo["size"_ls] = thumbnail.payloadSize;
+
+ thumbnailInfo["width"_ls] = thumbnail.imageSize.width();
+ thumbnailInfo["height"_ls] = thumbnail.imageSize.height();
+
+ return thumbnailInfo;
+}
+
bool EventHandler::hasReply() const
{
if (m_event == nullptr) {
diff --git a/src/eventhandler.h b/src/eventhandler.h
index 277273c9e..6a3520882 100644
--- a/src/eventhandler.h
+++ b/src/eventhandler.h
@@ -339,6 +339,14 @@ private:
QString getMessageBody(const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const;
QVariantMap getMediaInfoForEvent(const Quotient::RoomEvent *event) const;
- QVariantMap
- getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false, bool isSticker = false) const;
+ QVariantMap getMediaInfoFromFileInfo(
+#if Quotient_VERSION_MINOR > 8
+ const Quotient::EventContent::FileContentBase *fileContent,
+#else
+ const Quotient::EventContent::TypedBase *fileContent,
+#endif
+ const QString &eventId,
+ bool isThumbnail = false,
+ bool isSticker = false) const;
+ QVariantMap getMediaInfoFromTumbnail(const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId) const;
};
diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp
index 7de11f274..ac1756f84 100644
--- a/src/models/messagecontentmodel.cpp
+++ b/src/models/messagecontentmodel.cpp
@@ -7,6 +7,7 @@
#include <QImageReader>
+#include <Quotient/events/eventcontent.h>
#include <Quotient/events/redactionevent.h>
#include <Quotient/events/roommessageevent.h>
#include <Quotient/events/stickerevent.h>
@@ -445,10 +446,19 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
auto fileTransferInfo = m_room->cachedFileTransferInfo(m_event.get());
#ifndef Q_OS_ANDROID
- Q_ASSERT(event->content() != nullptr && event->content()->fileInfo() != nullptr);
+#if Quotient_VERSION_MINOR > 8
+ Q_ASSERT(event->content() != nullptr && event->has<EventContent::FileContent>());
+ const QMimeType mimeType = event->get<EventContent::FileContent>()->mimeType;
+#else
+ Q_ASSERT(event->content() != nullptr && event->hasFileContent());
const QMimeType mimeType = event->content()->fileInfo()->mimeType;
+#endif
if (mimeType.name() == QStringLiteral("text/plain") || mimeType.parentMimeTypes().contains(QStringLiteral("text/plain"))) {
+#if Quotient_VERSION_MINOR > 8
+ QString originalName = event->get<EventContent::FileContent>()->originalName;
+#else
QString originalName = event->content()->fileInfo()->originalName;
+#endif
if (originalName.isEmpty()) {
originalName = event->plainBody();
}
@@ -571,8 +581,12 @@ void MessageContentModel::updateItineraryModel()
}
if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+#if Quotient_VERSION_MINOR > 8
+ if (event->has<EventContent::FileContent>()) {
+#else
if (event->hasFileContent()) {
- auto filePath = m_room->cachedFileTransferInfo(m_event.get()).localPath;
+#endif
+ auto filePath = m_room->cachedFileTransferInfo(event).localPath;
if (filePath.isEmpty() && m_itineraryModel != nullptr) {
delete m_itineraryModel;
m_itineraryModel = nullptr;
diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index 09c738d0e..784fcd36e 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -8,6 +8,7 @@
#include "neochatconfig.h"
#include <Quotient/csapi/rooms.h>
+#include <Quotient/events/eventcontent.h>
#include <Quotient/events/redactionevent.h>
#include <Quotient/events/roommessageevent.h>
#include <Quotient/events/stickerevent.h>
@@ -498,7 +499,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
if (role == ProgressInfoRole) {
if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
+#if Quotient_VERSION_MINOR > 8
+ if (e->has<EventContent::FileContent>()) {
+#else
if (e->hasFileContent()) {
+#endif
return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
}
}
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index f5b1eb57b..8f4201e58 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -9,6 +9,7 @@
#include <QMimeDatabase>
#include <QTemporaryFile>
+#include <Quotient/events/eventcontent.h>
#include <Quotient/jobs/basejob.h>
#include <Quotient/quotient_common.h>
#include <qcoro/qcorosignal.h>
@@ -76,11 +77,16 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
const auto m_event = evtIt->viewAs<RoomEvent>();
QString mxcUrl;
if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+#if Quotient_VERSION_MINOR > 8
+ if (event->has<EventContent::FileContentBase>()) {
+ mxcUrl = event->get<EventContent::FileContentBase>()->url().toString();
+#else
if (event->hasFileContent()) {
mxcUrl = event->content()->fileInfo()->url().toString();
+#endif
}
} else if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
- mxcUrl = event->image().fileInfo()->url().toString();
+ mxcUrl = event->image().url().toString();
}
if (mxcUrl.isEmpty()) {
return;
@@ -255,7 +261,11 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
auto mime = QMimeDatabase().mimeTypeForUrl(url);
url.setScheme("file"_ls);
QFileInfo fileInfo(url.isLocalFile() ? url.toLocalFile() : url.toString());
+#if Quotient_VERSION_MINOR > 8
+ EventContent::FileContentBase *content;
+#else
EventContent::TypedBase *content;
+#endif
if (mime.name().startsWith("image/"_ls)) {
QImage image(url.toLocalFile());
content = new EventContent::ImageContent(url, fileInfo.size(), mime, image.size(), fileInfo.fileName());
@@ -270,7 +280,11 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
} else {
content = new EventContent::FileContent(url, fileInfo.size(), mime, fileInfo.fileName());
}
+#if Quotient_VERSION_MINOR > 8
+ QString txnId = postFile(body.isEmpty() ? url.fileName() : body, std::unique_ptr<EventContent::FileContentBase>(content));
+#else
QString txnId = postFile(body.isEmpty() ? url.fileName() : body, content);
+#endif
setHasFileUploading(true);
connect(this, &Room::fileTransferCompleted, [this, txnId](const QString &id, FileSourceInfo) {
if (id == txnId) {
@@ -396,8 +410,13 @@ bool NeoChatRoom::lastEventIsSpoiler() const
{
if (auto event = lastEvent()) {
if (auto e = eventCast<const RoomMessageEvent>(event)) {
+#if Quotient_VERSION_MINOR > 8
+ if (e->has<EventContent::TextContent>() && e->content() && e->mimeType().name() == "text/html"_ls) {
+ auto htmlBody = e->get<EventContent::TextContent>()->body;
+#else
if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html"_ls) {
auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content())->body;
+#endif
return htmlBody.contains("data-mx-spoiler"_ls);
}
}
@@ -1456,7 +1475,11 @@ void NeoChatRoom::openEventMediaExternally(const QString &eventId)
const auto evtIt = findInTimeline(eventId);
if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
const auto event = evtIt->viewAs<RoomMessageEvent>();
+#if Quotient_VERSION_MINOR > 8
+ if (event->has<EventContent::FileContent>()) {
+#else
if (event->hasFileContent()) {
+#endif
const auto transferInfo = cachedFileTransferInfo(event);
if (transferInfo.completed()) {
UrlHelper helper;
@@ -1489,7 +1512,11 @@ void NeoChatRoom::copyEventMedia(const QString &eventId)
const auto evtIt = findInTimeline(eventId);
if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
const auto event = evtIt->viewAs<RoomMessageEvent>();
+#if Quotient_VERSION_MINOR > 8
+ if (event->has<EventContent::FileContent>()) {
+#else
if (event->hasFileContent()) {
+#endif
const auto transferInfo = fileTransferInfo(eventId);
if (transferInfo.completed()) {
Clipboard clipboard;
@@ -1522,13 +1549,20 @@ FileTransferInfo NeoChatRoom::cachedFileTransferInfo(const Quotient::RoomEvent *
QString mxcUrl;
int total = 0;
if (auto evt = eventCast<const Quotient::RoomMessageEvent>(event)) {
+#if Quotient_VERSION_MINOR > 8
+ if (evt->has<EventContent::FileContent>()) {
+ const auto fileContent = evt->get<EventContent::FileContent>();
+#else
if (evt->hasFileContent()) {
- mxcUrl = evt->content()->fileInfo()->url().toString();
- total = evt->content()->fileInfo()->payloadSize;
+ const auto fileContent = evt->content()->fileInfo();
+#endif
+
+ mxcUrl = fileContent->url().toString();
+ total = fileContent->payloadSize;
}
} else if (auto evt = eventCast<const Quotient::StickerEvent>(event)) {
- mxcUrl = evt->image().fileInfo()->url().toString();
- total = evt->image().fileInfo()->payloadSize;
+ mxcUrl = evt->image().url().toString();
+ total = evt->image().payloadSize;
}
FileTransferInfo transferInfo = fileTransferInfo(event->id());
--
2.47.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfd419a87cbbe5fecbd7833189255ee2f582b4e1fb0f4f88bdef7e60a92fbc8f
size 980740

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmaDnTEACgkQu0YzUNbv
Me+NtQ/9GvS+JIQ/Q2lIz7j+kHAM8AB/+iU2QT/9EEwUB1C43KnGr71xK/SW9Cnc
Ug1ctNLE1kuDu1cfOo59+MY/ite1r4lksGl/3lGFUe6OGexbkfj9sArtFrm2ci4+
JIiNfceGgFIrVcDotyDEqyoSrRTpeT33IIlNbmB6TrJmPNPQtnHwE4CPp1K7/oXK
/YEYfikYJ7FJ3a329qQ6IqiX9pNGNYnA10Hnh7fFEIrEqPPjQOG/0wIOXYtZHdfK
sjWYpxkXm47NDuvJdh40oRYYFEPfnsTMyalA08jZ/v7LJk6tii2UPkQXDW3QRdj5
1CHgtScM5bmwvpOqPoPmC3tldS3aQQmevRARIKucXfp2cG+oXvWWejOM+rcFCQK9
/B8E+M8Yg5emLUNGHmnC0yp7TnwjY3E5SQO43Vvu3o87pM+VICP9q2tjtM1p41dH
TbGVMEJghD502IGS49zXTDpgxmvcfEY1DcfaaMIQTEvlc2vYEYiF9iYlBka/snUb
1UjvwIpZE6XPkV1eZx0QZEjwE9lqrIwImKp+gqOFWvMlDsc/nw4BgzbofNApZFkU
rDtBiUpRUJzCUBR0mGY+u45RT+PfMsZ4jwTCK7b7HS/CFBlMgNEB+QIrlA3hH7Hd
s6D27AhtAfNv6BO2gmmghrq7mp1NPqZd7OonOrIm6HpM12LVo/U=
=uTZj
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b72d1864cc0d90704318c8970b9dc6a2dacd541fc5b95c46dcebb5c6a61705f
size 1024700

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAma+4OIACgkQu0YzUNbv
Me9Ulg//RSBBVRtllnbfvqEtMsR4GTdAl9MzMI56XvPRszsHWiNVJqP3PXOYR7+m
fqpGkxbAxelBxKn8gpYzBqj75TLMnPKQdjXR5op3kI9EIr5kToc6VWvPyr7+MOaW
V1Jos7n3EzzL9cMOyWcG+ty9ar5+o80Zr3MuLNN7bevc11YQSzmx+EG1A6sfCPCO
wWyjX0CBepYZJsuafbT0Zxd1+hHvjGOTQg6GmVl1l0kn1Jkt7jb1hS+pVzNPgniJ
y3/sMkR6PE/fNmteUbBiqYBMVLyx7Ii2lqwlD+8vWRrRjSF/p5QjAieVjYybY/6q
sHgsBvfoPS4znN6ld1Guvx9KdoCUkoftJ54xZpe6fPZBlRLAqxd91a7guZ1aqbSp
XRsVnos0JCsViHIXCgaSm8KmmtGgHZSQX3rxmRzx2hnLn7V16zs7rAA6rXRE36XH
6fntJwYBKPER6BK06h8bxCxna0qljF9v1nSx84qN06jtWcn78dGZsR+EWR8PcN6C
gPpoXyp050sUwtVYPaYD/xZ/ypsuRFj0z2fbmUslONFwMPwmCdgcYoaRcUXey6Nc
iEQe2YkUY0408INPgVafA5puVgWrGm6dU6wSv6sjQHl70Z2p/RDA91hpQC/662Fy
cvoREbi83cVIpzrf+EaYCGLd6JiDhddpaZayPCG/XvGm7Qr+mfc=
=q5Hs
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a394f04cf19d5567437e558075c9f7ce5c37bf73943b13c47739ff56acde571d
size 1025240

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmbf/SUACgkQu0YzUNbv
Me8geQ//RxjnQ0GVT7lKRZAIqd3Do6mFGt8Mi0L1pspRRRW8W9HmG+k7aO5Syo2D
slkPngcLFEOwm/4x5dqIre2SOt+vvJwC07TDkUv8pkd4GjsmnyJmnAV2Y6yz1+cw
kDKP569Re/IW+EZxnuweGTlAn7eu4sp36LpFwZwFHxNUcdHMX2BvO24nk4kLy2VC
Igt8BCZfng1Qf0jybIjIqKGPDmaJ8WGmUMRfyqn9aPVc+O9Tb6SMo4cPSUMbic4i
XAFpPlrkgudwd0KlBftAx1zGNFxUU/3o3kTQv/2ZNj/Y4ouuRBpR0vl5Js5zDK4E
+S5bVtSTIFU4qYcxm1nTVYrfjp0DGADUavz64op5DgLzmalMAe7DNqHIhOmA25O3
urKbyU6p9WtUZ2Dx6ZPO78TepTGgl+CSkfPtCTTtSGFwQyR/D7HzihMXqXHb7rjK
L+FjUq7Kq+Vkl5cXyYWJaqMBDbwRRRU0Vv72DUB/Lj6GpVUSaJzNKTlU76Xgp/hj
vUhIvanwube9FTiKLfRxuf64vm56j2/llkAqpb3sBFz6ygOlwMo+AF7gFKmvHtlc
UuF4khQQYimjaoAMI/skd1xBmjVGVZmrTpiX3ZeDwhb9Sq240kazRxLwEnh7tfoG
0mEv0Efl7Zv5DR3G+x6MKJPmWxU6zn/fewlT59xfiFuAOyYp+as=
=F8mD
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:873f08f35ef1055b17647098a2ba5a3924dc0fb8350441d380c3598d8213c1bc
size 1027192

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmcGk4kACgkQu0YzUNbv
Me8e9Q/+LTIxIAfoDPOM1KjqErxZC9FGfQVewTwQhE7G3+zsXmydxk3J0CskKlKL
3FrbKJKE5APPJU33fnGRK+5mBpF9ZlnfD4p6eN8Cj//8M09M8NOHK1uTeNXzxD9L
YTFkJftkW8lGqAoFE6xOPqJz3enZrnpjoH5tisRp6UHRgAjSL72yljVL5PPID1Rn
aTISvCvPd3efKDdTiLJozYCSzboH5hJI4t3Unq9EACBXCnpecFZGQaFx/IGkm+wc
VF46g6YPV5wnYseqYrmS2esCBrdDz7DmT2chfeeJz42HkhmVUpqzyWs00tTo3j6n
cHcsOv5IFpHe9ryxnHPBfeh4uSnVvHMpDpeFbjWvQqF3zssiJNMluqiXAKKyHK2e
W5WJZd5+gSerSNDEnNUnCiX6hVhJ2+EN1Ez5CINJferJx7yp9Vz+Gsh3119E6chs
x/x9qJS3Jtibi4gKKZq+dKFEzGiaFyUcBG9iXM864rrzKumZ4cATmar8ik7x35Sh
tp6B8IvklMREZz4t327eV8l8FtbogEanvNFKyv+bohDAzyDgNG9eRvCLto4W9/ab
2QZVydVru1hnbQRgg1UcxNe/WIqex4zLS5hSUpISWmxanJGGzGJn4z8lUQxs14GF
/jQjwN5DIpa90Rcl9OY9KKNNd6ZTbN5V9M0dGBLENJuThx/Hf6E=
=w8nA
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f28988f68ebf405b0c448ab9f8e4ddace819e08e86fad9d6b2149bb98e7d0f09
size 1031148

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmcpZPAACgkQu0YzUNbv
Me+WHg/8CZJFrkPTvJ9r/hYwLheQhvgBqfcU4HnxM/IDss62ckeba3XQohMg5xze
jxgPq72zVRAB9UDN4srpsUH2JKdmKgEbYJP1MLzr9x7074mh7c8Ooa0iyMDrrlGR
+NfHU7vBCphUYd6oSEMzoOnV03pWAQ5o3nz7YW5+syZrJgnhbPbqZ9YXVrGcDuZy
wbrEjEnPXy9StPKi8M+kbr8ufHardBfgoccYr7Vn8ONeLm6iEzmnT8CjDumAZBSL
I28ZpO6dn3+5zbdtUDe2EkFNqzQvrlSVPornFtSpl1wfnmBwwCdBRjiuy1FFLUF0
YCB0W6Boog1S62j10pWaQl5zrHjJbT/+QTkzSTtp4x6GWwk0k5L/jOTrwe3NUVEO
Ztc4MGO2vDw5OZ7QjGPGa/YxWAwvx1lnyHpxz+DiXKGZQ9Ry0rILg/sOMkHnI0s7
BtM7KW4b160MCLP7Z2iIXx6GWJBL94/VLM3+quJ5ou7z9rxYHgyLJsbTrE38X1Af
WkXoixjJRH4BYVBe/xyyu4x2y/bNC270CH/t7CdA2ZPZcFa6TV7LfSxi9taqMuPe
K4DX3Hfh8+f47+/KZ7KivCqtLEpldYIpTEGCa59po+ueIxAXstr/CYscZ7GXjne5
m4c9gFkcPbXwseOh+8KsjiMjIHLj1xWvdhnkYYT6WuyDgvG2jVw=
=seO3
-----END PGP SIGNATURE-----