This repository has been archived by the owner on Oct 17, 2019. It is now read-only.
Add support for read room access #324
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mujx
reviewed
May 11, 2018
src/Cache.cc
Outdated
| if (res) { | ||
| try { | ||
| StateEvent<GuestAccess> msg = json::parse(std::string(event.data(), event.size())); | ||
| if (msg.content.guest_access == AccessState::CanJoin) |
There was a problem hiding this comment.
You can just write is as return msg.content.guest_access == AccessState::CanJoin.
mujx
suggested changes
May 11, 2018
src/Cache.cc
Outdated
| return false; | ||
| } | ||
| catch (const json::exception &e) { | ||
| qWarning() << QString::fromStdString(e.what()); |
There was a problem hiding this comment.
You don't need the QString::fromStdString method here.
src/Cache.cc
Outdated
| @@ -435,6 +435,8 @@ Cache::saveState(const mtx::responses::Sync &res) | |||
| updatedInfo.avatar_url = | |||
| getRoomAvatarUrl(txn, statesdb, membersdb, QString::fromStdString(room.first)) | |||
| .toStdString(); | |||
| updatedInfo.join_rule = getRoomJoinRules(txn, statesdb); | |||
There was a problem hiding this comment.
This is already saved in the states db. You can remove those lines.
src/Cache.cc
Outdated
| @@ -467,6 +469,8 @@ Cache::saveInvites(lmdb::txn &txn, const std::map<std::string, mtx::responses::I | |||
| updatedInfo.avatar_url = | |||
| getInviteRoomAvatarUrl(txn, statesdb, membersdb).toStdString(); | |||
| updatedInfo.is_invite = true; | |||
| updatedInfo.join_rule = getRoomJoinRules(txn, statesdb); | |||
include/Cache.h
Outdated
| @@ -164,6 +169,9 @@ class Cache : public QObject | |||
|
|
|||
| //! Calculate & return the name of the room. | |||
| QString getRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); | |||
| //! Get room join rules | |||
| JoinRule getRoomJoinRules(lmdb::txn &txn, lmdb::dbi &statesdb); | |||
|
|
||
| void | ||
| RoomSettings::save_and_close() { | ||
| // TODO: Save access changes to the room |
There was a problem hiding this comment.
To save the changes you'll have to send a state event using the http API.
src/Cache.cc
Outdated
| return msg.content.join_rule; | ||
| } | ||
| catch (const json::exception &e) { | ||
| qWarning() << QString::fromStdString(e.what()); |
There was a problem hiding this comment.
Same here for QString::fromStdString
src/Cache.cc
Outdated
| @@ -604,6 +611,8 @@ Cache::getRoomInfo(const std::vector<std::string> &rooms) | |||
| RoomInfo tmp = | |||
| json::parse(std::string(data.data(), data.size())); | |||
| tmp.member_count = getInviteMembersDb(txn, room).size(txn); | |||
| tmp.join_rule = getRoomJoinRules(txn, statesdb); | |||
There was a problem hiding this comment.
Invited rooms are not viewable in nheko so we don't need those.
src/Cache.cc
Outdated
|
|
||
| // Check if the room is joined. | ||
| if (lmdb::dbi_get(txn, roomsDb_, lmdb::val(room), data)) { | ||
| try { | ||
| RoomInfo tmp = json::parse(std::string(data.data(), data.size())); | ||
| tmp.member_count = getMembersDb(txn, room).size(txn); | ||
| tmp.join_rule = getRoomJoinRules(txn, statesdb); |
There was a problem hiding this comment.
Could you copy those lines in Cache::singleRoomInfo also, and make the RoomSettings page call that method instead of Cache::getRoomInfo.
mujx
reviewed
May 11, 2018
include/Cache.h
Outdated
| @@ -74,6 +76,9 @@ struct RoomInfo | |||
| bool is_invite = false; | |||
| //! Total number of members in the room. | |||
| int16_t member_count = 0; | |||
| //! Who can access to the room. | |||
| JoinRule join_rule = JoinRule::Public; | |||
| bool guest_access = false; | |||
There was a problem hiding this comment.
Add those in the to_json & from_json methods also.
mujx
reviewed
May 12, 2018
src/dialogs/RoomSettings.cpp
Outdated
| accessCombo = new QComboBox(this); | ||
| accessCombo->addItem(tr("Anyone and guests")); | ||
| accessCombo->addItem(tr("Anyone")); | ||
| accessCombo->addItem(tr("Inviteds")); |
mujx
reviewed
May 12, 2018
src/dialogs/RoomSettings.cpp
Outdated
| accessCombo->setDisabled(true); | ||
| accessLabel->setStyleSheet("font-size: 15px;"); | ||
|
|
||
| if(info_.join_rule == JoinRule::Public) |
There was a problem hiding this comment.
Could you add some braces around the outer if/else statement.
vurpo
pushed a commit
to vurpo/nheko
that referenced
this pull request
Jun 28, 2018
- Join rules - Guest access
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In Room settings you can see who can join to the room, whether it's just the inviteds, anyone or anyone including guests.
I would have liked to implement the possibility of changing it, but I am not familiar with the source code and I did not find a similar function with which I could be oriented.