Call stuff

Fixes #463

.gitignore

@@ -5,3 +5,4 @@ build
 neochat.kdev4
 compile_commands.json
 .cache/
+.vscode/

.reuse/dep5

@@ -13,3 +13,32 @@ License: CC0-1.0
 Files: android/res/drawable/splash.xml
 Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
+
+Files: */qmldir .gitignore
+Copyright: None
+License: CC0-1.0
+
+Files: .gitlab/issue_templates/bug.md
+Copyright: 2021 Carl Schwan <carlschwan@kde.org>
+License: CC0-1.0
+
+Files: res.qrc
+Copyright: None
+License: CC0-1.0
+
+Files: cmake/Flatpak/99-noto-mono-color-emoji.conf
+Copyright: 2021 Carl Schwan <carlschwan@kde.org>
+License: BSD-2-Clause
+
+Files: src/neochatconfig.kcfg
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>
+Copyright: 2020-2021 Tobias Fella <fella@posteo.de>
+License: BSD-2-Clause
+
+Files: neochat.notifyrc
+Copyright: 2020 Tobias Fella <fella@posteo.de>
+License: BSD-2-Clause
+
+Files: imports/NeoChat/Component/confetti.png imports/NeoChat/Component/glowdot.png
+Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
+License: CC0-1.0

CMakeLists.txt

@@ -4,20 +4,22 @@
 # SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.16)
 
 project(NeoChat)
 
-set(KF5_MIN_VERSION "5.77.0")
+set(KF5_MIN_VERSION "5.87.0")
 set(QT_MIN_VERSION "5.15.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(KDE_COMPILERSETTINGS_LEVEL 5.84)
+
 include(FeatureSummary)
 include(ECMSetupVersion)
 include(KDEInstallDirs)
@@ -26,6 +28,8 @@ include(KDEClangFormat)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
+include(KDEGitCommitHooks)
+include(ECMCheckOutboundLicense)
 
 if(NEOCHAT_FLATPAK)
     include(cmake/Flatpak.cmake)
@@ -34,12 +38,12 @@ endif()
 # Fix a crash due to problems with quotient's event system. Can probably be removed once the reworked event system is in
 cmake_policy(SET CMP0063 OLD)
 
-ecm_setup_version(1.1.80
+ecm_setup_version(1.2.80
     VARIABLE_PREFIX NEOCHAT
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Widgets Core Quick Gui QuickControls2 Multimedia Svg)
+find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
 set_package_properties(Qt5 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -67,10 +71,12 @@ if(ANDROID)
         PURPOSE "Encrypted communications"
     )
 else()
-    find_package(KF5QQC2DesktopStyle ${KF5_MIN_VERSION} REQUIRED)
+    find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Widgets)
+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem Sonnet)
     set_package_properties(KF5QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )
+    ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
@@ -104,6 +110,17 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
+find_package(QCoro REQUIRED)
+
+qcoro_enable_coroutines()
+
+include(FindPkgConfig)
+pkg_check_modules(GSTREAMER IMPORTED_TARGET gstreamer-sdp-1.0>=1.16 gstreamer-webrtc-1.0>=1.16)
+
+if(ANDROID)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
+endif()
+
 install(FILES org.kde.neochat.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.neochat.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES org.kde.neochat.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
@@ -121,3 +138,7 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAG
 
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
+kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h *.qml)
+ecm_check_outbound_license(LICENSES GPL-3.0-only FILES ${ALL_SOURCE_FILES})

LICENSES/LGPL-2.0-or-later.txt

@@ -0,0 +1,446 @@
+GNU LIBRARY GENERAL PUBLIC LICENSE
+
+Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
+
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is numbered 2 because
+it goes with version 2 of the ordinary GPL.]
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public Licenses are intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.
+
+This license, the Library General Public License, applies to some specially
+designated Free Software Foundation software, and to any other libraries whose
+authors decide to use it. You can use it for your libraries, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom
+to distribute copies of free software (and charge for this service if you
+wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of
+the library, or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis or for
+a fee, you must give the recipients all the rights that we gave you. You must
+make sure that they, too, receive or can get the source code. If you link
+a program with the library, you must provide complete object files to the
+recipients so that they can relink them with the library, after making changes
+to the library and recompiling it. And you must show them these terms so they
+know their rights.
+
+Our method of protecting your rights has two steps: (1) copyright the library,
+and (2) offer you this license which gives you legal permission to copy, distribute
+and/or modify the library.
+
+Also, for each distributor's protection, we want to make certain that everyone
+understands that there is no warranty for this free library. If the library
+is modified by someone else and passed on, we want its recipients to know
+that what they have is not the original version, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that companies distributing free software will individually
+obtain patent licenses, thus in effect transforming the program into proprietary
+software. To prevent this, we have made it clear that any patent must be licensed
+for everyone's free use or not licensed at all.
+
+Most GNU software, including some libraries, is covered by the ordinary GNU
+General Public License, which was designed for utility programs. This license,
+the GNU Library General Public License, applies to certain designated libraries.
+This license is quite different from the ordinary one; be sure to read it
+in full, and don't assume that anything in it is the same as in the ordinary
+license.
+
+The reason we have a separate public license for some libraries is that they
+blur the distinction we usually make between modifying or adding to a program
+and simply using it. Linking a program with a library, without changing the
+library, is in some sense simply using the library, and is analogous to running
+a utility program or application program. However, in a textual and legal
+sense, the linked executable is a combined work, a derivative of the original
+library, and the ordinary General Public License treats it as such.
+
+Because of this blurred distinction, using the ordinary General Public License
+for libraries did not effectively promote software sharing, because most developers
+did not use the libraries. We concluded that weaker conditions might promote
+sharing better.
+
+However, unrestricted linking of non-free programs would deprive the users
+of those programs of all benefit from the free status of the libraries themselves.
+This Library General Public License is intended to permit developers of non-free
+programs to use free libraries, while preserving your freedom as a user of
+such programs to change the free libraries that are incorporated in them.
+(We have not seen how to achieve this as regards changes in header files,
+but we have achieved it as regards changes in the actual functions of the
+Library.) The hope is that this will lead to faster development of free libraries.
+
+The precise terms and conditions for copying, distribution and modification
+follow. Pay close attention to the difference between a "work based on the
+library" and a "work that uses the library". The former contains code derived
+from the library, while the latter only works together with the library.
+
+Note that it is possible for a library to be covered by the ordinary General
+Public License rather than by this special one.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License Agreement applies to any software library which contains a
+notice placed by the copyright holder or other authorized party saying it
+may be distributed under the terms of this Library General Public License
+(also called "this License"). Each licensee is addressed as "you".
+
+A "library" means a collection of software functions and/or data prepared
+so as to be conveniently linked with application programs (which use some
+of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work which has
+been distributed under these terms. A "work based on the Library" means either
+the Library or any derivative work under copyright law: that is to say, a
+work containing the Library or a portion of it, either verbatim or with modifications
+and/or translated straightforwardly into another language. (Hereinafter, translation
+is included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for making modifications
+to it. For a library, complete source code means all the source code for all
+modules it contains, plus any associated interface definition files, plus
+the scripts used to control compilation and installation of the library.
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running a program
+using the Library is not restricted, and output from such a program is covered
+only if its contents constitute a work based on the Library (independent of
+the use of the Library in a tool for writing it). Whether that is true depends
+on what the Library does and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's complete source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and disclaimer
+of warranty; keep intact all the notices that refer to this License and to
+the absence of any warranty; and distribute a copy of this License along with
+the Library.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Library or any portion of it,
+thus forming a work based on the Library, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all
+of these conditions:
+
+      a) The modified work must itself be a software library.
+
+b) You must cause the files modified to carry prominent notices stating that
+you changed the files and the date of any change.
+
+c) You must cause the whole of the work to be licensed at no charge to all
+third parties under the terms of this License.
+
+d) If a facility in the modified Library refers to a function or a table of
+data to be supplied by an application program that uses the facility, other
+than as an argument passed when the facility is invoked, then you must make
+a good faith effort to ensure that, in the event an application does not supply
+such function or table, the facility still operates, and performs whatever
+part of its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has a purpose
+that is entirely well-defined independent of the application. Therefore, Subsection
+2d requires that any application-supplied function or table used by this function
+must be optional: if the application does not supply it, the square root function
+must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Library, and can be reasonably
+considered independent and separate works in themselves, then this License,
+and its terms, do not apply to those sections when you distribute them as
+separate works. But when you distribute the same sections as part of a whole
+which is a work based on the Library, the distribution of the whole must be
+on the terms of this License, whose permissions for other licensees extend
+to the entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise
+the right to control the distribution of derivative or collective works based
+on the Library.
+
+In addition, mere aggregation of another work not based on the Library with
+the Library (or with a work based on the Library) on a volume of a storage
+or distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public License
+instead of this License to a given copy of the Library. To do this, you must
+alter all the notices that refer to this License, so that they refer to the
+ordinary GNU General Public License, version 2, instead of to this License.
+(If a newer version than version 2 of the ordinary GNU General Public License
+has appeared, then you can specify that version instead if you wish.) Do not
+make any other change in these notices.
+
+Once this change is made in a given copy, it is irreversible for that copy,
+so the ordinary GNU General Public License applies to all subsequent copies
+and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of the Library
+into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or derivative of
+it, under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you accompany it with the complete corresponding
+machine-readable source code, which must be distributed under the terms of
+Sections 1 and 2 above on a medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy from a designated
+place, then offering equivalent access to copy the source code from the same
+place satisfies the requirement to distribute the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the Library, but
+is designed to work with the Library by being compiled or linked with it,
+is called a "work that uses the Library". Such a work, in isolation, is not
+a derivative work of the Library, and therefore falls outside the scope of
+this License.
+
+However, linking a "work that uses the Library" with the Library creates an
+executable that is a derivative of the Library (because it contains portions
+of the Library), rather than a "work that uses the library". The executable
+is therefore covered by this License. Section 6 states terms for distribution
+of such executables.
+
+When a "work that uses the Library" uses material from a header file that
+is part of the Library, the object code for the work may be a derivative work
+of the Library even though the source code is not. Whether this is true is
+especially significant if the work can be linked without the Library, or if
+the work is itself a library. The threshold for this to be true is not precisely
+defined by law.
+
+If such an object file uses only numerical parameters, data structure layouts
+and accessors, and small macros and small inline functions (ten lines or less
+in length), then the use of the object file is unrestricted, regardless of
+whether it is legally a derivative work. (Executables containing this object
+code plus portions of the Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may distribute
+the object code for the work under the terms of Section 6. Any executables
+containing that work also fall under Section 6, whether or not they are linked
+directly with the Library itself.
+
+6. As an exception to the Sections above, you may also compile or link a "work
+that uses the Library" with the Library to produce a work containing portions
+of the Library, and distribute that work under terms of your choice, provided
+that the terms permit modification of the work for the customer's own use
+and reverse engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the Library
+is used in it and that the Library and its use are covered by this License.
+You must supply a copy of this License. If the work during execution displays
+copyright notices, you must include the copyright notice for the Library among
+them, as well as a reference directing the user to the copy of this License.
+Also, you must do one of these things:
+
+a) Accompany the work with the complete corresponding machine-readable source
+code for the Library including whatever changes were used in the work (which
+must be distributed under Sections 1 and 2 above); and, if the work is an
+executable linked with the Library, with the complete machine-readable "work
+that uses the Library", as object code and/or source code, so that the user
+can modify the Library and then relink to produce a modified executable containing
+the modified Library. (It is understood that the user who changes the contents
+of definitions files in the Library will not necessarily be able to recompile
+the application to use the modified definitions.)
+
+b) Accompany the work with a written offer, valid for at least three years,
+to give the same user the materials specified in Subsection 6a, above, for
+a charge no more than the cost of performing this distribution.
+
+c) If distribution of the work is made by offering access to copy from a designated
+place, offer equivalent access to copy the above specified materials from
+the same place.
+
+d) Verify that the user has already received a copy of these materials or
+that you have already sent this user a copy.
+
+For an executable, the required form of the "work that uses the Library" must
+include any data and utility programs needed for reproducing the executable
+from it. However, as a special exception, the source code distributed need
+not include anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the operating
+system on which the executable runs, unless that component itself accompanies
+the executable.
+
+It may happen that this requirement contradicts the license restrictions of
+other proprietary libraries that do not normally accompany the operating system.
+Such a contradiction means you cannot use both them and the Library together
+in an executable that you distribute.
+
+7. You may place library facilities that are a work based on the Library side-by-side
+in a single library together with other library facilities not covered by
+this License, and distribute such a combined library, provided that the separate
+distribution of the work based on the Library and of the other library facilities
+is otherwise permitted, and provided that you do these two things:
+
+a) Accompany the combined library with a copy of the same work based on the
+Library, uncombined with any other library facilities. This must be distributed
+under the terms of the Sections above.
+
+b) Give prominent notice with the combined library of the fact that part of
+it is a work based on the Library, and explaining where to find the accompanying
+uncombined form of the same work.
+
+8. You may not copy, modify, sublicense, link with, or distribute the Library
+except as expressly provided under this License. Any attempt otherwise to
+copy, modify, sublicense, link with, or distribute the Library is void, and
+will automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will not
+have their licenses terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not signed
+it. However, nothing else grants you permission to modify or distribute the
+Library or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the Library
+(or any work based on the Library), you indicate your acceptance of this License
+to do so, and all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the Library),
+the recipient automatically receives a license from the original licensor
+to copy, distribute, link with or modify the Library subject to these terms
+and conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+11. If, as a consequence of a court judgment or allegation of patent infringement
+or for any other reason (not limited to patent issues), conditions are imposed
+on you (whether by court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the conditions of
+this License. If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations, then as
+a consequence you may not distribute the Library at all. For example, if a
+patent license would not permit royalty-free redistribution of the Library
+by all those who receive copies directly or indirectly through you, then the
+only way you could satisfy both it and this License would be to refrain entirely
+from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents
+or other property right claims or to contest validity of any such claims;
+this section has the sole purpose of protecting the integrity of the free
+software distribution system which is implemented by public license practices.
+Many people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Library under this License may add an explicit geographical
+distribution limitation excluding those countries, so that distribution is
+permitted only in or among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new versions of
+the Library General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to address
+new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that version
+or of any later version published by the Free Software Foundation. If the
+Library does not specify a license version number, you may choose any version
+ever published by the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free programs
+whose distribution conditions are incompatible with these, write to the author
+to ask for permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make exceptions
+for this. Our decision will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+   NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
+OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
+THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE
+OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
+OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
+HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Libraries
+
+If you develop a new library, and you want it to be of the greatest possible
+use to the public, we recommend making it free software that everyone can
+redistribute and change. You can do so by permitting redistribution under
+these terms (or, alternatively, under the terms of the ordinary General Public
+License).
+
+To apply these terms, attach the following notices to the library. It is safest
+to attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the "copyright"
+line and a pointer to where the full notice is found.
+
+one line to give the library's name and an idea of what it does.
+
+Copyright (C) year name of author
+
+This library is free software; you can redistribute it and/or modify it under
+the terms of the GNU Library General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
+details.
+
+You should have received a copy of the GNU Library General Public License
+along with this library; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the library, if necessary. Here
+is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in
+
+the library `Frob' (a library for tweaking knobs) written
+
+by James Random Hacker.
+
+signature of Ty Coon, 1 April 1990
+
+Ty Coon, President of Vice
+
+That's all there is to it!

LICENSES/LicenseRef-KDE-Accepted-GPL.txt

@@ -0,0 +1,12 @@
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 3 of
+the license or (at your option) at any later version that is
+accepted by the membership of KDE e.V. (or its successor
+approved by the membership of KDE e.V.), which shall act as a
+proxy as defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.

LICENSES/MIT.txt

@@ -0,0 +1,19 @@
+MIT License Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Messages.sh

@@ -1,2 +1,4 @@
 #! /usr/bin/env bash
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
 $XGETTEXT `find . \( -name \*.cpp -o -name \*.h -o -name \*.qml \)` -o $podir/neochat.pot

README.md

@@ -1,3 +1,8 @@
+<!--
+    SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
+    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
+    SPDX-License-Identifier: CC0-1.0
+-->
 # NeoChat
 
 NeoChat is a client for Matrix, the decentralized communication protocol for instant
@@ -22,7 +27,7 @@ flatpak install kdeapps org.kde.neochat
 ```
 
 A nightly build is also available for Android in the [KDE nightly F-Droid repo](https://community.kde.org/Android/FDroid)
-and can also directly be downloaded from the [binary factory](https://binary-factory.kde.org/view/Android/job/Neochat_android/).
+and can also directly be downloaded from the [binary factory](https://binary-factory.kde.org/view/Android/job/NeoChat_Nightly_android-arm64/).
 
 Nightly builds for [Windows](https://binary-factory.kde.org/job/NeoChat_Nightly_win64/), [MacOS](https://binary-factory.kde.org/job/NeoChat_Nightly_macos/) and [AppImages](https://binary-factory.kde.org/job/NeoChat_Nightly_appimage/) can also be downloaded from the [binary factory](https://binary-factory.kde.org/search/?q=neochat).
 

android/AndroidManifest.xml

@@ -6,8 +6,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.kde.neochat"
-          android:versionName="0.0.1"
-          android:versionCode="1604412458"
+          android:versionName="${versionName}"
+          android:versionCode="${versionCode}"
           android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
@@ -53,7 +53,6 @@
         </activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

android/build.gradle

@@ -0,0 +1,96 @@
+/*
+    SPDX-FileCopyrightText: 2018-2020 Volker Krause <vkrause@kde.org>
+    SPDX-FileCopyrightText: 2019 Nicolas Fella <nicolas.fella@gmx.de>
+    SPDX-FileCopyrightText: 2020 Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
+    SPDX-License-Identifier: BSD-3-Clause
+*/
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.6.4'
+    }
+}
+
+repositories {
+    google()
+    jcenter()
+}
+
+
+apply plugin: 'com.android.application'
+apply from: '../version.gradle'
+def timestamp = (int)(new Date().getTime()/1000)
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+}
+
+android {
+    /*******************************************************
+     * The following variables:
+     * - androidBuildToolsVersion,
+     * - androidCompileSdkVersion
+     * - qt5AndroidDir - holds the path to qt android files
+     *                   needed to build any Qt application
+     *                   on Android.
+     *
+     * are defined in gradle.properties file. This file is
+     * updated by QtCreator and androiddeployqt tools.
+     * Changing them manually might break the compilation!
+     *******************************************************/
+
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+
+    buildToolsVersion androidBuildToolsVersion
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+            res.srcDirs = [qt5AndroidDir + '/res', 'res']
+            resources.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            assets.srcDirs = ['assets']
+            jniLibs.srcDirs = ['libs']
+       }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    defaultConfig {
+        minSdkVersion qtMinSdkVersion
+        targetSdkVersion qtTargetSdkVersion
+        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
+    }
+
+    packagingOptions {
+        exclude 'lib/*/*RemoteObjects*'
+        exclude 'lib/*/*StateMachine*'
+        exclude 'lib/*/*_imageformats_qico_*'
+        exclude 'lib/*/*_imageformats_qicns_*'
+        exclude 'lib/*/*_imageformats_qtga_*'
+        exclude 'lib/*/*_imageformats_qtiff_*'
+        exclude 'lib/*/*_qmltooling_*'
+    }
+
+    aaptOptions {
+        // different syntax than above
+        // see https://android.googlesource.com/platform/frameworks/base/+/refs/heads/pie-release/tools/aapt2/util/Files.h#90
+        ignoreAssetsPattern '!<dir>ECM:!<dir>aclocal:!<dir>doc:!<dir>gtk-doc:!<dir>iso-codes:!<dir>man:!<dir>mime:!<dir>pkgconfig:!<dir>qlogging-categories5:!<file>iso_15924.mo:!<file>iso_3166-2.mo:!<file>iso_3166-3.mo:!<file>iso_4217.mo:!<file>iso_639-2.mo:!<file>iso_639-3.mo:!<file>iso_639-5.mo:!<file>kcodecs5_qt.qm:!<file>kde5_xml_mimetypes.qm'
+     }
+
+
+}

android/version.gradle.in

@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+ext {
+    projectVersionFull = "@NEOCHAT_VERSION@"
+}

cmake/Findcmark.cmake

@@ -7,14 +7,16 @@
 
 # first try to find cmark-config.cmake
 # path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-find_package(cmark CONFIG)
+find_package(cmark CONFIG QUIET)
 if(cmark_FOUND AND TARGET cmark::cmark)
   # found it!
   return()
 endif()
 
-include(FindPkgConfig)
-pkg_check_modules(PC_CMARK QUIET cmark)
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_CMARK QUIET cmark)
+endif()
 
 if(NOT CMARK_INCLUDE_DIR)
   find_path(CMARK_INCLUDE_DIR

imports/NeoChat/Component/ChatBox/ChatBar.qml

@@ -5,7 +5,9 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
+import QtQuick.Templates 2.15 as T
 import Qt.labs.platform 1.1 as Platform
+import QtQuick.Window 2.15
 
 import org.kde.kirigami 2.15 as Kirigami
 
@@ -66,7 +68,8 @@ ToolBar {
                 id: fontMetrics
                 font: inputField.font
             }
-            TextArea {
+
+            T.TextArea {
                 id: inputField
                 focus: true
                 /* Some QQC2 styles will have their own predefined backgrounds for TextAreas.
@@ -76,7 +79,12 @@ ToolBar {
                 * background colors being very different from the QPalette::Base color.
                 * Luckily, none of the Qt QQC2 styles do that and neither do KDE's QQC2 styles.
                 */
-                background: null
+                background: MouseArea {
+                    acceptedButtons: Qt.NoButton
+                    cursorShape: Qt.IBeamCursor
+                    z: 1
+                }
+
                 leftPadding: mirrored ? 0 : Kirigami.Units.largeSpacing
                 rightPadding: !mirrored ? 0 : Kirigami.Units.largeSpacing
                 topPadding: 0
@@ -93,6 +101,82 @@ ToolBar {
                 wrapMode: Text.Wrap
                 readOnly: currentRoom.usesEncryption
 
+                palette: Kirigami.Theme.palette
+                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                Kirigami.Theme.inherit: false
+
+                implicitWidth: Math.max(contentWidth + leftPadding + rightPadding,
+                                        implicitBackgroundWidth + leftInset + rightInset,
+                                        placeholder.implicitWidth + leftPadding + rightPadding)
+                implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
+                                         implicitBackgroundHeight + topInset + bottomInset,
+                                         placeholder.implicitHeight + topPadding + bottomPadding)
+
+                color: Kirigami.Theme.textColor
+                selectionColor: Kirigami.Theme.highlightColor
+                selectedTextColor: Kirigami.Theme.highlightedTextColor
+                hoverEnabled: !Kirigami.Settings.tabletMode
+
+                selectByMouse: !Kirigami.Settings.tabletMode
+
+                cursorDelegate: Loader {
+                    visible: inputField.activeFocus && !inputField.readOnly && inputField.selectionStart === inputField.selectionEnd
+                    active: visible
+                    sourceComponent: CursorDelegate { target: inputField }
+                }
+
+                CursorHandle {
+                    id: selectionStartHandle
+                    target: inputField
+                }
+
+                CursorHandle {
+                    id: selectionEndHandle
+                    target: inputField
+                    isSelectionEnd: true
+                }
+
+                TapHandler {
+                    acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+                    // unfortunately, taphandler's pressed event only triggers when the press is lifted
+                    // we need to use the longpress signal since it triggers when the button is first pressed
+                    longPressThreshold: 0
+                    onLongPressed: TextFieldContextMenu.targetClick(point, inputField, spellcheckhighlighter, inputField.positionAt(point.position.x, point.position.y));
+                }
+
+                onPressAndHold: {
+                    if (!Kirigami.Settings.tabletMode) {
+                        return;
+                    }
+                    forceActiveFocus();
+                    cursorPosition = positionAt(event.x, event.y);
+                    selectWord();
+                }
+
+                onFocusChanged: {
+                    if (focus) {
+                        MobileTextActionsToolBar.controlRoot = inputField;
+                    }
+                }
+
+                Label {
+                    id: placeholder
+                    x: inputField.leftPadding
+                    y: inputField.topPadding
+                    width: inputField.width - (inputField.leftPadding + inputField.rightPadding)
+                    height: inputField.height - (inputField.topPadding + inputField.bottomPadding)
+
+                    text: inputField.placeholderText
+                    font: inputField.font
+                    color: Kirigami.Theme.disabledTextColor
+                    horizontalAlignment: inputField.horizontalAlignment
+                    verticalAlignment: inputField.verticalAlignment
+                    visible: !inputField.length && !inputField.preeditText && (!inputField.activeFocus || inputField.horizontalAlignment !== Qt.AlignHCenter)
+                    wrapMode: Text.Wrap
+                }
+
 
                 ChatDocumentHandler {
                     id: documentHandler
@@ -103,6 +187,18 @@ ToolBar {
                     room: currentRoom ?? null
                 }
 
+                SpellcheckHighlighter {
+                    id: spellcheckhighlighter
+                    document: inputField.textDocument
+                    cursorPosition: inputField.cursorPosition
+                    selectionStart: inputField.selectionStart
+                    selectionEnd: inputField.selectionEnd
+                    onChangeCursorPosition: {
+                        inputField.cursorPosition = start;
+                        inputField.moveCursorSelection(end, TextEdit.SelectCharacters);
+                    }
+                }
+
                 Timer {
                     id: timeoutTimer
                     repeat: false
@@ -143,6 +239,9 @@ ToolBar {
                 }
 
                 Keys.onPressed: {
+                    // trigger if context menu button is pressed
+                    TextFieldContextMenu.targetKeyPressed(event, inputField)
+
                     if (event.key === Qt.Key_PageDown) {
                         switchRoomDown();
                     } else if (event.key === Qt.Key_PageUp) {
@@ -165,12 +264,37 @@ ToolBar {
                         nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocusReason)
                         return
                     }
-                    let decrementedIndex = completionMenu.currentIndex - 1
-                    // Wrap around to the last item
-                    if (decrementedIndex < 0) {
-                        decrementedIndex = Math.max(completionMenu.count - 1, 0) // 0 if count == 0
+                    if (!autoAppeared) {
+                        let decrementedIndex = completionMenu.currentIndex - 1
+                        // Wrap around to the last item
+                        if (decrementedIndex < 0) {
+                            decrementedIndex = Math.max(completionMenu.count - 1, 0) // 0 if count == 0
+                        }
+                        completionMenu.currentIndex = decrementedIndex
+                    } else {
+                        autoAppeared = false;
                     }
-                    completionMenu.currentIndex = decrementedIndex
+
+                    chatBar.complete();
+                }
+
+                // yes, decrement goes up and increment goes down visually.
+                Keys.onUpPressed: (event) => {
+                    if (chatBar.isCompleting) {
+                        event.accepted = true
+                        completionMenu.listView.decrementCurrentIndex()
+                        autoAppeared = true;
+                    }
+                    event.accepted = false
+                }
+
+                Keys.onDownPressed: (event) => {
+                    if (chatBar.isCompleting) {
+                        event.accepted = true
+                        completionMenu.listView.incrementCurrentIndex()
+                        autoAppeared = true;
+                    }
+                    event.accepted = false
                 }
 
                 Keys.onTabPressed: {
@@ -187,7 +311,7 @@ ToolBar {
 
                     // ignore first time tab was clicked so that user can select
                     // first emoji/user
-                    if (autoAppeared === false) {
+                    if (!autoAppeared) {
                         let incrementedIndex = completionMenu.currentIndex + 1;
                         // Wrap around to the first item
                         if (incrementedIndex > completionMenu.count - 1) {
@@ -201,17 +325,27 @@ ToolBar {
                     chatBar.complete();
                 }
 
+                onPressed: MobileTextActionsToolBar.shouldBeVisible = true;
+
                 onTextChanged: {
+                    MobileTextActionsToolBar.shouldBeVisible = false;
                     timeoutTimer.restart()
                     repeatTimer.start()
                     currentRoom.cachedInput = text
                     autoAppeared = false;
 
-                    const completionInfo = documentHandler.getAutocompletionInfo();
+                    const completionInfo = documentHandler.getAutocompletionInfo(isCompleting);
 
                     if (completionInfo.type === ChatDocumentHandler.Ignore) {
+                        if (completionInfo.keyword) {
+                            // custom emojis
+                            const idx = completionMenu.currentIndex;
+                            completionMenu.model = Array.from(chatBar.customEmojiModel.filterModel(completionInfo.keyword)).concat(EmojiModel.filterModel(completionInfo.keyword))
+                            completionMenu.currentIndex = idx;
+                        }
                         return;
                     }
+
                     if (completionInfo.type === ChatDocumentHandler.None) {
                         isCompleting = false;
                         return;
@@ -223,16 +357,19 @@ ToolBar {
                     } else if (completionInfo.type === ChatDocumentHandler.Command) {
                         completionMenu.model = CommandModel.filterModel(completionInfo.keyword);
                     } else {
-                        completionMenu.model = EmojiModel.filterModel(completionInfo.keyword);
+                        completionMenu.model = Array.from(chatBar.customEmojiModel.filterModel(completionInfo.keyword)).concat(EmojiModel.filterModel(completionInfo.keyword))
                     }
 
                     if (completionMenu.model.length === 0) {
                         isCompleting = false;
                         return;
                     }
-                    isCompleting = true
-                    autoAppeared = true;
-                    completionMenu.endPosition = cursorPosition
+
+                    if (!isCompleting) {
+                        isCompleting = true
+                        autoAppeared = true;
+                        completionMenu.endPosition = cursorPosition
+                    }
                 }
             }
         }
@@ -331,6 +468,10 @@ ToolBar {
         }
     }
 
+    property CustomEmojiModel customEmojiModel: CustomEmojiModel {
+        connection: Controller.activeConnection
+    }
+
     function pasteImage() {
         let localPath = Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/screenshots/" + (new Date()).getTime() + ".png";
         if (!Clipboard.saveImage(localPath)) {
@@ -345,7 +486,7 @@ ToolBar {
         if (ChatBoxHelper.hasAttachment) {
             // send attachment but don't reset the text
             actionsHandler.postMessage("", ChatBoxHelper.attachmentPath,
-                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, {});
+                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, {}, this.customEmojiModel);
             currentRoom.markAllMessagesAsRead();
             messageSent();
             return;
@@ -358,7 +499,7 @@ ToolBar {
         } else {
             // send normal message
             actionsHandler.postMessage(inputField.text.trim(), ChatBoxHelper.attachmentPath,
-                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, userAutocompleted);
+                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, userAutocompleted, this.customEmojiModel);
         }
         currentRoom.markAllMessagesAsRead();
         inputField.clear();
@@ -370,8 +511,10 @@ ToolBar {
 
     function complete() {
         documentHandler.replaceAutoComplete(completionMenu.currentDisplayText);
-        if (completionMenu.completionType === "username") {
-            userAutocompleted[completionMenu.currentDisplayText] = completionMenu.currentUserId;
+        if (completionMenu.completionType === ChatDocumentHandler.User
+            && completionMenu.currentDisplayText.length > 0
+            && completionMenu.currentItem.userId.length > 0) {
+            userAutocompleted[completionMenu.currentDisplayText] = completionMenu.currentItem.userId;
         }
     }
 }

imports/NeoChat/Component/ChatBox/ChatBox.qml

@@ -61,6 +61,10 @@ Item {
     QQC2.Pane {
         id: connectionPane
         padding: fontMetrics.lineSpacing * 0.25
+        FontMetrics {
+            id: fontMetrics
+            font: networkLabel.font
+        }
         spacing: 0
         Kirigami.Theme.colorSet: Kirigami.Theme.View
         background: Rectangle {
@@ -69,6 +73,7 @@ Item {
         visible: !Controller.isOnline
         width: parent.width
         QQC2.Label {
+            id: networkLabel
             text: i18n("NeoChat is offline. Please check your network connection.")
         }
         anchors.bottom: emojiPickerLoaderSeparator.top
@@ -227,6 +232,14 @@ Item {
         chatBar.inputFieldForceActiveFocusTriggered()
     }
 
+    Connections {
+        target: RoomManager
+
+        function onCurrentRoomChanged() {
+            chatBar.userAutocompleted = {};
+        }
+    }
+
     Connections {
         target: ChatBoxHelper
 

imports/NeoChat/Component/ChatBox/CompletionMenu.qml

@@ -10,20 +10,21 @@ import Qt.labs.qmlmodels 1.0
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
+import NeoChat.Component 1.0
 
 Popup {
     id: control
 
     // Expose internal ListView properties.
     property alias model: completionListView.model
+    property alias listView: completionListView
     property alias currentIndex: completionListView.currentIndex
     property alias currentItem: completionListView.currentItem
     property alias count: completionListView.count
     property alias delegate: completionListView.delegate
 
     // Autocomplee text
-    property string currentDisplayText: currentItem && currentItem.displayName ? currentItem.displayName : ""
-    property string currentUserId: currentItem && currentItem.id ? currentItem.id : ""
+    property string currentDisplayText: currentItem && (currentItem.displayName ?? "")
 
     property int completionType: ChatDocumentHandler.Emoji
     property int beginPosition: 0
@@ -43,7 +44,7 @@ Popup {
         completionListView.currentIndex = 0;
     }
 
-    implicitHeight: Math.min(completionListView.contentHeight, Kirigami.Units.gridUnit * 5)
+    implicitHeight: Math.min(completionListView.contentHeight, Kirigami.Units.gridUnit * 10)
 
     contentItem: ScrollView {
         ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
@@ -78,6 +79,7 @@ Popup {
             id: usernameItem
             width: ListView.view.width ?? implicitWidth
             property string displayName: modelData.displayName
+            property string userId: modelData.id
             leading: Kirigami.Avatar {
                 implicitHeight: Kirigami.Units.gridUnit
                 implicitWidth: implicitHeight
@@ -86,11 +88,6 @@ Popup {
             }
             text: modelData.displayName
             onClicked: completeTriggered();
-            Component.onCompleted: {
-                completionMenu.currentUserId = Qt.binding(() => {
-                    return modelData.id ?? "";
-                });
-            }
         }
     }
 
@@ -99,23 +96,40 @@ Popup {
         Kirigami.BasicListItem {
             id: emojiItem
             width: ListView.view.width ?? implicitWidth
-            property string displayName: modelData.unicode
-            text: modelData.unicode + " " + modelData.shortname
+            property string displayName: modelData.isCustom ? modelData.shortname : modelData.unicode
+            text: modelData.shortname
+            height: Kirigami.Units.gridUnit * 2
 
-            leading: Label {
-                id: unicodeLabel
-                Layout.preferredHeight: Kirigami.Units.gridUnit
-                Layout.preferredWidth: textMetrics.tightBoundingRect.width
-                font.pointSize: Kirigami.Units.gridUnit * 0.75
-                text: modelData.unicode
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-            TextMetrics {
-                id: textMetrics
-                text: modelData.unicode
-                font: unicodeLabel.font
+            leading: Image {
+                source: modelData.isCustom ? modelData.unicode : ""
+
+                width: height
+                sourceSize.width: width
+                sourceSize.height: height
+
+                Rectangle {
+                    anchors.fill: parent
+                    visible: parent.status === Image.Loading
+                    radius: height/2
+                    gradient: ShimmerGradient { }
+                }
+
+                Label {
+                    id: unicodeLabel
+
+                    visible: !modelData.isCustom
+
+                    font.family: 'emoji'
+                    font.pixelSize: height - 2
+
+                    text: modelData.unicode
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    anchors.fill: parent
+                }
             }
+
             onClicked: completeTriggered();
         }
     }

imports/NeoChat/Component/ChatBox/CursorDelegate.qml

@@ -0,0 +1,65 @@
+/* SPDX-FileCopyrightText: 2018 Marco Martin <mart@kde.org>
+ * SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
+ * SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import QtQuick.Templates 2.15
+import org.kde.kirigami 2.14 as Kirigami
+
+Item {
+    id: root
+    property alias target: root.parent
+
+    Rectangle {
+        id: cursorLine
+        property real previousX: 0
+        property real previousY: 0
+        parent: target
+        implicitWidth: target.cursorRectangle.width
+        implicitHeight: target.cursorRectangle.height
+        x: Math.floor(target.cursorRectangle.x)
+        y: Math.floor(target.cursorRectangle.y)
+
+        color: target.color
+        SequentialAnimation {
+            id: blinkAnimation
+            running: root.visible && Qt.styleHints.cursorFlashTime != 0 && target.selectionStart === target.selectionEnd
+            PropertyAction {
+                target: cursorLine
+                property: "opacity"
+                value: 1
+            }
+            PauseAnimation {
+                duration: Qt.styleHints.cursorFlashTime/2
+            }
+            SequentialAnimation {
+                loops: Animation.Infinite
+                OpacityAnimator {
+                    target: cursorLine
+                    from: 1
+                    to: 0
+                    duration: Qt.styleHints.cursorFlashTime/2
+                    easing.type: Easing.OutCubic
+                }
+                OpacityAnimator {
+                    target: cursorLine
+                    from: 0
+                    to: 1
+                    duration: Qt.styleHints.cursorFlashTime/2
+                    easing.type: Easing.OutCubic
+                }
+            }
+        }
+    }
+
+    Connections {
+        target: root.target
+        function onCursorPositionChanged() {
+            blinkAnimation.restart()
+        }
+    }
+}
+
+

imports/NeoChat/Component/ChatBox/CursorHandle.qml

@@ -0,0 +1,98 @@
+/* SPDX-FileCopyrightText: 2018 Marco Martin <mart@kde.org>
+ * SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
+ * SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import QtQuick.Templates 2.15
+import org.kde.kirigami 2.14 as Kirigami
+
+Loader {
+    id: root
+    property Item target
+    property bool isSelectionEnd: false
+    visible: Kirigami.Settings.tabletMode && target.activeFocus && (isSelectionEnd ? target.selectionStart !== target.selectionEnd : true)
+    active: visible
+    sourceComponent: Kirigami.ShadowedRectangle {
+        id: handle
+        property real selectionStartX: Math.floor(Qt.inputMethod.anchorRectangle.x + (Qt.inputMethod.cursorRectangle.width - width)/2)
+        property real selectionStartY: Math.floor(Qt.inputMethod.anchorRectangle.y + Qt.inputMethod.cursorRectangle.height + pointyBitVerticalOffset)
+        property real selectionEndX: Math.floor(Qt.inputMethod.cursorRectangle.x + (Qt.inputMethod.cursorRectangle.width - width)/2)
+        property real selectionEndY: Math.floor(Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height + pointyBitVerticalOffset)
+        property real pointyBitVerticalOffset: Math.abs(pointyBit.y*2)
+        parent: Overlay.overlay
+        x: isSelectionEnd ? selectionEndX : selectionStartX
+        y: isSelectionEnd ? selectionEndY : selectionStartY
+
+        // HACK: make it appear above most popups that show up in the
+        // overlay in case any of them use TextField or TextArea
+        z: 999
+
+        //opacity: target.activeFocus ? 1 : 0
+        implicitHeight: {
+            let h = Kirigami.Units.gridUnit
+            return h - (h % 2 == 0 ? 1 : 0)
+        }
+        implicitWidth: implicitHeight
+        radius: width/2
+
+        color: target.selectionColor
+
+        shadow {
+            color: Qt.rgba(0,0,0,0.2)
+            size: 3
+            yOffset: 1
+        }
+
+        Rectangle {
+            id: pointyBit
+            x: (parent.width - width)/2
+            y: -height/4 + 0.2 // magic number to get it to line up with the edge of the circle
+            implicitHeight: parent.implicitHeight/2
+            implicitWidth: implicitHeight
+            antialiasing: true
+            rotation: 45
+            color: parent.color
+        }
+
+        Kirigami.ShadowedRectangle {
+            id: inner
+            visible: target.selectionStart !== target.selectionEnd && (handle.y < selectionStartY || handle.y < selectionEndY)
+            anchors.fill: parent
+            anchors.margins: Kirigami.Units.smallBorder
+            color: target.selectedTextColor
+            radius: height/2
+            Rectangle {
+                id: innerPointyBit
+                x: (parent.width - width)/2
+                y: -height/4 + 0.8 // magic number to get it to line up with the edge of the circle
+                implicitHeight: pointyBit.implicitHeight
+                implicitWidth: implicitHeight
+                antialiasing: true
+                rotation: 45
+                color: parent.color
+            }
+        }
+
+        MouseArea {
+            enabled: handle.visible
+            anchors.fill: parent
+    //         preventStealing: true
+            onPositionChanged: {
+                let pos = mapToItem(root.target, mouse.x, mouse.y);
+                pos = root.target.positionAt(pos.x, pos.y - handle.height - handle.pointyBitVerticalOffset);
+
+                if (target.selectionStart !== target.selectionEnd) {
+                    if (!isSelectionEnd) {
+                        root.target.select(Math.min(pos, root.target.selectionEnd - 1), root.target.selectionEnd);
+                    } else {
+                        root.target.select(root.target.selectionStart, Math.max(pos, root.target.selectionStart + 1));
+                    }
+                } else {
+                    root.target.cursorPosition = pos;
+                }
+            }
+        }
+    }
+}

imports/NeoChat/Component/ChatBox/MobileTextActionsToolBar.qml

@@ -0,0 +1,77 @@
+/*
+    SPDX-FileCopyrightText: 2018 Marco Martin <mart@kde.org>
+
+    SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+pragma Singleton
+
+import QtQuick 2.1
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.15
+import org.kde.kirigami 2.5 as Kirigami
+
+Popup {
+    id: root
+
+    property Item controlRoot
+    parent: controlRoot ? controlRoot.Window.contentItem : undefined
+    modal: false
+    focus: false
+    closePolicy: Popup.NoAutoClose
+    property bool shouldBeVisible: false
+
+    x: {
+        if (!controlRoot || !controlRoot.Window.contentItem) {
+            return 0;
+        }
+        return Math.min(Math.max(0, controlRoot.mapToItem(root.parent, controlRoot.positionToRectangle(controlRoot.selectionStart).x, 0).x - root.width/2), controlRoot.Window.contentItem.width - root.width);
+    }
+
+    y: {
+        if (!controlRoot || !controlRoot.Window.contentItem) {
+            return 0;
+        }
+        var desiredY = controlRoot.mapToItem(root.parent, 0, controlRoot.positionToRectangle(controlRoot.selectionStart).y).y  - root.height;
+
+        if (desiredY >= 0) {
+            return Math.min(desiredY, controlRoot.Window.contentItem.height - root.height);
+        } else {
+            return Math.min(Math.max(0, controlRoot.mapToItem(root.parent, 0, controlRoot.positionToRectangle(controlRoot.selectionEnd).y + Math.round(Kirigami.Units.gridUnit*1.5)).y), controlRoot.Window.contentItem.height - root.height);
+        }
+    }
+
+
+    visible: controlRoot ? shouldBeVisible && Qt.platform.os !== "android" && Kirigami.Settings.tabletMode && (controlRoot.selectedText.length > 0 || controlRoot.canPaste) : false
+
+    width: contentItem.implicitWidth + leftPadding + rightPadding
+
+    contentItem: RowLayout {
+        ToolButton {
+            focusPolicy: Qt.NoFocus
+            icon.name: "edit-cut"
+            visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal)
+            onClicked: {
+                controlRoot.cut();
+            }
+        }
+        ToolButton {
+            focusPolicy: Qt.NoFocus
+            icon.name: "edit-copy"
+            visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal)
+            onClicked: {
+                controlRoot.copy();
+            }
+        }
+        ToolButton {
+            focusPolicy: Qt.NoFocus
+            icon.name: "edit-paste"
+            visible: controlRoot && controlRoot.canPaste
+            onClicked: {
+                controlRoot.paste();
+            }
+        }
+    }
+}
+

imports/NeoChat/Component/ChatBox/ReplyPane.qml

@@ -57,7 +57,7 @@ Loader {
                     elide: Text.ElideRight
                     text: {
                         let heading = "<b>%1</b>"
-                        let userName = user ? "<font color=\""+ user.color +"\">" + user.displayName + "</font>" : ""
+                        let userName = user ? "<font color=\""+ user.color +"\">" + currentRoom.htmlSafeMemberName(user.id) + "</font>" : ""
                         if (isEdit) {
                             heading = heading.arg(i18n("Editing message:")) + "<br/>"
                         } else {

imports/NeoChat/Component/ChatBox/TextFieldContextMenu.qml

@@ -0,0 +1,259 @@
+/*
+    SPDX-FileCopyrightText: 2020 Devin Lin <espidev@gmail.com>
+    SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+
+    SPDX-License-Identifier: LGPL-2.0-or-later
+*/ 
+
+pragma Singleton
+
+import QtQuick 2.6
+import QtQml 2.2
+import QtQuick.Controls 2.15
+import org.kde.kirigami 2.5 as Kirigami
+
+Menu {
+    id: contextMenu
+
+    property Item target
+    property bool deselectWhenMenuClosed: true
+    property int restoredCursorPosition: 0
+    property int restoredSelectionStart
+    property int restoredSelectionEnd
+    property bool persistentSelectionSetting
+    property var spellcheckhighlighter: null
+    property var suggestions: ([])
+    Component.onCompleted: persistentSelectionSetting = persistentSelectionSetting // break binding
+
+    property var runOnMenuClose 
+
+    parent: Overlay.overlay
+
+    function storeCursorAndSelection() {
+        contextMenu.restoredCursorPosition = target.cursorPosition;
+        contextMenu.restoredSelectionStart = target.selectionStart;
+        contextMenu.restoredSelectionEnd = target.selectionEnd;
+    }
+
+    // target is pressed with mouse
+    function targetClick(handlerPoint, newTarget, spellcheckhighlighter, mousePosition) {
+        if (handlerPoint.pressedButtons === Qt.RightButton) { // only accept just right click
+            if (contextMenu.visible) {
+                deselectWhenMenuClosed = false; // don't deselect text if menu closed by right click on textfield
+                dismiss();
+            } else {
+                contextMenu.target = newTarget;
+                contextMenu.target.persistentSelection = true; // persist selection when menu is opened
+                contextMenu.spellcheckhighlighter = spellcheckhighlighter
+                contextMenu.suggestions = spellcheckhighlighter.suggestions(mousePosition);
+                storeCursorAndSelection();
+                popup(contextMenu.target);
+                // slightly locate context menu away from mouse so no item is selected when menu is opened
+                x += 1
+                y += 1
+            }
+        } else {
+            dismiss();
+        }
+    }
+
+    // context menu keyboard key
+    function targetKeyPressed(event, newTarget) {
+        if (event.modifiers === Qt.NoModifier && event.key === Qt.Key_Menu) {
+            contextMenu.target = newTarget;
+            target.persistentSelection = true; // persist selection when menu is opened
+            storeCursorAndSelection();
+            popup(contextMenu.target);
+        }
+    }
+
+    readonly property bool targetIsPassword: target !== null && (target.echoMode === TextInput.PasswordEchoOnEdit || target.echoMode === TextInput.Password)
+
+    onAboutToShow: {
+        if (Overlay.overlay) {
+            let tempZ = 0
+            for (let i in Overlay.overlay.visibleChildren) {
+                tempZ = Math.max(tempZ, Overlay.overlay.visibleChildren[i].z)
+            }
+            z = tempZ + 1
+        }
+    }
+
+    // deal with whether or not text should be deselected
+    onClosed: {
+        // restore text field's original persistent selection setting
+        target.persistentSelection = persistentSelectionSetting
+        // deselect text field text if menu is closed not because of a right click on the text field
+        if (deselectWhenMenuClosed) {
+            target.deselect();
+        }
+        deselectWhenMenuClosed = true;
+
+        // restore cursor position
+        target.forceActiveFocus();
+        target.cursorPosition = restoredCursorPosition;
+        target.select(restoredSelectionStart, restoredSelectionEnd);
+
+        // run action
+        runOnMenuClose();
+    }
+
+    onOpened: {
+        runOnMenuClose = function() {};
+    }
+
+    Instantiator {
+        active: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
+        model: suggestions
+        delegate: MenuItem {
+            text: modelData
+            onClicked: {
+                deselectWhenMenuClosed = false;
+                runOnMenuClose = function() {
+                    spellcheckhighlighter.replaceWord(modelData);
+                };
+            }
+        }
+        onObjectAdded: contextMenu.insertItem(0, object)
+        onObjectRemoved: contextMenu.removeItem(0)
+    }
+
+    MenuItem {
+        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled && suggestions.length === 0
+        action: Action {
+            text: spellcheckhighlighter ? i18nc("@action:inmenu", "No suggestions for %1", spellcheckhighlighter.wordUnderMouse) : ""
+            enabled: false
+        }
+    }
+
+    MenuSeparator {
+        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
+    }
+
+    MenuItem {
+        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
+        action: Action {
+            text: i18n("Add to dictionary")
+            onTriggered: {
+                deselectWhenMenuClosed = false;
+                runOnMenuClose = function() {
+                    spellcheckhighlighter.addWordToDictionary(spellcheckhighlighter.wordUnderMouse)
+                };
+            }
+        }
+    }
+
+    MenuItem {
+        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
+        action: Action {
+            text: i18n("Ignore")
+            onTriggered: {
+                deselectWhenMenuClosed = false;
+                runOnMenuClose = function() {
+                    spellcheckhighlighter.ignoreWord(spellcheckhighlighter.wordUnderMouse)
+                };
+            }
+        }
+    }
+
+    MenuSeparator {
+        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
+    }
+
+    MenuItem {
+        visible: target !== null && !target.readOnly
+        action: Action {
+            icon.name: "edit-undo-symbolic"
+            text: i18nc("@action:inmenu", "Undo")
+            shortcut: StandardKey.Undo
+        }
+        enabled: target !== null && target.canUndo
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.undo()};
+        }
+    }
+    MenuItem {
+        visible: target !== null && !target.readOnly
+        action: Action {
+            icon.name: "edit-redo-symbolic"
+            text: i18nc("@action:inmenu", "Redo")
+            shortcut: StandardKey.Redo
+        }
+        enabled: target !== null && target.canRedo
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.redo()};
+        }
+    }
+    MenuSeparator {
+        visible: target !== null && !target.readOnly
+    }
+    MenuItem {
+        visible: target !== null && !target.readOnly && !targetIsPassword
+        action: Action {
+            icon.name: "edit-cut-symbolic"
+            text: i18nc("@action:inmenu", "Cut")
+            shortcut: StandardKey.Cut
+        }
+        enabled: target !== null && target.selectedText
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.cut()}
+        }
+    }
+    MenuItem {
+        action: Action {
+            icon.name: "edit-copy-symbolic"
+            text: i18nc("@action:inmenu", "Copy")
+            shortcut: StandardKey.Copy
+        }
+        enabled: target !== null && target.selectedText
+        visible: !targetIsPassword
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.copy()}
+        }
+    }
+    MenuItem {
+        visible: target !== null && !target.readOnly
+        action: Action {
+            icon.name: "edit-paste-symbolic"
+            text: i18nc("@action:inmenu", "Paste")
+            shortcut: StandardKey.Paste
+        }
+        enabled: target !== null && target.canPaste
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.paste()};
+        }
+    }
+    MenuItem {
+        visible: target !== null && !target.readOnly
+        action: Action {
+            icon.name: "edit-delete-symbolic"
+            text: i18nc("@action:inmenu", "Delete")
+            shortcut: StandardKey.Delete
+        }
+        enabled: target !== null && target.selectedText
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.remove(target.selectionStart, target.selectionEnd)};
+        }
+    }
+    MenuSeparator {
+        visible: !targetIsPassword
+    }
+    MenuItem {
+        action: Action {
+            icon.name: "edit-select-all-symbolic"
+            text: i18nc("@action:inmenu", "Select All")
+            shortcut: StandardKey.SelectAll
+        }
+        visible: !targetIsPassword
+        onTriggered: {
+            deselectWhenMenuClosed = false;
+            runOnMenuClose = function() {target.selectAll()};
+        }
+    }
+}

imports/NeoChat/Component/ChatBox/TypingPane.qml

@@ -1,66 +0,0 @@
-/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
- * SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
- * SPDX-FileCopyrightText: 2021 Srevin Saju <srevinsaju@sugarlabs.org>
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import org.kde.kirigami 2.14 as Kirigami
-import org.kde.neochat 1.0
-
-Loader {
-    id: root
-    property var typingNotification: null
-
-    active: visible
-    sourceComponent: Pane {
-        id: typingPane
-
-        padding: fontMetrics.lineSpacing * 0.25
-        spacing: 0
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-        contentItem: RowLayout {
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignLeft
-            spacing: 0
-
-            FontMetrics {
-                id: fontMetrics
-                font: typingLabel.font
-            }
-            Label {
-                id: typingLabel
-                textFormat: TextEdit.RichText
-                wrapMode: Label.Wrap
-                text: typingNotification
-            }
-            BusyIndicator {
-                running: root.active
-                Layout.alignment: Qt.AlignRight
-                Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium
-                Layout.preferredHeight: Kirigami.Units.iconSizes.smallMedium
-            }
-        }
-
-        background: Item {
-            Rectangle {
-                height: 1
-                property color borderColor: Kirigami.Theme.textColor
-                color: Qt.rgba(borderColor.r, borderColor.g, borderColor.b, 0.1)
-                anchors {
-                    left: typingIndicatorBackground.left
-                    right: typingIndicatorBackground.right
-                    bottom: typingIndicatorBackground.top
-                }
-            }
-            Rectangle {
-                anchors.fill: parent
-                id: typingIndicatorBackground
-                color: Kirigami.Theme.backgroundColor
-            }
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/qmldir

@@ -5,4 +5,7 @@ ReplyPane 1.0 ReplyPane.qml
 AttachmentPane 1.0 AttachmentPane.qml
 CompletionMenu 1.0 CompletionMenu.qml
 EmojiPickerPane 1.0 EmojiPickerPane.qml
-TypingPane 1.0 TypingPane.qml
+singleton TextFieldContextMenu 1.0 TextFieldContextMenu.qml
+CursorDelegate 1.0 CursorDelegate.qml
+CursorHandle 1.0 CursorHandle.qml
+singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml

imports/NeoChat/Component/Emoji/EmojiPicker.qml

@@ -10,10 +10,16 @@ import org.kde.neochat 1.0 as NeoChat
 import NeoChat.Component 1.0
 
 ColumnLayout {
+    id: _picker
+
     property string emojiCategory: "history"
     property var textArea
     readonly property var emojiModel: NeoChat.EmojiModel
 
+    property NeoChat.CustomEmojiModel customModel: NeoChat.CustomEmojiModel {
+        connection: NeoChat.Controller.activeConnection
+    }
+
     signal chosen(string emoji)
 
     spacing: 0
@@ -29,6 +35,7 @@ ColumnLayout {
         orientation: ListView.Horizontal
 
         model: ListModel {
+            ListElement { label: "custom"; category: "custom" }
             ListElement { label: "⌛️"; category: "history" }
             ListElement { label: "😏"; category: "people" }
             ListElement { label: "🌲"; category: "nature" }
@@ -41,16 +48,23 @@ ColumnLayout {
         }
 
         delegate: ItemDelegate {
-            width: Kirigami.Units.gridUnit * 2
+            id: del
+
+            required property string label
+            required property string category
+
+            width: contentItem.Layout.preferredWidth
             height: Kirigami.Units.gridUnit * 2
 
             contentItem: Kirigami.Heading {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                level: 1
+                level: del.label === "custom" ? 4 : 1
 
-                font.family: 'emoji'
-                text: label
+                Layout.preferredWidth: del.label === "custom" ? implicitWidth + Kirigami.Units.largeSpacing : Kirigami.Units.gridUnit * 2
+
+                font.family: del.label === "custom" ? "" : 'emoji'
+                text: del.label === "custom" ? i18n("Custom") : del.label
             }
 
             Rectangle {
@@ -87,6 +101,8 @@ ColumnLayout {
 
         model: {
             switch (emojiCategory) {
+            case "custom":
+                return _picker.customModel
             case "history":
                 return emojiModel.history
             case "people":
@@ -118,11 +134,32 @@ ColumnLayout {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 font.family: 'emoji'
-                text: modelData.unicode
+                text: modelData.isCustom ? "" : modelData.unicode
+            }
+
+            Image {
+                visible: modelData.isCustom
+                source: visible ? modelData.unicode : ""
+                anchors.fill: parent
+                anchors.margins: 2
+
+                sourceSize.width: width
+                sourceSize.height: height
+
+                Rectangle {
+                    anchors.fill: parent
+                    visible: parent.status === Image.Loading
+                    radius: height/2
+                    gradient: ShimmerGradient { }
+                }
             }
 
             onClicked: {
-                chosen(modelData.unicode)
+                if (modelData.isCustom) {
+                    chosen(modelData.shortname)
+                } else {
+                    chosen(modelData.unicode)
+                }
                 emojiModel.emojiUsed(modelData)
             }
         }

imports/NeoChat/Component/FancyEffectsContainer.qml

@@ -8,7 +8,7 @@ import QtQuick.Particles 2.15
 
 import org.kde.kirigami 2.15 as Kirigami
 
-Rectangle {
+Item {
     id: item
     property bool enabled: false
     property int effectInterval: Kirigami.Units.veryLongDuration*10;
@@ -27,11 +27,6 @@ Rectangle {
         fireworksTimer.start()
     }
 
-    // backgroundColor
-    color: Kirigami.Theme.backgroundColor
-    Kirigami.Theme.colorSet: Kirigami.Theme.Window
-    Kirigami.Theme.inherit: false
-
     // Confetti
 
     Timer {

imports/NeoChat/Component/FullScreenImage.qml

@@ -11,6 +11,9 @@ ApplicationWindow {
 
     property string filename
     property url localPath
+    property string blurhash: ""
+    property int imageWidth: -1
+    property int imageHeight: -1
 
     flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
     visibility: Qt.WindowFullScreen
@@ -29,22 +32,29 @@ ApplicationWindow {
     }
 
     BusyIndicator {
-	visible: image.status !== Image.Ready
-	anchors.centerIn: parent
-	running: visible
+        visible: image.status !== Image.Ready && root.blurhash === ""
+        anchors.centerIn: parent
+        running: visible
     }
 
     AnimatedImage {
-	id: image
+	    id: image
         anchors.centerIn: parent
 
-        width: Math.min(sourceSize.width, root.width)
-        height: Math.min(sourceSize.height, root.height)
+        width: Math.min(root.imageWidth !== -1 ? root.imageWidth : sourceSize.width, root.width)
+        height: Math.min(root.imageHeight !== -1 ? root.imageWidth : sourceSize.height, root.height)
 
-        cache: false
         fillMode: Image.PreserveAspectFit
 
         source: localPath
+
+        Image {
+            anchors.centerIn: parent
+            width: image.width
+            height: image.height
+            source: root.blurhash !== "" ? ("image://blurhash/" + root.blurhash) : ""
+            visible: root.blurhash !== "" && parent.status !== Image.Ready
+        }
     }
 
     Button {

imports/NeoChat/Component/Login/Homeserver.qml

@@ -15,7 +15,7 @@ LoginStep {
     readonly property var homeserver: customHomeserver.visible ? customHomeserver.text : serverCombo.currentText
     property bool loading: false
 
-    title: i18n("@title", "Select a Homeserver")
+    title: i18nc("@title", "Select a Homeserver")
 
     action: Kirigami.Action {
         enabled: LoginHelper.homeserverReachable && !customHomeserver.visible || customHomeserver.acceptableInput

imports/NeoChat/Component/Login/Loading.qml

@@ -10,11 +10,18 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 import NeoChat.Component 1.0
 
-QQC2.BusyIndicator {
-
+Kirigami.PlaceholderMessage {
     property var showContinueButton: false
     property var showBackButton: false
     property string title: i18n("Loading")
 
     anchors.centerIn: parent
+
+    QQC2.Label {
+        text: i18n("Please wait. This might take a little while.")
+    }
+
+    QQC2.BusyIndicator {
+        Layout.alignment: Qt.AlignHCenter
+    }
 }

imports/NeoChat/Component/Login/Sso.qml

@@ -19,10 +19,12 @@ LoginStep {
     Kirigami.FormLayout {
         Connections {
             target: LoginHelper
-            onSsoUrlChanged: {
+            function onSsoUrlChanged() {
                 Qt.openUrlExternally(LoginHelper.ssoUrl)
             }
-            onConnected: processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
+            function onConnected() {
+                processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
+            }
         }
 
         QQC2.Button {

imports/NeoChat/Component/QuickSwitcher.qml

@@ -0,0 +1,81 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick 2.15
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.12 as QQC2
+import org.kde.kirigami 2.14 as Kirigami
+import org.kde.kitemmodels 1.0
+import org.kde.neochat 1.0
+
+QQC2.Popup {
+    id: _popup
+
+    onVisibleChanged: {
+        if (!visible) {
+            return
+        }
+        quickSearch.forceActiveFocus()
+        quickSearch.text = ""
+    }
+    anchors.centerIn: QQC2.Overlay.overlay
+    background: Kirigami.Card {}
+    height: 2 * Math.round(implicitHeight / 2)
+    padding: Kirigami.Units.largeSpacing * 2
+    contentItem: ColumnLayout {
+        spacing: Kirigami.Units.largeSpacing * 2
+
+        Kirigami.SearchField {
+            id: quickSearch
+
+            // TODO: get this broken property removed/disabled by default in Kirigami,
+            // we used to be able to expect that the text field wouldn't attempt to
+            // perform a mini-DDOS attack using signals.
+            autoAccept: false
+
+            Layout.preferredWidth: Kirigami.Units.gridUnit * 21 // 3 * 7 = 21, roughly 7 avatars on screen
+            Keys.onLeftPressed: cView.decrementCurrentIndex()
+            Keys.onRightPressed: cView.incrementCurrentIndex()
+            onAccepted: {
+                const item = cView.itemAtIndex(cView.currentIndex)
+
+                RoomManager.enterRoom(item.currentRoom)
+
+                _popup.close()
+            }
+        }
+        ListView {
+            id: cView
+
+            orientation: Qt.Horizontal
+            spacing: Kirigami.Units.largeSpacing
+
+            model: SortFilterRoomListModel {
+                id: sortFilterRoomListModel
+                sourceModel: RoomListModel {
+                    id: roomListModel
+                    connection: Controller.activeConnection
+                }
+                filterText: quickSearch.text
+                roomSortOrder: SortFilterRoomListModel.LastActivity
+            }
+
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.fillWidth: true
+
+            delegate: Kirigami.Avatar {
+                id: del
+
+                implicitHeight: Kirigami.Units.gridUnit * 3
+                implicitWidth: Kirigami.Units.gridUnit * 3
+
+                required property string avatar
+                required property var currentRoom
+
+                source: avatar != "" ? "image://mxc/" + avatar : ""
+            }
+        }
+    }
+    modal: true
+    focus: true
+}

imports/NeoChat/Component/ShimmerGradient.qml

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+// Not to be confused with the Shimmer project.
+// I like their gradiented GTK themes though.
+
+import QtQuick 2.15
+import org.kde.kirigami 2.15 as Kirigami
+
+Gradient {
+    id: gradient
+
+    orientation: Gradient.Horizontal
+
+    property color color: Kirigami.Theme.textColor
+    property color translucent: Qt.rgba(color.r, color.g, color.b, 0.2)
+    property color bright: Qt.rgba(color.r, color.g, color.b, 0.3)
+    property real pos: 0.5
+    property real offset: 0.6
+
+    property SequentialAnimation ani: SequentialAnimation {
+        running: true
+        loops: Animation.Infinite
+        NumberAnimation {
+            from: -2.0
+            to: 2.0
+            duration: 700
+            target: gradient
+            properties: "pos"
+        }
+        PauseAnimation {
+            duration: 300
+        }
+    }
+
+    GradientStop { position: gradient.pos-gradient.offset; color: gradient.translucent }
+    GradientStop { position: gradient.pos; color: gradient.bright }
+    GradientStop { position: gradient.pos+gradient.offset; color: gradient.translucent }
+}

imports/NeoChat/Component/Timeline/EncryptedDelegate.qml

@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+import org.kde.kirigami 2.15 as Kirigami
+import org.kde.neochat 1.0
+
+TextEdit {
+    text: i18n("This message is encrypted and the sender has not shared the key with this device.")
+    color: Kirigami.Theme.disabledTextColor
+    font.pointSize: Kirigami.Theme.defaultFont.pointSize
+    selectByMouse: !Kirigami.Settings.isMobile
+    readOnly: true
+    wrapMode: Text.WordWrap
+    textFormat: Text.RichText
+}

imports/NeoChat/Component/Timeline/FileDelegate.qml

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import QtGraphicalEffects 1.15
 import Qt.labs.platform 1.1
@@ -23,29 +23,82 @@ RowLayout {
 
     spacing: Kirigami.Units.largeSpacing
 
-    onDownloadedChanged: if (downloaded && openOnFinished) {
-        openSavedFile();
-    }
+    states: [
+        State {
+            name: "downloaded"
+            when: progressInfo.completed
 
-    ToolButton {
-        icon.name: progressInfo.completed ? "document-open" : "document-save"
-        onClicked: progressInfo.completed ? openSavedFile() : saveFileAs()
-    }
+            PropertyChanges {
+                target: downloadButton
 
+                icon.name: "document-open"
+
+                QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
+
+                onClicked: openSavedFile()
+            }
+        },
+        State {
+            name: "downloading"
+            when: progressInfo.active
+
+            PropertyChanges {
+                target: sizeLabel
+                text: i18nc("file download progress", "%1 / %2", Controller.formatByteSize(progressInfo.progress), Controller.formatByteSize(progressInfo.total))
+            }
+            PropertyChanges {
+                target: downloadButton
+                icon.name: "media-playback-stop"
+
+                QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
+                onClicked: currentRoom.cancelFileTransfer(eventId)
+            }
+        },
+        State {
+            name: "raw"
+            when: true
+
+            PropertyChanges {
+                target: downloadButton
+
+                onClicked: root.saveFileAs()
+            }
+        }
+    ]
+
+    Kirigami.Icon {
+        id: ikon
+        source: model.fileMimetypeIcon
+        fallback: "unknown"
+    }
     ColumnLayout {
-        Kirigami.Heading {
-            Layout.fillWidth: true
-            level: 4
-            text: model.display
-            wrapMode: Label.Wrap
-        }
+        Layout.alignment: Qt.AlignVCenter
+        Layout.fillWidth: true
+
+        spacing: 0
+
+        QQC2.Label {
+            text: model.display
+            wrapMode: Text.Wrap
 
-        Label {
             Layout.fillWidth: true
-            text: !progressInfo.completed && progressInfo.active ? (Controller.formatByteSize(progressInfo.progress) + "/" + Controller.formatByteSize(progressInfo.total)) : Controller.formatByteSize(content.info ? content.info.size : 0)
-            color: Kirigami.Theme.disabledTextColor
-            wrapMode: Label.Wrap
         }
+        QQC2.Label {
+            id: sizeLabel
+
+            text: Controller.formatByteSize(content.info ? content.info.size : 0)
+            opacity: 0.7
+
+            Layout.fillWidth: true
+        }
+    }
+
+    QQC2.Button {
+        id: downloadButton
+        icon.name: "download"
+
+        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
+        QQC2.ToolTip.visible: hovered
     }
 
     Component {
@@ -61,21 +114,11 @@ RowLayout {
     }
 
     function saveFileAs() {
-        var dialog = fileDialog.createObject(ApplicationWindow.overlay)
+        var dialog = fileDialog.createObject(QQC2.ApplicationWindow.overlay)
         dialog.open()
         dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId)
     }
 
-    function downloadAndOpen() {
-        if (downloaded) {
-            openSavedFile();
-        } else {
-            openOnFinished = true;
-            currentRoom.downloadFile(eventId, StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/"
-                + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId));
-        }
-    }
-
     function openSavedFile() {
         if (Qt.openUrlExternally(progressInfo.localPath)) return;
         if (Qt.openUrlExternally(progressInfo.localDir)) return;

imports/NeoChat/Component/Timeline/ImageDelegate.qml

@@ -29,6 +29,12 @@ Image {
 
     source: "image://mxc/" + mediaId
 
+    Image {
+        anchors.fill: parent
+        source: content.info["xyz.amorgan.blurhash"] ? ("image://blurhash/" + content.info["xyz.amorgan.blurhash"]) : ""
+        visible: parent.status !== Image.Ready
+    }
+
     fillMode: Image.PreserveAspectFit
 
     ToolTip.text: display

imports/NeoChat/Component/Timeline/ReactionDelegate.qml

@@ -29,7 +29,7 @@ Flow {
                 shadow.size: Kirigami.Units.smallSpacing
                 shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
                 border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                border.width: Kirigami.Units.devicePixelRatio
+                border.width: 1
             }
 
 

imports/NeoChat/Component/Timeline/ReplyComponent.qml

@@ -15,7 +15,7 @@ MouseArea {
     id: replyButton
     Layout.fillWidth: true
     implicitHeight: replyName.implicitHeight + (loader.item ? loader.item.height : 0) + Kirigami.Units.largeSpacing
-    implicitWidth: Math.min(bubbleMaxWidth, Math.max((loader.item ? loader.item.width : 0), replyName.implicitWidth)) + Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 3
+    implicitWidth: Math.min(bubbleMaxWidth, Math.max((loader.item ? loader.item.width + Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing : 0), replyName.implicitWidth)) + Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 3
     Component.onCompleted: {
         parent.Layout.fillWidth = true;
         parent.Layout.preferredWidth = Qt.binding(function() { return implicitWidth; })
@@ -25,14 +25,15 @@ MouseArea {
         id: replyLeftBorder
         width: Kirigami.Units.smallSpacing
         height: parent.height
+        x: Config.compactLayout ? Kirigami.Units.largeSpacing : 0
         color: Kirigami.Theme.highlightColor
     }
 
     Kirigami.Avatar {
-        id: avatatReply
+        id: replyAvatar
         anchors.left: replyLeftBorder.right
         anchors.leftMargin: Kirigami.Units.smallSpacing
-        width: Kirigami.Units.gridUnit
+        width: visible ? Kirigami.Units.gridUnit : 0
         height: Kirigami.Units.gridUnit
         sourceSize.width: width
         sourceSize.height: height
@@ -46,12 +47,12 @@ MouseArea {
     QQC2.Label {
         id: replyName
         anchors {
-            left: avatatReply.right
+            left: replyAvatar.right
             leftMargin: Kirigami.Units.smallSpacing
             right: parent.right
             rightMargin: Kirigami.Units.smallSpacing
         }
-        text: reply.author.displayName
+        text: currentRoom.htmlSafeMemberName(reply.author.id)
         color: reply.author.color
         elide: Text.ElideRight
     }
@@ -78,9 +79,9 @@ MouseArea {
                 id: replyText
                 textMessage: reply.display
                 textFormat: Text.RichText
-                wrapMode: Text.WordWrap
-                width: Math.min(implicitWidth, bubbleMaxWidth) - Kirigami.Units.smallSpacing * 5 - avatatReply.width
-                x: Kirigami.Units.smallSpacing * 3 + avatatReply.width
+                hasContextMenu: false
+                width: Math.min(implicitWidth, bubbleMaxWidth - Kirigami.Units.largeSpacing * 3)
+                x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
             }
         }
 
@@ -94,9 +95,9 @@ MouseArea {
                 readonly property string mediaId: isThumbnail ? content.thumbnailMediaId : content.mediaId
                 source: "image://mxc/" + mediaId
 
-                width: bubbleMaxWidth * 0.75 - Kirigami.Units.smallSpacing * 5 - avatatReply.width
+                width: bubbleMaxWidth * 0.75 - Kirigami.Units.smallSpacing * 5 - replyAvatar.width
                 height: reply.content.info.h / reply.content.info.w * width
-                x: Kirigami.Units.smallSpacing * 3 + avatatReply.width
+                x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
             }
         }
     }

imports/NeoChat/Component/Timeline/SectionDelegate.qml

@@ -9,6 +9,8 @@ import org.kde.kirigami 2.15 as Kirigami
 Kirigami.Heading {
     level: 4
     text: model.showSection ? section : ""
+    color: Kirigami.Theme.disabledTextColor
+    horizontalAlignment: Text.AlignHCenter
     verticalAlignment: Text.AlignVCenter
     topPadding: Kirigami.Units.largeSpacing * 2
     bottomPadding: Kirigami.Units.smallSpacing

imports/NeoChat/Component/Timeline/StateDelegate.qml

@@ -14,6 +14,7 @@ RowLayout {
     id: row
 
     Kirigami.Avatar {
+        id: icon
         Layout.preferredWidth: Kirigami.Units.iconSizes.small
         Layout.preferredHeight: Kirigami.Units.iconSizes.small
         Layout.alignment: Qt.AlignTop
@@ -37,9 +38,10 @@ RowLayout {
     Label {
         Layout.alignment: Qt.AlignVCenter
         Layout.fillWidth: true
+        Layout.preferredHeight: icon.height
         wrapMode: Text.WordWrap
         textFormat: Text.RichText
-        text: "<style>a {text-decoration: none;}</style><a href=\"https://matrix.to/#/" + author.id + "\" style='color: " + author.color + "'>" + author.displayName + "</a> " + display
-        onLinkActivated: Qt.openUrlExternally(link)
+        text: "<style>a {text-decoration: none;}</style><a href=\"https://matrix.to/#/" + author.id + "\" style='color: " + author.color + "'>" + currentRoom.htmlSafeMemberName(author.id) + "</a> " + display
+        onLinkActivated: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": currentRoom, "user": author.object, "displayName": author.displayName, "avatarMediaId": author.avatarMediaId, "avatarUrl": author.avatarUrl}).open()
     }
 }

imports/NeoChat/Component/Timeline/TextDelegate.qml

@@ -11,13 +11,22 @@ import org.kde.kirigami 2.15 as Kirigami
 TextEdit {
     id: contentLabel
 
-    Layout.margins: Kirigami.Units.largeSpacing
-    Layout.topMargin: 0
-
     readonly property var isEmoji: /^(<span style='.*'>)?(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])+(<\/span>)?$/
+    readonly property var hasSpoiler: /data-mx-spoiler/g
 
     property bool isEmote: false
     property string textMessage: model.display
+    property bool spoilerRevealed: !hasSpoiler.test(textMessage)
+
+    property bool hasContextMenu: true
+
+    signal requestOpenMessageContext()
+
+    ListView.onReused: Qt.binding(() => !hasSpoiler.test(textMessage))
+
+    Layout.fillWidth: Config.compactLayout
+    Layout.rightMargin: Kirigami.Units.largeSpacing
+    Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
 
     text: "<style>
 table {
@@ -38,17 +47,21 @@ a{
     color: " + Kirigami.Theme.linkColor + ";
     text-decoration: none;
 }
+" + (!spoilerRevealed ? "
+[data-mx-spoiler] {
+    color: transparent;
+    background: " + Kirigami.Theme.textColor + ";
+}
+" : "") + "
 </style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + textMessage + (isEdited ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigami.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")
 
     color: Kirigami.Theme.textColor
     font.pointSize: model.reply === undefined && isEmoji.test(model.display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
     selectByMouse: !Kirigami.Settings.isMobile
     readOnly: true
-    wrapMode: Text.WordWrap
+    wrapMode: Text.Wrap
     textFormat: Text.RichText
 
-    Layout.fillWidth: true
-
     onLinkActivated: RoomManager.openResource(link)
     onHoveredLinkChanged: if (hoveredLink.length > 0) {
         applicationWindow().hoverLinkIndicator.text = hoveredLink;
@@ -56,9 +69,24 @@ a{
         applicationWindow().hoverLinkIndicator.text = "";
     }
 
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.NoButton
-        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+    HoverHandler {
+        cursorShape: (parent.hoveredLink || !spoilerRevealed) ? Qt.PointingHandCursor : Qt.IBeamCursor
+    }
+
+    TapHandler {
+        enabled: !parent.hoveredLink && !spoilerRevealed
+        onTapped: spoilerRevealed = true
+    }
+
+    TapHandler {
+        acceptedButtons: Qt.RightButton
+        onTapped: openMessageContext(model, parent.selectedText)
+        enabled: hasContextMenu
+    }
+
+    TapHandler {
+        acceptedButtons: Qt.LeftButton
+        onLongPressed: requestOpenMessageContext()
+        enabled: hasContextMenu
     }
 }

imports/NeoChat/Component/Timeline/TimelineContainer.qml

@@ -21,7 +21,9 @@ QQC2.ItemDelegate {
     property bool isEmote: false
     property bool cardBackground: true
 
-    readonly property int bubbleMaxWidth: Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4, Kirigami.Units.gridUnit * 20)
+    readonly property int bubbleMaxWidth: Config.compactLayout && !Config.showAvatarInTimeline ? width : (Config.compactLayout ? width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 : Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 6, Kirigami.Units.gridUnit * 20))
+
+    property bool showUserMessageOnRight: Config.showLocalMessagesOnRight && model.author.isLocalUser && !applicationWindow().wideScreen
 
     signal saveFileAs()
     signal openExternally()
@@ -48,33 +50,33 @@ QQC2.ItemDelegate {
         }
     }
 
-    height: sectionDelegate.height + Math.max(avatar.height, bubble.implicitHeight) + loader.height + (model.showAuthor ? Kirigami.Units.smallSpacing : 0)
+    height: sectionDelegate.height + Math.max(model.showAuthor ? avatar.height : 0, bubble.implicitHeight) + loader.height + (showAuthor ? Kirigami.Units.largeSpacing : 0)
 
     SectionDelegate {
         id: sectionDelegate
         width: parent.width
-        anchors.left: parent.left
-        anchors.leftMargin: Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
+        anchors.left: avatar.left
+        anchors.leftMargin: Kirigami.Units.smallSpacing
         visible: model.showSection
         height: visible ? implicitHeight : 0
     }
 
     Kirigami.Avatar {
         id: avatar
-        width: Kirigami.Units.gridUnit * 2
+        width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0
         height: width
         sourceSize.width: width
         sourceSize.height: width
         anchors {
             top: sectionDelegate.bottom
-            topMargin: model.showAuthor ? Kirigami.Units.smallSpacing * 2 : Kirigami.Units.smallSpacing
+            topMargin: model.showAuthor ? Kirigami.Units.largeSpacing : 0
             left: parent.left
             leftMargin: Kirigami.Units.largeSpacing
         }
 
-        visible: model.showAuthor && Config.showAvatarInTimeline
+        visible: model.showAuthor && Config.showAvatarInTimeline && !showUserMessageOnRight
         name: model.author.name ?? model.author.displayName
-        source: model.author.avatarMediaId ? ("image://mxc/" + model.author.avatarMediaId) : ""
+        source: visible && model.author.avatarMediaId ? ("image://mxc/" + model.author.avatarMediaId) : ""
         color: model.author.color
 
         MouseArea {
@@ -94,16 +96,50 @@ QQC2.ItemDelegate {
 
     QQC2.Control {
         id: bubble
-        topPadding: Kirigami.Units.largeSpacing
-        bottomPadding: 0
-        leftPadding: 0
-        rightPadding: 0
+        topPadding: !Config.compactLayout ? Kirigami.Units.largeSpacing : 0
+        bottomPadding: !Config.compactLayout ? Kirigami.Units.largeSpacing : 0
+        leftPadding: Kirigami.Units.smallSpacing
+        rightPadding: Config.compactLayout ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
         hoverEnabled: true
+
+        // state: Config.compactLayout ? "compactLayout" : "default"
+        state: showUserMessageOnRight ? "userMessageOnRight" : "userMessageOnLeft"
+
         anchors {
             top: avatar.top
-            left: avatar.right
-            leftMargin: Kirigami.Units.smallSpacing
+            leftMargin: Kirigami.Units.largeSpacing
+            rightMargin: showUserMessageOnRight ? Kirigami.Units.smallSpacing : Kirigami.Units.largeSpacing
         }
+        // HACK: anchoring didn't reset anchors.right when switching from parent.right to undefined reliably
+        width: Config.compactLayout ? messageDelegate.width - (Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0) + Kirigami.Units.largeSpacing * 2 : implicitWidth
+
+
+        // states for anchor animations on window resize
+        // as setting anchors to undefined did not work reliably
+        states: [
+            State {
+                name: "userMessageOnRight"
+                AnchorChanges {
+                    target: bubble
+                    anchors.left: undefined
+                    anchors.right: parent.right
+                }
+            },
+            State {
+                name: "userMessageOnLeft"
+                AnchorChanges {
+                    target: bubble
+                    anchors.left: avatar.right
+                    anchors.right: undefined
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic}
+            }
+        ]
 
         contentItem: ColumnLayout {
             id: column
@@ -112,10 +148,10 @@ QQC2.ItemDelegate {
                 id: rowLayout
                 visible: model.showAuthor && !isEmote
                 Layout.fillWidth: true
-                Layout.leftMargin: Kirigami.Units.largeSpacing
+                Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
                 Layout.rightMargin: Kirigami.Units.largeSpacing
-                Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing
-                Layout.maximumWidth: bubbleMaxWidth - Kirigami.Units.largeSpacing * 2
+                Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing * 2
+                Layout.maximumWidth: bubbleMaxWidth
                 implicitHeight: visible ? nameLabel.implicitHeight : 0
 
                 QQC2.Label {
@@ -128,9 +164,23 @@ QQC2.ItemDelegate {
                     anchors.rightMargin: Kirigami.Units.smallSpacing
 
                     text: visible ? author.displayName : ""
+                    textFormat: Text.PlainText
                     font.weight: Font.Bold
                     color: author.color
                     wrapMode: Text.Wrap
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+                                room: currentRoom,
+                                user: author.object,
+                                displayName: author.displayName,
+                                avatarMediaId: author.avatarMediaId,
+                                avatarUrl: author.avatarUrl
+                            }).open();
+                        }
+                    }
                 }
                 QQC2.Label {
                     id: timeLabel
@@ -145,7 +195,8 @@ QQC2.ItemDelegate {
                 active: model.reply !== undefined
                 source: 'qrc:imports/NeoChat/Component/Timeline/ReplyComponent.qml'
                 visible: active
-                Layout.bottomMargin: Kirigami.Units.smallSpacing
+                Layout.topMargin: Kirigami.Units.smallSpacing
+                Layout.bottomMargin: Config.compactLayout ? 0 : Kirigami.Units.smallSpacing
 
                 Connections {
                     target: replyLoader.item
@@ -156,27 +207,43 @@ QQC2.ItemDelegate {
             }
         }
 
-        background: Kirigami.ShadowedRectangle {
-            visible: cardBackground
-            color: model.isHighlighted ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
-            radius: Kirigami.Units.smallSpacing
-            shadow.size: Kirigami.Units.smallSpacing
-            shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-            border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-            border.width: Kirigami.Units.devicePixelRatio
+        background: Item {
+            Rectangle {
+                visible: messageDelegate.hovered
+                color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
+                radius: Kirigami.Units.smallSpacing
+                anchors.fill: parent
+            }
+            Kirigami.ShadowedRectangle {
+                visible: cardBackground && !Config.compactLayout
+                anchors.fill: parent
+                color: {
+                    if (model.author.isLocalUser) {
+                        return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
+                    } else if (model.isHighlighted) {
+                        return Kirigami.Theme.positiveBackgroundColor
+                    } else {
+                        return Kirigami.Theme.backgroundColor
+                    }
+                }
+                radius: Kirigami.Units.smallSpacing
+                shadow.size: Kirigami.Units.smallSpacing
+                shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
+                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+                border.width: 1
+            }
         }
     }
 
     Loader {
         id: loader
         anchors {
-            left: parent.left
-            leftMargin: Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing * 2
+            left: bubble.left
             right: parent.right
             top: bubble.bottom
-            topMargin: active ? Kirigami.Units.smallSpacing : 0
+            topMargin: active && !Config.compactLayout ? Kirigami.Units.smallSpacing : 0
         }
-        height: active ? item.implicitHeight + Kirigami.Units.smallSpacing : 0
+        height: active ? item.implicitHeight : 0
         //Layout.bottomMargin: readMarker ? Kirigami.Units.smallSpacing : 0
         active: eventType !== "state" && eventType !== "notice" && reaction != undefined && reaction.length > 0
         visible: active

imports/NeoChat/Component/Timeline/qmldir

@@ -8,3 +8,4 @@ FileDelegate 1.0 FileDelegate.qml
 VideoDelegate 1.0 VideoDelegate.qml
 ReactionDelegate 1.0 ReactionDelegate.qml
 AudioDelegate 1.0 AudioDelegate.qml
+EncryptedDelegate 1.0 EncryptedDelegate.qml

imports/NeoChat/Component/TypingPane.qml

@@ -0,0 +1,106 @@
+/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
+ * SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
+ * SPDX-FileCopyrightText: 2021 Srevin Saju <srevinsaju@sugarlabs.org>
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
+import org.kde.kirigami 2.14 as Kirigami
+import org.kde.neochat 1.0
+
+Loader {
+    id: root
+    property string labelText: ""
+
+    active: visible
+    sourceComponent: Pane {
+        id: typingPane
+
+        leftPadding: Kirigami.Units.largeSpacing
+        rightPadding: Kirigami.Units.largeSpacing
+        topPadding: Kirigami.Units.smallSpacing
+        bottomPadding: Kirigami.Units.smallSpacing
+        spacing: Kirigami.Units.largeSpacing
+
+        FontMetrics {
+            id: fontMetrics
+        }
+
+        contentItem: RowLayout {
+            spacing: typingPane.spacing
+            Row {
+                id: dotRow
+                property int duration: 400
+                spacing: Kirigami.Units.smallSpacing
+                Repeater {
+                    model: 3
+                    delegate: Rectangle {
+                        id: dot
+                        color: Kirigami.Theme.textColor
+                        radius: height/2
+                        implicitWidth: fontMetrics.xHeight
+                        implicitHeight: fontMetrics.xHeight
+                        // rotating 45 degrees makes the dots look a bit smoother when scaled up
+                        rotation: 45
+                        opacity: 0.5
+                        scale: 1
+                        // FIXME: Sometimes the animation timings for each
+                        // dot drift slightly reletative to each other.
+                        // Not everyone can see this, but I'm pretty sure it's there.
+                        SequentialAnimation {
+                            running: true
+                            PauseAnimation { duration: dotRow.duration * index / 2 }
+                            SequentialAnimation {
+                                loops: Animation.Infinite
+                                ParallelAnimation {
+                                    // Animators unfortunately sync up instead of being
+                                    // staggered, so I'm using NumberAnimations instead.
+                                    NumberAnimation {
+                                        target: dot; property: "scale";
+                                        from: 1; to: 1.33
+                                        duration: dotRow.duration
+                                    }
+                                    NumberAnimation {
+                                        target: dot; property: "opacity"
+                                        from: 0.5; to: 1
+                                        duration: dotRow.duration
+                                    }
+                                }
+                                ParallelAnimation {
+                                    NumberAnimation {
+                                        target: dot; property: "scale"
+                                        from: 1.33; to: 1
+                                        duration: dotRow.duration
+                                    }
+                                    NumberAnimation {
+                                        target: dot; property: "opacity"
+                                        from: 1; to: 0.5
+                                        duration: dotRow.duration
+                                    }
+                                }
+                                PauseAnimation { duration: dotRow.duration }
+                            }
+                        }
+                    }
+                }
+            }
+            Label {
+                id: typingLabel
+                elide: Text.ElideRight
+                text: root.labelText
+            }
+        }
+
+        leftInset: !mirrored ? 0 : -background.radius
+        rightInset: mirrored ? 0 : -background.radius
+        bottomInset: -background.radius
+        background: Rectangle {
+            radius: 3
+            color: Kirigami.Theme.backgroundColor
+            border.color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, 0.2)
+            border.width: 1
+        }
+    }
+}

imports/NeoChat/Component/qmldir

@@ -2,3 +2,6 @@ module NeoChat.Component
 FullScreenImage 1.0 FullScreenImage.qml
 ChatTextInput 1.0 ChatTextInput.qml
 FancyEffectsContainer 1.0 FancyEffectsContainer.qml
+TypingPane 1.0 TypingPane.qml
+QuickSwitcher 1.0 QuickSwitcher.qml
+ShimmerGradient 1.0 ShimmerGradient.qml

imports/NeoChat/Dialog/CreateRoomDialog.qml

@@ -14,9 +14,7 @@ Kirigami.OverlaySheet {
 
     parent: applicationWindow().overlay
 
-    header: Kirigami.Heading {
-        text: i18n("Create a Room")
-    }
+    title: i18n("Create a Room")
 
     contentItem: Kirigami.FormLayout {
         TextField {

imports/NeoChat/Dialog/RoomSettingsDialog.qml

@@ -1,207 +0,0 @@
-// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-
-Kirigami.OverlaySheet {
-    id: root
-
-    property var room
-
-    readonly property bool canChangeAvatar: room.canSendState("m.room.avatar")
-    readonly property bool canChangeName: room.canSendState("m.room.name")
-    readonly property bool canChangeTopic: room.canSendState("m.room.topic")
-    readonly property bool canChangeCanonicalAlias: room.canSendState("m.room.canonical_alias")
-
-    parent: applicationWindow().overlay
-
-
-    header: Kirigami.Heading {
-        text: i18nc("%1 is the room name", "Room Settings - %1", room.displayName)
-        elide: Text.ElideRight
-    }
-
-    contentItem: ColumnLayout {
-        RowLayout {
-            Layout.fillWidth: true
-
-            spacing: 16
-
-            Kirigami.Avatar {
-                Layout.preferredWidth: 72
-                Layout.preferredHeight: 72
-                Layout.alignment: Qt.AlignTop
-
-                name: room.name
-                source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
-
-                MouseArea {
-                    anchors.fill: parent
-
-                    enabled: canChangeAvatar
-
-                    onClicked: {
-                        var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
-
-                        fileDialog.chosen.connect(function(path) {
-                            if (!path) return
-
-                            room.changeAvatar(path)
-                        })
-
-                        fileDialog.open()
-                    }
-                }
-            }
-
-            Kirigami.FormLayout {
-                Layout.fillWidth: true
-
-                TextField {
-                    id: roomNameField
-                    text: room.name
-                    Kirigami.FormData.label: i18n("Room Name:")
-                    enabled: canChangeName
-                }
-
-                TextArea {
-                    id: roomTopicField
-                    Layout.fillWidth: true
-                    text: room.topic
-                    Kirigami.FormData.label: i18n("Room topic:")
-                    enabled: canChangeTopic
-                }
-                Button {
-                    Layout.alignment: Qt.AlignRight
-
-                    visible: canChangeName || canChangeTopic
-
-                    text: i18n("Save")
-                    highlighted: true
-
-                    onClicked: {
-                        if (room.name != roomNameField.text) {
-                            room.setName(roomNameField.text)
-                        }
-
-                        if (room.topic != roomTopicField.text) {
-                            room.setTopic(roomTopicField.text)
-                        }
-                    }
-                }
-
-                Kirigami.Separator {
-                    Layout.fillWidth: true
-                    visible: canonicalAliasComboBox.visible || altAlias.visible
-                }
-
-                ComboBox {
-                    id: canonicalAliasComboBox
-                    visible: room.aliases && room.aliases.length
-                    Kirigami.FormData.label: i18n("Canonical Alias:")
-                    popup.z: 999; // HACK This is an absolute hack, but combos inside OverlaySheets have their popups show up underneath, because of fun z ordering stuff
-
-                    enabled: canChangeCanonicalAlias
-
-                    model: room.aliases
-
-                    currentIndex: room.aliases.indexOf(room.canonicalAlias)
-                    onCurrentIndexChanged: {
-                        if (room.canonicalAlias != room.aliases[currentIndex]) {
-                            room.setCanonicalAlias(room.aliases[currentIndex])
-                        }
-                    }
-                }
-
-                RowLayout {
-                    id: altAlias
-                    Kirigami.FormData.label: i18n("Alt Aliases")
-                    Layout.fillWidth: true
-
-                    visible: room.altAliases && room.altAliases.length
-
-                    ColumnLayout {
-                        Layout.fillWidth: true
-
-                        spacing: 0
-
-                        Repeater {
-                            model: room.altAliases
-
-                            delegate: RowLayout {
-                                Layout.maximumWidth: parent.width
-
-                                Label {
-                                    text: modelData
-                                    color: Kirigami.Theme.disabledColor
-                                }
-
-                                ToolButton {
-                                    icon.name: ""
-                                    onClicked: room.removeLocalAlias(modelData)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Kirigami.Separator {
-            Layout.fillWidth: true
-            visible: next.visible || prev.visible 
-        }
-
-        Control {
-            id: next
-            Layout.fillWidth: true
-
-            visible: room.predecessorId && room.connection.room(room.predecessorId)
-
-            padding: Kirigami.Units.largeSpacing
-
-            contentItem: Kirigami.InlineMessage {
-                text: i18n("This room continues another conversation.")
-                actions: Kirigami.Action {
-                    text: i18n("See older messages...")
-                    onTriggered: {
-                        roomListForm.enteredRoom = Controller.activeConnection.room(room.predecessorId)
-                        root.close()
-                    }
-                }
-            }
-        }
-
-        Control {
-            id: prev
-            Layout.fillWidth: true
-
-            visible: room.successorId && room.connection.room(room.successorId)
-
-            padding: Kirigami.Units.largeSpacing
-
-            contentItem: Kirigami.InlineMessage {
-                text: i18n("This room has been replaced.")
-                actions: Kirigami.Action {
-                    text: i18n("See new room...")
-                    onTriggered: {
-                        roomListForm.enteredRoom = Controller.activeConnection.room(room.successorId)
-                        root.close()
-                    }
-                }
-            }
-        }
-        Component {
-            id: openFileDialog
-
-            OpenFileDialog {}
-        }
-    }
-}
-

imports/NeoChat/Dialog/UserDetailDialog.qml

@@ -27,13 +27,7 @@ Kirigami.OverlaySheet {
     rightPadding: 0
     topPadding: 0
 
-    header: Kirigami.Heading {
-        id: heading
-        text: i18nc("@title:menu Account detail dialog", "Account detail")
-        elide: Text.ElideRight
-        QQC2.ToolTip.visible: truncated && hovered
-        QQC2.ToolTip.text: text
-    }
+    title: i18nc("@title:menu Account detail dialog", "Account detail")
 
     contentItem: ColumnLayout {
         spacing: 0
@@ -74,7 +68,7 @@ Kirigami.OverlaySheet {
 
                     elide: Text.ElideRight
                     wrapMode: Text.NoWrap
-                    text: displayName
+                    text: room.htmlSafeMemberName(user.id)
                 }
 
                 QQC2.Label {
@@ -104,7 +98,7 @@ Kirigami.OverlaySheet {
             }
         }
         Kirigami.BasicListItem {
-            visible: user !== room.localUser && room.canSendState("kick")
+            visible: user !== room.localUser && room.canSendState("kick") && room.containsUser(user.id)
 
             action: Kirigami.Action {
                 text: i18n("Kick this user")
@@ -116,24 +110,50 @@ Kirigami.OverlaySheet {
             }
         }
         Kirigami.BasicListItem {
-            visible: user !== room.localUser && room.canSendState("ban")
+            visible: user !== room.localUser && room.canSendState("ban") && !room.isUserBanned(user.id)
 
             action: Kirigami.Action {
                 text: i18n("Ban this user")
                 icon.name: "im-ban-user"
                 icon.color: Kirigami.Theme.negativeTextColor
                 onTriggered: {
-                    room.banMember(user.id)
+                    room.ban(user.id)
                     root.close()
                 }
             }
         }
         Kirigami.BasicListItem {
+            visible: user !== room.localUser && room.canSendState("ban") && room.isUserBanned(user.id)
+
+            action: Kirigami.Action {
+                text: i18n("Unban this user")
+                icon.name: "im-irc"
+                icon.color: Kirigami.Theme.negativeTextColor
+                onTriggered: {
+                    room.unban(user.id)
+                    root.close()
+                }
+            }
+        }
+        Kirigami.BasicListItem {
+            visible: user === room.localUser || room.canSendState("redact")
+
+            action: Kirigami.Action {
+                text: i18n("Delete recent messages by this user")
+                icon.name: "delete"
+                icon.color: Kirigami.Theme.negativeTextColor
+                onTriggered: {
+                    room.deleteMessagesByUser(user.id)
+                }
+            }
+        }
+        Kirigami.BasicListItem {
+            visible: user !== room.localUser
             action: Kirigami.Action {
                 text: i18n("Open a private chat")
                 icon.name: "document-send"
                 onTriggered: {
-                    Controller.activeConnection.requestDirectChat(user)
+                    Controller.openOrCreateDirectChat(user);
                     root.close()
                 }
             }

imports/NeoChat/Dialog/qmldir

@@ -1,5 +1,4 @@
 module NeoChat.Dialog
-RoomSettingsDialog 1.0 RoomSettingsDialog.qml
 UserDetailDialog 1.0 UserDetailDialog.qml
 LoginDialog 1.0 LoginDialog.qml
 CreateRoomDialog 1.0 CreateRoomDialog.qml

imports/NeoChat/Menu/EditMenu.qml

@@ -0,0 +1,90 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import Qt.labs.platform 1.1 as Labs
+import QtQuick 2.15
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.10
+import org.kde.kirigami 2.15 as Kirigami
+
+Labs.Menu {
+    id: editMenu
+
+    required property Item field
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null && editMenu.field.canUndo
+        text: i18nc("text editing menu action", "Undo")
+        shortcut: StandardKey.Undo
+        onTriggered: {
+            editMenu.field.undo()
+            editMenu.close()
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null && editMenu.field.canRedo
+        text: i18nc("text editing menu action", "Redo")
+        shortcut: StandardKey.Redo
+        onTriggered: {
+            editMenu.field.undo()
+            editMenu.close()
+        }
+    }
+
+    Labs.MenuSeparator {
+    }
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null && editMenu.field.selectedText
+        text: i18nc("text editing menu action", "Cut")
+        shortcut: StandardKey.Cut
+        onTriggered: {
+            editMenu.field.cut()
+            editMenu.close()
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null && editMenu.field.selectedText
+        text: i18nc("text editing menu action", "Copy")
+        shortcut: StandardKey.Copy
+        onTriggered: {
+            editMenu.field.copy()
+            editMenu.close()
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null && editMenu.field.canPaste
+        text: i18nc("text editing menu action", "Paste")
+        shortcut: StandardKey.Paste
+        onTriggered: {
+            editMenu.field.paste()
+            editMenu.close()
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null && editMenu.field.selectedText !== ""
+        text: i18nc("text editing menu action", "Delete")
+        shortcut: ""
+        onTriggered: {
+            editMenu.field.remove(editMenu.field.selectionStart, editMenu.field.selectionEnd)
+            editMenu.close()
+        }
+    }
+
+    Labs.MenuSeparator {
+    }
+
+    Labs.MenuItem {
+        enabled: editMenu.field !== null
+        text: i18nc("text editing menu action", "Select All")
+        shortcut: StandardKey.SelectAll
+        onTriggered: {
+            editMenu.field.selectAll()
+            editMenu.close()
+        }
+    }
+}

imports/NeoChat/Menu/GlobalMenu.qml

@@ -0,0 +1,96 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Qt.labs.platform 1.1 as Labs
+
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.10
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Component 1.0
+import NeoChat.Dialog 1.0
+import NeoChat.Page 1.0
+import NeoChat.Panel 1.0
+
+Labs.MenuBar {
+    Labs.Menu {
+        title: i18nc("menu", "NeoChat")
+
+        // TODO: make about page its own thing so we can go to it instead of settings where it's currently at
+        // Labs.MenuItem {
+        //     text: i18nc("menu", "About NeoChat")
+        // }
+        Labs.MenuItem {
+            enabled: pageStack.layers.currentItem.title !== i18n("Settings")
+            text: i18nc("menu", "Preferences…")
+
+            shortcut: StandardKey.Preferences
+            onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml")
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "Quit NeoChat")
+
+            shortcut: StandardKey.Quit
+            onTriggered: Qt.quit()
+        }
+    }
+    Labs.Menu {
+        title: i18nc("menu", "File")
+
+        Labs.MenuItem {
+            text: i18nc("menu", "New Private Chat…")
+            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
+            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {"connection": Controller.activeConnection})
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "New Group…")
+            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
+            shortcut: StandardKey.New
+            onTriggered: {
+                const dialog = createRoomDialog.createObject(root.overlay)
+                dialog.open()
+            }
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "Browse Chats…")
+            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": Controller.activeConnection})
+        }
+    }
+    EditMenu {
+        title: i18nc("menu", "Edit")
+        field: (root.activeFocusItem instanceof TextEdit || root.activeFocusItem instanceof TextInput) ? root.activeFocusItem : null
+    }
+    Labs.Menu {
+        title: i18nc("menu", "View")
+
+        Labs.MenuItem {
+            text: i18nc("menu item that opens a UI element called the 'Quick Switcher', which offers a fast keyboard-based interface for switching in between chats.", "Open Quick Switcher")
+            shortcut: "Ctrl+K"
+            onTriggered: quickView.item.open()
+        }
+    }
+    Labs.Menu {
+        title: i18nc("menu", "Window")
+
+        // Labs.MenuItem {
+        //     text: settings.userWantsSidebars ? i18nc("menu", "Hide Sidebar") : i18nc("menu", "Show Sidebar")
+        //     onTriggered: settings.userWantsSidebars = !settings.userWantsSidebars
+        // }
+        Labs.MenuItem {
+            text: root.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
+            onTriggered: root.visibility === Window.FullScreen ? root.showNormal() : root.showFullScreen()
+        }
+    }
+    // TODO: offline help system (https://invent.kde.org/network/neochat/-/issues/411)
+    Labs.Menu {
+        title: i18nc("menu", "Help")
+
+        Labs.MenuItem {
+            text: i18nc("menu", "Matrix FAQ")
+            onTriggered: Qt.openUrlExternally("https://matrix.org/faq/")
+        }
+    }
+}

imports/NeoChat/Menu/RoomListContextMenu.qml

@@ -5,6 +5,8 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 
+import org.kde.kirigami 2.19 as Kirigami
+
 import org.kde.neochat 1.0
 import NeoChat.Page 1.0
 
@@ -16,11 +18,15 @@ Menu {
     property var room
 
     MenuItem {
+        id: newWindow
         text: i18n("Open in new window")
         onTriggered: RoomManager.openWindow(room);
+        visible: !Kirigami.Settings.isMobile
     }
 
-    MenuSeparator {}
+    MenuSeparator {
+        visible: newWindow.visible
+    }
 
     MenuItem {
         text: room.isFavourite ? i18n("Remove from Favourites") : i18n("Add to Favourites")

imports/NeoChat/Menu/TextContextMenu.qml

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+
+/**
+ * Context menu when clicking on a room in the room list
+ */
+Menu {
+    id: root
+    property var selectedText
+
+    Repeater {
+        model: WebShortcutModel {
+            selectedText: root.selectedText
+        }
+        delegate: MenuItem {
+            text: model.display
+            icon.name: model.decoration
+        }
+    }
+
+    MenuSeparator {}
+
+    onClosed: destroy()
+}

imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -19,6 +19,7 @@ Loader {
     property string eventType: ""
     property string formattedBody: ""
     required property string source
+    property string selectedText: ""
 
     property list<Kirigami.Action> actions: [
         Kirigami.Action {
@@ -42,7 +43,7 @@ Loader {
         Kirigami.Action {
             text: i18n("Copy")
             icon.name: "edit-copy"
-            onTriggered: Clipboard.saveText(message)
+            onTriggered: Clipboard.saveText(loadRoot.selectedText === "" ? loadRoot.message : loadRoot.selectedText)
         },
         Kirigami.Action {
             text: i18n("View Source")
@@ -65,89 +66,33 @@ Loader {
                     onClicked: loadRoot.item.close();
                 }
             }
+            QQC2.Menu {
+                id: webshortcutmenu
+                title: i18n("Search for '%1'", webshortcutmodel.trunkatedSearchText)
+                property bool isVisible: selectedText && selectedText.length > 0 && webshortcutmodel.enabled
+                Component.onCompleted: webshortcutmenu.parent.visible = isVisible
+                onIsVisibleChanged: webshortcutmenu.parent.visible = isVisible
+                Instantiator {
+                    model: WebShortcutModel {
+                        id: webshortcutmodel
+                        selectedText: loadRoot.selectedText
+                        onOpenUrl: RoomManager.visitNonMatrix(url)
+                    }
+                    delegate: QQC2.MenuItem {
+                        text: model.display
+                        icon.name: model.decoration
+                        onTriggered: webshortcutmodel.trigger(model.edit)
+                    }
+                    onObjectAdded: webshortcutmenu.insertItem(0, object)
+                }
+                QQC2.MenuSeparator {}
+                QQC2.MenuItem {
+                    text: i18n("Configure Web Shortcuts...")
+                    icon.name: "configure"
+                    onTriggered: webshortcutmodel.configureWebShortcuts()
+                }
+            }
         }
-        /*
-        Kirigami.OverlaySheet {
-            id: root
-
-            parent: applicationWindow().overlay
-
-            leftPadding: 0
-            rightPadding: 0
-
-            header: Kirigami.Heading {
-                text: i18nc("@title:menu Message detail dialog", "Message detail")
-            }
-
-            contentItem: ColumnLayout {
-                spacing: 0
-                RowLayout {
-                    id: headerLayout
-                    Layout.fillWidth: true
-                    Layout.margins: Kirigami.Units.largeSpacing
-                    spacing: Kirigami.Units.largeSpacing
-                    Kirigami.Avatar {
-                        id: avatar
-                        source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
-                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3
-                        Layout.preferredHeight: Kirigami.Units.gridUnit * 3
-                        Layout.alignment: Qt.AlignTop
-                        name: author.displayName
-                        color: author.color
-                    }
-                    ColumnLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Heading {
-                            level: 3
-                            Layout.fillWidth: true
-                            text: author.displayName
-                            wrapMode: Text.WordWrap
-                        }
-                        QQC2.Label {
-                            text: message
-                            Layout.fillWidth: true
-                            Layout.maximumWidth: Kirigami.Units.gridUnit * 24
-                            wrapMode: Text.WordWrap
-
-                            onLinkActivated: RoomManager.openResource(link);
-                        }
-                    }
-                }
-                Kirigami.Separator {
-                    Layout.fillWidth: true
-                }
-                RowLayout {
-                    spacing: 0
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
-                    Repeater {
-                        model: ["👍", "👎️", "😄", "🎉", "🚀", "👀"]
-                        delegate: QQC2.ItemDelegate {
-                            Layout.fillWidth: true
-                            Layout.fillHeight: true
-
-                            contentItem: QQC2.Label {
-                                horizontalAlignment: Text.AlignHCenter
-                                verticalAlignment: Text.AlignVCenter
-
-                                font.pixelSize: 16
-                                font.family: "emoji"
-                                text: modelData
-
-                            }
-
-                            onClicked: {
-                                currentRoom.toggleReaction(eventId, modelData)
-                                loadRoot.item.close();
-                            }
-                        }
-                    }
-                }
-                Kirigami.Separator {
-                    Layout.fillWidth: true
-                }
-            }
-        }*/
     }
     Component {
         id: mobileMenu
@@ -185,7 +130,7 @@ Loader {
                         Kirigami.Heading {
                             level: 3
                             Layout.fillWidth: true
-                            text: author.displayName
+                            text: currentRoom.htmlSafeMemberName(author.id)
                             wrapMode: Text.WordWrap
                         }
                         QQC2.Label {

imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml

@@ -5,20 +5,26 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 
+import org.kde.syntaxhighlighting 1.0
 import org.kde.kirigami 2.15 as Kirigami
 
 Kirigami.OverlaySheet {
 
     property string sourceText
 
-    header: Kirigami.Heading {
-        text: i18n("Message Source")
-    }
+    title: i18n("Message Source")
 
     TextArea {
+        id: sourceTextArea
         text: sourceText
         readOnly: true
         wrapMode: Text.WordWrap
+
+        SyntaxHighlighter {
+            textEdit: sourceTextArea
+            repository: Repository
+            definition: "JSON"
+        }
     }
 }
 

imports/NeoChat/Menu/qmldir

@@ -1,2 +1,4 @@
 module NeoChat.Menu
 RoomListContextMenu 1.0 RoomListContextMenu.qml
+GlobalMenu 1.0 GlobalMenu.qml
+EditMenu 1.0 EditMenu.qml

imports/NeoChat/Page/DevicesPage.qml

@@ -1,100 +0,0 @@
-// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-Kirigami.ScrollablePage {
-    title: i18n("Devices")
-
-    ListView {
-        model: DevicesModel {
-            id: devices
-        }
-        delegate: Kirigami.SwipeListItem {
-            leftPadding: 0
-            rightPadding: 0
-            Kirigami.BasicListItem {
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-
-                text: model.displayName
-                subtitle: model.id
-                icon: "network-connect"
-            }
-            actions: [
-                Kirigami.Action {
-                    text: i18n("Edit device name")
-                    iconName: "document-edit"
-                    onTriggered: {
-                        renameSheet.index = model.index
-                        renameSheet.name = model.displayName
-                        renameSheet.open()
-                    }
-                },
-                Kirigami.Action {
-                    text: i18n("Logout device")
-                    iconName: "edit-delete-remove"
-                    onTriggered: {
-                        passwordSheet.index = index
-                        passwordSheet.open()
-                    }
-                }
-            ]
-        }
-    }
-
-    Kirigami.OverlaySheet {
-        id: passwordSheet
-
-        property var index
-
-        header: Kirigami.Heading {
-            text: i18n("Remove device")
-        }
-        Kirigami.FormLayout {
-            Controls.TextField {
-                id: passwordField
-                Kirigami.FormData.label: i18n("Password:")
-                echoMode: TextInput.Password
-            }
-            Controls.Button {
-                text: i18n("Confirm")
-                onClicked: {
-                    devices.logout(passwordSheet.index, passwordField.text)
-                    passwordField.text = ""
-                    passwordSheet.close()
-                }
-            }
-        }
-    }
-
-    Kirigami.OverlaySheet {
-        id: renameSheet
-        property int index
-        property string name
-
-        header: Kirigami.Heading {
-            text: i18n("Edit device")
-        }
-        Kirigami.FormLayout {
-            Controls.TextField {
-                id: nameField
-                Kirigami.FormData.label: i18n("Name:")
-                text: renameSheet.name
-            }
-            Controls.Button {
-                text: i18n("Save")
-                onClicked: {
-                    devices.setName(renameSheet.index, nameField.text)
-                    renameSheet.close()
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Page/ImageEditorPage.qml

@@ -21,14 +21,14 @@ Kirigami.Page {
     title: i18n("Edit")
     leftPadding: 0
     rightPadding: 0
-
-    
+    topPadding: 0
+    bottomPadding: 0
 
     function crop() {
         const ratioX = editImage.paintedWidth / editImage.nativeWidth;
         const ratioY = editImage.paintedHeight / editImage.nativeHeight;
         rootEditorView.resizing = false
-        imageDoc.crop(resizeRectangle.insideX / ratioX, resizeRectangle.insideY / ratioY, resizeRectangle.insideWidth / ratioX, resizeRectangle.insideHeight / ratioY);
+        imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
     }
 
     actions {
@@ -58,8 +58,11 @@ Kirigami.Page {
 
 
 
-    contentItem: KQuickImageEditor.ImageItem {
+    KQuickImageEditor.ImageItem {
         id: editImage
+        // Assigning this to the contentItem and setting the padding causes weird positioning issues
+        anchors.fill: parent
+        anchors.margins: Kirigami.Units.gridUnit
         fillMode: KQuickImageEditor.ImageItem.PreserveAspectFit
         image: imageDoc.image
 
@@ -76,12 +79,41 @@ Kirigami.Page {
         Shortcut {
             sequence: StandardKey.SaveAs
             onActivated: saveAsAction.trigger();
-        }    anchors.fill: parent
+        }
 
         KQuickImageEditor.ImageDocument {
             id: imageDoc
             path: rootEditorView.imagePath
         }
+
+        KQuickImageEditor.SelectionTool {
+            id: selectionTool
+            visible: rootEditorView.resizing
+            width: editImage.paintedWidth
+            height: editImage.paintedHeight
+            x: editImage.horizontalPadding
+            y: editImage.verticalPadding
+            KQuickImageEditor.CropBackground {
+                anchors.fill: parent
+                z: -1
+                insideX: selectionTool.selectionX
+                insideY: selectionTool.selectionY
+                insideWidth: selectionTool.selectionWidth
+                insideHeight: selectionTool.selectionHeight
+            }
+            Connections {
+                target: selectionTool.selectionArea
+                function onDoubleClicked() {
+                    rootEditorView.crop()
+                }
+            }
+        }
+        onImageChanged: {
+            selectionTool.selectionX = 0
+            selectionTool.selectionY = 0
+            selectionTool.selectionWidth = Qt.binding(() => selectionTool.width)
+            selectionTool.selectionHeight = Qt.binding(() => selectionTool.height)
+        }
     }
 
     header: QQC2.ToolBar {
@@ -145,22 +177,4 @@ Kirigami.Page {
         showCloseButton: true
         visible: false
     }
-
-    KQuickImageEditor.ResizeRectangle {
-        id: resizeRectangle
-
-        visible: rootEditorView.resizing
-
-        width: editImage.paintedWidth
-        height: editImage.paintedHeight
-        x: editImage.horizontalPadding
-        y: editImage.verticalPadding
-
-        insideX: 100
-        insideY: 100
-        insideWidth: 100
-        insideHeight: 100
-
-        onAcceptSize: rootEditorView.crop();
-    }
 }

imports/NeoChat/Page/LoadingPage.qml

@@ -1,13 +1,20 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.12 as QQC2
 import org.kde.kirigami 2.12 as Kirigami
 
 Kirigami.Page {
     title: i18n("Loading")
 
-    QQC2.BusyIndicator {
+    Kirigami.PlaceholderMessage {
+        id: loadingIndicator
         anchors.centerIn: parent
+        text: i18n("Loading")
+        QQC2.BusyIndicator {
+            running: loadingIndicator.visible
+            Layout.alignment: Qt.AlignHCenter
+        }
     }
 }

imports/NeoChat/Page/RoomListPage.qml

@@ -17,7 +17,34 @@ import NeoChat.Menu 1.0
 Kirigami.ScrollablePage {
     id: page
 
+    title: i18n("Rooms")
+
     property var enteredRoom
+    property bool collapsedMode: Config.roomListPageWidth === applicationWindow().collapsedPageWidth && applicationWindow().shouldUseSidebars
+
+    onCollapsedModeChanged: if (collapsedMode) {
+        sortFilterRoomListModel.filterText = "";
+        if (page.contentItem && page.contentItem.flickableItem && page.contentItem.flickableItem.QQC2.ScrollBar.vertical) {
+            page.contentItem.flickableItem.QQC2.ScrollBar.vertical.visible = false;
+        }
+    } else {
+        page.contentItem.flickableItem.QQC2.ScrollBar.vertical.visible = true;
+    }
+
+    // HACK: the scrollbar is created with a 0 timer, so we need to set the visible flag
+    // after it has been created
+    Timer {
+        running: true
+        interval: 200 
+        onTriggered: page.contentItem.flickableItem.QQC2.ScrollBar.vertical.visible = !collapsedMode;
+    }
+
+    Connections {
+        target: RoomManager
+        function onCurrentRoomChanged() {
+            itemSelection.setCurrentIndex(roomListModel.index(roomListModel.indexForRoom(RoomManager.currentRoom), 0), ItemSelectionModel.SelectCurrent)
+        }
+    }
 
     function goToNextRoom() {
         do {
@@ -33,21 +60,56 @@ Kirigami.ScrollablePage {
         listView.currentItem.action.trigger();
     }
 
-    title: i18n("Rooms")
+    titleDelegate: collapsedMode ? empty : searchField
 
-    titleDelegate: Kirigami.SearchField {
-        Layout.topMargin: Kirigami.Units.smallSpacing
-        Layout.bottomMargin: Kirigami.Units.smallSpacing
-        Layout.fillHeight: true
-        Layout.fillWidth: true
-        onTextChanged: sortFilterRoomListModel.filterText = text
-        KeyNavigation.tab: listView
+    Component {
+        id: empty
+        Item {}
     }
 
+    Component {
+        id: searchField
+        Kirigami.SearchField {
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            Layout.bottomMargin: Kirigami.Units.smallSpacing
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            onTextChanged: sortFilterRoomListModel.filterText = text
+            KeyNavigation.tab: listView
+        }
+    }
+
+    header: QQC2.ItemDelegate {
+        visible: page.collapsedMode
+        action: Kirigami.Action {
+            id: enterRoomAction
+            onTriggered: quickView.item.open();
+        }
+        topPadding: Kirigami.Units.largeSpacing
+        leftPadding: Kirigami.Units.largeSpacing
+        rightPadding: Kirigami.Units.largeSpacing
+        bottomPadding: Kirigami.Units.largeSpacing
+        width: visible ? page.width : 0
+        height: visible ? Kirigami.Units.gridUnit * 2 : 0
+
+        Kirigami.Icon {
+            anchors.centerIn: parent
+            width: 22
+            height: 22
+            source: "search"
+        }
+        Kirigami.Separator {
+            width: parent.width
+            anchors.bottom: parent.bottom
+        }
+    }
+
+
     ListView {
         id: listView
 
         activeFocusOnTab: true
+        clip: accountList.count > 1
 
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
@@ -64,6 +126,7 @@ Kirigami.ScrollablePage {
             }
         }
 
+
         ItemSelectionModel {
             id: itemSelection
             model: roomListModel
@@ -87,6 +150,7 @@ Kirigami.ScrollablePage {
         section.property: sortFilterRoomListModel.filterText.length === 0 && !Config.mergeRoomList ? "category" : null
         section.delegate: Kirigami.ListSectionHeader {
             id: sectionHeader
+            height: implicitHeight
             action: Kirigami.Action {
                 onTriggered: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
             }
@@ -97,11 +161,14 @@ Kirigami.ScrollablePage {
                     level: 3
                     text: roomListModel.categoryName(section)
                     Layout.fillWidth: true
+                    elide: Text.ElideRight
+                    visible: !page.collapsedMode
                 }
                 Kirigami.Icon {
-                    source: roomListModel.categoryVisible(section) ? "go-up" : "go-down"
+                    source: page.collapsedMode ? roomListModel.categoryIconName(section) : (roomListModel.categoryVisible(section) ? "go-up" : "go-down")
                     implicitHeight: Kirigami.Units.iconSizes.small
                     implicitWidth: Kirigami.Units.iconSizes.small
+                    Layout.alignment: Qt.AlignHCenter
                 }
             }
         }
@@ -109,85 +176,124 @@ Kirigami.ScrollablePage {
         reuseItems: true
         currentIndex: -1 // we don't want any room highlighted by default
 
-        delegate: Kirigami.BasicListItem {
-            id: roomListItem
-            visible: model.categoryVisible || sortFilterRoomListModel.filterText.length > 0 || Config.mergeRoomList
-            topPadding: Kirigami.Units.largeSpacing
-            bottomPadding: Kirigami.Units.largeSpacing
-            highlighted: listView.currentIndex === index
-            focus: true
-            icon: undefined
-            action: Kirigami.Action {
-                id: enterRoomAction
-                onTriggered: {
-                    RoomManager.enterRoom(currentRoom);
-                    itemSelection.setCurrentIndex(sortFilterRoomListModel.mapToSource(
-                        sortFilterRoomListModel.index(index, 0)), ItemSelectionModel.SelectCurrent)
-                }
-            }
-            bold: unreadCount > 0
-            label: name ?? ""
-            subtitle: {
-                let txt = (lastEvent.length === 0 ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm, " ")
-                if (txt.length) {
-                    return txt
-                }
-                return " "
-            }
+        delegate: page.collapsedMode ? collapsedModeListComponent : normalModeListComponent
 
-            leading: Kirigami.Avatar {
-                source: avatar ? "image://mxc/" + avatar : ""
-                name: model.name || i18n("No Name")
-                implicitWidth: visible ? height : 0
-                visible: Config.showAvatarInTimeline
-                sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-                sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-            }
+        Component {
+            id: collapsedModeListComponent
 
-            trailing: RowLayout {
-                QQC2.Label {
-                    text: notificationCount
-                    visible: notificationCount > 0
-                    padding: Kirigami.Units.smallSpacing
-                    color: highlightCount > 0 ? "white" : Kirigami.Theme.textColor
-                    Layout.minimumWidth: height
-                    horizontalAlignment: Text.AlignHCenter
-                    background: Rectangle {
-                        Kirigami.Theme.colorSet: Kirigami.Theme.Button
-                        color: highlightCount > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
-                        radius: height / 2
+            QQC2.ItemDelegate {
+                action: Kirigami.Action {
+                    id: enterRoomAction
+                    onTriggered: {
+                        RoomManager.enterRoom(currentRoom);
                     }
                 }
-                QQC2.Button {
-                    id: configButton
-                    visible: roomListItem.hovered || Kirigami.Settings.isMobile
-                    Accessible.name: i18n("Configure room")
+                Keys.onEnterPressed: enterRoomAction.trigger()
+                Keys.onReturnPressed: enterRoomAction.trigger()
+                topPadding: Kirigami.Units.largeSpacing
+                leftPadding: Kirigami.Units.largeSpacing
+                rightPadding: Kirigami.Units.largeSpacing
+                bottomPadding: Kirigami.Units.largeSpacing
+                width: ListView.view.width
+                height: ListView.view.width
 
-                    action: Kirigami.Action {
-                        id: optionAction
-                        icon.name: "configure"
-                        onTriggered: {
-                            const menu = roomListContextMenu.createObject(page, {"room": currentRoom})
-                            configButton.visible = true
-                            configButton.down = true
-                            menu.closed.connect(function() {
-                                configButton.down = undefined
-                                configButton.visible = Qt.binding(function() { return roomListItem.hovered || Kirigami.Settings.isMobile })
-                            })
-                            menu.popup()
+                contentItem: Kirigami.Avatar {
+                    source: avatar ? "image://mxc/" + avatar : ""
+                    name: model.name || i18n("No Name")
+                    sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
+                    sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
+                }
+
+                QQC2.ToolTip {
+                    enabled: text.length !== 0
+                    text: name ?? ""
+                }
+            }
+        }
+
+        Component {
+            id: roomListContextMenu
+            RoomListContextMenu {}
+        }
+
+        Component {
+            id: normalModeListComponent
+            Kirigami.BasicListItem {
+                id: roomListItem
+                visible: model.categoryVisible || sortFilterRoomListModel.filterText.length > 0 || Config.mergeRoomList
+                topPadding: Kirigami.Units.largeSpacing
+                bottomPadding: Kirigami.Units.largeSpacing
+                highlighted: listView.currentIndex === index
+                focus: true
+                icon: undefined
+                action: Kirigami.Action {
+                    id: enterRoomAction
+                    onTriggered: {
+                        RoomManager.enterRoom(currentRoom);
+                    }
+                }
+                Keys.onEnterPressed: enterRoomAction.trigger()
+                Keys.onReturnPressed: enterRoomAction.trigger()
+                bold: unreadCount > 0
+                label: name ?? ""
+                subtitle: {
+                    let txt = (lastEvent.length === 0 ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm, " ")
+                    if (txt.length) {
+                        return txt
+                    }
+                    return " "
+                }
+
+                leading: Kirigami.Avatar {
+                    source: avatar ? "image://mxc/" + avatar : ""
+                    name: model.name || i18n("No Name")
+                    implicitWidth: visible ? height : 0
+                    visible: Config.showAvatarInTimeline
+                    sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
+                    sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
+                }
+
+                trailing: RowLayout {
+                    QQC2.Label {
+                        text: notificationCount
+                        visible: notificationCount > 0
+                        padding: Kirigami.Units.smallSpacing
+                        color: highlightCount > 0 ? "white" : Kirigami.Theme.textColor
+                        Layout.minimumWidth: height
+                        horizontalAlignment: Text.AlignHCenter
+                        background: Rectangle {
+                            Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                            color: highlightCount > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
+                            radius: height / 2
+                        }
+                    }
+                    QQC2.Button {
+                        id: configButton
+                        visible: roomListItem.hovered || Kirigami.Settings.isMobile
+                        Accessible.name: i18n("Configure room")
+
+                        action: Kirigami.Action {
+                            id: optionAction
+                            icon.name: "configure"
+                            onTriggered: {
+                                const menu = roomListContextMenu.createObject(page, {"room": currentRoom})
+                                configButton.visible = true
+                                configButton.down = true
+                                menu.closed.connect(function() {
+                                    configButton.down = undefined
+                                    configButton.visible = Qt.binding(function() { return roomListItem.hovered || Kirigami.Settings.isMobile })
+                                })
+                                menu.popup()
+                            }
                         }
                     }
                 }
             }
         }
-        Component {
-            id: roomListContextMenu
-            RoomListContextMenu {}
-        }
     }
 
     footer: QQC2.ToolBar {
-        visible: accountList.count > 1
+        visible: accountList.count > 1 && !collapsedMode
         height: visible ? implicitHeight : 0
         leftPadding: 0
         rightPadding: 0
@@ -202,7 +308,7 @@ Kirigami.ScrollablePage {
                 }
                 delegate: Kirigami.BasicListItem {
                     checkable: true
-                    checked: Controller.activeConnection.localUser.id === model.user.id
+                    checked: Controller.activeConnection && Controller.activeConnection.localUser.id === model.user.id
                     onClicked: Controller.activeConnection = model.connection
                     Layout.fillWidth: true
                     Layout.fillHeight: true

imports/NeoChat/Page/RoomPage.qml

@@ -23,13 +23,29 @@ Kirigami.ScrollablePage {
 
     /// It's not readonly because of the seperate window view.
     property var currentRoom: RoomManager.currentRoom
+    /// Used to determine if scrolling to the bottom should mark the message as unread
+    property bool hasScrolledUpBefore: false;
 
-    title: currentRoom.displayName
+    title: currentRoom.htmlSafeDisplayName
+
+    Connections {
+        target: RoomManager
+        function onCurrentRoomChanged() {
+            if(!RoomManager.currentRoom) {
+                if(pageStack.lastItem == page) {
+                    pageStack.pop()
+                }
+            }
+        }
+    }
 
     signal switchRoomUp()
     signal switchRoomDown()
 
-    onCurrentRoomChanged: ChatBoxHelper.clearEditReply()
+    onCurrentRoomChanged: {
+        hasScrolledUpBefore = false;
+        ChatBoxHelper.clearEditReply()
+    }
 
     ActionsHandler {
         id: actionsHandler
@@ -39,8 +55,8 @@ Kirigami.ScrollablePage {
 
     Connections {
         target: Controller.activeConnection
-        function onJoinedRoom(room) {
-            if(room.id === invitation.id) {
+        function onJoinedRoom(room, invited) {
+            if(page.currentRoom.id === invited.id) {
                 RoomManager.enterRoom(room);
             }
         }
@@ -48,7 +64,7 @@ Kirigami.ScrollablePage {
 
     Connections {
         target: actionsHandler
-        onShowMessage: {
+        function onShowMessage(messageType, message) {
             page.header.contentItem.text = message;
             page.header.contentItem.type = messageType === ActionsHandler.Error ? Kirigami.MessageType.Error : Kirigami.MessageType.Information;
             page.header.contentItem.visible = true;
@@ -68,8 +84,6 @@ Kirigami.ScrollablePage {
     Kirigami.PlaceholderMessage {
         id: invitation
 
-        property var id
-
         visible: currentRoom && currentRoom.isInvite
         anchors.centerIn: parent
         text: i18n("Accept this invitation?")
@@ -78,7 +92,7 @@ Kirigami.ScrollablePage {
                 Layout.alignment : Qt.AlignHCenter
                 text: i18n("Reject")
 
-                onClicked: RoomManager.leave(page.currentRoom);
+                onClicked: RoomManager.leaveRoom(page.currentRoom);
             }
 
             QQC2.Button {
@@ -87,8 +101,6 @@ Kirigami.ScrollablePage {
 
                 onClicked: {
                     currentRoom.acceptInvitation();
-                    invitation.id = currentRoom.id
-                    currentRoom = null
                 }
             }
         }
@@ -143,9 +155,9 @@ Kirigami.ScrollablePage {
 
     Item {
         id: hoverActions
-        property var event
+        property var event: null
         property bool showEdit: event && (event.author.id === Controller.activeConnection.localUserId && (event.eventType === "emote" || event.eventType === "message"))
-        property var bubble
+        property var bubble: null
         property var hovered: bubble && bubble.hovered
         property var visibleDelayed: (hovered || hoverHandler.hovered) && !Kirigami.Settings.isMobile
         onVisibleDelayedChanged: if (visibleDelayed) {
@@ -160,8 +172,8 @@ Kirigami.ScrollablePage {
             interval: 200
             onTriggered: hoverActions.visible = hoverActions.visibleDelayed;
         }
-        x: bubble ? (bubble.x + Kirigami.Units.largeSpacing + Math.max(bubble.width - childWidth, 0)) : 0
-        y: bubble ? bubble.mapToItem(page, 0, -Kirigami.Units.largeSpacing - hoverActions.childHeight * 1.5).y : 0
+        x: bubble ? (bubble.x + Kirigami.Units.largeSpacing + Math.max(bubble.width - childWidth, 0) - (Config.compactLayout ? Kirigami.Units.gridUnit * 3 : 0)) : 0
+        y: bubble ? bubble.mapToItem(parent, 0, 0).y - hoverActions.childHeight + Kirigami.Units.smallSpacing: 0;
         visible: false
 
         property var updateFunction
@@ -217,14 +229,12 @@ Kirigami.ScrollablePage {
 
     ListView {
         id: messageListView
-        pixelAligned: true
         visible: !invitation.visible
 
         readonly property int largestVisibleIndex: count > 0 ? indexAt(contentX + (width / 2), contentY + height - 1) : -1
-        readonly property bool noNeedMoreContent: !currentRoom || currentRoom.eventsHistoryJob || currentRoom.allHistoryLoaded
         readonly property bool isLoaded: page.width * page.height > 10
 
-        spacing: Kirigami.Units.smallSpacing
+        spacing: Config.compactLayout ? 1 : Kirigami.Units.smallSpacing
         reuseItems: true
 
         verticalLayoutDirection: ListView.BottomToTop
@@ -232,20 +242,38 @@ Kirigami.ScrollablePage {
 
         model: !isLoaded ? undefined : sortedMessageEventModel
 
-        onContentYChanged: fetchMoreContent()
-
-        function fetchMoreContent() {
-            if(!noNeedMoreContent && contentY - 5000 < originY) {
-                currentRoom.getPreviousContent(20);
-            }
-        }
-
         MessageEventModel {
             id: messageEventModel
 
             room: currentRoom
         }
 
+        Timer {
+            interval: 1000
+            running: messageListView.atYBeginning
+            triggeredOnStart: true
+            onTriggered: {
+                if (messageListView.atYBeginning && messageEventModel.canFetchMore(messageEventModel.index(0, 0))) {
+                    messageEventModel.fetchMore(messageEventModel.index(0, 0));
+                }
+            }
+            repeat: true
+        }
+
+        // HACK: The view should do this automatically but doesn't.
+        onAtYBeginningChanged: if (atYBeginning && messageEventModel.canFetchMore(messageEventModel.index(0, 0))) {
+            messageEventModel.fetchMore(messageEventModel.index(0, 0));
+        }
+
+        onAtYEndChanged: if (atYEnd && hasScrolledUpBefore) {
+            if (QQC2.ApplicationWindow.window && (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden)) {
+                currentRoom.markAllMessagesAsRead();
+            }
+            hasScrolledUpBefore = false;
+        } else if (!atYEnd) {
+            hasScrolledUpBefore = true;
+        }
+
         QQC2.Popup {
             anchors.centerIn: parent
 
@@ -344,17 +372,7 @@ Kirigami.ScrollablePage {
                     innerObject: TextDelegate {
                         isEmote: true
                         Layout.maximumWidth: emoteContainer.bubbleMaxWidth
-                        Layout.rightMargin: Kirigami.Units.largeSpacing
-                        Layout.leftMargin: Kirigami.Units.largeSpacing
-                        Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
-                        TapHandler {
-                            acceptedButtons: Qt.RightButton
-                            onTapped: openMessageContext(author, model.message, eventId, toolTip, eventType, model.formattedBody)
-                        }
-                        TapHandler {
-                            acceptedButtons: Qt.LeftButton
-                            onLongPressed: openMessageContext(author, model.message, eventId, toolTip, eventType, model.formattedBody)
-                        }
+                        onRequestOpenMessageContext: openMessageContext(model, parent.selectedText)
                     }
                 }
             }
@@ -370,17 +388,7 @@ Kirigami.ScrollablePage {
 
                     innerObject: TextDelegate {
                         Layout.maximumWidth: messageContainer.bubbleMaxWidth
-                        Layout.rightMargin: Kirigami.Units.largeSpacing
-                        Layout.bottomMargin: Kirigami.Units.largeSpacing
-                        Layout.leftMargin: Kirigami.Units.largeSpacing
-                        TapHandler {
-                            acceptedButtons: Qt.RightButton
-                            onTapped: openMessageContext(author, model.message, eventId, toolTip, eventType, model.formattedBody)
-                        }
-                        TapHandler {
-                            acceptedButtons: Qt.LeftButton
-                            onLongPressed: openMessageContext(author, model.message, eventId, toolTip, eventType, model.formattedBody)
-                        }
+                        onRequestOpenMessageContext: openMessageContext(model, parent.selectedText)
                     }
                 }
             }
@@ -394,10 +402,9 @@ Kirigami.ScrollablePage {
                     onReplyClicked: goToEvent(eventID)
 
                     innerObject: TextDelegate {
+                        Layout.fillWidth: !Config.compactLayout
+                        hasContextMenu: false
                         Layout.maximumWidth: noticeContainer.bubbleMaxWidth
-                        Layout.rightMargin: Kirigami.Units.largeSpacing
-                        Layout.leftMargin: Kirigami.Units.largeSpacing
-                        Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
                     }
                 }
             }
@@ -414,18 +421,23 @@ Kirigami.ScrollablePage {
                     innerObject: ImageDelegate {
                         Layout.preferredWidth: Kirigami.Units.gridUnit * 15
                         Layout.maximumWidth: imageContainer.bubbleMaxWidth
-                        Layout.bottomMargin: Kirigami.Units.largeSpacing
                         Layout.preferredHeight: info.h / info.w * width
                         Layout.maximumHeight: Kirigami.Units.gridUnit * 20
                         TapHandler {
                             acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onTapped: openFileContext(model, parent)
                         }
                         TapHandler {
                             acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onLongPressed: openFileContext(model, parent)
                             onTapped: {
-                                fullScreenImage.createObject(parent, {"filename": eventId, "localPath": currentRoom.urlToDownload(eventId)}).showFullScreen()
+                                fullScreenImage.createObject(parent, {
+                                    filename: eventId,
+                                    localPath: currentRoom.urlToDownload(eventId),
+                                    blurhash: model.content.info["xyz.amorgan.blurhash"],
+                                    imageWidth: content.info.w,
+                                    imageHeight: content.info.h
+                                }).showFullScreen();
                             }
                         }
                     }
@@ -464,11 +476,11 @@ Kirigami.ScrollablePage {
                         Layout.maximumWidth: audioContainer.bubbleMaxWidth
                         TapHandler {
                             acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onTapped: openFileContext(model, parent)
                         }
                         TapHandler {
                             acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onLongPressed: openFileContext(model, parent)
                         }
                     }
                 }
@@ -492,11 +504,11 @@ Kirigami.ScrollablePage {
 
                         TapHandler {
                             acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onTapped: openFileContext(model, parent)
                         }
                         TapHandler {
                             acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onLongPressed: openFileContext(model, parent)
                         }
                     }
                 }
@@ -515,16 +527,32 @@ Kirigami.ScrollablePage {
                         Layout.maximumWidth: fileContainer.bubbleMaxWidth
                         TapHandler {
                             acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onTapped: openFileContext(model, parent)
                         }
                         TapHandler {
                             acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(author, model.display, eventId, toolTip, progressInfo, parent)
+                            onLongPressed: openFileContext(model, parent)
                         }
                     }
                 }
             }
 
+            DelegateChoice {
+                roleValue: "encrypted"
+                delegate: TimelineContainer {
+                    id: encryptedContainer
+                    width: messageListView.width
+                    isLoaded: timelineDelegateChooser.delegateLoaded
+
+                    innerObject: EncryptedDelegate {
+                        Layout.fillWidth: Config.compactLayout
+                        Layout.maximumWidth: encryptedContainer.bubbleMaxWidth
+                        Layout.rightMargin: Kirigami.Units.largeSpacing
+                        Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
+                    }
+                }
+            }
+
             DelegateChoice {
                 roleValue: "readMarker"
                 delegate: QQC2.ItemDelegate {
@@ -544,13 +572,15 @@ Kirigami.ScrollablePage {
                         shadow.size: Kirigami.Units.smallSpacing
                         shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
                         border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                        border.width: Kirigami.Units.devicePixelRatio
+                        border.width: 1
                     }
 
                     Timer {
                         id: makeMeDisapearTimer
                         interval: Kirigami.Units.humanMoment * 2
-                        onTriggered: currentRoom.markAllMessagesAsRead();
+                        onTriggered: if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
+                            currentRoom.markAllMessagesAsRead();
+                        }
                     }
 
                     ListView.onPooled: makeMeDisapearTimer.stop()
@@ -577,7 +607,9 @@ Kirigami.ScrollablePage {
 
                         if (view.atYEnd) {
                             // easy case just mark everything as read
-                            currentRoom.markAllMessagesAsRead();
+                            if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
+                                currentRoom.markAllMessagesAsRead();
+                            }
                             return;
                         }
 
@@ -622,7 +654,7 @@ Kirigami.ScrollablePage {
         QQC2.RoundButton {
             anchors.right: parent.right
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: Kirigami.Units.largeSpacing
+            anchors.bottomMargin: Kirigami.Units.largeSpacing + messageListView.headerItem.height
             anchors.rightMargin: Kirigami.Units.largeSpacing
             implicitWidth: Kirigami.Units.gridUnit * 2
             implicitHeight: Kirigami.Units.gridUnit * 2
@@ -633,6 +665,7 @@ Kirigami.ScrollablePage {
             action: Kirigami.Action {
                 onTriggered: {
                     goToLastMessage();
+                    currentRoom.markAllMessagesAsRead();
                 }
                 icon.name: "go-down"
             }
@@ -643,10 +676,10 @@ Kirigami.ScrollablePage {
         }
 
         Component.onCompleted: {
-            updateReadMarker()
             if (currentRoom) {
-                if (currentRoom.timelineSize < 20)
-                    currentRoom.getPreviousContent(50)
+                if (currentRoom.timelineSize < 20) {
+                    currentRoom.getPreviousContent(50);
+                }
             }
 
             positionViewAtBeginning();
@@ -705,8 +738,12 @@ Kirigami.ScrollablePage {
         header: TypingPane {
             id: typingPane
             visible: !loadingIndicator.visible && currentRoom && currentRoom.usersTyping.length > 0
-            typingNotification: visible ? i18ncp("Message displayed when some users are typing", "%2 is typing", "%2 are typing", currentRoom.usersTyping.length, currentRoom.usersTyping.map(user => user.displayName).join(", ")) : ""
-            width: parent.width
+            labelText: visible ? i18ncp(
+                "Message displayed when some users are typing", "%2 is typing", "%2 are typing",
+                currentRoom.usersTyping.length,
+                currentRoom.usersTyping.map(user => user.displayName).join(", ")
+            ) : ""
+            anchors.right: parent.right
             height: visible ? implicitHeight : 0
             Behavior on height {
                 NumberAnimation {
@@ -747,6 +784,7 @@ Kirigami.ScrollablePage {
 
     background: FancyEffectsContainer {
         id: fancyEffectsContainer
+        z: 100
 
         enabled: Config.showFancyEffects
 
@@ -833,28 +871,28 @@ Kirigami.ScrollablePage {
     }
 
     /// Open message context dialog for file and videos
-    function openFileContext(author, message, eventId, source, progressInfo, file) {
+    function openFileContext(event, file) {
         const contextMenu = fileDelegateContextMenu.createObject(page, {
-            author: author,
-            message: message,
-            eventId: eventId,
-            source: source,
+            author: event.author,
+            message: event.message,
+            eventId: event.eventId,
+            source: event.toolTip,
             file: file,
-            progressInfo: progressInfo,
+            progressInfo: event.progressInfo,
         });
         contextMenu.open();
     }
 
     /// Open context menu for normal message
-    function openMessageContext(author, message, eventId, source, eventType, formattedBody) {
-        console.log("message", message)
+    function openMessageContext(event, selectedText) {
         const contextMenu = messageDelegateContextMenu.createObject(page, {
-            author: author,
-            message: message,
-            eventId: eventId,
-            formattedBody: formattedBody,
-            source: source,
-            eventType: eventType
+            selectedText: selectedText,
+            author: event.author,
+            message: event.message,
+            eventId: event.eventId,
+            formattedBody: event.formattedBody,
+            source: event.toolTip,
+            eventType: event.eventType
         });
         contextMenu.open();
     }

imports/NeoChat/Page/SettingsPage.qml

@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-Kirigami.ScrollablePage {
-    title: i18n("Settings")
-
-    Kirigami.FormLayout {
-        QQC2.CheckBox {
-            Kirigami.FormData.label: i18n("General settings:")
-            text: i18n("Close to system tray")
-            checked: Config.systemTray
-            visible: Controller.supportSystemTray
-            onToggled: {
-                Config.systemTray = checked
-                Config.save()
-            }
-        }
-        QQC2.CheckBox {
-            // TODO: When there are enough notification and timeline event
-            // settings, make 2 separate groups with FormData labels.
-            Kirigami.FormData.label: i18n("Notifications and events:")
-            text: i18n("Show notifications")
-            checked: Config.showNotifications
-            onToggled: {
-                Config.showNotifications = checked
-                Config.save()
-            }
-        }
-        QQC2.CheckBox {
-            text: i18n("Show leave and join events")
-            checked: Config.showLeaveJoinEvent
-            onToggled: {
-                Config.showLeaveJoinEvent = checked
-                Config.save()
-            }
-        }
-        QQC2.RadioButton {
-            Kirigami.FormData.label: i18n("Rooms and private chats:")
-            text: i18n("Separated")
-            checked: !Config.mergeRoomList
-            onToggled: {
-                Config.mergeRoomList = false
-                Config.save()
-            }
-        }
-        QQC2.RadioButton {
-            text: i18n("Intermixed")
-            checked: Config.mergeRoomList
-            onToggled: {
-                Config.mergeRoomList = true
-                Config.save()
-            }
-        }
-        QQC2.CheckBox {
-            Kirigami.FormData.label: i18n("Timeline:")
-            text: i18n("Show User Avatar")
-            checked: Config.showAvatarInTimeline
-            onToggled: {
-                Config.showAvatarInTimeline = checked
-                Config.save()
-            }
-        }
-        QQC2.CheckBox {
-            text: i18n("Show Fancy Effects")
-            checked: Config.showFancyEffects
-            onToggled: {
-                Config.showFancyEffects = checked
-                Config.save()
-            }
-        }
-        QQC2.CheckBox {
-            text: i18n("Use s/text/replacement syntax to edit your last message")
-            checked: Config.allowQuickEdit
-            onToggled: {
-                Config.allowQuickEdit = checked
-                Config.save()
-            }
-        }
-    }
-}

imports/NeoChat/Page/WelcomePage.qml

@@ -30,7 +30,7 @@ Kirigami.ScrollablePage {
 
     Connections {
         target: LoginHelper
-        onErrorOccured: {
+        function onErrorOccured(message) {
             headerMessage.text = message;
             headerMessage.visible = true;
             headerMessage.type = Kirigami.MessageType.Error;

imports/NeoChat/Page/qmldir

@@ -5,6 +5,5 @@ RoomPage 1.0 RoomPage.qml
 RoomWindow 1.0 RoomWindow.qml
 JoinRoomPage 1.0 JoinRoomPage.qml
 InviteUserPage 1.0 InviteUserPage.qml
-SettingsPage 1.0 SettingsPage.qml
 ImageEditorPage 1.0 ImageEditorPage.qml
 

imports/NeoChat/Panel/RoomDrawer.qml

@@ -18,6 +18,46 @@ Kirigami.OverlayDrawer {
     id: roomDrawer
     readonly property var room: RoomManager.currentRoom
 
+    width: modal ? undefined : actualWidth
+    readonly property int minWidth: Kirigami.Units.gridUnit * 15
+    readonly property int maxWidth: Kirigami.Units.gridUnit * 25
+    readonly property int defaultWidth: Kirigami.Units.gridUnit * 20
+    property int actualWidth: {
+        if (Config.roomDrawerWidth === -1) {
+            return Kirigami.Units.gridUnit * 20;
+        } else {
+            return Config.roomDrawerWidth
+        }
+    }
+
+    MouseArea {
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.right: undefined
+        width: 2
+        z: 500
+        cursorShape: !Kirigami.Settings.isMobile ? Qt.SplitHCursor : undefined
+        enabled: true
+        visible: true
+        onPressed: _lastX = mapToGlobal(mouseX, mouseY).x
+        onReleased: {
+            Config.roomDrawerWidth = roomDrawer.actualWidth;
+            Config.save();
+        }
+        property real _lastX: -1
+
+        onPositionChanged: {
+            if (_lastX === -1) {
+                return;
+            }
+            if (Qt.application.layoutDirection === Qt.RightToLeft) {
+                roomDrawer.actualWidth = Math.min(roomDrawer.maxWidth, Math.max(roomDrawer.minWidth, Config.roomDrawerWidth - _lastX + mapToGlobal(mouseX, mouseY).x))
+            } else {
+                roomDrawer.actualWidth = Math.min(roomDrawer.maxWidth, Math.max(roomDrawer.minWidth, Config.roomDrawerWidth + _lastX - mapToGlobal(mouseX, mouseY).x))
+            }
+        }
+    }
     enabled: true
 
     edge: Qt.application.layoutDirection == Qt.RightToLeft ? Qt.LeftEdge : Qt.RightEdge
@@ -30,7 +70,6 @@ Kirigami.OverlayDrawer {
         active: roomDrawer.drawerOpen
         sourceComponent: ColumnLayout {
             id: columnLayout
-            anchors.fill: parent
             spacing: 0
             Kirigami.AbstractApplicationHeader {
                 Layout.fillWidth: true
@@ -47,7 +86,7 @@ Kirigami.OverlayDrawer {
                         icon.name: "list-add-user"
                         text: i18n("Invite")
                         onClicked: {
-                            applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {"room": room})
+                            applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {room: room})
                             roomDrawer.close();
                         }
                     }
@@ -69,12 +108,7 @@ Kirigami.OverlayDrawer {
                     ToolButton {
                         Layout.alignment: Qt.AlignRight
                         icon.name: 'settings-configure'
-                        onClicked: {
-                            roomSettingDialog.createObject(ApplicationWindow.overlay, {"room": room}).open()
-                            if (!wideScreen) {
-                                roomDrawer.close();
-                            }
-                        }
+                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})
 
                         ToolTip {
                             text: i18n("Room settings")
@@ -83,67 +117,61 @@ Kirigami.OverlayDrawer {
                 }
             }
 
-            Control {
+            ColumnLayout {
                 Layout.fillWidth: true
-                padding: Kirigami.Units.largeSpacing
-                contentItem: ColumnLayout {
-                    id: infoLayout
+                Layout.margins: Kirigami.Units.largeSpacing
+                Kirigami.Heading {
+                    text: i18n("Room information")
+                    level: 3
+                }
+                RowLayout {
                     Layout.fillWidth: true
-                    Kirigami.Heading {
-                        text: i18n("Room information")
-                        level: 3
+                    Layout.margins: Kirigami.Units.largeSpacing
+
+                    spacing: Kirigami.Units.largeSpacing
+
+                    Kirigami.Avatar {
+                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
+                        Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
+
+                        name: room ? room.name : i18n("No name")
+                        source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
                     }
-                    RowLayout {
+
+                    ColumnLayout {
                         Layout.fillWidth: true
-                        Layout.margins: Kirigami.Units.largeSpacing
+                        Layout.alignment: Qt.AlignVCenter
+                        spacing: 0
 
-                        spacing: Kirigami.Units.largeSpacing
-
-                        Kirigami.Avatar {
-                            Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
-                            Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
-
-                            name: room ? room.name : i18n("No name")
-                            source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
-                        }
-
-                        ColumnLayout {
+                        Kirigami.Heading {
+                            Layout.maximumWidth: Kirigami.Units.gridUnit * 9
                             Layout.fillWidth: true
-                            Layout.alignment: Qt.AlignVCenter
-                            spacing: 0
-
-                            Kirigami.Heading {
-                                Layout.maximumWidth: Kirigami.Units.gridUnit * 9
-                                Layout.fillWidth: true
-                                level: 1
-                                font.bold: true
-                                wrapMode: Label.Wrap
-                                text: room ? room.displayName : i18n("No name")
-                            }
-                            Label {
-                                Layout.fillWidth: true
-                                text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
-                            }
+                            level: 1
+                            font.bold: true
+                            wrapMode: Label.Wrap
+                            text: room ? room.displayName : i18n("No name")
+                        }
+                        Label {
+                            Layout.fillWidth: true
+                            text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
                         }
                     }
+                }
 
-                    TextEdit {
-                        Layout.maximumWidth: Kirigami.Units.gridUnit * 13
-                        Layout.preferredWidth: Kirigami.Units.gridUnit * 13
-                        Layout.fillWidth: true
-                        text: room && room.topic ? room.topic.replace(replaceLinks, "<a href=\"$1\">$1</a>") : i18n("No Topic")
-                        readonly property var replaceLinks: /\(https:\/\/[^ ]*\)/
-                        textFormat: TextEdit.MarkdownText
-                        wrapMode: Text.WordWrap
-                        selectByMouse: true
-                        color: Kirigami.Theme.textColor
-                        onLinkActivated: Qt.openUrlExternally(link)
-                        readOnly: true
-                        MouseArea {
-                            anchors.fill: parent
-                            acceptedButtons: Qt.NoButton
-                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
-                        }
+                TextEdit {
+                    Layout.fillWidth: true
+                    text: room && room.topic ? room.topic.replace(replaceLinks, "<a href=\"$1\">$1</a>") : i18n("No Topic")
+                    readonly property var replaceLinks: /\(https:\/\/[^ ]*\)/
+                    textFormat: TextEdit.MarkdownText
+                    wrapMode: Text.WordWrap
+                    selectByMouse: true
+                    color: Kirigami.Theme.textColor
+                    onLinkActivated: Qt.openUrlExternally(link)
+                    readOnly: true
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
                     }
                 }
             }
@@ -153,7 +181,22 @@ Kirigami.OverlayDrawer {
                 activeFocusOnTab: false
                 Label {
                     Layout.alignment: Qt.AlignRight
-                    text: room ? i18np("%1 Member", "%1 Members", room.totalMemberCount) : i18n("No Member Count")
+                    text: room ? i18np("%1 Member", "%1 Members", room.joinedCount) : i18n("No Member Count")
+                }
+            }
+
+            Pane {
+                padding: Kirigami.Units.smallSpacing
+                implicitWidth: parent.width
+                z: 2
+                background: Rectangle {
+                    color: Kirigami.Theme.backgroundColor
+                    Kirigami.Theme.inherit: false
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                }
+                contentItem: Kirigami.SearchField {
+                    id: userListSearchField
+                    onAccepted: sortedMessageEventModel.filterString = text;
                 }
             }
 
@@ -168,16 +211,6 @@ Kirigami.OverlayDrawer {
                     boundsBehavior: Flickable.DragOverBounds
                     activeFocusOnTab: true
 
-                    header: Pane {
-                        padding: Kirigami.Units.smallSpacing
-                        implicitWidth: parent.width
-                        z: 2
-                        contentItem: Kirigami.SearchField {
-                            id: userListSearchField
-                            onTextChanged: sortedMessageEventModel.filterString = text;
-                        }
-                    }
-
                     model: KSortFilterProxyModel {
                         id: sortedMessageEventModel
 
@@ -187,6 +220,7 @@ Kirigami.OverlayDrawer {
 
                         sortRole: "perm"
                         filterRole: "name"
+                        filterCaseSensitivity: Qt.CaseInsensitive
                     }
 
                     delegate: Kirigami.AbstractListItem {
@@ -198,7 +232,7 @@ Kirigami.OverlayDrawer {
                             Kirigami.Avatar {
                                 Layout.preferredWidth: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
                                 Layout.preferredHeight: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                visible: Config.showAvatarInTimeline
+                                visible: Config.showAvatarInRoomDrawer
                                 sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
                                 sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
                                 source: avatar ? ("image://mxc/" + avatar) : ""
@@ -254,12 +288,6 @@ Kirigami.OverlayDrawer {
         }
     }
 
-    Component {
-        id: roomSettingDialog
-
-        RoomSettingsDialog {}
-    }
-
     Component {
         id: userDetailDialog
 

imports/NeoChat/RoomSettings/Categories.qml

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import QtQuick 2.15
+import org.kde.kirigami 2.18 as Kirigami
+import QtQuick.Controls 2.15 as Controls
+import QtQuick.Layouts 1.15
+
+Kirigami.CategorizedSettings {
+    id: root
+    required property var room
+    objectName: "settingsPage"
+    actions: [
+        Kirigami.SettingAction {
+            text: i18n("General")
+            icon.name: "settings-configure"
+            page: Qt.resolvedUrl("General.qml")
+            initialProperties: {
+                return {
+                    room: root.room
+                }
+            }
+        },
+        Kirigami.SettingAction {
+            text: i18n("Security")
+            icon.name: "security-low"
+            page: Qt.resolvedUrl("Security.qml")
+            initialProperties: {
+                return {
+                    room: root.room
+                }
+            }
+        }
+    ]
+}

imports/NeoChat/RoomSettings/General.qml

@@ -0,0 +1,202 @@
+// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Component 1.0
+import NeoChat.Dialog 1.0
+
+Kirigami.ScrollablePage {
+    id: root
+
+    property var room
+
+    readonly property bool canChangeAvatar: room.canSendState("m.room.avatar")
+    readonly property bool canChangeName: room.canSendState("m.room.name")
+    readonly property bool canChangeTopic: room.canSendState("m.room.topic")
+    readonly property bool canChangeCanonicalAlias: room.canSendState("m.room.canonical_alias")
+
+    title: i18n('General')
+
+    ColumnLayout {
+        Kirigami.FormLayout {
+            Layout.fillWidth: true
+
+            Kirigami.Avatar {
+                Layout.bottomMargin: Kirigami.Units.largeSpacing
+
+                name: room.name
+                source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
+
+                RoundButton {
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: Kirigami.Units.gridUnits
+                    width: Kirigami.Units.gridUnits
+                    icon.name: 'cloud-upload'
+                    Accessible.name: i18n("Update avatar")
+                    enabled: canChangeAvatar
+                    onClicked: {
+                        const fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
+
+                        fileDialog.chosen.connect(function(path) {
+                            if (!path) return
+
+                            room.changeAvatar(path)
+                        })
+
+                        fileDialog.open()
+                    }
+                }
+            }
+            TextField {
+                id: roomNameField
+                text: room.name
+                Kirigami.FormData.label: i18n("Room Name:")
+                enabled: canChangeName
+            }
+
+            TextArea {
+                id: roomTopicField
+                Layout.fillWidth: true
+                text: room.topic
+                Kirigami.FormData.label: i18n("Room topic:")
+                enabled: canChangeTopic
+            }
+
+
+            Kirigami.Separator {
+                Layout.fillWidth: true
+                visible: canonicalAliasComboBox.visible || altAlias.visible
+            }
+
+            ComboBox {
+                id: canonicalAliasComboBox
+                visible: room.aliases && room.aliases.length
+                Kirigami.FormData.label: i18n("Canonical Alias:")
+                popup.z: 999; // HACK This is an absolute hack, but combos inside OverlaySheets have their popups show up underneath, because of fun z ordering stuff
+
+                enabled: canChangeCanonicalAlias
+
+                model: room.aliases
+
+                currentIndex: room.aliases.indexOf(room.canonicalAlias)
+                onCurrentIndexChanged: {
+                    if (room.canonicalAlias != room.aliases[currentIndex]) {
+                        room.setCanonicalAlias(room.aliases[currentIndex])
+                    }
+                }
+            }
+
+            RowLayout {
+                id: altAlias
+                Kirigami.FormData.label: i18n("Other Aliases:")
+                Layout.fillWidth: true
+
+                visible: room.altAliases && room.altAliases.length
+
+                ColumnLayout {
+                    Layout.fillWidth: true
+
+                    spacing: 0
+
+                    Repeater {
+                        model: room.altAliases
+
+                        delegate: RowLayout {
+                            Layout.maximumWidth: parent.width
+
+                            Label {
+                                text: modelData
+                            }
+
+                            ToolButton {
+                                icon.name: ""
+                                onClicked: room.removeLocalAlias(modelData)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Kirigami.Separator {
+            Layout.fillWidth: true
+            visible: next.visible || prev.visible 
+        }
+
+        Control {
+            id: next
+            Layout.fillWidth: true
+
+            visible: room.predecessorId && room.connection.room(room.predecessorId)
+
+            padding: Kirigami.Units.largeSpacing
+
+            contentItem: Kirigami.InlineMessage {
+                text: i18n("This room continues another conversation.")
+                actions: Kirigami.Action {
+                    text: i18n("See older messages...")
+                    onTriggered: {
+                        roomListForm.enteredRoom = Controller.activeConnection.room(room.predecessorId)
+                        root.close()
+                    }
+                }
+            }
+        }
+
+        Control {
+            id: prev
+            Layout.fillWidth: true
+
+            visible: room.successorId && room.connection.room(room.successorId)
+
+            padding: Kirigami.Units.largeSpacing
+
+            contentItem: Kirigami.InlineMessage {
+                text: i18n("This room has been replaced.")
+                actions: Kirigami.Action {
+                    text: i18n("See new room...")
+                    onTriggered: {
+                        roomListForm.enteredRoom = Controller.activeConnection.room(room.successorId)
+                        root.close()
+                    }
+                }
+            }
+        }
+
+        Component {
+            id: openFileDialog
+
+            OpenFileDialog {}
+        }
+    }
+
+    footer: ToolBar {
+        contentItem: RowLayout {
+            Item {
+                Layout.fillWidth: true
+            }
+            Button {
+                Layout.alignment: Qt.AlignRight
+                enabled: room.name !== roomNameField.text || room.topic !== roomTopicField.text
+                text: i18n("Apply")
+                onClicked: {
+                    if (room.name != roomNameField.text) {
+                        room.setName(roomNameField.text)
+                    }
+
+                    if (room.topic != roomTopicField.text) {
+                        room.setTopic(roomTopicField.text)
+                    }
+                }
+            }
+        }
+    }
+}
+

imports/NeoChat/RoomSettings/Security.qml

@@ -0,0 +1,69 @@
+// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Component 1.0
+import NeoChat.Dialog 1.0
+
+Kirigami.ScrollablePage {
+    id: root
+
+    property var room
+
+    title: i18n('Security')
+
+    ColumnLayout {
+        Kirigami.FormLayout {
+            Layout.fillWidth: true
+
+            CheckBox {
+                text: i18nc("@option:check", "Private (invite only)")
+                Kirigami.FormData.label: i18nc("@option:check", "Access:")
+                checked: room.joinRule === "invite"
+                enabled: false
+            }
+            Label {
+                text: i18n("Only invited people can join.")
+                font: Kirigami.Theme.smallFont
+            }
+            CheckBox {
+                text: i18nc("@option:check", "Space members")
+                checked: room.joinRule === "restricted"
+                enabled: false
+            }
+            Label {
+                text: i18n("Anyone in a space can find and join.")
+                font: Kirigami.Theme.smallFont
+            }
+            CheckBox {
+                text: i18nc("@option:check", "Public")
+                checked: room.joinRule === "public"
+                enabled: false
+            }
+            Label {
+                text: i18nc("@option:check", "Anyone can find and join.") + room.joinRule
+                font: Kirigami.Theme.smallFont
+            }
+        }
+    }
+
+    footer: ToolBar {
+        contentItem: RowLayout {
+            Item {
+                Layout.fillWidth: true
+            }
+            Button {
+                Layout.alignment: Qt.AlignRight
+                enabled: false
+                text: i18n("Apply")
+            }
+        }
+    }
+}
+

imports/NeoChat/Settings/About.qml

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+Kirigami.AboutPage {
+    title: i18nc('@title:window', 'About NeoChat')
+    aboutData: Controller.aboutData
+}

imports/NeoChat/Settings/AccountsPage.qml

@@ -11,52 +11,99 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 import NeoChat.Dialog 1.0
 
-Kirigami.ScrollablePage {
+Kirigami.Page {
     title: i18n("Accounts")
 
-    ListView {
-        model: AccountListModel { }
-        delegate: Kirigami.SwipeListItem {
-            leftPadding: 0
-            rightPadding: 0
-            action: Kirigami.Action {
-                onTriggered: Controller.activeConnection = model.connection
-            }
-            Kirigami.BasicListItem {
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
+    leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
 
-                text: model.user.displayName
-                subtitle: model.user.id
-                icon: model.user.avatarMediaId ? ("image://mxc/" + model.user.avatarMediaId) : "im-user"
+    actions.main: Kirigami.Action {
+        text: i18n("Add an account")
+        icon.name: "list-add-user"
+        onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
+        visible: !pageSettingStack.wideMode
+    }
 
-                onClicked: {
-                    Controller.activeConnection = model.connection
-                    pageStack.layers.pop()
-                }
-            }
-            actions: [
-                Kirigami.Action {
-                    text: i18n("Edit this account")
-                    iconName: "document-edit"
-                    onTriggered: {
-                        userEditSheet.connection = model.connection
-                        userEditSheet.open()
-                    }
-                },
-                Kirigami.Action {
-                    text: i18n("Logout")
-                    iconName: "im-kick-user"
-                    onTriggered: {
-                        Controller.logout(model.connection, true)
-                        if(Controller.accountCount === 1)
-                            pageStack.layers.pop()
-                    }
-                }
-            ]
+    Connections {
+        target: pageSettingStack
+        function onWideModeChanged() {
+            scroll.background.visible = pageSettingStack.wideMode
         }
     }
 
+    Controls.ScrollView {
+        id: scroll
+        Component.onCompleted: background.visible = pageSettingStack.wideMode
+
+        anchors.fill: parent
+
+        Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
+        ListView {
+            clip: true
+            model: AccountListModel { }
+            delegate: Kirigami.SwipeListItem {
+                leftPadding: 0
+                rightPadding: 0
+                Kirigami.BasicListItem {
+                    anchors.top: parent.top
+                    anchors.bottom: parent.bottom
+
+                    text: model.user.displayName
+                    labelItem.textFormat: Text.PlainText
+                    subtitle: model.user.id
+                    icon: model.user.avatarMediaId ? ("image://mxc/" + model.user.avatarMediaId) : "im-user"
+
+                    onClicked: {
+                        Controller.activeConnection = model.connection
+                        pageStack.layers.pop()
+                    }
+                }
+                actions: [
+                    Kirigami.Action {
+                        text: i18n("Edit this account")
+                        iconName: "document-edit"
+                        onTriggered: {
+                            userEditSheet.connection = model.connection
+                            userEditSheet.open()
+                        }
+                    },
+                    Kirigami.Action {
+                        text: i18n("Logout")
+                        iconName: "im-kick-user"
+                        onTriggered: {
+                            Controller.logout(model.connection, true)
+                            if(Controller.accountCount === 1)
+                                pageStack.layers.pop()
+                        }
+                    }
+                ]
+            }
+        }
+    }
+
+    footer: Column {
+        height: visible ? implicitHeight : 0
+        Kirigami.ActionToolBar {
+            alignment: Qt.AlignRight
+            visible: pageSettingStack.wideMode
+            rightPadding: Kirigami.Units.smallSpacing
+            width: parent.width
+            flat: false
+            actions: [
+                Kirigami.Action {
+                    text: i18n("Add an account")
+                    icon.name: "list-add-user"
+                    onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
+                }
+            ]
+        }
+        Item {
+            width: parent.width
+            height: Kirigami.Units.smallSpacing
+        }
+    }
     Connections {
         target: Controller
         function onConnectionAdded() {
@@ -73,12 +120,6 @@ Kirigami.ScrollablePage {
         }
     }
 
-    actions.main: Kirigami.Action {
-        text: i18n("Add an account")
-        iconName: "list-add-user"
-        onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
-    }
-
     Component {
         id: openFileDialog
 
@@ -92,16 +133,13 @@ Kirigami.ScrollablePage {
 
         property var connection
 
-        header: Kirigami.Heading {
-            text: i18n("Edit Account")
-        }
+        title: i18n("Edit Account")
 
         Kirigami.FormLayout {
-            anchors.top: passwordsMessage.bottom
             RowLayout {
                 Kirigami.Avatar {
                     id: avatar
-                    source: userEditSheet.connection.localUser.avatarMediaId ? ("image://mxc/" + userEditSheet.connection.localUser.avatarMediaId) : ""
+                    source: userEditSheet.connection && userEditSheet.connection.localUser.avatarMediaId ? ("image://mxc/" + userEditSheet.connection.localUser.avatarMediaId) : ""
 
                     MouseArea {
                         id: mouseArea
@@ -138,7 +176,7 @@ Kirigami.ScrollablePage {
             }
             Controls.TextField {
                 id: name
-                text: userEditSheet.connection.localUser.displayName
+                text: userEditSheet.connection ? userEditSheet.connection.localUser.displayName : ""
                 Kirigami.FormData.label: i18n("Name:")
             }
             Controls.TextField {

imports/NeoChat/Settings/AppearanceSettingsPage.qml

@@ -0,0 +1,255 @@
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Settings 1.0
+
+Kirigami.ScrollablePage {
+    title: i18nc('@title:window', 'Appearance')
+    ColumnLayout {
+        RowLayout {
+            Layout.alignment: Qt.AlignCenter
+            spacing: Kirigami.Units.gridUnit * 2
+            QQC2.ButtonGroup { id: themeGroup }
+            ThemeRadioButton {
+                innerObject: [
+                    RowLayout {
+                        Layout.fillWidth: true
+                        Kirigami.Avatar {
+                            color: "#4a5bcc"
+                            Layout.alignment: Qt.AlignTop
+                            visible: Config.showAvatarInTimeline
+                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
+                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
+                        }
+                        QQC2.Control {
+                            Layout.fillWidth: true
+                            contentItem: ColumnLayout {
+                                QQC2.Label {
+                                    Layout.fillWidth: true
+                                    font.weight: Font.Bold
+                                    font.pixelSize: 7
+                                    text: "Paul Müller"
+                                    color: "#4a5bcc"
+                                    wrapMode: Text.Wrap
+                                }
+                                QQC2.Label {
+                                    Layout.fillWidth: true
+                                    text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta mauris, quis finibus sem suscipit tincidunt."
+                                    wrapMode: Text.Wrap
+                                    font.pixelSize: 7
+                                }
+                            }
+                            background: Kirigami.ShadowedRectangle {
+                                color: Kirigami.Theme.backgroundColor
+                                radius: Kirigami.Units.smallSpacing
+                                shadow.size: Kirigami.Units.smallSpacing
+                                shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
+                                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+                                border.width: 1
+                            }
+                        }
+                    },
+                    RowLayout {
+                        Layout.fillWidth: true
+                        Kirigami.Avatar {
+                            color: "#9f244b"
+                            Layout.alignment: Qt.AlignTop
+                            visible: Config.showAvatarInTimeline
+                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
+                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
+                        }
+                        QQC2.Control {
+                            Layout.fillWidth: true
+                            contentItem: ColumnLayout {
+                                QQC2.Label {
+                                    Layout.fillWidth: true
+                                    font.weight: Font.Bold
+                                    font.pixelSize: 7
+                                    text: "Jean Paul"
+                                    color: "#9f244b"
+                                    wrapMode: Text.Wrap
+                                }
+                                QQC2.Label {
+                                    Layout.fillWidth: true
+                                    text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta , quis sem suscipit tincidunt."
+                                    wrapMode: Text.Wrap
+                                    font.pixelSize: 7
+                                }
+                            }
+                            background: Kirigami.ShadowedRectangle {
+                                color: Kirigami.Theme.backgroundColor
+                                radius: Kirigami.Units.smallSpacing
+                                shadow.size: Kirigami.Units.smallSpacing
+                                shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
+                                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+                                border.width: 1
+                            }
+                        }
+                    }
+                ]
+
+                text: i18n("Bubbles")
+                checked: !Config.compactLayout
+                QQC2.ButtonGroup.group: themeGroup
+                enabled: !Config.isCompactLayoutImmutable
+
+                onToggled: {
+                    Config.compactLayout = !checked;
+                    Config.save();
+                }
+            }
+            ThemeRadioButton {
+                innerObject: [
+                    RowLayout {
+                        Layout.fillWidth: true
+                        Kirigami.Avatar {
+                            color: "#4a5bcc"
+                            Layout.alignment: Qt.AlignTop
+                            visible: Config.showAvatarInTimeline
+                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
+                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
+                        }
+                        ColumnLayout {
+                            Layout.fillWidth: true
+                            QQC2.Label {
+                                Layout.fillWidth: true
+                                font.weight: Font.Bold
+                                font.pixelSize: 7
+                                text: "Paul Müller"
+                                color: "#4a5bcc"
+                                wrapMode: Text.Wrap
+                            }
+                            QQC2.Label {
+                                Layout.fillWidth: true
+                                text: "Lorem ipsum dolor sit amet, consectetur elit. Vivamus facilisis porta mauris, finibus sem suscipit tincidunt."
+                                wrapMode: Text.Wrap
+                                font.pixelSize: 7
+                            }
+                        }
+                    },
+                    RowLayout {
+                        Layout.fillWidth: true
+                        Kirigami.Avatar {
+                            color: "#9f244b"
+                            Layout.alignment: Qt.AlignTop
+                            visible: Config.showAvatarInTimeline
+                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
+                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
+                        }
+                        ColumnLayout {
+                            Layout.fillWidth: true
+                            QQC2.Label {
+                                Layout.fillWidth: true
+                                font.weight: Font.Bold
+                                font.pixelSize: 7
+                                text: "Jean Paul"
+                                color: "#9f244b"
+                                wrapMode: Text.Wrap
+                            }
+                            QQC2.Label {
+                                Layout.fillWidth: true
+                                text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta mauris, quis finibus sem suscipit tincidunt."
+                                wrapMode: Text.Wrap
+                                font.pixelSize: 7
+                            }
+                        }
+                    }
+                ]
+                text: i18n("Compact")
+                checked: Config.compactLayout
+                QQC2.ButtonGroup.group: themeGroup
+                enabled: !Config.isCompactLayoutImmutable
+
+                onToggled: {
+                    Config.compactLayout = checked;
+                    Config.save();
+                }
+            }
+        }
+        Kirigami.FormLayout {
+            QQC2.CheckBox {
+                Kirigami.FormData.label: "Show Avatar:"
+                text: i18n("In Chat")
+                checked: Config.showAvatarInTimeline
+                onToggled: {
+                    Config.showAvatarInTimeline = checked
+                    Config.save()
+                }
+                enabled: !Config.isShowAvatarInTimelineImmutable
+            }
+            QQC2.CheckBox {
+                text: i18n("In Sidebar")
+                checked: Config.showAvatarInRoomDrawer
+                enabled: !Config.isShowAvatarInRoomDrawerImmutable
+                onToggled: {
+                    Config.showAvatarInRoomDrawer = checked
+                    Config.save()
+                }
+            }
+            QQC2.CheckBox {
+                text: i18n("Show Fancy Effects")
+                checked: Config.showFancyEffects
+                enabled: !Config.isShowFancyEffectsImmutable
+                onToggled: {
+                    Config.showFancyEffects = checked;
+                    Config.save();
+                }
+            }
+            Loader {
+                visible: item !== null
+                Kirigami.FormData.label: item ? i18n("Theme:") : ""
+                source: "qrc:/imports/NeoChat/Settings/ColorScheme.qml"
+            }
+            QQC2.CheckBox {
+                visible: Controller.hasWindowSystem
+                text: i18n("Use transparent chat page")
+                enabled: !Config.compactLayout && !Config.isBlurImmutable
+                checked: Config.blur
+                onToggled: {
+                    Config.blur = checked;
+                    Config.save();
+                }
+            }
+            RowLayout {
+                visible: Controller.hasWindowSystem && Config.blur
+                enabled: !Config.isTransparancyImmutable
+                Kirigami.FormData.label: i18n("Transparency:")
+                QQC2.Slider {
+                    enabled: !Config.compactLayout && Config.blur
+                    from: 0
+                    to: 1
+                    stepSize: 0.05
+                    value: Config.transparency
+                    onMoved: {
+                        Config.transparency = value;
+                        Config.save();
+                    }
+
+                    HoverHandler { id: sliderHover }
+                    QQC2.ToolTip.visible: sliderHover.hovered && !enabled
+                    QQC2.ToolTip.text: i18n("Only enabled if the transparent chat page is enabled.")
+                }
+                QQC2.Label {
+                    text: Math.round(Config.transparency * 100) + "%"
+                }
+            }
+            QQC2.CheckBox {
+                text: i18n("Show your messages on the right")
+                checked: Config.showLocalMessagesOnRight
+                enabled: !Config.isShowLocalMessagesOnRightImmutable
+                onToggled: {
+                    Config.showLocalMessagesOnRight = checked
+                    Config.save()
+                }
+            }
+        }
+    }
+}

imports/NeoChat/Settings/ColorScheme.qml

@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Settings 1.0
+
+QQC2.ComboBox {
+    textRole: "display"
+    model: ColorSchemer.model
+    Component.onCompleted: currentIndex = ColorSchemer.indexForScheme(Config.colorScheme);
+    onActivated: {
+        ColorSchemer.apply(currentIndex);
+        Config.colorScheme = ColorSchemer.nameForIndex(currentIndex);
+        Config.save();
+    }
+}

imports/NeoChat/Settings/DevicesPage.qml

@@ -0,0 +1,124 @@
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as Controls
+import QtQuick.Layouts 1.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+Kirigami.Page {
+    title: i18n("Devices")
+
+    leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+
+    Connections {
+        target: pageSettingStack
+        function onWideModeChanged() {
+            scroll.background.visible = pageSettingStack.wideMode
+        }
+    }
+
+    Controls.ScrollView {
+        id: scroll
+        Component.onCompleted: background.visible = pageSettingStack.wideMode
+        anchors.fill: parent
+        ListView {
+            clip: true
+            model: DevicesModel {
+                id: devices
+            }
+
+            Kirigami.PlaceholderMessage {
+                visible: parent.model.count === 0 // We can assume 0 means loading since there is at least one device
+                anchors.centerIn: parent
+                text: i18n("Loading")
+                Controls.BusyIndicator {
+                    running: parent.visible
+                }
+            }
+
+            delegate: Kirigami.SwipeListItem {
+                leftPadding: 0
+                rightPadding: 0
+                Kirigami.BasicListItem {
+                    anchors.top: parent.top
+                    anchors.bottom: parent.bottom
+
+                    text: model.displayName
+                    subtitle: model.id
+                    icon: "network-connect"
+                }
+                actions: [
+                    Kirigami.Action {
+                        text: i18n("Edit device name")
+                        iconName: "document-edit"
+                        onTriggered: {
+                            renameSheet.index = model.index
+                            renameSheet.name = model.displayName
+                            renameSheet.open()
+                        }
+                    },
+                    Kirigami.Action {
+                        text: i18n("Logout device")
+                        iconName: "edit-delete-remove"
+                        onTriggered: {
+                            passwordSheet.index = index
+                            passwordSheet.open()
+                        }
+                    }
+                ]
+            }
+        }
+    }
+
+    Kirigami.OverlaySheet {
+        id: passwordSheet
+
+        property var index
+
+        title: i18n("Remove device")
+        Kirigami.FormLayout {
+            Controls.TextField {
+                id: passwordField
+                Kirigami.FormData.label: i18n("Password:")
+                echoMode: TextInput.Password
+            }
+            Controls.Button {
+                text: i18n("Confirm")
+                onClicked: {
+                    devices.logout(passwordSheet.index, passwordField.text)
+                    passwordField.text = ""
+                    passwordSheet.close()
+                }
+            }
+        }
+    }
+
+    Kirigami.OverlaySheet {
+        id: renameSheet
+        property int index
+        property string name
+
+        title: i18n("Edit device")
+        Kirigami.FormLayout {
+            Controls.TextField {
+                id: nameField
+                Kirigami.FormData.label: i18n("Name:")
+                text: renameSheet.name
+            }
+            Controls.Button {
+                text: i18n("Save")
+                onClicked: {
+                    devices.setName(renameSheet.index, nameField.text)
+                    renameSheet.close()
+                }
+            }
+        }
+    }
+}

imports/NeoChat/Settings/Emoticons.qml

@@ -0,0 +1,156 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Settings 1.0
+
+import NeoChat.Component 1.0 as Components
+import NeoChat.Dialog 1.0
+
+Kirigami.Page {
+    title: i18nc('@title:window', 'Custom Emojis')
+
+    leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+
+    ColumnLayout {
+        id: column
+        anchors.fill: parent
+
+        Connections {
+            target: pageSettingStack
+            function onWideModeChanged() {
+                scroll.background.visible = pageSettingStack.wideMode
+            }
+        }
+
+        QQC2.ScrollView {
+            id: scroll
+            Component.onCompleted: background.visible = pageSettingStack.wideMode
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            ListView {
+                clip: true
+                model: CustomEmojiModel {
+                    id: emojiModel
+
+                    connection: Controller.activeConnection
+                }
+
+                Kirigami.PlaceholderMessage {
+                    anchors.centerIn: parent
+                    text: i18n("No custom inline stickers found")
+                    visible: parent.model.count === 0
+                }
+
+                delegate: Kirigami.BasicListItem {
+                    id: del
+
+                    required property string name
+                    required property url imageURL
+
+                    text: name
+                    reserveSpaceForSubtitle: true
+
+                    leading: Image {
+                        width: height
+                        sourceSize.width: width
+                        sourceSize.height: height
+                        source: imageURL
+
+                        Rectangle {
+                            anchors.fill: parent
+                            visible: parent.status === Image.Loading
+                            radius: height/2
+                            gradient: Components.ShimmerGradient { }
+                        }
+                    }
+
+                    trailing: QQC2.ToolButton {
+                        width: height
+                        icon.name: "delete"
+                        onClicked: emojiModel.removeEmoji(del.name)
+                    }
+                }
+            }
+        }
+
+        Loader {
+            active: pageSettingStack.wideMode
+            sourceComponent: addEmojiComponent
+            Layout.fillWidth: true
+        }
+    }
+
+    footer: QQC2.ToolBar {
+        id: toolbar
+        width: parent.width
+        visible: !pageSettingStack.wideMode
+        height: visible ? implicitHeight : 0
+        contentItem: Loader {
+            active: !pageSettingStack.wideMode
+            sourceComponent: addEmojiComponent
+        }
+    }
+
+    Component {
+        id: openFileDialog
+
+        OpenFileDialog {
+            folder: StandardPaths.writableLocation(StandardPaths.PicturesLocation)
+        }
+    }
+
+    property Component addEmojiComponent: RowLayout {
+        Item {
+            Layout.fillWidth: Qt.application.layoutDirection == Qt.LeftToRight
+        }
+
+        QQC2.TextField {
+            id: emojiField
+            placeholderText: i18n("new_emoji_name_here")
+
+            validator: RegularExpressionValidator {
+                regularExpression: /[a-zA-Z_0-9]*/
+            }
+        }
+
+        QQC2.Button {
+            text: i18n("Add Emoji...")
+
+            enabled: emojiField.text != ""
+            property var fileDialog: null
+
+            onClicked: {
+                if (this.fileDialog != null) {
+                    return;
+                }
+
+                this.fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay)
+
+                this.fileDialog.chosen.connect((url) => {
+                    emojiModel.addEmoji(emojiField.text, url)
+                    this.fileDialog = null
+                })
+                this.fileDialog.onRejected.connect(() => {
+                    rej()
+                    this.fileDialog = null
+                })
+                this.fileDialog.open()
+            }
+        }
+
+        Item {
+            Layout.fillWidth: Qt.application.layoutDirection == Qt.RightToLeft
+        }
+    }
+}

imports/NeoChat/Settings/GeneralSettingsPage.qml

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+Kirigami.ScrollablePage {
+    title: i18nc('@title:window', 'General')
+    ColumnLayout {
+        Kirigami.FormLayout {
+            QQC2.CheckBox {
+                Kirigami.FormData.label: i18n("General settings:")
+                text: i18n("Close to system tray")
+                checked: Config.systemTray
+                visible: Controller.supportSystemTray
+                enabled: !Config.isSystemTrayImmutable
+                onToggled: {
+                    Config.systemTray = checked
+                    Config.save()
+                }
+            }
+            QQC2.CheckBox {
+                // TODO: When there are enough notification and timeline event
+                // settings, make 2 separate groups with FormData labels.
+                Kirigami.FormData.label: i18n("Notifications and events:")
+                text: i18n("Show notifications")
+                checked: Config.showNotifications
+                enabled: !Config.isShowNotificationsImmutable
+                onToggled: {
+                    Config.showNotifications = checked
+                    Config.save()
+                }
+            }
+            QQC2.CheckBox {
+                text: i18n("Show leave and join events")
+                checked: Config.showLeaveJoinEvent
+                enabled: !Config.isShowLeaveJoinEventImmutable
+                onToggled: {
+                    Config.showLeaveJoinEvent = checked
+                    Config.save()
+                }
+            }
+            QQC2.RadioButton {
+                Kirigami.FormData.label: i18n("Rooms and private chats:")
+                text: i18n("Separated")
+                checked: !Config.mergeRoomList
+                enabled: !Config.isMergeRoomListImmutable
+                onToggled: {
+                    Config.mergeRoomList = false
+                    Config.save()
+                }
+            }
+            QQC2.RadioButton {
+                text: i18n("Intermixed")
+                checked: Config.mergeRoomList
+                enabled: !Config.isMergeRoomListImmutable
+                onToggled: {
+                    Config.mergeRoomList = true
+                    Config.save()
+                }
+            }
+            QQC2.CheckBox {
+                text: i18n("Use s/text/replacement syntax to edit your last message")
+                checked: Config.allowQuickEdit
+                enabled: !Config.isAllowQuickEditImmutable
+                onToggled: {
+                    Config.allowQuickEdit = checked
+                    Config.save()
+                }
+            }
+        }
+    }
+}

imports/NeoChat/Settings/SettingsPage.qml

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import QtQuick 2.15
+import org.kde.kirigami 2.18 as Kirigami
+import QtQuick.Controls 2.15 as Controls
+import QtQuick.Layouts 1.15
+
+Kirigami.CategorizedSettings {
+    objectName: "settingsPage"
+    actions: [
+        Kirigami.SettingAction {
+            text: i18n("General")
+            icon.name: "org.kde.neochat"
+            page: Qt.resolvedUrl("GeneralSettingsPage.qml")
+        },
+        Kirigami.SettingAction {
+            text: i18n("Appearance")
+            icon.name: "preferences-desktop-theme-global"
+            page: Qt.resolvedUrl("AppearanceSettingsPage.qml")
+        },
+        Kirigami.SettingAction {
+            text: i18n("Accounts")
+            icon.name: "preferences-system-users"
+            page: Qt.resolvedUrl("AccountsPage.qml")
+        },
+        Kirigami.SettingAction {
+            text: i18n("Custom Emoji")
+            icon.name: "preferences-desktop-emoticons"
+            page: Qt.resolvedUrl("Emoticons.qml")
+        },
+        Kirigami.SettingAction {
+            text: i18n("Devices")
+            iconName: "network-connect"
+            page: Qt.resolvedUrl("DevicesPage.qml")
+        },
+        Kirigami.SettingAction {
+            text: i18n("About NeoChat")
+            icon.name: "help-about"
+            page: Qt.resolvedUrl("About.qml")
+        }
+    ]
+}

imports/NeoChat/Settings/ThemeRadioButton.qml

@@ -0,0 +1,65 @@
+// Copyright 2021 Marco Martin <mart@kde.org>
+// Copyright 2018 Furkan Tokac <furkantokac34@gmail.com>
+// Copyright 2019 Nate Graham <nate@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+import org.kde.kirigami 2.15 as Kirigami
+
+QQC2.RadioButton {
+    id: delegate
+
+    implicitWidth: contentItem.implicitWidth
+    implicitHeight: contentItem.implicitHeight
+
+    property alias innerObject: contentLayout.children
+
+    contentItem: ColumnLayout {
+        Kirigami.ShadowedRectangle {
+            implicitWidth: implicitHeight * 1.6
+            implicitHeight: Kirigami.Units.gridUnit * 6
+            radius: Kirigami.Units.smallSpacing
+            Kirigami.Theme.inherit: false
+            Kirigami.Theme.colorSet: Kirigami.Theme.View
+
+            shadow.xOffset: 0
+            shadow.yOffset: 2
+            shadow.size: 10
+            shadow.color: Qt.rgba(0, 0, 0, 0.3)
+
+            color: {
+                if (delegate.checked) {
+                    return Kirigami.Theme.highlightColor;
+                } else if (delegate.hovered) {
+                    // Match appearance of hovered list items
+                    return Qt.rgba(Kirigami.Theme.highlightColor.r,
+                                Kirigami.Theme.highlightColor.g,
+                                Kirigami.Theme.highlightColor.b,
+                                0.5);
+                } else {
+                    return Kirigami.Theme.backgroundColor;
+                }
+            }
+            ColumnLayout {
+                id: contentLayout
+                anchors.fill: parent
+                anchors.margins: Kirigami.Units.smallSpacing
+                clip: true
+            }
+        }
+
+        QQC2.Label {
+            id: label
+            Layout.fillWidth: true
+            text: delegate.text
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
+
+    indicator: Item {}
+    background: Item {}
+}
+
+

imports/NeoChat/Settings/qmldir

@@ -0,0 +1,3 @@
+module NeoChat.Settings
+ThemeRadioButton 1.0 ThemeRadioButton.qml
+SettingsPage 1.0 SettingsPage.qml

neochat.notifyrc

@@ -8,10 +8,14 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
+Name[ko]=NeoChat
+Name[lt]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
@@ -19,11 +23,13 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
+Name[zh_CN]=NeoChat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
@@ -38,6 +44,8 @@ Comment[fr]=Un client pour « Matrix », le protocole décentralisé de commun
 Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
 Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate
 Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
+Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트
+Comment[lt]=Matrix decentralizuoto bendravimo protokolo kliento programa
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
 Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ
@@ -68,6 +76,8 @@ Name[fr]=Nouveau message
 Name[hu]=Új üzenet
 Name[ia]=Nove message
 Name[it]=Nuovo messaggio
+Name[ko]=새 메시지
+Name[lt]=Nauja žinutė
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
 Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
@@ -95,6 +105,8 @@ Comment[fr]=Il y a un nouveau message
 Comment[hu]=Új üzenet érkezett
 Comment[ia]=Il ha un nove message
 Comment[it]=È presente un nuovo messaggio
+Comment[ko]=새 메시지가 있음
+Comment[lt]=Yra nauja žinutė
 Comment[nl]=Er is een nieuw bericht
 Comment[nn]=Du har ei ny melding
 Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ

org.kde.neochat.appdata.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  - SPDX-License-Identifier: CC0-1.0
+  - SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
+  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
+ -->
 <component type="desktop">
   <id>org.kde.neochat</id>
   <provides>
@@ -12,22 +17,27 @@
   <name xml:lang="de">NeoChat</name>
   <name xml:lang="en-GB">NeoChat</name>
   <name xml:lang="es">NeoChat</name>
+  <name xml:lang="eu">NeoChat</name>
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
+  <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
   <name xml:lang="it">NeoChat</name>
+  <name xml:lang="ko">NeoChat</name>
   <name xml:lang="nl">NeoChat</name>
   <name xml:lang="nn">NeoChat</name>
   <name xml:lang="pa">ਨਿਓ-ਚੈਟ</name>
   <name xml:lang="pl">NeoChat</name>
   <name xml:lang="pt">NeoChat</name>
   <name xml:lang="pt-BR">NeoChat</name>
+  <name xml:lang="sk">NeoChat</name>
   <name xml:lang="sl">NeoChat</name>
   <name xml:lang="sv">NeoChat</name>
   <name xml:lang="ta">நியோச்சாட்</name>
   <name xml:lang="uk">NeoChat</name>
   <name xml:lang="x-test">xxNeoChatxx</name>
+  <name xml:lang="zh-CN">NeoChat</name>
   <summary>A client for matrix, the decentralized communication protocol</summary>
   <summary xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu</summary>
   <summary xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
@@ -43,6 +53,7 @@
   <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
   <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
   <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
+  <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
   <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
   <summary xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen</summary>
   <summary xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ</summary>
@@ -54,33 +65,80 @@
   <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
   <summary xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними</summary>
   <summary xml:lang="x-test">xxA client for matrix, the decentralized communication protocolxx</summary>
+  <summary xml:lang="zh-CN">分布式通讯协议 Matrix 的客户端</summary>
   <description>
-    <p>A client for matrix, the decentralized communication protocol.</p>
-    <p xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu.</p>
-    <p xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat.</p>
-    <p xml:lang="ca-valencia">Un client per al Matrix, el protocol de comunicacions descentralitzat.</p>
-    <p xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix.</p>
-    <p xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll.</p>
-    <p xml:lang="en-GB">A client for matrix, the decentralised communication protocol.</p>
-    <p xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado.</p>
-    <p xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat.</p>
-    <p xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle.</p>
-    <p xml:lang="fr">Un client « Matrix », le protocole décentralisé de communications.</p>
-    <p xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz.</p>
-    <p xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate.</p>
-    <p xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi.</p>
-    <p xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato.</p>
-    <p xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol.</p>
-    <p xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen.</p>
-    <p xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ।</p>
-    <p xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się.</p>
-    <p xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado.</p>
-    <p xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado.</p>
-    <p xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol.</p>
-    <p xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol.</p>
-    <p xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet.</p>
-    <p xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними.</p>
-    <p xml:lang="x-test">xxA client for matrix, the decentralized communication protocol.xx</p>
+    <p>NeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.</p>
+    <p xml:lang="az">NeoChat Mtrix müştərisidir. O, Matrix protokolundan istifadə edərək, ailənizə, dostlarınıza, iş yoldaşlarınıza mətn, səsli və görüntülü ismarıclar göndərməyə imkan verir.</p>
+    <p xml:lang="ca">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
+    <p xml:lang="ca-valencia">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
+    <p xml:lang="de">NeoChat ist ein Matrix-Client. Er ermöglicht Ihnen das Senden von Textnachrichten, Videos und Audiodateien an Ihre Familie, Kollegen und Freunde unter Verwendung des Matrix-Protokolls.</p>
+    <p xml:lang="en-GB">NeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.</p>
+    <p xml:lang="es">NeoChat es un cliente para Matrix. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos usando el protocolo Matrix.</p>
+    <p xml:lang="eu">NeoChat Matrix bezero bat da. Familiari, lankideei eta lagunei testu-mezuak, bideoak eta audio-fitxategiak bidaltzeko aukera ematen du, Matrix protokoloa erabiliz.</p>
+    <p xml:lang="fi">NeoChat on Matrix-asiakas. Sillä voi lähettää perheelle, tuttaville ja kavereille tekstiviestejä sekä video- ja äänitiedostoja Matrix-yhteyskäytännöllä.</p>
+    <p xml:lang="fr">NeoChat est un client Matrix. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis en utilisant le protocole Matrix.</p>
+    <p xml:lang="hu">A NeoChat egy Matrix kliens. Szöveges üzeneteket, videókat ésaudio fájlokat küldhet családjának, kollégáinak és barátainak a Matrix protokoll használatával.</p>
+    <p xml:lang="ia">NeoChat es un cliente de Matrix. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante le protocollo de Matrix.</p>
+    <p xml:lang="it">NeoChat è un client Matrix. Ti consente di inviare messaggi di testo, file video e audio a familiari, colleghi e amici utilizzando il protocollo Matrix.</p>
+    <p xml:lang="ko">NeoChat은 Matrix 클라이언트입니다. Matrix 프로토콜을 사용하여 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다.</p>
+    <p xml:lang="nl">NeoChat is een Matrix-client. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden met het Matrix-protocol.</p>
+    <p xml:lang="pl">NeoChat jest programem do Matrisa. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół poprzez protokół Matriksa.</p>
+    <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix.</p>
+    <p xml:lang="pt-BR">O NeoChat é um cliente Matrix. Ele permite a você enviar mensagens de texto, arquivos de vídeo e áudio para seus familiares, colegas e amigos usando o protocolo Matrix.</p>
+    <p xml:lang="sk">NeoChat je Matrix klient. Umožňuje vám posielať textové správy, videá a zvukové súbory rodine, kolegom a priateľom pomocou protokolu Matrix.</p>
+    <p xml:lang="sl">NeoChat je odjemalec Matrixa. Dovoljuje vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, kolegom in prijateljem z uporabo protokola Matrix.</p>
+    <p xml:lang="sv">NeoChat är en Matrix-klient. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner med användning av Matrix-protokollet.</p>
+    <p xml:lang="uk">NeoChat — клієнт мережі обміну повідомленнями Matrix. За допомогою цієї програми ви зможете надсилати текстові повідомлення, відео та звукові файли вашій родині, колегам та друзям за допомогою протоколу Matrix.</p>
+    <p xml:lang="x-test">xxNeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.xx</p>
+    <p xml:lang="zh-CN">NeoChat 是一个 Matrix 客户端。 它允许您使用 Matrix 协议向您的家人、同事和朋友发送文本消息、视频和音频文件。</p>
+    <p>Matrix is a decentralized communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
+    <p xml:lang="az">Matrix, istifadəçini nəzarətdə saxlayan, mərkəzləşməmişi rabitə protokoludur. NeoChat, söhbətin və video əlaqəsinin şifrələnməsindən başqa bir çox protokolları həyata keçirə bilir.</p>
+    <p xml:lang="ca">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
+    <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
+    <p xml:lang="de">Matrix ist ein dezentralisiertes Kommunikationsprotokoll, das dem Benutzer wieder die Kontrolle zurückgibt. Derzeit implementiert NeoChat einen großen Teil des Protokolls mit der Ausnahme von verschlüsselten Chats und Video-Chat.</p>
+    <p xml:lang="en-GB">Matrix is a decentralised communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
+    <p xml:lang="es">Matrix es un protocolo de comunicaciones descentralizado, que devuelve el control al usuario. En la actualidad, NeoChat implementa gran parte del protocolo con la excepción de chats cifrados y chats de vídeo.</p>
+    <p xml:lang="eu">Matrix komunikazio-protokolo deszentralizatu bat da, erabiltzaileari kontrola itzultzen diona. Gaur egun, NeoChat-ek protokoloaren zati handi bat inplementatzen du, berriketa zifratuak eta bideo berriketak izan ezik.</p>
+    <p xml:lang="fi">Matrix on hajautettu viestintäyhteyskäytäntö, joka antaa hallinnan takaisin käyttäjille. NeoChat tarjoaa nykyisellään valtaosan yhteyskäytännöstä salattuja keskustelu- ja videokeskusteluja lukuun ottamatta.</p>
+    <p xml:lang="fr">Matrix est un protocole de communication décentralisé, donnant le contrôle à l'utilisateur. Actuellement, NeoChat met en œuvre une grande partie du protocole, à l'exception des discussions cryptées et du chat vidéo.</p>
+    <p xml:lang="hu">A Matrix egy decentralizált kommunikációs protokoll, amely a felhasználók kezébe adja az irányítást.</p>
+    <p xml:lang="ia">Matrix es un protocollo de communication decentrate, ponente le usator in le controlo. Currentemente NeoChat implementa un grande parte del protocollo con le exception de conversationes cryptate e conversationes video.</p>
+    <p xml:lang="it">Matrix è un protocollo di comunicazione decentralizzato, che restituisce all'utente il controllo. Attualmente NeoChat implementa gran parte del protocollo ad eccezione delle chat cifrate e delle chat video.</p>
+    <p xml:lang="ko">Matrix는 사용자에게 제어권을 돌려 주는 분산 통신 프로토콜입니다. NeoChat은 암호화된 대화 및 영상 통화를 제외한 프로토콜의 대부분 기능을 구현합니다.</p>
+    <p xml:lang="nl">Matrix is een gedecentraliseerd communicatieprotocol, dat de gebruiker de controle teruggeeft. Op dit moment implementeert NeoChat grote delen van het protocol met de uitzondering van versleutelde chats en video-chat.</p>
+    <p xml:lang="pl">Matrix jest protokołem rozproszonego porozumiewania się oddający użytkownikowi jego władzę. Obecnie NeoChat obsługuje dużą część protokołu poza szyfrowanymi rozmowami tekstowymi i z obrazem.</p>
+    <p xml:lang="pt">O Matrix é um protocolo de comunicações descentralizado, colocando de novo o utilizador no poder. De momento, o NeoChat implementa uma boa parte do protocolo, com a excepção das conversas encriptadas e as conversas de vídeo.</p>
+    <p xml:lang="pt-BR">O Matrix é um protocolo de comunicação descentralizado, colocando o usuário de volta no controle. Atualmente o NeoChat implementa grande parte do protocolo com a exceção de bate-papos criptografados e bate-papo por vídeo.</p>
+    <p xml:lang="sk">Matrix je decentralizovaný komunikačný protokol, ktorý používateľovi vracia kontrolu. V súčasnosti NeoChat implementuje veľkú časť protokolu s výnimkou šifrovaných chatov a videohovorov.</p>
+    <p xml:lang="sl">Matrix je decentraliziran komunikacijski protokol, kjer ima uporabnik uporabnik kontrolo rabe. Trenutno ima NeoChat izveden velik del protokola z izjemo šifriranih klepetov in video klepetov.</p>
+    <p xml:lang="sv">Matrix är ett decentraliserat kommunikationsprotokoll, som ger tillbaka kontrollen till användaren. För närvarande implementerar NeoChat en stor del av protokollet, med undantag för krypterad chatt och videochatt.</p>
+    <p xml:lang="uk">Matrix — протокол децентралізованого спілкування, який передає контроль над даними користувачеві. У поточній версії NeoChat реалізовано більшу частину протоколу, окрім зашифрованого спілкування та відеоспілкування.</p>
+    <p xml:lang="x-test">xxMatrix is a decentralized communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.xx</p>
+    <p xml:lang="zh-CN">Matrix 是一个分布式通讯协议，使用户重新得到控制权。 目前，NeoChat 实现了协议的大部分，除了加密聊天和视频聊天。</p>
+    <p>NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
+    <p xml:lang="az">Vahid istifadəçi interfeysi ilə təmin olunan NeoChat, həm mobil telefonda həm də kompyuterlərdə işləyir.</p>
+    <p xml:lang="ca">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
+    <p xml:lang="ca-valencia">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
+    <p xml:lang="de">NeoChat funktioniert sowohl auf dem Mobiltelefon als auch auf dem Arbeitsfläche und bietet ein einheitliches Benutzererlebnis. </p>
+    <p xml:lang="en-GB">NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
+    <p xml:lang="es">NeoChat funciona en móviles y en el escritorio a la vez que proporciona una experiencia de usuario consistente.</p>
+    <p xml:lang="eu">NeoChat mugikorretan eta mahaigainean dabil, erabiltzaile esperientzia koherentea eskainiz.</p>
+    <p xml:lang="fi">NeoChat toimii sekä mobiili- että työpöytäalustoilla tarjoten yhdenmukaisen käyttökokemuksen.</p>
+    <p xml:lang="fr">NeoChat fonctionne aussi bien sur les mobiles que sur les ordinateurs de bureau, tout en offrant une expérience utilisateur cohérente.</p>
+    <p xml:lang="hu">A NeoChat mobilon és asztali számítógépen is működik, egységes felhasználói élményt nyújtva.</p>
+    <p xml:lang="ia">NeoChat functiona sia sur mobile que ur scriptorio durante que forni un experientia de usator consistente.</p>
+    <p xml:lang="it">NeoChat funziona sia su dispositivi mobili che desktop, fornendo un'esperienza utente coerente.</p>
+    <p xml:lang="ko">NeoChat은 모바일과 데스크톱 모두에서 일관된 사용자 경험을 제공합니다.</p>
+    <p xml:lang="nl">NeoChat werkt zowel op de mobiel en het bureaublad met het leveren van een consistente gebruikerservaring.</p>
+    <p xml:lang="pl">NeoChat działa zarówno na urządzeniach przenośnych jak i biurkowych, zapewniając spójne wrażenia użytkownika</p>
+    <p xml:lang="pt">O NeoChat funciona tanto em dispositivos móveis como no computador, fornecendo uma experiência de utilizador consistente.</p>
+    <p xml:lang="pt-BR">O NeoChat funciona tanto no celular como no computador enquanto fornece uma experiência consistente ao usuário.</p>
+    <p xml:lang="sk">NeoChat funguje na mobilných aj stolových počítačoch a poskytuje konzistentný používateľský zážitok.</p>
+    <p xml:lang="sl">NeoChat deluje tako na mobilnih kot na namiznih platformah z zagotavljanjem konsistentne uporabniške izkušnje.</p>
+    <p xml:lang="sv">NeoChat fungerar både på mobil och skrivbord och tillhandahåller en konsekvent användarupplevelse.</p>
+    <p xml:lang="uk">NeoChat працює на мобільних пристроях та звичайних комп'ютерах, маючи однорідний інтерфейс на усіх підтримуваних пристроях.</p>
+    <p xml:lang="x-test">xxNeoChat works both on mobile and desktop while providing a consistent user experience.xx</p>
+    <p xml:lang="zh-CN">NeoChat 在移动设备和桌面上均可用，并提供一致的用户体验。</p>
   </description>
   <url type="homepage">https://apps.kde.org/neochat/</url>
   <url type="bugtracker">https://invent.kde.org/network/neochat/-/issues</url>
@@ -102,6 +160,7 @@
   <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
   <developer_name xml:lang="id">Komunitas KDE</developer_name>
   <developer_name xml:lang="it">La comunità KDE</developer_name>
+  <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
   <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
   <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>
   <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
@@ -113,18 +172,30 @@
   <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
   <developer_name xml:lang="uk">Спільнота KDE</developer_name>
   <developer_name xml:lang="x-test">xxThe KDE Communityxx</developer_name>
+  <developer_name xml:lang="zh-CN">KDE 社区</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <value key="KDE::matrix">#neochat:kde.org</value>
   <screenshots>
     <screenshot type="default">
-      <image>https://www.plasma-mobile.org/img/post-2020-10/post-2020-10-neochat-timeline.png</image>
+      <image>https://cdn.kde.org/screenshots/neochat/application-mobile.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="1.2.0" date="2021-06-01">
+      <description>
+        <p>NeoChat 1.2 brings a major redesign of the user interface. The chat page is now using bubbles for the messages and the input component was completely rewritten with a nicer look as well.</p>
+        <p>It's now possible to send custom reactions by replying to a comment with /react &lt;message&gt;.</p>
+        <p>NeoChat now supports opening Matrix URIs from your browser.</p>
+      </description>
+      <url>https://carlschwan.eu/2021/06/01/neochat-1.2/</url>
+    </release>
     <release urgency="critical" version="1.1.1" date="2021-02-23"/>
     <release version="1.1.0" date="2021-02-22">
       <description>
@@ -134,7 +205,7 @@
         <p>We added a few commands to NeoChat (/shrug, /lenny, /join, /ignore, ...).</p>
         <p>We improved the Plasma integration a bit. Now the number of unread messages is displayed in the Plasma Taskbar.</p>
       </description>
-      <url>https://carlschwan.eu/2020/02/22/neochat-1.1/</url>
+      <url>https://carlschwan.eu/2021/02/22/neochat-1.1/</url>
     </release>
     <release version="1.0.1" date="2021-01-13">
       <description>

org.kde.neochat.desktop

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 [Desktop Entry]
 Name=NeoChat
 Name[az]=NeoChat
@@ -7,10 +9,14 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[it]=NeoChat
+Name[ko]=NeoChat
+Name[lt]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
@@ -18,11 +24,13 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
+Name[zh_CN]=NeoChat
 GenericName=Matrix Client
 GenericName[az]=Matrix Müştərisi
 GenericName[ca]=Client de Matrix
@@ -37,6 +45,8 @@ GenericName[fr]=Client « Matrix »
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[it]=Client Matrix
+GenericName[ko]=Matrix 클라이언트
+GenericName[lt]=Matrix kliento programą
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
@@ -64,6 +74,8 @@ Comment[fr]=Client pour le protocole « Matrix »
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[it]=Client per il protocollo Matrix
+Comment[ko]=Matrix 프로토콜용 클라이언트
+Comment[lt]=Matrix protokolo kliento programa
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
 Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ

qml/main.qml

@@ -27,9 +27,14 @@ Kirigami.ApplicationWindow {
     onClosing: Controller.saveWindowGeometry(root)
 
     pageStack.initialPage: LoadingPage {}
+    pageStack.globalToolBar.canContainHandles: true
 
     property bool roomListLoaded: false
 
+    property RoomPage roomPage: RoomPage {
+        KeyNavigation.left: pageStack.get(0)
+    }
+
     Connections {
         target: root.quitAction
         function onTriggered() {
@@ -37,6 +42,11 @@ Kirigami.ApplicationWindow {
         }
     }
 
+    Loader {
+        active: !Kirigami.Settings.isMobile
+        source: Qt.resolvedUrl("qrc:/imports/NeoChat/Menu/GlobalMenu.qml")
+    }
+
     // This timer allows to batch update the window size change to reduce
     // the io load and also work around the fact that x/y/width/height are
     // changed when loading the page and overwrite the saved geometry from
@@ -52,39 +62,35 @@ Kirigami.ApplicationWindow {
     onXChanged: saveWindowGeometryTimer.restart()
     onYChanged: saveWindowGeometryTimer.restart()
 
-
-    /// Setup keyboard navigation to the room page.
-    function connectRoomToSignal(item) {
-        if (!roomListLoaded) {
-            console.log("Should not happen: no room list page but room page");
+    Shortcut {
+        sequence: "Ctrl+K"
+        onActivated: {
+            quickView.item.open()
         }
-        const roomList = pageStack.get(0);
-        item.switchRoomUp.connect(function() {
-            roomList.goToNextRoom();
-        });
+    }
 
-        item.switchRoomDown.connect(function() {
-            roomList.goToPreviousRoom();
-        });
-        item.forceActiveFocus();
-        item.KeyNavigation.left = pageStack.get(0);
+    Loader {
+        id: quickView
+
+        active: !Kirigami.Settings.isMobile
+        sourceComponent: QuickSwitcher { }
     }
 
     Connections {
         target: RoomManager
 
         function onPushRoom(room, event) {
-            const roomItem = pageStack.push("qrc:/imports/NeoChat/Page/RoomPage.qml");
-            connectRoomToSignal(roomItem);
+            pageStack.push(root.roomPage);
+            root.roomPage.forceActiveFocus();
             if (event.length > 0) {
-                roomItem.goToEvent(event);
+                roomPage.goToEvent(event);
             }
         }
 
         function onReplaceRoom(room, event) {
             const roomItem = pageStack.get(pageStack.depth - 1);
             pageStack.currentIndex = pageStack.depth - 1;
-            connectRoomToSignal(roomItem);
+            root.roomPage.forceActiveFocus();
             if (event.length > 0) {
                 roomItem.goToEvent(event);
             }
@@ -140,11 +146,11 @@ Kirigami.ApplicationWindow {
         root.show()
         root.raise()
         root.requestActivate()
+        Controller.raiseWindow(root)
     }
 
     contextDrawer: RoomDrawer {
         id: contextDrawer
-        contentItem.implicitWidth: columnWidth
         edge: Qt.application.layoutDirection == Qt.RightToLeft ? Qt.LeftEdge : Qt.RightEdge
         modal: !root.wideScreen || !enabled
         onEnabledChanged: drawerOpen = enabled && !modal
@@ -153,7 +159,70 @@ Kirigami.ApplicationWindow {
         handleVisible: enabled && pageStack.layers.depth < 2 && pageStack.depth < 3
     }
 
-    pageStack.columnView.columnWidth: Kirigami.Units.gridUnit * 17
+    readonly property int defaultPageWidth: Kirigami.Units.gridUnit * 17
+    readonly property int minPageWidth: Kirigami.Units.gridUnit * 10
+    readonly property int collapsedPageWidth: Kirigami.Units.gridUnit * 3 - Kirigami.Units.smallSpacing * 3
+    readonly property bool shouldUseSidebars: RoomManager.hasOpenRoom && (Config.roomListPageWidth > minPageWidth ? root.width >= Kirigami.Units.gridUnit * 35 : root.width > Kirigami.Units.gridUnit * 27) && roomListLoaded
+    readonly property int pageWidth: {
+        if (Config.roomListPageWidth === -1) {
+            return defaultPageWidth;
+        } else if (Config.roomListPageWidth < minPageWidth) {
+            return collapsedPageWidth;
+        } else {
+            return Config.roomListPageWidth;
+        }
+    }
+
+    pageStack.defaultColumnWidth: pageWidth
+    pageStack.columnView.columnResizeMode: shouldUseSidebars ? Kirigami.ColumnView.FixedColumns : Kirigami.ColumnView.SingleColumn
+
+    MouseArea {
+        visible: root.pageStack.wideMode
+        z: 500
+
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+
+        x: root.pageStack.defaultColumnWidth - (width / 2)
+        width: 2
+
+        property int _lastX: -1
+        enabled: !Kirigami.Settings.isMobile
+
+        cursorShape: !Kirigami.Settings.isMobile ? Qt.SplitHCursor : undefined
+
+        onPressed: _lastX = mouseX
+        onReleased: Config.save();
+
+        onPositionChanged: {
+            if (_lastX == -1) {
+                return;
+            }
+
+            if (mouse.x > _lastX) {
+                // we moved to the right
+                if (Config.roomListPageWidth === root.collapsedPageWidth && root.pageWidth + (mouse.x - _lastX) >= root.minPageWidth) {
+                    // Here we get back directly to a more wide mode.
+                    Config.roomListPageWidth = root.minPageWidth;
+                    if (root.width < Kirigami.Units.gridUnit * 35) {
+                        root.width = Kirigami.Units.gridUnit * 35;
+                    }
+                } else if (Config.roomListPageWidth !== root.collapsedPageWidth) {
+                    // Increase page width
+                    Config.roomListPageWidth = Math.min(root.defaultPageWidth, root.pageWidth + (mouse.x - _lastX));
+                }
+            } else if (mouse.x < _lastX) {
+                const tmpWidth = root.pageWidth - (_lastX - mouse.x);
+
+                if (tmpWidth < root.minPageWidth) {
+                    Config.roomListPageWidth = root.collapsedPageWidth;
+                } else {
+                    Config.roomListPageWidth = tmpWidth;
+                }
+            }
+        }
+    }
+
 
     globalDrawer: Kirigami.GlobalDrawer {
         property bool hasLayer
@@ -182,32 +251,13 @@ Kirigami.ApplicationWindow {
                 shortcut: StandardKey.New
                 enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
             },
-            Kirigami.Action {
-                text: i18n("Accounts")
-                icon.name: "im-user"
-                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/AccountsPage.qml")
-                enabled: pageStack.layers.currentItem.title !== i18n("Accounts") && Controller.accountCount > 0
-
-            },
-            Kirigami.Action {
-                text: i18n("Devices")
-                iconName: "network-connect"
-                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/DevicesPage.qml")
-                enabled: pageStack.layers.currentItem.title !== i18n("Devices") && Controller.accountCount > 0
-            },
             Kirigami.Action {
                 text: i18n("Settings")
                 icon.name: "settings-configure"
-                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/SettingsPage.qml")
+                onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml")
                 enabled: pageStack.layers.currentItem.title !== i18n("Settings")
                 shortcut: StandardKey.Preferences
             },
-            Kirigami.Action {
-                text: i18n("About NeoChat")
-                icon.name: "help-about"
-                onTriggered: pushReplaceLayer(aboutPage)
-                enabled: pageStack.layers.currentItem.title !== i18n("About")
-            },
             Kirigami.Action {
                 text: i18n("Logout")
                 icon.name: "list-remove-user"
@@ -223,27 +273,39 @@ Kirigami.ApplicationWindow {
         ]
     }
 
-    Component {
-        id: aboutPage
-        Kirigami.AboutPage {
-            aboutData: Controller.aboutData
+    Component.onCompleted: Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
+    Connections {
+        target: Config
+        function onBlurChanged() {
+            Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
+        }
+        function onCompactLayoutChanged() {
+            Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
         }
     }
 
+    // blur effect
+    color: Config.blur && !Config.compactLayout ? "transparent" : Kirigami.Theme.backgroundColor
+    
+    // we need to apply the translucency effect separately on top of the color
+    background: Rectangle {
+        color: Config.blur && !Config.compactLayout ? Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 1 - Config.transparency) : "transparent"
+    }
+    
     Component {
         id: roomListComponent
         RoomListPage {
             id: roomList
-        }
-    }
-    Connections {
-        target: LoginHelper
-        function onInitialSyncFinished() {
-            pageStack.replace(roomListComponent, {
-                activeConnection: Controller.activeConnection
-            });
-            roomListLoaded = true;
-            RoomManager.loadInitialRoom();
+
+            Connections {
+                target: root.roomPage
+                function onSwitchRoomUp() {
+                    roomList.goToNextRoom();
+                }
+                function onSwitchRoomDown() {
+                    roomList.goToPreviousRoom();
+                }
+            }
         }
     }
 
@@ -251,12 +313,9 @@ Kirigami.ApplicationWindow {
         target: Controller
 
         function onInitiated() {
-            if (RoomManager.hasOpenRoom) {
-                return;
-            }
             if (Controller.accountCount === 0) {
                 pageStack.replace("qrc:/imports/NeoChat/Page/WelcomePage.qml", {});
-            } else {
+            } else if (!roomListLoaded) {
                 pageStack.replace(roomListComponent, {
                     activeConnection: Controller.activeConnection
                 });
@@ -265,13 +324,6 @@ Kirigami.ApplicationWindow {
             }
         }
 
-        function onBusyChanged() {
-            if(!Controller.busy && roomListLoaded === false) {
-                pageStack.replace(roomListComponent);
-                roomListLoaded = true;
-            }
-        }
-
         function onConnectionDropped() {
             if (Controller.accountCount === 0) {
                 RoomManager.reset();
@@ -287,6 +339,7 @@ Kirigami.ApplicationWindow {
 
         function onShowWindow() {
             root.showWindow()
+            root.raise()
         }
 
         function onUserConsentRequired(url) {
@@ -297,7 +350,7 @@ Kirigami.ApplicationWindow {
 
     Connections {
         target: Controller.activeConnection
-        onDirectChatAvailable: {
+        function onDirectChatAvailable(directChat) {
             RoomManager.enterRoom(Controller.activeConnection.room(directChat.id));
         }
     }
@@ -307,9 +360,7 @@ Kirigami.ApplicationWindow {
 
         property string url: ""
 
-        header: Kirigami.Heading {
-            text: i18n("User consent")
-        }
+        title: i18n("User consent")
 
         QQC2.Label {
             id: label
@@ -348,9 +399,7 @@ Kirigami.ApplicationWindow {
             required property var user;
 
             parent: QQC2.ApplicationWindow.overlay
-            header: Kirigami.Heading {
-                text: i18n("Start a chat")
-            }
+            title: i18n("Start a chat")
             contentItem: QQC2.Label {
                 text: i18n("Do you want to start a chat with %1?", user.displayName)
                 wrapMode: Text.WordWrap

res.qrc

@@ -6,23 +6,30 @@
         <file>imports/NeoChat/Page/RoomListPage.qml</file>
         <file>imports/NeoChat/Page/RoomPage.qml</file>
         <file>imports/NeoChat/Page/RoomWindow.qml</file>
-        <file>imports/NeoChat/Page/AccountsPage.qml</file>
         <file>imports/NeoChat/Page/JoinRoomPage.qml</file>
         <file>imports/NeoChat/Page/InviteUserPage.qml</file>
-        <file>imports/NeoChat/Page/SettingsPage.qml</file>
         <file>imports/NeoChat/Page/StartChatPage.qml</file>
         <file>imports/NeoChat/Page/ImageEditorPage.qml</file>
-        <file>imports/NeoChat/Page/DevicesPage.qml</file>
         <file>imports/NeoChat/Page/WelcomePage.qml</file>
+        <file>imports/NeoChat/RoomSettings/General.qml</file>
+        <file>imports/NeoChat/RoomSettings/Security.qml</file>
+        <file>imports/NeoChat/RoomSettings/Categories.qml</file>
         <file>imports/NeoChat/Component/qmldir</file>
         <file>imports/NeoChat/Component/FullScreenImage.qml</file>
         <file>imports/NeoChat/Component/FancyEffectsContainer.qml</file>
+        <file>imports/NeoChat/Component/TypingPane.qml</file>
+        <file>imports/NeoChat/Component/ShimmerGradient.qml</file>
+        <file>imports/NeoChat/Component/QuickSwitcher.qml</file>
         <file>imports/NeoChat/Component/ChatBox</file>
         <file>imports/NeoChat/Component/ChatBox/ChatBox.qml</file>
         <file>imports/NeoChat/Component/ChatBox/ChatBar.qml</file>
         <file>imports/NeoChat/Component/ChatBox/AttachmentPane.qml</file>
         <file>imports/NeoChat/Component/ChatBox/ReplyPane.qml</file>
         <file>imports/NeoChat/Component/ChatBox/CompletionMenu.qml</file>
+        <file>imports/NeoChat/Component/ChatBox/CursorHandle.qml</file>
+        <file>imports/NeoChat/Component/ChatBox/CursorDelegate.qml</file>
+        <file>imports/NeoChat/Component/ChatBox/MobileTextActionsToolBar.qml</file>
+        <file>imports/NeoChat/Component/ChatBox/TextFieldContextMenu.qml</file>
         <file>imports/NeoChat/Component/ChatBox/qmldir</file>
         <file>imports/NeoChat/Component/Emoji/EmojiPicker.qml</file>
         <file>imports/NeoChat/Component/Emoji/qmldir</file>
@@ -37,6 +44,7 @@
         <file>imports/NeoChat/Component/Timeline/AudioDelegate.qml</file>
         <file>imports/NeoChat/Component/Timeline/FileDelegate.qml</file>
         <file>imports/NeoChat/Component/Timeline/ImageDelegate.qml</file>
+        <file>imports/NeoChat/Component/Timeline/EncryptedDelegate.qml</file>
         <file>imports/NeoChat/Component/Login/qmldir</file>
         <file>imports/NeoChat/Component/Login/LoginStep.qml</file>
         <file>imports/NeoChat/Component/Login/Login.qml</file>
@@ -49,12 +57,13 @@
         <file>imports/NeoChat/Panel/qmldir</file>
         <file>imports/NeoChat/Panel/RoomDrawer.qml</file>
         <file>imports/NeoChat/Dialog/qmldir</file>
-        <file>imports/NeoChat/Dialog/RoomSettingsDialog.qml</file>
         <file>imports/NeoChat/Dialog/UserDetailDialog.qml</file>
         <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
         <file>imports/NeoChat/Dialog/EmojiDialog.qml</file>
         <file>imports/NeoChat/Dialog/OpenFileDialog.qml</file>
         <file>imports/NeoChat/Menu/qmldir</file>
+        <file>imports/NeoChat/Menu/GlobalMenu.qml</file>
+        <file>imports/NeoChat/Menu/EditMenu.qml</file>
         <file>imports/NeoChat/Menu/Timeline/qmldir</file>
         <file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file>
         <file>imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml</file>
@@ -63,5 +72,15 @@
         <file>qtquickcontrols2.conf</file>
         <file>imports/NeoChat/Component/glowdot.png</file>
         <file>imports/NeoChat/Component/confetti.png</file>
+        <file>imports/NeoChat/Settings/SettingsPage.qml</file>
+        <file>imports/NeoChat/Settings/ThemeRadioButton.qml</file>
+        <file>imports/NeoChat/Settings/ColorScheme.qml</file>
+        <file>imports/NeoChat/Settings/GeneralSettingsPage.qml</file>
+        <file>imports/NeoChat/Settings/Emoticons.qml</file>
+        <file>imports/NeoChat/Settings/AppearanceSettingsPage.qml</file>
+        <file>imports/NeoChat/Settings/AccountsPage.qml</file>
+        <file>imports/NeoChat/Settings/DevicesPage.qml</file>
+        <file>imports/NeoChat/Settings/About.qml</file>
+        <file>imports/NeoChat/Settings/qmldir</file>
     </qresource>
 </RCC>

src/CMakeLists.txt

@@ -8,6 +8,8 @@ add_executable(neochat
     controller.cpp
     actionshandler.cpp
     emojimodel.cpp
+    customemojimodel.cpp
+    customemojimodel+network.cpp
     clipboard.cpp
     matriximageprovider.cpp
     messageeventmodel.cpp
@@ -30,10 +32,25 @@ add_executable(neochat
     stickerevent.cpp
     chatboxhelper.cpp
     commandmodel.cpp
+    webshortcutmodel.cpp
+    spellcheckhighlighter.cpp
+    blurhash.cpp
+    blurhashimageprovider.cpp
+    joinrulesevent.cpp
+    voip/audiosources.cpp
+    voip/devicemonitor.cpp
+    voip/pipelinemanager.cpp
+    voip/screencast.cpp
+    voip/videosources.cpp
+    voip/waylandscreencast.cpp
+    voip/webrtcfoo.cpp
+    voip/windowmodel.cpp
+    voip/xscreencast.cpp
+    voip/callhandler.cpp
     ../res.qrc
 )
 
-if(${Quotient_VERSION_MINOR} GREATER 6)
+if(Quotient_VERSION_MINOR GREATER 6)
     target_compile_definitions(neochat PRIVATE QUOTIENT_07)
 endif()
 
@@ -42,11 +59,19 @@ ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 target_sources(neochat PRIVATE ${NEOCHAT_ICON})
 
 if(NOT ANDROID)
-    target_sources(neochat PRIVATE trayicon.cpp)
+    target_sources(neochat PRIVATE colorschemer.cpp)
+    if (NOT WIN32 AND NOT APPLE)
+        target_sources(neochat PRIVATE trayicon_sni.cpp)
+    else()
+        target_sources(neochat PRIVATE trayicon.cpp)
+    endif()
+    target_link_libraries(neochat PRIVATE KF5::ConfigWidgets KF5::WindowSystem KF5::SonnetCore)
+    target_compile_definitions(neochat PRIVATE -DHAVE_COLORSCHEME)
+    target_compile_definitions(neochat PRIVATE -DHAVE_WINDOWSYSTEM)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
+target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::QCoro PkgConfig::GSTREAMER)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -56,6 +81,7 @@ endif()
 if(ANDROID)
     target_link_libraries(neochat PRIVATE Qt5::Svg OpenSSL::SSL)
     kirigami_package_breeze_icons(ICONS
+        "arrow-down"
         "help-about"
         "im-user"
         "im-invisible-user"
@@ -89,9 +115,13 @@ if(ANDROID)
         "gtk-quit"
         "compass"
         "network-connect"
+        "list-remove-user"
+        "org.kde.neochat"
+        "preferences-system-users"
+        "preferences-desktop-theme-global"
     )
 else()
-    target_link_libraries(neochat PRIVATE Qt5::Widgets)
+    target_link_libraries(neochat PRIVATE Qt5::Widgets KF5::KIOWidgets)
 endif()
 
 if(TARGET KF5::DBusAddons)
@@ -99,4 +129,8 @@ if(TARGET KF5::DBusAddons)
     target_compile_definitions(neochat PRIVATE -DHAVE_KDBUSADDONS)
 endif()
 
+if (TARGET KF5::KIOWidgets)
+    target_compile_definitions(neochat PRIVATE -DHAVE_KIO)
+endif()
+
 install(TARGETS neochat ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

src/accountlistmodel.cpp

@@ -8,31 +8,13 @@
 AccountListModel::AccountListModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    m_connections.clear();
-    m_connections += Controller::instance().connections();
-
-    connect(&Controller::instance(), &Controller::connectionAdded, this, [=](Connection *conn) {
-        if (!conn) {
-            return;
-        }
-        beginInsertRows(QModelIndex(), m_connections.count(), m_connections.count());
-        m_connections.append(conn);
-        endInsertRows();
+    connect(&Controller::instance(), &Controller::connectionAdded, this, [=]() {
+        beginResetModel();
+        endResetModel();
     });
-    connect(&Controller::instance(), &Controller::connectionDropped, this, [=](Connection *conn) {
-        if (!conn) {
-            qDebug() << "Trying to remove null connection";
-            return;
-        }
-        conn->disconnect(this);
-        const auto it = std::find(m_connections.begin(), m_connections.end(), conn);
-        if (it == m_connections.end()) {
-            return; // Already deleted, nothing to do
-        }
-        const int row = it - m_connections.begin();
-        beginRemoveRows(QModelIndex(), row, row);
-        m_connections.erase(it);
-        endRemoveRows();
+    connect(&Controller::instance(), &Controller::connectionDropped, this, [=]() {
+        beginResetModel();
+        endResetModel();
     });
 }
 
@@ -42,19 +24,17 @@ QVariant AccountListModel::data(const QModelIndex &index, int role) const
         return {};
     }
 
-    if (index.row() >= m_connections.count()) {
-        qDebug() << "AccountListModel, something's wrong: index.row() >= "
-                    "m_users.count()";
+    if (index.row() >= Controller::instance().connections().count()) {
         return {};
     }
 
-    auto m_connection = m_connections.at(index.row());
+    auto connection = Controller::instance().connections().at(index.row());
 
     if (role == UserRole) {
-        return QVariant::fromValue(m_connection->user());
+        return QVariant::fromValue(connection->user());
     }
     if (role == ConnectionRole) {
-        return QVariant::fromValue(m_connection);
+        return QVariant::fromValue(connection);
     }
 
     return {};
@@ -66,7 +46,7 @@ int AccountListModel::rowCount(const QModelIndex &parent) const
         return 0;
     }
 
-    return m_connections.count();
+    return Controller::instance().connections().count();
 }
 
 QHash<int, QByteArray> AccountListModel::roleNames() const

src/accountlistmodel.h

@@ -23,7 +23,4 @@ public:
     [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-
-private:
-    QVector<Connection *> m_connections;
 };

src/actionshandler.cpp

@@ -12,6 +12,7 @@
 #include <QStringBuilder>
 
 #include "controller.h"
+#include "customemojimodel.h"
 #include "roommanager.h"
 
 ActionsHandler::ActionsHandler(QObject *parent)
@@ -61,28 +62,36 @@ void ActionsHandler::setConnection(Connection *connection)
 
 void ActionsHandler::postEdit(const QString &text)
 {
-
     const auto localId = Controller::instance().activeConnection()->userId();
     for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); ++it) {
         const auto &evt = **it;
         if (const auto event = eventCast<const RoomMessageEvent>(&evt)) {
             if (event->senderId() == localId && event->hasTextContent()) {
-                static QRegularExpression re("^s/([^/]*)/([^/]*)");
+                static QRegularExpression re("^s/([^/]*)/([^/]*)(/g)?");
                 auto match = re.match(text);
                 if (!match.hasMatch()) {
                     // should not happen but still make sure to send the message normally
                     // just in case.
-                    postMessage(text, QString(), QString(), QString(), QVariantMap());
+                    postMessage(text, QString(), QString(), QString(), QVariantMap(), nullptr);
                 }
                 const QString regex = match.captured(1);
                 const QString replacement = match.captured(2);
+                const QString flags = match.captured(3);
                 QString originalString;
                 if (event->content()) {
                     originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
                 } else {
                     originalString = event->plainBody();
                 }
-                m_room->postHtmlMessage(text, originalString.replace(regex, replacement), event->msgtype(), "", event->id());
+                if (flags == "/g") {
+                    m_room->postHtmlMessage(text, originalString.replace(regex, replacement), event->msgtype(), "", event->id());
+                } else {
+                    m_room->postHtmlMessage(text,
+                                            originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
+                                            event->msgtype(),
+                                            "",
+                                            event->id());
+                }
                 return;
             }
         }
@@ -90,20 +99,41 @@ void ActionsHandler::postEdit(const QString &text)
 }
 
 void ActionsHandler::postMessage(const QString &text,
-                                 const QString &attachementPath,
+                                 const QString &attachmentPath,
                                  const QString &replyEventId,
                                  const QString &editEventId,
-                                 const QVariantMap &usernames)
+                                 const QVariantMap &usernames,
+                                 CustomEmojiModel *cem)
 {
     QString rawText = text;
-    QString cleanedText = text;
+    auto stringList = text.split(QStringLiteral("```"));
+    QString cleanedText;
+    const auto count = stringList.count();
+    for (int i = 0; i < count; i++) {
+        if (i % 2 == 0) {
+            if (i + 1 != count) {
+                cleanedText += stringList[i].toHtmlEscaped() + QStringLiteral("```");
+            } else {
+                cleanedText += stringList[i].toHtmlEscaped();
+            }
+        } else {
+            cleanedText += stringList[i] + QStringLiteral("```");
+        }
+    }
+
+    auto preprocess = [cem](const QString &it) -> QString {
+        if (cem == nullptr) {
+            return it;
+        }
+        return cem->preprocessText(it);
+    };
 
     for (auto it = usernames.constBegin(); it != usernames.constEnd(); it++) {
         cleanedText = cleanedText.replace(it.key(), "[" + it.key() + "](https://matrix.to/#/" + it.value().toString() + ")");
     }
 
-    if (attachementPath.length() > 0) {
-        m_room->uploadFile(attachementPath, cleanedText);
+    if (attachmentPath.length() > 0) {
+        m_room->uploadFile(attachmentPath, cleanedText);
     }
 
     if (cleanedText.length() == 0) {
@@ -115,27 +145,32 @@ void ActionsHandler::postMessage(const QString &text,
     // Message commands
     static const QString shrugPrefix = QStringLiteral("/shrug");
     static const QString lennyPrefix = QStringLiteral("/lenny");
-    static const QString plainPrefix = QStringLiteral("/plain "); // TODO
-    static const QString htmlPrefix = QStringLiteral("/html "); // TODO
+    static const QString tableflipPrefix = QStringLiteral("/tableflip");
+    static const QString unflipPrefix = QStringLiteral("/unflip");
+    // static const QString plainPrefix = QStringLiteral("/plain "); // TODO
+    // static const QString htmlPrefix = QStringLiteral("/html "); // TODO
     static const QString rainbowPrefix = QStringLiteral("/rainbow ");
     static const QString rainbowmePrefix = QStringLiteral("/rainbowme ");
+    static const QString spoilerPrefix = QStringLiteral("/spoiler ");
     static const QString mePrefix = QStringLiteral("/me ");
     static const QString noticePrefix = QStringLiteral("/notice ");
 
     // Actions commands
-    static const QString ddgPrefix = QStringLiteral("/ddg "); // TODO
-    static const QString nickPrefix = QStringLiteral("/nick "); // TODO
-    static const QString meroomnickPrefix = QStringLiteral("/myroomnick "); // TODO
-    static const QString roomavatarPrefix = QStringLiteral("/roomavatar "); // TODO
-    static const QString myroomavatarPrefix = QStringLiteral("/myroomavatar "); // TODO
-    static const QString myavatarPrefix = QStringLiteral("/myavatar "); // TODO
+    // static const QString ddgPrefix = QStringLiteral("/ddg "); // TODO
+    // static const QString nickPrefix = QStringLiteral("/nick "); // TODO
+    // static const QString meroomnickPrefix = QStringLiteral("/myroomnick "); // TODO
+    // static const QString roomavatarPrefix = QStringLiteral("/roomavatar "); // TODO
+    // static const QString myroomavatarPrefix = QStringLiteral("/myroomavatar "); // TODO
+    // static const QString myavatarPrefix = QStringLiteral("/myavatar "); // TODO
     static const QString invitePrefix = QStringLiteral("/invite ");
     static const QString joinPrefix = QStringLiteral("/join ");
+    static const QString joinShortPrefix = QStringLiteral("/j ");
     static const QString partPrefix = QStringLiteral("/part");
+    static const QString leavePrefix = QStringLiteral("/leave");
     static const QString ignorePrefix = QStringLiteral("/ignore ");
     static const QString unignorePrefix = QStringLiteral("/unignore ");
-    static const QString queryPrefix = QStringLiteral("/query "); // TODO
-    static const QString msgPrefix = QStringLiteral("/msg "); // TODO
+    // static const QString queryPrefix = QStringLiteral("/query "); // TODO
+    // static const QString msgPrefix = QStringLiteral("/msg "); // TODO
     static const QString reactPrefix = QStringLiteral("/react ");
 
     // Admin commands
@@ -157,13 +192,33 @@ void ActionsHandler::postMessage(const QString &text,
         return;
     }
 
+    if (cleanedText.indexOf(tableflipPrefix) == 0) {
+        cleanedText = QStringLiteral("(╯°□°）╯︵ ┻━┻") % cleanedText.remove(0, tableflipPrefix.length());
+        m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
+        return;
+    }
+
+    if (cleanedText.indexOf(unflipPrefix) == 0) {
+        cleanedText = QStringLiteral("┬──┬ ノ( ゜-゜ノ)") % cleanedText.remove(0, unflipPrefix.length());
+        m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
+        return;
+    }
+
     if (cleanedText.indexOf(rainbowPrefix) == 0) {
         cleanedText = cleanedText.remove(0, rainbowPrefix.length());
         QString rainbowText;
         for (int i = 0; i < cleanedText.length(); i++) {
             rainbowText = rainbowText % QStringLiteral("<font color='") % rainbowColors.at(i % rainbowColors.length()) % "'>" % cleanedText.at(i) % "</font>";
         }
-        m_room->postHtmlMessage(cleanedText, rainbowText, RoomMessageEvent::MsgType::Notice, replyEventId, editEventId);
+        m_room->postHtmlMessage(cleanedText, preprocess(rainbowText), RoomMessageEvent::MsgType::Notice, replyEventId, editEventId);
+        return;
+    }
+
+    if (cleanedText.indexOf(spoilerPrefix) == 0) {
+        cleanedText = cleanedText.remove(0, spoilerPrefix.length());
+        const QStringList splittedText = rawText.split(" ");
+        QString spoilerHtml = QStringLiteral("<span data-mx-spoiler>") % preprocess(cleanedText) % QStringLiteral("</span>");
+        m_room->postHtmlMessage(cleanedText, spoilerHtml, RoomMessageEvent::MsgType::Notice, replyEventId, editEventId);
         return;
     }
 
@@ -173,12 +228,16 @@ void ActionsHandler::postMessage(const QString &text,
         for (int i = 0; i < cleanedText.length(); i++) {
             rainbowText = rainbowText % QStringLiteral("<font color='") % rainbowColors.at(i % rainbowColors.length()) % "'>" % cleanedText.at(i) % "</font>";
         }
-        m_room->postHtmlMessage(cleanedText, rainbowText, messageEventType, replyEventId, editEventId);
+        m_room->postHtmlMessage(cleanedText, preprocess(rainbowText), messageEventType, replyEventId, editEventId);
         return;
     }
 
-    if (rawText.indexOf(joinPrefix) == 0) {
-        rawText = rawText.remove(0, joinPrefix.length());
+    if (rawText.indexOf(joinPrefix) == 0 || rawText.indexOf(joinShortPrefix) == 0) {
+        if (rawText.indexOf(joinPrefix) == 0) {
+            rawText = rawText.remove(0, joinPrefix.length());
+        } else {
+            rawText = rawText.remove(0, joinShortPrefix.length());
+        }
         const QStringList splittedText = rawText.split(" ");
         if (text.count() == 0) {
             Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
@@ -207,8 +266,12 @@ void ActionsHandler::postMessage(const QString &text,
         return;
     }
 
-    if (rawText.indexOf(partPrefix) == 0) {
-        rawText = rawText.remove(0, partPrefix.length());
+    if (rawText.indexOf(partPrefix) == 0 || rawText.indexOf(leavePrefix) == 0) {
+        if (rawText.indexOf(partPrefix) == 0) {
+            rawText = rawText.remove(0, partPrefix.length());
+        } else {
+            rawText = rawText.remove(0, leavePrefix.length());
+        }
         const QStringList splittedText = rawText.split(" ");
         if (splittedText.count() == 0 || splittedText[0].isEmpty()) {
             // leave current room
@@ -256,10 +319,18 @@ void ActionsHandler::postMessage(const QString &text,
     }
 
     if (rawText.indexOf(reactPrefix) == 0) {
+        rawText = rawText.remove(0, reactPrefix.length());
         if (replyEventId.isEmpty()) {
+            for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); ++it) {
+                const auto &evt = **it;
+                if (const auto event = eventCast<const RoomMessageEvent>(&evt)) {
+                    m_room->toggleReaction(event->id(), rawText);
+                    return;
+                }
+            }
+            Q_EMIT showMessage(MessageType::Error, i18n("Couldn't find a message to react to"));
             return;
         }
-        rawText = rawText.remove(0, reactPrefix.length());
         m_room->toggleReaction(replyEventId, rawText);
         return;
     }
@@ -272,5 +343,5 @@ void ActionsHandler::postMessage(const QString &text,
         cleanedText = cleanedText.remove(0, noticePrefix.length());
         messageEventType = RoomMessageEvent::MsgType::Notice;
     }
-    m_room->postMessage(rawText, cleanedText, messageEventType, replyEventId, editEventId);
+    m_room->postMessage(rawText, preprocess(m_room->preprocessText(cleanedText)), messageEventType, replyEventId, editEventId);
 }

src/actionshandler.h

@@ -10,13 +10,14 @@
 
 using namespace Quotient;
 
+class CustomEmojiModel;
+
 /// \brief Handles user interactions with NeoChat (joining room, creating room,
 /// sending message). Account management is handled by Controller.
 class ActionsHandler : public QObject
 {
     Q_OBJECT
 
-
     /// \brief The connection that will handle sending the message.
     Q_PROPERTY(Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
@@ -33,8 +34,6 @@ public:
     explicit ActionsHandler(QObject *parent = nullptr);
     ~ActionsHandler();
 
-
-
     [[nodiscard]] Connection *connection() const;
     void setConnection(Connection *connection);
 
@@ -45,7 +44,7 @@ Q_SIGNALS:
     /// \brief Show error or information message.
     ///
     /// These messages will be displayed in the room view header.
-    void showMessage(MessageType messageType, QString message);
+    void showMessage(ActionsHandler::MessageType messageType, QString message);
 
     void roomChanged();
     void connectionChanged();
@@ -55,8 +54,12 @@ public Q_SLOTS:
     /// \brief Post a message.
     ///
     /// This also interprets commands if any.
-    void
-    postMessage(const QString &text, const QString &attachementPath, const QString &replyEventId, const QString &editEventId, const QVariantMap &usernames);
+    void postMessage(const QString &text,
+                     const QString &attachementPath,
+                     const QString &replyEventId,
+                     const QString &editEventId,
+                     const QVariantMap &usernames,
+                     CustomEmojiModel *cem);
 
     /// \brief Send edit instructions (.e.g s/hallo/hello/)
     ///

src/blurhash.cpp

@@ -0,0 +1,194 @@
+// SPDX-FileCopyrightText: 2018 Wolt Enterprises
+// SPDX-License-Identifier: MIT
+
+#include "blurhash.h"
+
+#include <vector>
+
+namespace
+{
+const char chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~";
+
+struct Color {
+    float r = 0;
+    float g = 0;
+    float b = 0;
+};
+
+inline int linearTosRGB(float value)
+{
+    float v = fmaxf(0, fminf(1, value));
+    if (v <= 0.0031308)
+        return v * 12.92 * 255 + 0.5;
+    else
+        return (1.055 * powf(v, 1 / 2.4) - 0.055) * 255 + 0.5;
+}
+
+inline float sRGBToLinear(int value)
+{
+    float v = (float)value / 255;
+    if (v <= 0.04045)
+        return v / 12.92;
+    else
+        return powf((v + 0.055) / 1.055, 2.4);
+}
+
+inline float signPow(float value, float exp)
+{
+    return copysignf(powf(fabsf(value), exp), value);
+}
+
+inline uint8_t clampToUByte(int *src)
+{
+    if (*src >= 0 && *src <= 255) {
+        return *src;
+    }
+    return (*src < 0) ? 0 : 255;
+}
+
+inline uint8_t *createByteArray(int size)
+{
+    return (uint8_t *)malloc(size * sizeof(uint8_t));
+}
+
+int decodeToInt(const char *string, int start, int end)
+{
+    int value = 0;
+    for (int iter1 = start; iter1 < end; iter1++) {
+        int index = -1;
+        for (int iter2 = 0; iter2 < 83; iter2++) {
+            if (chars[iter2] == string[iter1]) {
+                index = iter2;
+                break;
+            }
+        }
+        if (index == -1) {
+            return -1;
+        }
+        value = value * 83 + index;
+    }
+    return value;
+}
+
+void decodeDC(int value, Color *color)
+{
+    color->r = sRGBToLinear(value >> 16);
+    color->g = sRGBToLinear((value >> 8) & 255);
+    color->b = sRGBToLinear(value & 255);
+}
+
+void decodeAC(int value, float maximumValue, Color *color)
+{
+    int quantR = (int)floorf(value / (19 * 19));
+    int quantG = (int)floorf(value / 19) % 19;
+    int quantB = (int)value % 19;
+
+    color->r = signPow(((float)quantR - 9) / 9, 2.0) * maximumValue;
+    color->g = signPow(((float)quantG - 9) / 9, 2.0) * maximumValue;
+    color->b = signPow(((float)quantB - 9) / 9, 2.0) * maximumValue;
+}
+
+int decodeToArray(const char *blurhash, int width, int height, int punch, int nChannels, uint8_t *pixelArray)
+{
+    if (!isValidBlurhash(blurhash)) {
+        return -1;
+    }
+    if (punch < 1) {
+        punch = 1;
+    }
+
+    int sizeFlag = decodeToInt(blurhash, 0, 1);
+    int numY = (int)floorf(sizeFlag / 9) + 1;
+    int numX = (sizeFlag % 9) + 1;
+    int iter = 0;
+
+    Color color;
+    int quantizedMaxValue = decodeToInt(blurhash, 1, 2);
+    if (quantizedMaxValue == -1) {
+        return -1;
+    }
+
+    const float maxValue = ((float)(quantizedMaxValue + 1)) / 166;
+
+    const int colors_size = numX * numY;
+
+    std::vector<Color> colors(colors_size, {0, 0, 0});
+
+    for (iter = 0; iter < colors_size; iter++) {
+        if (iter == 0) {
+            int value = decodeToInt(blurhash, 2, 6);
+            if (value == -1) {
+                return -1;
+            }
+            decodeDC(value, &color);
+            colors[iter] = color;
+        } else {
+            int value = decodeToInt(blurhash, 4 + iter * 2, 6 + iter * 2);
+            if (value == -1) {
+                return -1;
+            }
+            decodeAC(value, maxValue * punch, &color);
+            colors[iter] = color;
+        }
+    }
+
+    int bytesPerRow = width * nChannels;
+    int x = 0, y = 0, i = 0, j = 0;
+    int intR = 0, intG = 0, intB = 0;
+
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            float r = 0, g = 0, b = 0;
+
+            for (j = 0; j < numY; j++) {
+                for (i = 0; i < numX; i++) {
+                    float basics = cos((M_PI * x * i) / width) * cos((M_PI * y * j) / height);
+                    int idx = i + j * numX;
+                    r += colors[idx].r * basics;
+                    g += colors[idx].g * basics;
+                    b += colors[idx].b * basics;
+                }
+            }
+
+            intR = linearTosRGB(r);
+            intG = linearTosRGB(g);
+            intB = linearTosRGB(b);
+
+            pixelArray[nChannels * x + 0 + y * bytesPerRow] = clampToUByte(&intR);
+            pixelArray[nChannels * x + 1 + y * bytesPerRow] = clampToUByte(&intG);
+            pixelArray[nChannels * x + 2 + y * bytesPerRow] = clampToUByte(&intB);
+
+            if (nChannels == 4) {
+                pixelArray[nChannels * x + 3 + y * bytesPerRow] = 255;
+            }
+        }
+    }
+    return 0;
+}
+}
+
+uint8_t *decode(const char *blurhash, int width, int height, int punch, int nChannels)
+{
+    int bytesPerRow = width * nChannels;
+    uint8_t *pixelArray = createByteArray(bytesPerRow * height);
+
+    if (decodeToArray(blurhash, width, height, punch, nChannels, pixelArray) == -1) {
+        return NULL;
+    }
+    return pixelArray;
+}
+
+bool isValidBlurhash(const char *blurhash)
+{
+    const int hashLength = strlen(blurhash);
+
+    if (!blurhash || strlen(blurhash) < 6) {
+        return false;
+    }
+
+    int sizeFlag = decodeToInt(blurhash, 0, 1);
+    int numY = (int)floorf(sizeFlag / 9) + 1;
+    int numX = (sizeFlag % 9) + 1;
+
+    return hashLength == 4 + 2 * numX * numY;
+}

src/blurhash.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2018 Wolt Enterprises
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+uint8_t *decode(const char *blurhash, int width, int height, int punch, int nChannels);
+
+bool isValidBlurhash(const char *blurhash);

src/blurhashimageprovider.cpp

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "blurhashimageprovider.h"
+
+#include <QImage>
+#include <QString>
+
+#include "blurhash.h"
+
+BlurhashImageProvider::BlurhashImageProvider()
+    : QQuickImageProvider(QQuickImageProvider::Image)
+{
+}
+
+QImage BlurhashImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
+{
+    if (id.isEmpty()) {
+        return QImage();
+    }
+    *size = requestedSize;
+    if (size->width() == -1) {
+        size->setWidth(256);
+    }
+    if (size->height() == -1) {
+        size->setHeight(256);
+    }
+    auto data = decode(QUrl::fromPercentEncoding(id.toLatin1()).toLatin1().data(), size->width(), size->height(), 1, 3);
+    QImage image(data, size->width(), size->height(), size->width() * 3, QImage::Format_RGB888, free, data);
+    return image;
+}

src/blurhashimageprovider.h

@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QQuickImageProvider>
+
+class BlurhashImageProvider : public QQuickImageProvider
+{
+public:
+    BlurhashImageProvider();
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
+};

src/chatdocumenthandler.cpp

@@ -16,6 +16,8 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
     : QObject(parent)
     , m_document(nullptr)
     , m_cursorPosition(-1)
+    , m_selectionStart(-1)
+    , m_selectionEnd(-1)
 {
 }
 
@@ -123,7 +125,7 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-QVariantMap ChatDocumentHandler::getAutocompletionInfo()
+QVariantMap ChatDocumentHandler::getAutocompletionInfo(bool isAutocompleting)
 {
     QTextCursor cursor = textCursor();
 
@@ -133,9 +135,6 @@ QVariantMap ChatDocumentHandler::getAutocompletionInfo()
             {"type", AutoCompletionType::Ignore},
         };
     }
-    if (m_cursorPosition != m_autoCompleteBeginPosition && m_cursorPosition != m_autoCompleteEndPosition) {
-        // we moved our cursor, so cancel autocompletion
-    }
 
     QString text = cursor.block().text();
     QString textBeforeCursor = text;
@@ -167,10 +166,17 @@ QVariantMap ChatDocumentHandler::getAutocompletionInfo()
             };
         }
 
-        return QVariantMap{
-            {"keyword", autoCompletePrefix},
-            {"type", AutoCompletionType::Emoji},
-        };
+        if (!isAutocompleting) {
+            return QVariantMap{
+                {"keyword", autoCompletePrefix},
+                {"type", AutoCompletionType::Emoji},
+            };
+        } else {
+            return QVariantMap{
+                {"type", AutoCompletionType::Ignore},
+                {"keyword", autoCompletePrefix},
+            };
+        }
     }
 
     return QVariantMap{

src/chatdocumenthandler.h

@@ -52,7 +52,7 @@ public:
 
     /// This function will look at the current QTextCursor and determine if there
     /// is the possibility to autocomplete it.
-    Q_INVOKABLE QVariantMap getAutocompletionInfo();
+    Q_INVOKABLE QVariantMap getAutocompletionInfo(bool isAutocompleting);
     Q_INVOKABLE void replaceAutoComplete(const QString &word);
 
 Q_SIGNALS:

src/colorschemer.cpp

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include <KColorSchemeManager>
+#include <QAbstractItemModel>
+
+#include "colorschemer.h"
+
+ColorSchemer::ColorSchemer(QObject *parent)
+    : QObject(parent)
+    , c(new KColorSchemeManager(this))
+{
+}
+
+ColorSchemer::~ColorSchemer()
+{
+}
+
+QAbstractItemModel *ColorSchemer::model() const
+{
+    return c->model();
+}
+
+void ColorSchemer::apply(int idx)
+{
+    c->activateScheme(c->model()->index(idx, 0));
+}
+
+void ColorSchemer::apply(const QString &name)
+{
+    c->activateScheme(c->indexForScheme(name));
+}
+
+int ColorSchemer::indexForScheme(const QString &name) const
+{
+    auto index = c->indexForScheme(name).row();
+    if (index == -1) {
+        index = 0;
+    }
+    return index;
+}
+
+QString ColorSchemer::nameForIndex(int index) const
+{
+    return c->model()->data(c->model()->index(index, 0), Qt::DisplayRole).toString();
+}

src/colorschemer.h

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <QIdentityProxyModel>
+#include <QObject>
+
+class QAbstractItemModel;
+class KColorSchemeManager;
+
+class ColorSchemer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QAbstractItemModel *model READ model CONSTANT)
+public:
+    ColorSchemer(QObject *parent = nullptr);
+    ~ColorSchemer();
+
+    QAbstractItemModel *model() const;
+    Q_INVOKABLE void apply(int idx);
+    Q_INVOKABLE void apply(const QString &name);
+    Q_INVOKABLE int indexForScheme(const QString &name) const;
+    Q_INVOKABLE QString nameForIndex(int index) const;
+
+private:
+    KColorSchemeManager *c;
+};

src/commandmodel.cpp

@@ -6,7 +6,6 @@
 #include "actionshandler.h"
 #include "commandmodel.h"
 
-
 QVariantList CommandModel::filterModel(const QString &filter)
 {
     QVariantList result;
@@ -24,70 +23,47 @@ QVariantList CommandModel::filterModel(const QString &filter)
     return result;
 }
 
-
 QVariantList CommandModel::commands()
 {
     QVariantList commands;
 
     // Messages commands
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/me "),
-        QStringLiteral("<message>"),
-        i18n("Displays action")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/me "), QStringLiteral("<message>"), i18n("Displays action")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/shrug "),
-        QStringLiteral("<message>"),
-        i18n("Prepends ¯\\_(ツ)_/¯ to a plain-text message")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/shrug "), QStringLiteral("<message>"), i18n("Prepends ¯\\_(ツ)_/¯ to a plain-text message")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/lenny "),
-        QStringLiteral("<message>"),
-        i18n("Prepends ( ͡° ͜ʖ ͡°) to a plain-text message")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/lenny "), QStringLiteral("<message>"), i18n("Prepends ( ͡° ͜ʖ ͡°) to a plain-text message")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/plain "),
-        QStringLiteral("<message>"),
-        i18n("Sends a message as plain text, without interpreting it as markdown")}));
+    commands.append(
+        QVariant::fromValue(Command{QStringLiteral("/tableflip "), QStringLiteral("<message>"), i18n("Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/html "),
-        QStringLiteral("<message>"),
-        i18n("Sends a message as html, without interpreting it as markdown")}));
+    commands.append(
+        QVariant::fromValue(Command{QStringLiteral("/unflip "), QStringLiteral("<message>"), i18n("Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/rainbow "),
-        QStringLiteral("<message>"),
-        i18n("Sends the given message coloured as a rainbow")}));
+    commands.append(QVariant::fromValue(
+        Command{QStringLiteral("/plain "), QStringLiteral("<message>"), i18n("Sends a message as plain text, without interpreting it as markdown")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/rainbowme "),
-        QStringLiteral("<message>"),
-        i18n("Sends the given emote coloured as a rainbow")}));
+    commands.append(QVariant::fromValue(
+        Command{QStringLiteral("/html "), QStringLiteral("<message>"), i18n("Sends a message as html, without interpreting it as markdown")}));
 
+    commands.append(
+        QVariant::fromValue(Command{QStringLiteral("/rainbow "), QStringLiteral("<message>"), i18n("Sends the given message coloured as a rainbow")}));
+
+    commands.append(
+        QVariant::fromValue(Command{QStringLiteral("/rainbowme "), QStringLiteral("<message>"), i18n("Sends the given emote coloured as a rainbow")}));
+
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/spoiler "), QStringLiteral("<message>"), i18n("Sends the given message as a spoiler")}));
 
     // Actions commands
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/join "), QStringLiteral("<room-address>"),
-        i18n("Joins room with given address")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/join "), QStringLiteral("<room-address>"), i18n("Joins room with given address")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/part "),
-        QStringLiteral("[<room-address>]"),
-        i18n("Leave room")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/part "), QStringLiteral("[<room-address>]"), i18n("Leave room")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/invite "),
-        QStringLiteral("<user-id>"),
-        i18n("Invites user with given id to current room")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/invite "), QStringLiteral("<user-id>"), i18n("Invites user with given id to current room")}));
 
-    commands.append(QVariant::fromValue(Command{
-        QStringLiteral("/react "),
-        QStringLiteral("<reaction text>"),
-        i18n("React to this message with a text")}));
+    commands.append(QVariant::fromValue(Command{QStringLiteral("/react "), QStringLiteral("<reaction text>"), i18n("React to this message with a text")}));
 
     // TODO more see elements /help action
 
     return commands;
 }
-

src/commandmodel.h

@@ -21,11 +21,10 @@ struct Command {
     QString parameter;
     QString help;
 
-Q_GADGET
+    Q_GADGET
     Q_PROPERTY(QString command MEMBER command)
     Q_PROPERTY(QString parameter MEMBER parameter)
     Q_PROPERTY(QString help MEMBER help)
-
 };
 
 Q_DECLARE_METATYPE(Command)

src/controller.cpp

@@ -10,26 +10,27 @@
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KWindowConfig>
+#ifdef HAVE_WINDOWSYSTEM
+#include <KWindowEffects>
+#include <KWindowSystem>
+#endif
 
 #include <QAuthenticator>
 #include <QClipboard>
-#include <QCloseEvent>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QDir>
-#include <QElapsedTimer>
 #include <QFile>
 #include <QFileInfo>
+#include <QGuiApplication>
 #include <QMovie>
+#include <QNetworkConfigurationManager>
 #include <QNetworkReply>
 #include <QPixmap>
+#include <QQuickItem>
 #include <QQuickWindow>
 #include <QStandardPaths>
 #include <QStringBuilder>
 #include <QSysInfo>
 #include <QTimer>
 #include <utility>
-#include <QNetworkConfigurationManager>
 
 #include <signal.h>
 
@@ -38,19 +39,18 @@
 #include "csapi/joining.h"
 #include "csapi/logout.h"
 #include "csapi/profile.h"
-#include "csapi/registration.h"
-#include "csapi/wellknown.h"
 #include "events/eventcontent.h"
-#include "events/roommessageevent.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
+#include "roommanager.h"
 #include "settings.h"
-#include "utils.h"
 #include <KStandardShortcut>
 
-#ifndef Q_OS_ANDROID
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
+#elif !defined(Q_OS_ANDROID)
+#include "trayicon_sni.h"
 #endif
 
 using namespace Quotient;
@@ -62,12 +62,32 @@ Controller::Controller(QObject *parent)
     Connection::setRoomType<NeoChatRoom>();
     Connection::setUserType<NeoChatUser>();
 
+    connect(this, &Controller::connectionAdded, this, [=, this](Connection *connection) {
+        connection->getTurnServers();
+
+        connect(connection, &Connection::turnServersChanged, this, [=, this](const QJsonObject &data) {
+            m_turnServers[connection->userId()].clear();
+            const auto username = QUrl::toPercentEncoding(data["username"].toString());
+            const auto password = QUrl::toPercentEncoding(data["password"].toString());
+            const auto ttl = data["ttl"].toInt();
+            for (const auto &uri : data["uris"].toArray()) {
+                const auto parts = uri.toString().split(":");
+                const auto port = parts[2].split("?")[0];
+                m_turnServers[connection->userId()] +=
+                    parts[0] + QStringLiteral("://") + username + QStringLiteral(":") + password + QStringLiteral("@") + parts[1] + QStringLiteral(":") + port;
+            }
+            QTimer::singleShot(1000 * ttl, this, [this, connection]() {
+                connection->getTurnServers();
+            });
+        });
+    });
+
 #ifndef Q_OS_ANDROID
     TrayIcon *trayIcon = new TrayIcon(this);
     if (NeoChatConfig::self()->systemTray()) {
         trayIcon->show();
         connect(trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
-        QApplication::setQuitOnLastWindowClosed(false);
+        QGuiApplication::setQuitOnLastWindowClosed(false);
     }
     connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, [=]() {
         if (NeoChatConfig::self()->systemTray()) {
@@ -77,7 +97,7 @@ Controller::Controller(QObject *parent)
             trayIcon->hide();
             disconnect(trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
         }
-        QApplication::setQuitOnLastWindowClosed(!NeoChatConfig::self()->systemTray());
+        QGuiApplication::setQuitOnLastWindowClosed(!NeoChatConfig::self()->systemTray());
     });
 #endif
 
@@ -85,7 +105,7 @@ Controller::Controller(QObject *parent)
         invokeLogin();
     });
 
-    QObject::connect(QApplication::instance(), &QCoreApplication::aboutToQuit, QApplication::instance(), [] {
+    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [] {
         NeoChatConfig::self()->save();
     });
 
@@ -113,8 +133,7 @@ Controller::Controller(QObject *parent)
     }
 #endif
 
-    connect(m_mgr, &QNetworkConfigurationManager::onlineStateChanged,
-            this, &Controller::isOnlineChanged);
+    connect(m_mgr, &QNetworkConfigurationManager::onlineStateChanged, this, &Controller::isOnlineChanged);
 }
 
 Controller::~Controller()
@@ -145,7 +164,7 @@ void Controller::loginWithAccessToken(const QString &serverAddr, const QString &
 
     QUrl serverUrl(serverAddr);
 
-    auto conn = new Connection(this);
+    auto conn = new Connection();
     if (serverUrl.isValid()) {
         conn->setHomeserver(serverUrl);
     }
@@ -153,7 +172,6 @@ void Controller::loginWithAccessToken(const QString &serverAddr, const QString &
     connect(conn, &Connection::connected, this, [=] {
         AccountSettings account(conn->userId());
         account.setKeepLoggedIn(true);
-        account.clearAccessToken(); // Drop the legacy - just in case
         account.setHomeserver(conn->homeserver());
         account.setDeviceId(conn->deviceId());
         account.setDeviceName(deviceName);
@@ -167,7 +185,7 @@ void Controller::loginWithAccessToken(const QString &serverAddr, const QString &
     connect(conn, &Connection::networkError, this, [=](QString error, const QString &, int, int) {
         Q_EMIT errorOccured(i18n("Network Error: %1", error));
     });
-    conn->connectWithToken(user, token, deviceName);
+    conn->assumeIdentity(user, token, deviceName);
 }
 
 void Controller::logout(Connection *conn, bool serverSideLogout)
@@ -262,13 +280,13 @@ void Controller::invokeLogin()
         if (!account.homeserver().isEmpty()) {
             auto accessToken = loadAccessTokenFromKeyChain(account);
 
-            auto connection = new Connection(account.homeserver(), this);
+            auto connection = new Connection(account.homeserver());
             connect(connection, &Connection::connected, this, [=] {
                 connection->loadState();
                 addConnection(connection);
                 if (connection->userId() == id) {
                     setActiveConnection(connection);
-                    Q_EMIT initiated();
+                    connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
                 }
             });
             connect(connection, &Connection::loginError, this, [=](const QString &error, const QString &) {
@@ -284,7 +302,7 @@ void Controller::invokeLogin()
             connect(connection, &Connection::networkError, this, [=](const QString &error, const QString &, int, int) {
                 Q_EMIT errorOccured(i18n("Network Error: %1", error));
             });
-            connection->connectWithToken(account.userId(), accessToken, account.deviceId());
+            connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
         }
     }
     if (accounts.isEmpty()) {
@@ -393,7 +411,7 @@ void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
     auto job = conn->uploadFile(localFile.toLocalFile());
 #ifdef QUOTIENT_07
-    if(isJobPending(job)) {
+    if (isJobPending(job)) {
 #else
     if (isJobRunning(job)) {
 #endif
@@ -427,7 +445,8 @@ bool Controller::supportSystemTray() const
 #ifdef Q_OS_ANDROID
     return false;
 #else
-    return true;
+    QString de = getenv("XDG_CURRENT_DESKTOP");
+    return de != QStringLiteral("GNOME") && de != QStringLiteral("Pantheon");
 #endif
 }
 
@@ -464,7 +483,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
     User *localUser = connection->user();
     QString decoded = avatarSource.path();
     if (decoded.isEmpty()) {
-        connection->callApi<SetAvatarUrlJob>(localUser->id(), "");
+#ifdef QUOTIENT_07
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+#else
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), QString());
+#endif
         return true;
     }
     if (QImageReader(decoded).read().isNull()) {
@@ -475,7 +498,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
 }
 
 NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), QStringLiteral("/_matrix/client/r0") % "/account/password")
+#ifdef QUOTIENT_07
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
+#else
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), QStringLiteral("/_matrix/client/r0/account/password"))
+#endif
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_password"), newPassword);
@@ -496,13 +523,13 @@ int Controller::accountCount() const
 
 bool Controller::quitOnLastWindowClosed()
 {
-    return QApplication::quitOnLastWindowClosed();
+    return QGuiApplication::quitOnLastWindowClosed();
 }
 
 void Controller::setQuitOnLastWindowClosed(bool value)
 {
     if (quitOnLastWindowClosed() != value) {
-        QApplication::setQuitOnLastWindowClosed(value);
+        QGuiApplication::setQuitOnLastWindowClosed(value);
         Q_EMIT quitOnLastWindowClosedChanged();
     }
 }
@@ -554,7 +581,11 @@ void Controller::saveWindowGeometry(QQuickWindow *window)
 }
 
 NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+#else
     : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId))
+#endif
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -574,6 +605,7 @@ bool Controller::isOnline() const
     return m_mgr->isOnline();
 }
 
+// TODO: Remove in favor of RoomManager::joinRoom
 void Controller::joinRoom(const QString &alias)
 {
     if (!alias.contains(":")) {
@@ -582,22 +614,59 @@ void Controller::joinRoom(const QString &alias)
     }
 
     const auto knownServer = alias.mid(alias.indexOf(":") + 1);
-    auto joinRoomJob = m_connection->joinRoom(alias, QStringList{knownServer});
+    RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
+}
 
-    connect(joinRoomJob, &JoinRoomJob::failure, [=] {
-        Q_EMIT errorOccured(i18n("Server error when joining the room \"%1\": %2", joinRoomJob->errorString()));
-    });
-    connect(joinRoomJob, &JoinRoomJob::success, [this, joinRoomJob] {
-        Q_EMIT errorOccured(joinRoomJob->roomId());
-    });
+void Controller::openOrCreateDirectChat(NeoChatUser *user)
+{
+    const auto existing = activeConnection()->directChats();
+
+    if (existing.contains(user)) {
+        RoomManager::instance().enterRoom(static_cast<NeoChatRoom *>(activeConnection()->room(existing.value(user))));
+        return;
+    }
+    activeConnection()->requestDirectChat(user);
 }
 
 QString Controller::formatByteSize(double size, int precision) const
 {
-    return KFormat().formatByteSize(size, precision);
+    return QLocale().formattedDataSize(size, precision);
 }
 
 QString Controller::formatDuration(quint64 msecs, KFormat::DurationFormatOptions options) const
 {
     return KFormat().formatDuration(msecs, options);
 }
+
+void Controller::setBlur(QQuickItem *item, bool blur)
+{
+#ifdef HAVE_WINDOWSYSTEM
+    auto setWindows = [item, blur]() {
+        auto reg = QRect(QPoint(0, 0), item->window()->size());
+        KWindowEffects::enableBackgroundContrast(item->window(), blur, 1, 1, 1, reg);
+        KWindowEffects::enableBlurBehind(item->window(), blur, reg);
+    };
+
+    disconnect(item->window(), &QQuickWindow::heightChanged, this, nullptr);
+    disconnect(item->window(), &QQuickWindow::widthChanged, this, nullptr);
+    connect(item->window(), &QQuickWindow::heightChanged, this, setWindows);
+    connect(item->window(), &QQuickWindow::widthChanged, this, setWindows);
+    setWindows();
+#endif
+}
+
+void Controller::raiseWindow(QWindow *window)
+{
+#ifdef HAVE_WINDOWSYSTEM
+    KWindowSystem::activateWindow(window->winId());
+#endif
+}
+
+bool Controller::hasWindowSystem() const
+{
+#ifdef HAVE_WINDOWSYSTEM
+    return true;
+#else
+    return false;
+#endif
+}

src/controller.h

@@ -3,10 +3,9 @@
 
 #pragma once
 
-#include <QApplication>
 #include <QMediaPlayer>
-#include <QMenu>
 #include <QObject>
+#include <QQuickItem>
 
 #include <KAboutData>
 #include <KFormat>
@@ -21,6 +20,7 @@ class QNetworkConfigurationManager;
 #include "user.h"
 
 class NeoChatRoom;
+class NeoChatUser;
 class QQuickWindow;
 
 using namespace Quotient;
@@ -34,6 +34,7 @@ class Controller : public QObject
     Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
     Q_PROPERTY(KAboutData aboutData READ aboutData WRITE setAboutData NOTIFY aboutDataChanged)
     Q_PROPERTY(bool supportSystemTray READ supportSystemTray CONSTANT)
+    Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT)
     Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
 
 public:
@@ -86,6 +87,12 @@ public:
 
     Q_INVOKABLE QString formatDuration(quint64 msecs, KFormat::DurationFormatOptions options = KFormat::DefaultDuration) const;
     Q_INVOKABLE QString formatByteSize(double size, int precision = 1) const;
+
+    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);
+
+    Q_INVOKABLE void setBlur(QQuickItem *item, bool blur);
+    Q_INVOKABLE void raiseWindow(QWindow *window);
+
 private:
     explicit Controller(QObject *parent = nullptr);
     ~Controller() override;
@@ -101,6 +108,7 @@ private:
     void saveSettings() const;
 
     KAboutData m_aboutData;
+    bool hasWindowSystem() const;
 
 private Q_SLOTS:
     void invokeLogin();
@@ -137,6 +145,7 @@ public Q_SLOTS:
 
 private:
     QNetworkConfigurationManager *m_mgr;
+    QHash<QString, QSet<QString>> m_turnServers; // userId -> List of TURN servers in the format that gstreamer needs
 };
 
 // TODO libQuotient 0.7: Drop

src/customemojimodel+network.cpp

@@ -0,0 +1,102 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <csapi/account-data.h>
+#include <csapi/content-repo.h>
+#include <csapi/profile.h>
+
+#include "customemojimodel_p.h"
+
+#ifdef QUOTIENT_07
+#define running isJobPending
+#else
+#define running isJobRunning
+#endif
+
+void CustomEmojiModel::fetchEmojies()
+{
+    if (d->conn == nullptr) {
+        return;
+    }
+
+    const auto &data = d->conn->accountData("im.ponies.user_emotes");
+    if (data == nullptr) {
+        return;
+    }
+    QJsonObject emojies = data->contentJson()["images"].toObject();
+
+    // TODO: Remove with stable migration
+    const auto legacyEmojies = data->contentJson()["emoticons"].toObject();
+    for (const auto &emoji : legacyEmojies.keys()) {
+        if (!emojies.contains(emoji)) {
+            emojies[emoji] = legacyEmojies[emoji];
+        }
+    }
+
+    beginResetModel();
+    d->emojies.clear();
+
+    for (const auto &emoji : emojies.keys()) {
+        const auto &data = emojies[emoji];
+
+        const auto e = emoji.startsWith(":") ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));
+
+        d->emojies << CustomEmoji{e, data.toObject()["url"].toString(), QRegularExpression(QStringLiteral(R"((^|[^\\]))") + e)};
+    }
+
+    endResetModel();
+}
+
+void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
+{
+    using namespace Quotient;
+
+    auto job = d->conn->uploadFile(location.toLocalFile());
+
+    if (running(job)) {
+        connect(job, &BaseJob::success, this, [this, name, job] {
+            const auto &data = d->conn->accountData("im.ponies.user_emotes");
+            auto json = data != nullptr ? data->contentJson() : QJsonObject();
+            auto emojiData = json["images"].toObject();
+            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
+#ifdef QUOTIENT_07
+                {QStringLiteral("url"), job->contentUri().toString()}
+#else
+                {QStringLiteral("url"), job->contentUri()}
+#endif
+            });
+            json["images"] = emojiData;
+            d->conn->setAccountData("im.ponies.user_emotes", json);
+        });
+    }
+}
+
+void CustomEmojiModel::removeEmoji(const QString &name)
+{
+    using namespace Quotient;
+
+    const auto &data = d->conn->accountData("im.ponies.user_emotes");
+    Q_ASSERT(data != nullptr); // something's screwed if we get here with a nullptr
+    auto json = data->contentJson();
+    const QString _name = name.mid(1).chopped(1);
+    auto emojiData = json["images"].toObject();
+
+    if (emojiData.contains(name)) {
+        emojiData.remove(name);
+        json["images"] = emojiData;
+    }
+    if (emojiData.contains(_name)) {
+        emojiData.remove(_name);
+        json["images"] = emojiData;
+    }
+    emojiData = json["emoticons"].toObject();
+    if (emojiData.contains(name)) {
+        emojiData.remove(name);
+        json["emoticons"] = emojiData;
+    }
+    if (emojiData.contains(_name)) {
+        emojiData.remove(_name);
+        json["emoticons"] = emojiData;
+    }
+    d->conn->setAccountData("im.ponies.user_emotes", json);
+}

src/customemojimodel.cpp

@@ -0,0 +1,111 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "customemojimodel_p.h"
+#include "emojimodel.h"
+
+enum Roles {
+    Name,
+    ImageURL,
+    ModelData, // for emulating the regular emoji model's usage, otherwise the UI code would get too complicated
+};
+
+CustomEmojiModel::CustomEmojiModel(QObject *parent)
+    : QAbstractListModel(parent)
+    , d(new Private)
+{
+    connect(this, &CustomEmojiModel::connectionChanged, this, &CustomEmojiModel::fetchEmojies);
+    connect(this, &CustomEmojiModel::connectionChanged, this, [this]() {
+        if (!d->conn)
+            return;
+
+        connect(d->conn, &Connection::accountDataChanged, this, [this](const QString &id) {
+            if (id != QStringLiteral("im.ponies.user_emotes")) {
+                return;
+            }
+            fetchEmojies();
+        });
+    });
+}
+
+CustomEmojiModel::~CustomEmojiModel()
+{
+}
+
+QVariant CustomEmojiModel::data(const QModelIndex &idx, int role) const
+{
+    const auto row = idx.row();
+    if (row >= d->emojies.length()) {
+        return QVariant();
+    }
+    const auto &data = d->emojies[row];
+
+    switch (Roles(role)) {
+    case Roles::ModelData:
+        return QVariant::fromValue(Emoji(QStringLiteral("image://mxc/") + data.url.mid(6), data.name, true));
+    case Roles::Name:
+        return data.name;
+    case Roles::ImageURL:
+        return QUrl(QStringLiteral("image://mxc/") + data.url.mid(6));
+    }
+
+    return QVariant();
+}
+
+int CustomEmojiModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+
+    return d->emojies.length();
+}
+
+QHash<int, QByteArray> CustomEmojiModel::roleNames() const
+{
+    return {
+        {Name, "name"},
+        {ImageURL, "imageURL"},
+        {ModelData, "modelData"},
+    };
+}
+
+Connection *CustomEmojiModel::connection() const
+{
+    return d->conn;
+}
+
+void CustomEmojiModel::setConnection(Connection *it)
+{
+    if (d->conn == it) {
+        return;
+    }
+    if (d->conn != nullptr) {
+        disconnect(d->conn, nullptr, this, nullptr);
+    }
+    d->conn = it;
+    Q_EMIT connectionChanged();
+}
+
+QString CustomEmojiModel::preprocessText(const QString &it)
+{
+    auto cp = it;
+    for (const auto &emoji : qAsConst(d->emojies)) {
+        cp.replace(
+            emoji.regexp,
+            QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url, emoji.name));
+    }
+    return cp;
+}
+
+QVariantList CustomEmojiModel::filterModel(const QString &filter)
+{
+    QVariantList results;
+    for (const auto &emoji : qAsConst(d->emojies)) {
+        if (results.length() >= 10)
+            break;
+        if (!emoji.name.contains(filter, Qt::CaseInsensitive))
+            continue;
+
+        results << QVariant::fromValue(Emoji(QStringLiteral("image://mxc/") + emoji.url.mid(6), emoji.name, true));
+    }
+    return results;
+}

src/customemojimodel.h

@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+
+#include <memory>
+
+#include "connection.h"
+
+using namespace Quotient;
+
+class CustomEmojiModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+
+public:
+    // constructors
+
+    explicit CustomEmojiModel(QObject *parent = nullptr);
+    ~CustomEmojiModel();
+
+    // model
+
+    QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    QHash<int, QByteArray> roleNames() const override;
+
+    // property setters
+
+    Connection *connection() const;
+    void setConnection(Connection *it);
+    Q_SIGNAL void connectionChanged();
+
+    // QML functions
+
+    Q_INVOKABLE QString preprocessText(const QString &it);
+    Q_INVOKABLE QVariantList filterModel(const QString &filter);
+    Q_INVOKABLE void addEmoji(const QString &name, const QUrl &location);
+    Q_INVOKABLE void removeEmoji(const QString &name);
+
+private:
+    struct Private;
+    std::unique_ptr<Private> d;
+
+    void fetchEmojies();
+};