aboutsummaryrefslogtreecommitdiff
path: root/lib/user.cpp
diff options
context:
space:
mode:
authorMarc Deop <marc@marcdeop.com>2019-03-02 12:26:57 +0100
committerMarc Deop <marc@marcdeop.com>2019-03-02 12:26:57 +0100
commitaacc4bcb4a487871daae6717f77605aaba444341 (patch)
tree4f50b6874821667ccb6b91c017e5d041e3846112 /lib/user.cpp
parentc971b924cd62822ed6fb1a0291c483ae73a3ecda (diff)
downloadlibquotient-aacc4bcb4a487871daae6717f77605aaba444341.tar.gz
libquotient-aacc4bcb4a487871daae6717f77605aaba444341.zip
style: apply .clang-format to all .cpp and .h files
Diffstat (limited to 'lib/user.cpp')
-rw-r--r--lib/user.cpp232
1 files changed, 100 insertions, 132 deletions
diff --git a/lib/user.cpp b/lib/user.cpp
index eec41957..43792e74 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -13,25 +13,25 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "user.h"
-#include "connection.h"
-#include "room.h"
#include "avatar.h"
+#include "connection.h"
+#include "csapi/content-repo.h"
+#include "csapi/profile.h"
+#include "csapi/room_state.h"
#include "events/event.h"
#include "events/roommemberevent.h"
-#include "csapi/room_state.h"
-#include "csapi/profile.h"
-#include "csapi/content-repo.h"
+#include "room.h"
-#include <QtCore/QTimer>
-#include <QtCore/QRegularExpression>
+#include <QtCore/QElapsedTimer>
#include <QtCore/QPointer>
+#include <QtCore/QRegularExpression>
#include <QtCore/QStringBuilder>
-#include <QtCore/QElapsedTimer>
+#include <QtCore/QTimer>
#include <functional>
@@ -42,42 +42,38 @@ using std::move;
class User::Private
{
public:
- static Avatar makeAvatar(QUrl url)
- {
- return Avatar(move(url));
- }
+ static Avatar makeAvatar(QUrl url) { return Avatar(move(url)); }
- Private(QString userId, Connection* connection)
- : userId(move(userId)), connection(connection)
- { }
-
- QString userId;
- Connection* connection;
-
- QString bridged;
- QString mostUsedName;
- QMultiHash<QString, const Room*> otherNames;
- Avatar mostUsedAvatar { makeAvatar({}) };
- std::vector<Avatar> otherAvatars;
- auto otherAvatar(QUrl url)
- {
- return std::find_if(otherAvatars.begin(), otherAvatars.end(),
- [&url] (const auto& av) { return av.url() == url; });
- }
- QMultiHash<QUrl, const Room*> avatarsToRooms;
+ Private(QString userId, Connection* connection)
+ : userId(move(userId)), connection(connection)
+ {
+ }
- mutable int totalRooms = 0;
+ QString userId;
+ Connection* connection;
- QString nameForRoom(const Room* r, const QString& hint = {}) const;
- void setNameForRoom(const Room* r, QString newName, QString oldName);
- QUrl avatarUrlForRoom(const Room* r, const QUrl& hint = {}) const;
- void setAvatarForRoom(const Room* r, const QUrl& newUrl,
- const QUrl& oldUrl);
+ QString bridged;
+ QString mostUsedName;
+ QMultiHash<QString, const Room*> otherNames;
+ Avatar mostUsedAvatar { makeAvatar({}) };
+ std::vector<Avatar> otherAvatars;
+ auto otherAvatar(QUrl url)
+ {
+ return std::find_if(otherAvatars.begin(), otherAvatars.end(),
+ [&url](const auto& av) { return av.url() == url; });
+ }
+ QMultiHash<QUrl, const Room*> avatarsToRooms;
- void setAvatarOnServer(QString contentUri, User* q);
+ mutable int totalRooms = 0;
-};
+ QString nameForRoom(const Room* r, const QString& hint = {}) const;
+ void setNameForRoom(const Room* r, QString newName, QString oldName);
+ QUrl avatarUrlForRoom(const Room* r, const QUrl& hint = {}) const;
+ void setAvatarForRoom(const Room* r, const QUrl& newUrl,
+ const QUrl& oldUrl);
+ void setAvatarOnServer(QString contentUri, User* q);
+};
QString User::Private::nameForRoom(const Room* r, const QString& hint) const
{
@@ -94,30 +90,27 @@ void User::Private::setNameForRoom(const Room* r, QString newName,
{
Q_ASSERT(oldName != newName);
Q_ASSERT(oldName == mostUsedName || otherNames.contains(oldName, r));
- if (totalRooms < 2)
- {
+ if (totalRooms < 2) {
Q_ASSERT_X(totalRooms > 0 && otherNames.empty(), __FUNCTION__,
"Internal structures inconsistency");
mostUsedName = move(newName);
return;
}
otherNames.remove(oldName, r);
- if (newName != mostUsedName)
- {
+ if (newName != mostUsedName) {
// Check if the newName is about to become most used.
- if (otherNames.count(newName) >= totalRooms - otherNames.size())
- {
+ if (otherNames.count(newName) >= totalRooms - otherNames.size()) {
Q_ASSERT(totalRooms > 1);
QElapsedTimer et;
- if (totalRooms > MIN_JOINED_ROOMS_TO_LOG)
- {
- qCDebug(MAIN) << "Switching the most used name of user" << userId
- << "from" << mostUsedName << "to" << newName;
+ if (totalRooms > MIN_JOINED_ROOMS_TO_LOG) {
+ qCDebug(MAIN)
+ << "Switching the most used name of user" << userId
+ << "from" << mostUsedName << "to" << newName;
qCDebug(MAIN) << "The user is in" << totalRooms << "rooms";
et.start();
}
- for (auto* r1: connection->roomMap())
+ for (auto* r1 : connection->roomMap())
if (nameForRoom(r1) == mostUsedName)
otherNames.insert(mostUsedName, r1);
@@ -125,8 +118,7 @@ void User::Private::setNameForRoom(const Room* r, QString newName,
otherNames.remove(newName);
if (totalRooms > MIN_JOINED_ROOMS_TO_LOG)
qCDebug(PROFILER) << et << "to switch the most used name";
- }
- else
+ } else
otherNames.insert(newName, r);
}
}
@@ -144,40 +136,37 @@ void User::Private::setAvatarForRoom(const Room* r, const QUrl& newUrl,
const QUrl& oldUrl)
{
Q_ASSERT(oldUrl != newUrl);
- Q_ASSERT(oldUrl == mostUsedAvatar.url() ||
- avatarsToRooms.contains(oldUrl, r));
- if (totalRooms < 2)
- {
+ Q_ASSERT(oldUrl == mostUsedAvatar.url()
+ || avatarsToRooms.contains(oldUrl, r));
+ if (totalRooms < 2) {
Q_ASSERT_X(totalRooms > 0 && otherAvatars.empty(), __FUNCTION__,
"Internal structures inconsistency");
mostUsedAvatar.updateUrl(newUrl);
return;
}
avatarsToRooms.remove(oldUrl, r);
- if (!avatarsToRooms.contains(oldUrl))
- {
+ if (!avatarsToRooms.contains(oldUrl)) {
auto it = otherAvatar(oldUrl);
if (it != otherAvatars.end())
otherAvatars.erase(it);
}
- if (newUrl != mostUsedAvatar.url())
- {
+ if (newUrl != mostUsedAvatar.url()) {
// Check if the new avatar is about to become most used.
- if (avatarsToRooms.count(newUrl) >= totalRooms - avatarsToRooms.size())
- {
+ if (avatarsToRooms.count(newUrl)
+ >= totalRooms - avatarsToRooms.size()) {
QElapsedTimer et;
- if (totalRooms > MIN_JOINED_ROOMS_TO_LOG)
- {
- qCDebug(MAIN) << "Switching the most used avatar of user" << userId
- << "from" << mostUsedAvatar.url().toDisplayString()
- << "to" << newUrl.toDisplayString();
+ if (totalRooms > MIN_JOINED_ROOMS_TO_LOG) {
+ qCDebug(MAIN)
+ << "Switching the most used avatar of user" << userId
+ << "from" << mostUsedAvatar.url().toDisplayString()
+ << "to" << newUrl.toDisplayString();
et.start();
}
avatarsToRooms.remove(newUrl);
auto nextMostUsedIt = otherAvatar(newUrl);
Q_ASSERT(nextMostUsedIt != otherAvatars.end());
std::swap(mostUsedAvatar, *nextMostUsedIt);
- for (const auto* r1: connection->roomMap())
+ for (const auto* r1 : connection->roomMap())
if (avatarUrlForRoom(r1) == nextMostUsedIt->url())
avatarsToRooms.insert(nextMostUsedIt->url(), r1);
@@ -205,29 +194,23 @@ Connection* User::connection() const
User::~User() = default;
-QString User::id() const
-{
- return d->userId;
-}
+QString User::id() const { return d->userId; }
bool User::isGuest() const
{
Q_ASSERT(!d->userId.isEmpty() && d->userId.startsWith('@'));
auto it = std::find_if_not(d->userId.begin() + 1, d->userId.end(),
- [] (QChar c) { return c.isDigit(); });
+ [](QChar c) { return c.isDigit(); });
Q_ASSERT(it != d->userId.end());
return *it == ':';
}
-QString User::name(const Room* room) const
-{
- return d->nameForRoom(room);
-}
+QString User::name(const Room* room) const { return d->nameForRoom(room); }
QString User::rawName(const Room* room) const
{
- return d->bridged.isEmpty() ? name(room) :
- name(room) % " (" % d->bridged % ')';
+ return d->bridged.isEmpty() ? name(room)
+ : name(room) % " (" % d->bridged % ')';
}
void User::updateName(const QString& newName, const Room* room)
@@ -238,9 +221,9 @@ void User::updateName(const QString& newName, const Room* room)
void User::updateName(const QString& newName, const QString& oldName,
const Room* room)
{
- Q_ASSERT(oldName == d->mostUsedName || d->otherNames.contains(oldName, room));
- if (newName != oldName)
- {
+ Q_ASSERT(oldName == d->mostUsedName
+ || d->otherNames.contains(oldName, room));
+ if (newName != oldName) {
emit nameAboutToChange(newName, oldName, room);
d->setNameForRoom(room, newName, oldName);
setObjectName(displayname());
@@ -251,15 +234,13 @@ void User::updateName(const QString& newName, const QString& oldName,
void User::updateAvatarUrl(const QUrl& newUrl, const QUrl& oldUrl,
const Room* room)
{
- Q_ASSERT(oldUrl == d->mostUsedAvatar.url() ||
- d->avatarsToRooms.contains(oldUrl, room));
- if (newUrl != oldUrl)
- {
+ Q_ASSERT(oldUrl == d->mostUsedAvatar.url()
+ || d->avatarsToRooms.contains(oldUrl, room));
+ if (newUrl != oldUrl) {
d->setAvatarForRoom(room, newUrl, oldUrl);
setObjectName(displayname());
emit avatarChanged(this, room);
}
-
}
void User::rename(const QString& newName)
@@ -270,8 +251,7 @@ void User::rename(const QString& newName)
void User::rename(const QString& newName, const Room* r)
{
- if (!r)
- {
+ if (!r) {
qCWarning(MAIN) << "Passing a null room to two-argument User::rename()"
"is incorrect; client developer, please fix it";
rename(newName);
@@ -287,35 +267,25 @@ void User::rename(const QString& newName, const Room* r)
bool User::setAvatar(const QString& fileName)
{
- return avatarObject().upload(connection(), fileName,
- std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
+ return avatarObject().upload(
+ connection(), fileName,
+ std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
}
bool User::setAvatar(QIODevice* source)
{
- return avatarObject().upload(connection(), source,
- std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
+ return avatarObject().upload(
+ connection(), source,
+ std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
}
-void User::requestDirectChat()
-{
- connection()->requestDirectChat(this);
-}
+void User::requestDirectChat() { connection()->requestDirectChat(this); }
-void User::ignore()
-{
- connection()->addToIgnoredUsers(this);
-}
+void User::ignore() { connection()->addToIgnoredUsers(this); }
-void User::unmarkIgnore()
-{
- connection()->removeFromIgnoredUsers(this);
-}
+void User::unmarkIgnore() { connection()->removeFromIgnoredUsers(this); }
-bool User::isIgnored() const
-{
- return connection()->isIgnored(this);
-}
+bool User::isIgnored() const { return connection()->isIgnored(this); }
void User::Private::setAvatarOnServer(QString contentUri, User* q)
{
@@ -339,10 +309,7 @@ QString User::fullName(const Room* room) const
return name.isEmpty() ? d->userId : name % " (" % d->userId % ')';
}
-QString User::bridged() const
-{
- return d->bridged;
-}
+QString User::bridged() const { return d->bridged; }
const Avatar& User::avatarObject(const Room* room) const
{
@@ -357,14 +324,16 @@ QImage User::avatar(int dimension, const Room* room)
QImage User::avatar(int width, int height, const Room* room)
{
- return avatar(width, height, room, []{});
+ return avatar(width, height, room, [] {});
}
QImage User::avatar(int width, int height, const Room* room,
const Avatar::get_callback_t& callback)
{
- return avatarObject(room).get(d->connection, width, height,
- [=] { emit avatarChanged(this, room); callback(); });
+ return avatarObject(room).get(d->connection, width, height, [=] {
+ emit avatarChanged(this, room);
+ callback();
+ });
}
QString User::avatarMediaId(const Room* room) const
@@ -380,13 +349,13 @@ QUrl User::avatarUrl(const Room* room) const
void User::processEvent(const RoomMemberEvent& event, const Room* room)
{
Q_ASSERT(room);
- if (event.membership() != MembershipType::Invite &&
- event.membership() != MembershipType::Join)
+ if (event.membership() != MembershipType::Invite
+ && event.membership() != MembershipType::Join)
return;
- auto aboutToEnter = room->memberJoinState(this) == JoinState::Leave &&
- (event.membership() == MembershipType::Join ||
- event.membership() == MembershipType::Invite);
+ auto aboutToEnter = room->memberJoinState(this) == JoinState::Leave
+ && (event.membership() == MembershipType::Join
+ || event.membership() == MembershipType::Invite);
if (aboutToEnter)
++d->totalRooms;
@@ -399,26 +368,25 @@ void User::processEvent(const RoomMemberEvent& event, const Room* room)
// bridge tags are not supported at all.
QRegularExpression reSuffix(" \\((IRC|Gitter|Telegram)\\)$");
auto match = reSuffix.match(newName);
- if (match.hasMatch())
- {
- if (d->bridged != match.captured(1))
- {
+ if (match.hasMatch()) {
+ if (d->bridged != match.captured(1)) {
if (!d->bridged.isEmpty())
- qCWarning(MAIN) << "Bridge for user" << id() << "changed:"
- << d->bridged << "->" << match.captured(1);
+ qCWarning(MAIN)
+ << "Bridge for user" << id() << "changed:" << d->bridged
+ << "->" << match.captured(1);
d->bridged = match.captured(1);
}
newName.truncate(match.capturedStart(0));
}
- if (event.prevContent())
- {
+ if (event.prevContent()) {
// FIXME: the hint doesn't work for bridged users
auto oldNameHint =
d->nameForRoom(room, event.prevContent()->displayName);
updateName(newName, oldNameHint, room);
- updateAvatarUrl(event.avatarUrl(),
- d->avatarUrlForRoom(room, event.prevContent()->avatarUrl),
- room);
+ updateAvatarUrl(
+ event.avatarUrl(),
+ d->avatarUrlForRoom(room, event.prevContent()->avatarUrl),
+ room);
} else {
updateName(newName, room);
updateAvatarUrl(event.avatarUrl(), d->avatarUrlForRoom(room), room);