+
+
+
+
diff --git a/web/app/riot/riot.component.ts b/web/app/riot/riot.component.ts
index 9b61638..06b68a8 100644
--- a/web/app/riot/riot.component.ts
+++ b/web/app/riot/riot.component.ts
@@ -54,6 +54,26 @@ export class RiotComponent {
private updateIntegrationState(integration: Integration) {
integration.hasConfig = IntegrationService.hasConfig(integration);
+ if (integration.requirements) {
+ let keys = _.keys(integration.requirements);
+ let promises = [];
+
+ for (let key of keys) {
+ let requirement = this.checkRequirement(integration, key);
+ promises.push(requirement);
+ }
+
+ return Promise.all(promises).then(() => {
+ integration.isEnabled = true;
+ integration.isBroken = false;
+ }, error => {
+ console.error(error);
+ integration.bridgeError = error.message || error;
+ integration.isEnabled = false;
+ integration.isBroken = false;
+ });
+ }
+
return this.scalar.getMembershipState(this.roomId, integration.userId).then(payload => {
integration.isBroken = false;
@@ -70,6 +90,24 @@ export class RiotComponent {
});
}
+ private checkRequirement(integration: Integration, key: string) {
+ let requirement = integration.requirements[key];
+
+ switch (key) {
+ case "joinRule":
+ return this.scalar.getJoinRule(this.roomId).then(payload => {
+ if (!payload.response) {
+ return Promise.reject("Could not communicate with Riot");
+ }
+ return payload.response.join_rule === requirement
+ ? Promise.resolve()
+ : Promise.reject(new Error("The room must be " + requirement + " to use this integration."));
+ });
+ default:
+ return Promise.reject(new Error("Requirement '" + key + "' not found"));
+ }
+ }
+
public updateIntegration(integration: Integration) {
let promise = null;
diff --git a/web/app/shared/integration.service.ts b/web/app/shared/integration.service.ts
index 6f8c93f..b68b837 100644
--- a/web/app/shared/integration.service.ts
+++ b/web/app/shared/integration.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from "@angular/core";
import { Integration } from "./models/integration";
import { RssConfigComponent } from "../configs/rss/rss-config.component";
import { ContainerContent } from "angular2-modal";
+import { IrcConfigComponent } from "../configs/irc/irc-config.component";
@Injectable()
export class IntegrationService {
@@ -10,12 +11,18 @@ export class IntegrationService {
"bot": true,
"complex-bot": {
"rss": true
+ },
+ "bridge": {
+ "irc": true
}
};
private static components = {
"complex-bot": {
"rss": RssConfigComponent
+ },
+ "bridge": {
+ "irc": IrcConfigComponent
}
};
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index e4a809b..b2fbb32 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -8,9 +8,16 @@ export interface Integration {
isEnabled: boolean;
isBroken: boolean;
hasConfig: boolean;
+ requirements?: any; // nullable
+ bridgeError: string; // nullable
}
export interface RSSIntegration extends Integration {
feeds: string[];
immutableFeeds: {url: string, ownerId: string}[];
+}
+
+export interface IRCIntegration extends Integration {
+ availableNetworks: {name: string, id: string};
+ channels: {[networkId: string]: string[]};
}
\ No newline at end of file
diff --git a/web/app/shared/models/scalar_responses.ts b/web/app/shared/models/scalar_responses.ts
index 93b1231..4b3e4be 100644
--- a/web/app/shared/models/scalar_responses.ts
+++ b/web/app/shared/models/scalar_responses.ts
@@ -24,4 +24,10 @@ export interface MembershipStateResponse extends ScalarUserResponse {
avatar_url: string;
displayname: string;
};
+}
+
+export interface JoinRuleStateResponse extends ScalarRoomResponse {
+ response: {
+ join_rule: string;
+ };
}
\ No newline at end of file
diff --git a/web/app/shared/scalar.service.ts b/web/app/shared/scalar.service.ts
index dd00527..abb2cbb 100644
--- a/web/app/shared/scalar.service.ts
+++ b/web/app/shared/scalar.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from "@angular/core";
import * as randomString from "random-string";
-import { MembershipStateResponse, ScalarSuccessResponse } from "./models/scalar_responses";
+import { MembershipStateResponse, ScalarSuccessResponse, JoinRuleStateResponse } from "./models/scalar_responses";
@Injectable()
export class ScalarService {
@@ -30,6 +30,12 @@ export class ScalarService {
});
}
+ public getJoinRule(roomId: string): Promise {
+ return this.callAction("join_rules_state", {
+ room_id: roomId
+ });
+ }
+
public close(): void {
this.callAction("close_scalar", {});
}
diff --git a/web/public/img/avatars/irc.png b/web/public/img/avatars/irc.png
new file mode 100644
index 0000000..bc24d31
Binary files /dev/null and b/web/public/img/avatars/irc.png differ
diff --git a/webpack.config.js b/webpack.config.js
index 1bbf927..80a38e8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -122,7 +122,7 @@ module.exports = function () {
config.devServer = {
contentBase: './web/public',
historyApiFallback: true,
- quiet: true,
+ quiet: false,
stats: 'minimal',
proxy: {
'/api': {
+ 
+