Skip to content
Extraits de code Groupes Projets
Non vérifiée Valider ba13248e rédigé par Sorunome's avatar Sorunome
Parcourir les fichiers

Merge branch 'soru/context' into develop

parents 0f266fcc a9f9f467
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -299,10 +299,10 @@ export class DbRoomStore { ...@@ -299,10 +299,10 @@ export class DbRoomStore {
discord_name: room.data.discord_name, discord_name: room.data.discord_name,
discord_topic: room.data.discord_topic, discord_topic: room.data.discord_topic,
discord_type: room.data.discord_type, discord_type: room.data.discord_type,
plumbed: room.data.plumbed || 0, plumbed: Number(room.data.plumbed || 0),
update_icon: room.data.update_icon || 0, update_icon: Number(room.data.update_icon || 0),
update_name: room.data.update_name || 0, update_name: Number(room.data.update_name || 0),
update_topic: room.data.update_topic || 0, update_topic: Number(room.data.update_topic || 0),
} as IRemoteRoomData; } as IRemoteRoomData;
if (!existingRow) { if (!existingRow) {
......
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { Cli, Bridge, AppServiceRegistration, ClientFactory } from "matrix-appservice-bridge"; import { Cli, Bridge, AppServiceRegistration, ClientFactory, BridgeContext } from "matrix-appservice-bridge";
import * as Bluebird from "bluebird"; import * as Bluebird from "bluebird";
import * as yaml from "js-yaml"; import * as yaml from "js-yaml";
import * as fs from "fs"; import * as fs from "fs";
...@@ -101,12 +101,12 @@ async function run(port: number, fileConfig: DiscordBridgeConfig) { ...@@ -101,12 +101,12 @@ async function run(port: number, fileConfig: DiscordBridgeConfig) {
return; return;
} }
const roomId = request.getData().room_id; const roomId = request.getData().room_id;
let context = {}; const context: BridgeContext = {
if (roomId) { rooms: {},
const entries = await store.roomStore.getEntriesByMatrixId(request.getData().room_id);
context = {
rooms: entries[0],
}; };
if (roomId) {
const entries = await store.roomStore.getEntriesByMatrixId(roomId);
context.rooms = entries[0] || {};
} }
await request.outcomeFrom(Bluebird.resolve(callbacks.onEvent(request, context))); await request.outcomeFrom(Bluebird.resolve(callbacks.onEvent(request, context)));
} catch (err) { } catch (err) {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter