Skip to content

Commit 8947b5d

Browse files
committed
Merge branch 'master_wc' into master-catchup-80cfd04
2 parents 80cfd04 + 7777d4b commit 8947b5d

1,015 files changed

Lines changed: 17724 additions & 11 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/auto_catchup.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Upstream catchup from Rocketchat master
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * 1' #on every Monday
6+
7+
jobs:
8+
catchup:
9+
name: Upstream Catchup
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
14+
- name: Catchup Info
15+
run: |
16+
echo "GITHUB_ACTION: $GITHUB_ACTION"
17+
echo "GITHUB_ACTOR: $GITHUB_ACTOR"
18+
echo "GITHUB_REF: $GITHUB_REF"
19+
echo "github.event_name: ${{ github.event_name }}"
20+
cat $GITHUB_EVENT_PATH
21+
- name: Checkout
22+
uses: actions/checkout@v2
23+
- name: Set up Node
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: 12
27+
- name: Create Catchup PR
28+
uses: shubhsherl/create-catchup-pr@v0.1.0
29+
with:
30+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
31+
SOURCE_BRANCH: "master"
32+
SOURCE_REPO: "RocketChat"
33+
TARGET_BRANCH: "master"
34+
GITHUB_REPO: ${{github.repository}}
35+
TITLE: "[Upstream Catchup] Merge RC:master to master"
36+
BODY: "Weekly Catchup PR to merge RC:master in master."
37+
DRAFT: "true"

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ jspm_packages
4949
/dev-dist/
5050
/data/
5151
/tests/test-data/dbs
52-
/client
53-
/definition
54-
/server
55-
/lib
52+
53+
# Commented this to directly use github repo as dependecy in package.json
54+
# /client
55+
# /definition
56+
# /server
57+
# /lib
5658

5759
.DS_Store

client/AppClientManager.d.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { AppsEngineUIHost } from './AppsEngineUIHost';
2+
import { AppServerCommunicator } from './AppServerCommunicator';
3+
export declare class AppClientManager {
4+
private readonly appsEngineUIHost;
5+
private readonly communicator?;
6+
private apps;
7+
constructor(appsEngineUIHost: AppsEngineUIHost, communicator?: AppServerCommunicator);
8+
load(): Promise<void>;
9+
initialize(): Promise<void>;
10+
}

client/AppClientManager.js

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/AppClientManager.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/AppServerCommunicator.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { IAppInfo } from '../definition/metadata';
2+
export declare abstract class AppServerCommunicator {
3+
abstract getEnabledApps(): Promise<Array<IAppInfo>>;
4+
abstract getDisabledApps(): Promise<Array<IAppInfo>>;
5+
abstract getLanguageAdditions(): Promise<Map<string, Map<string, object>>>;
6+
abstract getSlashCommands(): Promise<Map<string, Array<string>>>;
7+
abstract getContextualBarButtons(): Promise<Map<string, Array<object>>>;
8+
}

client/AppServerCommunicator.js

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/AppServerCommunicator.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/AppsEngineUIClient.d.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { IExternalComponentRoomInfo, IExternalComponentUserInfo } from './definition';
2+
/**
3+
* Represents the SDK provided to the external component.
4+
*/
5+
export declare class AppsEngineUIClient {
6+
private listener;
7+
private callbacks;
8+
constructor();
9+
/**
10+
* Get the current user's information.
11+
*
12+
* @return the information of the current user.
13+
*/
14+
getUserInfo(): Promise<IExternalComponentUserInfo>;
15+
/**
16+
* Get the current room's information.
17+
*
18+
* @return the information of the current room.
19+
*/
20+
getRoomInfo(): Promise<IExternalComponentRoomInfo>;
21+
/**
22+
* Initialize the app SDK for communicating with Rocket.Chat
23+
*/
24+
init(): void;
25+
private call;
26+
}

client/AppsEngineUIClient.js

Lines changed: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)