You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-11-29 16:43:09 +03:00
q(...) -> Promise.resolve
```
find src spec -name '*.js' |
xargs perl -i -pe 's/\bq(\([^(]*\))/Promise.resolve$1/'
```
This commit is contained in:
@@ -551,7 +551,7 @@ MatrixClient.prototype.setRoomEncryption = function(roomId, config) {
|
||||
throw new Error("End-to-End encryption disabled");
|
||||
}
|
||||
this._crypto.setRoomEncryption(roomId, config);
|
||||
return q();
|
||||
return Promise.resolve();
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -730,10 +730,10 @@ MatrixClient.prototype.joinRoom = function(roomIdOrAlias, opts, callback) {
|
||||
|
||||
const room = this.getRoom(roomIdOrAlias);
|
||||
if (room && room.hasMembershipState(this.credentials.userId, "join")) {
|
||||
return q(room);
|
||||
return Promise.resolve(room);
|
||||
}
|
||||
|
||||
let sign_promise = q();
|
||||
let sign_promise = Promise.resolve();
|
||||
|
||||
if (opts.inviteSignUrl) {
|
||||
sign_promise = this._http.requestOtherUrl(
|
||||
@@ -761,7 +761,7 @@ MatrixClient.prototype.joinRoom = function(roomIdOrAlias, opts, callback) {
|
||||
// v2 will do this for us
|
||||
// return syncApi.syncRoom(room);
|
||||
}
|
||||
return q(room);
|
||||
return Promise.resolve(room);
|
||||
}).done(function(room) {
|
||||
_resolve(callback, defer, room);
|
||||
}, function(err) {
|
||||
@@ -981,10 +981,10 @@ MatrixClient.prototype.sendEvent = function(roomId, eventType, content, txnId,
|
||||
// marks the event as sent/unsent
|
||||
// returns a promise which resolves with the result of the send request
|
||||
function _sendEvent(client, room, event, callback) {
|
||||
// Add an extra q() to turn synchronous exceptions into promise rejections,
|
||||
// Add an extra Promise.resolve() to turn synchronous exceptions into promise rejections,
|
||||
// so that we can handle synchronous and asynchronous exceptions with the
|
||||
// same code path.
|
||||
return q().then(function() {
|
||||
return Promise.resolve().then(function() {
|
||||
let encryptionPromise = null;
|
||||
if (client._crypto) {
|
||||
encryptionPromise = client._crypto.encryptEventIfNeeded(event, room);
|
||||
@@ -1238,7 +1238,7 @@ MatrixClient.prototype.sendHtmlEmote = function(roomId, body, htmlBody, callback
|
||||
*/
|
||||
MatrixClient.prototype.sendReceipt = function(event, receiptType, callback) {
|
||||
if (this.isGuest()) {
|
||||
return q({}); // guests cannot send receipts so don't bother.
|
||||
return Promise.resolve({}); // guests cannot send receipts so don't bother.
|
||||
}
|
||||
|
||||
const path = utils.encodeUri("/rooms/$roomId/receipt/$receiptType/$eventId", {
|
||||
@@ -1315,7 +1315,7 @@ MatrixClient.prototype.getUrlPreview = function(url, ts, callback) {
|
||||
const key = ts + "_" + url;
|
||||
const og = this.urlPreviewCache[key];
|
||||
if (og) {
|
||||
return q(og);
|
||||
return Promise.resolve(og);
|
||||
}
|
||||
|
||||
const self = this;
|
||||
@@ -1341,7 +1341,7 @@ MatrixClient.prototype.getUrlPreview = function(url, ts, callback) {
|
||||
*/
|
||||
MatrixClient.prototype.sendTyping = function(roomId, isTyping, timeoutMs, callback) {
|
||||
if (this.isGuest()) {
|
||||
return q({}); // guests cannot send typing notifications so don't bother.
|
||||
return Promise.resolve({}); // guests cannot send typing notifications so don't bother.
|
||||
}
|
||||
|
||||
const path = utils.encodeUri("/rooms/$roomId/typing/$userId", {
|
||||
@@ -1742,13 +1742,13 @@ MatrixClient.prototype.scrollback = function(room, limit, callback) {
|
||||
}
|
||||
|
||||
if (room.oldState.paginationToken === null) {
|
||||
return q(room); // already at the start.
|
||||
return Promise.resolve(room); // already at the start.
|
||||
}
|
||||
// attempt to grab more events from the store first
|
||||
const numAdded = this.store.scrollback(room, limit).length;
|
||||
if (numAdded === limit) {
|
||||
// store contained everything we needed.
|
||||
return q(room);
|
||||
return Promise.resolve(room);
|
||||
}
|
||||
// reduce the required number of events appropriately
|
||||
limit = limit - numAdded;
|
||||
@@ -1881,7 +1881,7 @@ MatrixClient.prototype.getEventTimeline = function(timelineSet, eventId) {
|
||||
}
|
||||
|
||||
if (timelineSet.getTimelineForEvent(eventId)) {
|
||||
return q(timelineSet.getTimelineForEvent(eventId));
|
||||
return Promise.resolve(timelineSet.getTimelineForEvent(eventId));
|
||||
}
|
||||
|
||||
const path = utils.encodeUri(
|
||||
@@ -1969,7 +1969,7 @@ MatrixClient.prototype.paginateEventTimeline = function(eventTimeline, opts) {
|
||||
const token = eventTimeline.getPaginationToken(dir);
|
||||
if (!token) {
|
||||
// no token - no results.
|
||||
return q(false);
|
||||
return Promise.resolve(false);
|
||||
}
|
||||
|
||||
const pendingRequest = eventTimeline._paginationRequests[dir];
|
||||
@@ -2146,7 +2146,7 @@ MatrixClient.prototype.setGuestAccess = function(roomId, opts) {
|
||||
guest_access: opts.allowJoin ? "can_join" : "forbidden",
|
||||
});
|
||||
|
||||
let readPromise = q();
|
||||
let readPromise = Promise.resolve();
|
||||
if (opts.allowRead) {
|
||||
readPromise = this.sendStateEvent(roomId, "m.room.history_visibility", {
|
||||
history_visibility: "world_readable",
|
||||
@@ -2624,7 +2624,7 @@ MatrixClient.prototype._processRoomEventsSearch = function(searchResults, respon
|
||||
MatrixClient.prototype.syncLeftRooms = function() {
|
||||
// Guard against multiple calls whilst ongoing and multiple calls post success
|
||||
if (this._syncedLeftRooms) {
|
||||
return q([]); // don't call syncRooms again if it succeeded.
|
||||
return Promise.resolve([]); // don't call syncRooms again if it succeeded.
|
||||
}
|
||||
if (this._syncLeftRoomsPromise) {
|
||||
return this._syncLeftRoomsPromise; // return the ongoing request
|
||||
@@ -2683,7 +2683,7 @@ MatrixClient.prototype.getFilter = function(userId, filterId, allowCached) {
|
||||
if (allowCached) {
|
||||
const filter = this.store.getFilter(userId, filterId);
|
||||
if (filter) {
|
||||
return q(filter);
|
||||
return Promise.resolve(filter);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2712,7 +2712,7 @@ MatrixClient.prototype.getFilter = function(userId, filterId, allowCached) {
|
||||
*/
|
||||
MatrixClient.prototype.getOrCreateFilter = function(filterName, filter) {
|
||||
const filterId = this.store.getFilterIdByName(filterName);
|
||||
let promise = q();
|
||||
let promise = Promise.resolve();
|
||||
const self = this;
|
||||
|
||||
if (filterId) {
|
||||
@@ -2727,7 +2727,7 @@ MatrixClient.prototype.getOrCreateFilter = function(filterName, filter) {
|
||||
// super, just use that.
|
||||
// debuglog("Using existing filter ID %s: %s", filterId,
|
||||
// JSON.stringify(oldDef));
|
||||
return q(filterId);
|
||||
return Promise.resolve(filterId);
|
||||
}
|
||||
// debuglog("Existing filter ID %s: %s; new filter: %s",
|
||||
// filterId, JSON.stringify(oldDef), JSON.stringify(newDef));
|
||||
|
||||
Reference in New Issue
Block a user