diff --git a/github/GithubApp.ts b/github/GithubApp.ts index 8cc6521..b368b5d 100644 --- a/github/GithubApp.ts +++ b/github/GithubApp.ts @@ -55,9 +55,7 @@ import { isGithubLink, hasGitHubCodeSegmentLink, hasGithubPRLink } from "./helpe import { SendReminder } from "./handlers/SendReminder"; import { AppSettingsEnum, settings } from "./settings/settings"; import { ISetting } from "@rocket.chat/apps-engine/definition/settings"; - import { handleGithubPRLinks } from "./handlers/GithubPRlinkHandler"; -import { UpdateSetting } from "./persistance/setting"; export class GithubApp extends App implements IPreMessageSentExtend { constructor(info: IAppInfo, logger: ILogger, accessors: IAppAccessors) { @@ -253,12 +251,6 @@ export class GithubApp extends App implements IPreMessageSentExtend { interval:"0 9 * * *" } }, - { - id:ProcessorsEnum.SETTING_UPDATE, - processor:async(jobContext, read, modify, http, persis)=>{ - await UpdateSetting(read, persis, this.getAccessors().environmentReader.getSettings()) - }, - } ]); configuration.api.provideApi({ visibility: ApiVisibility.PUBLIC, @@ -277,11 +269,6 @@ export class GithubApp extends App implements IPreMessageSentExtend { await sendDirectMessageOnInstall(read, modify, user, persistence); } - public async onEnable(environment: IEnvironmentRead, configurationModify: IConfigurationModify): Promise { - await configurationModify.scheduler.scheduleOnce({id:ProcessorsEnum.SETTING_UPDATE,when:"one second"}); - return true; - } - public async onSettingUpdated(setting: ISetting, configurationModify: IConfigurationModify, read: IRead, http: IHttp): Promise { const interval: string = await this.getAccessors().environmentReader.getSettings().getValueById(AppSettingsEnum.ReminderCRONjobID); await configurationModify.scheduler.cancelJob(ProcessorsEnum.PR_REMINDER); @@ -289,6 +276,5 @@ export class GithubApp extends App implements IPreMessageSentExtend { id: ProcessorsEnum.PR_REMINDER, interval: interval, }) - await configurationModify.scheduler.scheduleOnce({id:ProcessorsEnum.SETTING_UPDATE,when:"one second"}); } } diff --git a/github/definitions/AppSetting.ts b/github/definitions/AppSetting.ts deleted file mode 100644 index b3dbba0..0000000 --- a/github/definitions/AppSetting.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface IAppSetting { - ReminderCron: string; - BaseHost: string; - BaseApiHost: string; -} - diff --git a/github/enum/Processors.ts b/github/enum/Processors.ts index df73973..07f9d44 100644 --- a/github/enum/Processors.ts +++ b/github/enum/Processors.ts @@ -1,5 +1,4 @@ export enum ProcessorsEnum { REMOVE_GITHUB_LOGIN = 'remove_github_token', PR_REMINDER = 'pr_reminder', - SETTING_UPDATE = 'setting_update' } \ No newline at end of file diff --git a/github/modals/UserProfileModal.ts b/github/modals/UserProfileModal.ts index 1278d4c..77ca4cf 100644 --- a/github/modals/UserProfileModal.ts +++ b/github/modals/UserProfileModal.ts @@ -2,16 +2,14 @@ import { IHttp, IModify, IPersistence, IRead } from "@rocket.chat/apps-engine/de import { SlashCommandContext } from "@rocket.chat/apps-engine/definition/slashcommands"; import { ButtonStyle, TextObjectType, UIKitInteractionContext } from "@rocket.chat/apps-engine/definition/uikit"; import { IUIKitModalViewParam } from "@rocket.chat/apps-engine/definition/uikit/UIKitInteractionResponder"; -import { AppEnum } from "../enum/App"; import { ModalsEnum } from "../enum/Modals"; import { GitHubApi } from "../helpers/githubSDKclass"; -import { GetSetting } from "../persistance/setting"; import { UserInformation } from "../definitions/Userinfo"; import { getInteractionRoomData, storeInteractionRoomData, } from "../persistance/roomInteraction"; -import { IAppSetting } from "../definitions/AppSetting"; +import { AppSettingsEnum } from "../settings/settings"; export async function userProfileModal({ access_token, @@ -48,12 +46,13 @@ export async function userProfileModal({ } let userInfo: UserInformation | undefined; try { - const settings:IAppSetting = await GetSetting(read); + let BaseHost = await read.getEnvironmentReader().getSettings().getValueById(AppSettingsEnum.BaseHostID); + let BaseApiHost = await read.getEnvironmentReader().getSettings().getValueById(AppSettingsEnum.BaseApiHostID); const gitHubApiClient = new GitHubApi( http, access_token, - settings!.BaseHost, - settings!.BaseApiHost + BaseHost, + BaseApiHost ); userInfo = await gitHubApiClient.getBasicUserInfo(); } catch (error) { diff --git a/github/persistance/setting.ts b/github/persistance/setting.ts deleted file mode 100644 index 6ec7568..0000000 --- a/github/persistance/setting.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { - IPersistence, - IRead, - ISettingRead -} from '@rocket.chat/apps-engine/definition/accessors'; -import { - RocketChatAssociationModel, - RocketChatAssociationRecord -} from '@rocket.chat/apps-engine/definition/metadata'; -import { IAppSetting } from '../definitions/AppSetting'; -import { AppSettingsEnum } from '../settings/settings'; - -const assoc = new RocketChatAssociationRecord( - RocketChatAssociationModel.MISC, - 'setting' -); - -export async function UpdateSetting( - read: IRead, - persistence: IPersistence, - settingReader: ISettingRead, -): Promise { - const ReminderCron = (await settingReader.getValueById(AppSettingsEnum.ReminderCRONjobID)) as string; - const BaseHost = (await settingReader.getValueById(AppSettingsEnum.BaseHostID)) as string; - const BaseApiHost = (await settingReader.getValueById(AppSettingsEnum.BaseApiHostID)) as string; - const Setting: IAppSetting = { - ReminderCron, - BaseHost, - BaseApiHost - }; - await persistence.updateByAssociation(assoc, Setting, true); -} - -export async function GetSetting( - read: IRead, -): Promise { - const data = await read.getPersistenceReader().readByAssociation(assoc); - const settingData = data[0] as IAppSetting; - return settingData; -}