Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add getMediaLimits to client #644

Merged
merged 4 commits into from
Sep 26, 2018
Merged

Add getMediaLimits to client #644

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6570402
Add getMediaLimits to client
Half-Shot May 3, 2018
9596087
Remove extra return
Half-Shot May 3, 2018
8dd425f
Media/limits => /config
Half-Shot Jun 20, 2018
fde00b1
getMediaLimits -> getMediaConfig
Half-Shot Jun 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,20 @@ MatrixClient.prototype.getGroups = function() {
return this.store.getGroups();
};

/**
* Get the room for the given room ID.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahem

* This function will return a valid room for any room for which a Room event
* has been emitted. Note in particular that other events, eg. RoomState.members
* will be emitted for a room before this function will return the given room.
* @param {module:client.callback} callback Optional.
* @return {module:client.Promise} Resolves with an object containing the limits.
*/
MatrixClient.prototype.getMediaLimits = function(callback) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably just be getMediaRepoConfiguration or something, given the opportunity for future expansion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+++1 for magic this super generic

return this._http.requestWithPrefix(
callback, "GET", "/config", undefined, undefined, httpApi.PREFIX_MEDIA_R0,
);
};

// Room ops
// ========

Expand Down