Skip to content

Commit 109aae3

Browse files
committed
use direct settings
1 parent e8dd750 commit 109aae3

File tree

5 files changed

+5
-67
lines changed

5 files changed

+5
-67
lines changed

github/GithubApp.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ import { isGithubLink, hasGitHubCodeSegmentLink, hasGithubPRLink } from "./helpe
5555
import { SendReminder } from "./handlers/SendReminder";
5656
import { AppSettingsEnum, settings } from "./settings/settings";
5757
import { ISetting } from "@rocket.chat/apps-engine/definition/settings";
58-
5958
import { handleGithubPRLinks } from "./handlers/GithubPRlinkHandler";
60-
import { UpdateSetting } from "./persistance/setting";
6159

6260
export class GithubApp extends App implements IPreMessageSentExtend {
6361
constructor(info: IAppInfo, logger: ILogger, accessors: IAppAccessors) {
@@ -253,12 +251,6 @@ export class GithubApp extends App implements IPreMessageSentExtend {
253251
interval:"0 9 * * *"
254252
}
255253
},
256-
{
257-
id:ProcessorsEnum.SETTING_UPDATE,
258-
processor:async(jobContext, read, modify, http, persis)=>{
259-
await UpdateSetting(read, persis, this.getAccessors().environmentReader.getSettings())
260-
},
261-
}
262254
]);
263255
configuration.api.provideApi({
264256
visibility: ApiVisibility.PUBLIC,
@@ -277,18 +269,12 @@ export class GithubApp extends App implements IPreMessageSentExtend {
277269
await sendDirectMessageOnInstall(read, modify, user, persistence);
278270
}
279271

280-
public async onEnable(environment: IEnvironmentRead, configurationModify: IConfigurationModify): Promise<boolean> {
281-
await configurationModify.scheduler.scheduleOnce({id:ProcessorsEnum.SETTING_UPDATE,when:"one second"});
282-
return true;
283-
}
284-
285272
public async onSettingUpdated(setting: ISetting, configurationModify: IConfigurationModify, read: IRead, http: IHttp): Promise<void> {
286273
const interval: string = await this.getAccessors().environmentReader.getSettings().getValueById(AppSettingsEnum.ReminderCRONjobID);
287274
await configurationModify.scheduler.cancelJob(ProcessorsEnum.PR_REMINDER);
288275
await configurationModify.scheduler.scheduleRecurring({
289276
id: ProcessorsEnum.PR_REMINDER,
290277
interval: interval,
291278
})
292-
await configurationModify.scheduler.scheduleOnce({id:ProcessorsEnum.SETTING_UPDATE,when:"one second"});
293279
}
294280
}

github/definitions/AppSetting.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

github/enum/Processors.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export enum ProcessorsEnum {
22
REMOVE_GITHUB_LOGIN = 'remove_github_token',
33
PR_REMINDER = 'pr_reminder',
4-
SETTING_UPDATE = 'setting_update'
54
}

github/modals/UserProfileModal.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ import { IHttp, IModify, IPersistence, IRead } from "@rocket.chat/apps-engine/de
22
import { SlashCommandContext } from "@rocket.chat/apps-engine/definition/slashcommands";
33
import { ButtonStyle, TextObjectType, UIKitInteractionContext } from "@rocket.chat/apps-engine/definition/uikit";
44
import { IUIKitModalViewParam } from "@rocket.chat/apps-engine/definition/uikit/UIKitInteractionResponder";
5-
import { AppEnum } from "../enum/App";
65
import { ModalsEnum } from "../enum/Modals";
76
import { GitHubApi } from "../helpers/githubSDKclass";
8-
import { GetSetting } from "../persistance/setting";
97
import { UserInformation } from "../definitions/Userinfo";
108
import {
119
getInteractionRoomData,
1210
storeInteractionRoomData,
1311
} from "../persistance/roomInteraction";
14-
import { IAppSetting } from "../definitions/AppSetting";
12+
import { AppSettingsEnum } from "../settings/settings";
1513

1614
export async function userProfileModal({
1715
access_token,
@@ -48,12 +46,13 @@ export async function userProfileModal({
4846
}
4947
let userInfo: UserInformation | undefined;
5048
try {
51-
const settings:IAppSetting = await GetSetting(read);
49+
let BaseHost = await read.getEnvironmentReader().getSettings().getValueById(AppSettingsEnum.BaseHostID);
50+
let BaseApiHost = await read.getEnvironmentReader().getSettings().getValueById(AppSettingsEnum.BaseApiHostID);
5251
const gitHubApiClient = new GitHubApi(
5352
http,
5453
access_token,
55-
settings!.BaseHost,
56-
settings!.BaseApiHost
54+
BaseHost,
55+
BaseApiHost
5756
);
5857
userInfo = await gitHubApiClient.getBasicUserInfo();
5958
} catch (error) {

github/persistance/setting.ts

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)