Skip to content

Commit

Permalink
Merge branch 'master' of github.com:laravel/echo
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Jan 17, 2023
2 parents 71fbe75 + 215186e commit af58899
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
12 changes: 12 additions & 0 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: issues

on:
issues:
types: [labeled]

permissions:
issues: write

jobs:
help-wanted:
uses: laravel/.github/.github/workflows/issues.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Install dependencies
run: npm install
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Release Notes

## [Unreleased](https://github.com/laravel/echo/compare/v1.14.1...master)
## [Unreleased](https://github.com/laravel/echo/compare/v1.14.2...master)

## [v1.14.2](https://github.com/laravel/echo/compare/v1.14.1...v1.14.2) - 2022-11-22

### Fixed

- Fix node type issue by @timacdonald in https://github.com/laravel/echo/pull/361

## [v1.14.1](https://github.com/laravel/echo/compare/v1.14.0...v1.14.1) - 2022-10-25

Expand Down
7 changes: 7 additions & 0 deletions src/channel/null-channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ export class NullChannel extends Channel {
return this;
}

/**
* Listen for all events on the channel instance.
*/
listenToAll(callback: Function): NullChannel {
return this;
}

/**
* Stop listening for an event on the channel instance.
*/
Expand Down
7 changes: 7 additions & 0 deletions src/connector/null-connector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ export class NullConnector extends Connector {
return new NullPrivateChannel();
}

/**
* Get a private encrypted channel instance by name.
*/
encryptedPrivateChannel(name: string): NullPrivateChannel {
return new NullPrivateChannel();
}

/**
* Get a presence channel instance by name.
*/
Expand Down
9 changes: 9 additions & 0 deletions src/echo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@ export default class Echo {
this.connector.leaveChannel(channel);
}

/**
* Leave all channels.
*/
leaveAllChannels(): void {
for (const channel in this.connector.channels) {
this.leaveChannel(channel);
}
}

/**
* Listen for an event on a channel instance.
*/
Expand Down

0 comments on commit af58899

Please sign in to comment.