rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove dead code

This commit is contained in:
Konstantinos Sideris 2018-04-21 17:27:06 +03:00
parent 74ff905582
commit 9d825b07ca
11 changed files with 0 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -156,7 +156,6 @@ set(SRC_FILES
src/RegisterPage.cc
src/RoomInfoListItem.cc
src/RoomList.cc
src/RoomState.cc
src/RunGuard.cc
src/SideBarActions.cc
src/Splitter.cc

1
include/Cache.h
View File

@ -23,7 +23,6 @@
#include <lmdb++.h>
#include <mtx/responses.hpp>
#include "RoomState.h"
#include "Utils.h"
struct SearchResult

4
include/ChatPage.h
View File

@ -34,7 +34,6 @@ class MatrixClient;
class OverlayModal;
class QuickSwitcher;
class RoomList;
class RoomState;
class SideBarActions;
class Splitter;
class TextInputWidget;
@ -117,7 +116,6 @@ private:
static ChatPage *instance_;
using UserID = QString;
using RoomStates = std::map<UserID, QSharedPointer<RoomState>>;
using Membership = mtx::events::StateEvent<mtx::events::state::Member>;
using Memberships = std::map<std::string, Membership>;
@ -175,8 +173,6 @@ private:
UserInfoWidget *user_info_widget_;
RoomStates roomStates_;
std::map<QString, QSharedPointer<Community>> communities_;
// Keeps track of the users currently typing on each room.

1
include/RoomList.h
View File

@ -30,7 +30,6 @@ class LeaveRoomDialog;
class MatrixClient;
class OverlayModal;
class RoomInfoListItem;
class RoomState;
class Sync;
class UserSettings;
struct DescInfo;

52
include/RoomSettings.h
View File

@ -1,52 +0,0 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program 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) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <QSettings>
class RoomSettings
{
public:
RoomSettings(QString room_id)
{
path_ = QString("notifications/%1").arg(room_id);
isNotificationsEnabled_ = true;
QSettings settings;
if (settings.contains(path_))
isNotificationsEnabled_ = settings.value(path_).toBool();
else
settings.setValue(path_, isNotificationsEnabled_);
};
bool isNotificationsEnabled() { return isNotificationsEnabled_; };
void toggleNotifications()
{
isNotificationsEnabled_ = !isNotificationsEnabled_;
QSettings settings;
settings.setValue(path_, isNotificationsEnabled_);
}
private:
QString path_;
bool isNotificationsEnabled_;
};

121
include/RoomState.h
View File

@ -1,121 +0,0 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program 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) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <QJsonDocument>
#include <QPixmap>
#include <QUrl>
#include <mtx.hpp>
class RoomState
{
public:
RoomState() = default;
RoomState(const mtx::responses::Timeline &timeline);
RoomState(const mtx::responses::State &state);
// Calculate room data that are not immediatly accessible. Like room name and
// avatar.
//
// e.g If the room is 1-on-1 name and avatar should be extracted from a user.
void resolveName();
void resolveAvatar();
void parse(const nlohmann::json &object);
QUrl getAvatar() const { return avatar_; };
QString getName() const { return name_; };
QString getTopic() const
{
return QString::fromStdString(topic.content.topic).simplified();
};
void removeLeaveMemberships();
void update(const RoomState &state);
template<class Collection>
void updateFromEvents(const std::vector<Collection> &collection);
std::string serialize() const;
// The latest state events.
mtx::events::StateEvent<mtx::events::state::Aliases> aliases;
mtx::events::StateEvent<mtx::events::state::Avatar> avatar;
mtx::events::StateEvent<mtx::events::state::CanonicalAlias> canonical_alias;
mtx::events::StateEvent<mtx::events::state::Create> create;
mtx::events::StateEvent<mtx::events::state::HistoryVisibility> history_visibility;
mtx::events::StateEvent<mtx::events::state::JoinRules> join_rules;
mtx::events::StateEvent<mtx::events::state::Name> name;
mtx::events::StateEvent<mtx::events::state::PowerLevels> power_levels;
mtx::events::StateEvent<mtx::events::state::Topic> topic;
// Contains the m.room.member events for all the joined users.
using UserID = std::string;
std::map<UserID, mtx::events::StateEvent<mtx::events::state::Member>> memberships;
private:
QUrl avatar_;
QString name_;
// It defines the user whose avatar is used for the room. If the room has an
// avatar event this should be empty.
QString userAvatar_;
};
Q_DECLARE_METATYPE(RoomState)
template<class Collection>
void
RoomState::updateFromEvents(const std::vector<Collection> &collection)
{
using Aliases = mtx::events::StateEvent<mtx::events::state::Aliases>;
using Avatar = mtx::events::StateEvent<mtx::events::state::Avatar>;
using CanonicalAlias = mtx::events::StateEvent<mtx::events::state::CanonicalAlias>;
using Create = mtx::events::StateEvent<mtx::events::state::Create>;
using HistoryVisibility = mtx::events::StateEvent<mtx::events::state::HistoryVisibility>;
using JoinRules = mtx::events::StateEvent<mtx::events::state::JoinRules>;
using Member = mtx::events::StateEvent<mtx::events::state::Member>;
using Name = mtx::events::StateEvent<mtx::events::state::Name>;
using PowerLevels = mtx::events::StateEvent<mtx::events::state::PowerLevels>;
using Topic = mtx::events::StateEvent<mtx::events::state::Topic>;
for (const auto &event : collection) {
if (mpark::holds_alternative<Aliases>(event)) {
this->aliases = mpark::get<Aliases>(event);
} else if (mpark::holds_alternative<Avatar>(event)) {
this->avatar = mpark::get<Avatar>(event);
} else if (mpark::holds_alternative<CanonicalAlias>(event)) {
this->canonical_alias = mpark::get<CanonicalAlias>(event);
} else if (mpark::holds_alternative<Create>(event)) {
this->create = mpark::get<Create>(event);
} else if (mpark::holds_alternative<HistoryVisibility>(event)) {
this->history_visibility = mpark::get<HistoryVisibility>(event);
} else if (mpark::holds_alternative<JoinRules>(event)) {
this->join_rules = mpark::get<JoinRules>(event);
} else if (mpark::holds_alternative<Name>(event)) {
this->name = mpark::get<Name>(event);
} else if (mpark::holds_alternative<Member>(event)) {
auto membership = mpark::get<Member>(event);
memberships[membership.state_key] = membership;
} else if (mpark::holds_alternative<PowerLevels>(event)) {
this->power_levels = mpark::get<PowerLevels>(event);
} else if (mpark::holds_alternative<Topic>(event)) {
this->topic = mpark::get<Topic>(event);
}
}
}

1
src/Cache.cc
View File

@ -26,7 +26,6 @@
#include <variant.hpp>
#include "Cache.h"
#include "RoomState.h"
//! Should be changed when a breaking change occurs in the cache format.
//! This will reset client's data.

1
src/ChatPage.cc
View File

@ -29,7 +29,6 @@
#include "OverlayModal.h"
#include "QuickSwitcher.h"
#include "RoomList.h"
#include "RoomState.h"
#include "SideBarActions.h"
#include "Splitter.h"
#include "TextInputWidget.h"

1
src/RoomList.cc
View File

@ -26,7 +26,6 @@
#include "OverlayModal.h"
#include "RoomInfoListItem.h"
#include "RoomList.h"
#include "RoomState.h"
#include "UserSettingsPage.h"
RoomList::RoomList(QSharedPointer<MatrixClient> client,

302
src/RoomState.cc
View File

@ -1,302 +0,0 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program 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) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QDebug>
#include <QJsonArray>
#include <QJsonObject>
#include <QSettings>
#include "RoomState.h"
RoomState::RoomState(const mtx::responses::Timeline &timeline)
{
updateFromEvents(timeline.events);
}
RoomState::RoomState(const mtx::responses::State &state) { updateFromEvents(state.events); }
void
RoomState::resolveName()
{
name_ = "Empty Room";
userAvatar_.clear();
if (!name.content.name.empty()) {
name_ = QString::fromStdString(name.content.name).simplified();
return;
}
if (!canonical_alias.content.alias.empty()) {
name_ = QString::fromStdString(canonical_alias.content.alias).simplified();
return;
}
// FIXME: Doesn't follow the spec guidelines.
if (aliases.content.aliases.size() != 0) {
name_ = QString::fromStdString(aliases.content.aliases[0]).simplified();
return;
}
QSettings settings;
auto user_id = settings.value("auth/user_id").toString();
// TODO: Display names should be sorted alphabetically.
for (const auto membership : memberships) {
const auto stateKey = QString::fromStdString(membership.second.state_key);
if (stateKey == user_id) {
name_ = QString::fromStdString(membership.second.content.display_name);
if (name_.isEmpty())
name_ = stateKey;
userAvatar_ = stateKey;
continue;
}
if (membership.second.content.membership == mtx::events::state::Membership::Join ||
membership.second.content.membership ==
mtx::events::state::Membership::Invite) {
userAvatar_ = stateKey;
name_ = QString::fromStdString(membership.second.content.display_name);
if (name_.isEmpty())
name_ = stateKey;
// TODO: pluralization
if (memberships.size() > 2)
name_ = QString("%1 and %2 others")
.arg(name_)
.arg(memberships.size() - 2);
break;
}
}
}
void
RoomState::resolveAvatar()
{
if (userAvatar_.isEmpty()) {
avatar_ = QString::fromStdString(avatar.content.url);
return;
}
if (memberships.count(userAvatar_.toStdString()) != 0) {
avatar_ =
QString::fromStdString(memberships[userAvatar_.toStdString()].content.avatar_url);
} else {
qWarning() << "Setting room avatar from unknown user id" << userAvatar_;
}
}
// Should be used only after initial sync.
void
RoomState::removeLeaveMemberships()
{
for (auto it = memberships.cbegin(); it != memberships.cend();) {
if (it->second.content.membership == mtx::events::state::Membership::Leave) {
it = memberships.erase(it);
} else {
++it;
}
}
}
void
RoomState::update(const RoomState &state)
{
bool needsNameCalculation = false;
bool needsAvatarCalculation = false;
if (aliases.event_id != state.aliases.event_id)
aliases = state.aliases;
if (avatar.event_id != state.avatar.event_id) {
avatar = state.avatar;
needsAvatarCalculation = true;
}
if (canonical_alias.event_id != state.canonical_alias.event_id) {
canonical_alias = state.canonical_alias;
needsNameCalculation = true;
}
if (create.event_id != state.create.event_id)
create = state.create;
if (history_visibility.event_id != state.history_visibility.event_id)
history_visibility = state.history_visibility;
if (join_rules.event_id != state.join_rules.event_id)
join_rules = state.join_rules;
if (name.event_id != state.name.event_id) {
name = state.name;
needsNameCalculation = true;
}
if (power_levels.event_id != state.power_levels.event_id)
power_levels = state.power_levels;
if (topic.event_id != state.topic.event_id)
topic = state.topic;
for (auto it = state.memberships.cbegin(); it != state.memberships.cend(); ++it) {
auto membershipState = it->second.content.membership;
if (it->first == userAvatar_.toStdString()) {
needsNameCalculation = true;
needsAvatarCalculation = true;
}
if (membershipState == mtx::events::state::Membership::Leave)
this->memberships.erase(it->first);
else
this->memberships.emplace(it->first, it->second);
}
if (needsNameCalculation)
resolveName();
if (needsAvatarCalculation)
resolveAvatar();
}
std::string
RoomState::serialize() const
{
nlohmann::json obj;
if (!aliases.event_id.empty())
obj["aliases"] = aliases;
if (!avatar.event_id.empty())
obj["avatar"] = avatar;
if (!canonical_alias.event_id.empty())
obj["canonical_alias"] = canonical_alias;
if (!create.event_id.empty())
obj["create"] = create;
if (!history_visibility.event_id.empty())
obj["history_visibility"] = history_visibility;
if (!join_rules.event_id.empty())
obj["join_rules"] = join_rules;
if (!name.event_id.empty())
obj["name"] = name;
if (!power_levels.event_id.empty())
obj["power_levels"] = power_levels;
if (!topic.event_id.empty())
obj["topic"] = topic;
return obj.dump();
}
void
RoomState::parse(const nlohmann::json &object)
{
if (object.count("aliases") != 0) {
try {
aliases = object.at("aliases")
.get<mtx::events::StateEvent<mtx::events::state::Aliases>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - aliases" << e.what();
}
}
if (object.count("avatar") != 0) {
try {
avatar = object.at("avatar")
.get<mtx::events::StateEvent<mtx::events::state::Avatar>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - avatar" << e.what();
}
}
if (object.count("canonical_alias") != 0) {
try {
canonical_alias =
object.at("canonical_alias")
.get<mtx::events::StateEvent<mtx::events::state::CanonicalAlias>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - canonical_alias" << e.what();
}
}
if (object.count("create") != 0) {
try {
create = object.at("create")
.get<mtx::events::StateEvent<mtx::events::state::Create>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - create" << e.what();
}
}
if (object.count("history_visibility") != 0) {
try {
history_visibility =
object.at("history_visibility")
.get<mtx::events::StateEvent<mtx::events::state::HistoryVisibility>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - history_visibility" << e.what();
}
}
if (object.count("join_rules") != 0) {
try {
join_rules =
object.at("join_rules")
.get<mtx::events::StateEvent<mtx::events::state::JoinRules>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - join_rules" << e.what();
}
}
if (object.count("name") != 0) {
try {
name = object.at("name")
.get<mtx::events::StateEvent<mtx::events::state::Name>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - name" << e.what();
}
}
if (object.count("power_levels") != 0) {
try {
power_levels =
object.at("power_levels")
.get<mtx::events::StateEvent<mtx::events::state::PowerLevels>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - power_levels" << e.what();
}
}
if (object.count("topic") != 0) {
try {
topic = object.at("topic")
.get<mtx::events::StateEvent<mtx::events::state::Topic>>();
} catch (std::exception &e) {
qWarning() << "RoomState::parse - topic" << e.what();
}
}
}

1
src/TopRoomBar.cc
View File

@ -25,7 +25,6 @@
#include "MainWindow.h"
#include "Menu.h"
#include "OverlayModal.h"
#include "RoomSettings.h"
#include "TopRoomBar.h"
#include "Utils.h"