Skip to content

Commit

Permalink
Merge branch 'master' into MM-219
Browse files Browse the repository at this point in the history
  • Loading branch information
hanzei authored Apr 18, 2024
2 parents 40dd6b9 + cc21338 commit 02ade46
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
name: cd
on:
workflow_run:
workflows: ["ci"]
branches-ignore: ["*"]
types:
- completed
push:
tags:
- "v*"

permissions:
contents: read

jobs:
plugin-cd:
uses: mattermost/actions-workflows/.github/workflows/plugin-cd.yml@main
uses: mattermost/actions-workflows/.github/workflows/community-plugin-cd.yml@d9defa3e455bdbf889573e112ad8d05b91d66b4c
secrets: inherit
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
name: ci
on:
schedule:
- cron: "0 0 * * *"
pull_request:
push:
branches:
- master
tags:
- "v*"
pull_request:

permissions:
contents: read
- main

jobs:
plugin-ci:
uses: mattermost/actions-workflows/.github/workflows/plugin-ci.yml@main
uses: mattermost/actions-workflows/.github/workflows/community-plugin-ci.yml@139a051e8651e6246e3764fe342297b73120e590
secrets: inherit
4 changes: 3 additions & 1 deletion webapp/src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import {ClientError} from 'mattermost-redux/client/client4';
import manifest from '../manifest';

export default class Client {
private serverUrl: string | undefined;
private url: string | undefined;

setServerRoute(url: string) {
this.serverUrl = url;
this.url = url + '/plugins/' + manifest.id;
}

Expand All @@ -19,7 +21,7 @@ export default class Client {
};

setUserStatus = async (userId: string | null, status: string) => {
return this.doPut(`${this.url}/api/v4/users/${userId}/status`, {user_id: userId, status});
return this.doPut(`${this.serverUrl}/api/v4/users/${userId}/status`, {user_id: userId, status});
};

loadConfig = async () => {
Expand Down

0 comments on commit 02ade46

Please sign in to comment.