Skip to content

Add separate events for local and global chat - #4683

Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged

Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom
brawaru:feat/add-chat-type-events

Conversation

@brawaru

@brawarubrawaru commented Dec 12, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

Information

This PR helps DiscordSRV/DiscordSRV#1223.

Details

Proposed feature:

This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.

Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.

Environments tested:

OS: Windows 10 20H2.

Java version:

openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)
  • Most recent Paper version (1.18.1, git-Paper-71)
  • CraftBukkit/Spigot/Paper 1.12.2
  • CraftBukkit 1.8.8

Demonstration:

Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.

@brawarubrawaru mentioned this pull request Dec 12, 2021
Merged
3 tasks
brawaru
brawaru commented Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java Outdated
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 842e9fb to 45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal added module: chat Issues or PRs for the EssentialsChat module type: api Issue/Pull Request regards user-facing API labels Dec 15, 2021
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 45a0678 to bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy requested changes Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java Outdated
Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java Outdated
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java Outdated
Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java Outdated
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 18f24f7 to f9e6f52CompareApril 2, 2022 18:23
@brawaru

brawaru commented Apr 2, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.

@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from f9e6f52 to 1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 1bf775e to a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy requested changes Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java Outdated
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java Outdated
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java Outdated
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 21b8556 to 0cd4898CompareJuly 6, 2022 19:47
@brawaru

brawaru commented Jul 6, 2022

Copy link
Copy Markdown
ContributorAuthor

Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻

JRoy
JRoy previously approved these changes Jul 6, 2022
View reviewed changes
@JRoyJRoy added this to the 2.20.0 milestone Jul 6, 2022
@mdcfe

mdcfe commented Aug 16, 2022•
edited
Loading

Copy link
Copy Markdown
Member

Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.

@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 0cd4898 to c162217CompareAugust 17, 2022 08:52
@brawaru

brawaru commented Aug 17, 2022

Copy link
Copy Markdown
ContributorAuthor

Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.

brawaru
brawaru commented Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru commented Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java Outdated
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch 2 times, most recently from 8977e3f to 3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy requested changes Aug 19, 2022
View reviewed changes

@JRoyJRoy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java Outdated
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed the feat/add-chat-type-events branch from 3c60995 to 7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe enabled auto-merge (squash) February 13, 2023 23:12
@mdcfe
mdcfe disabled auto-merge February 13, 2023 23:12
@mdcfe
mdcfe enabled auto-merge (squash) February 13, 2023 23:12
@mdcfe
mdcfe merged commit 17051ea into EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit to rewsdjad1/EssentialsXPlus that referenced this pull request Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees

No one assigned

Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects

None yet

Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add separate events for local and global chat by brawaru · Pull Request #4683 · EssentialsX/Essentials · GitHub
Skip to content
Add separate events for local and global chat - #4683
Merged
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Feb 13, 2023
Merged
Add separate events for local and global chat#4683
mdcfe merged 4 commits into
EssentialsX:2.xfrom 
brawaru:feat/add-chat-type-events
Conversation
@brawaru
@brawarubrawaru
commented
Dec 12, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Information
This PR helps DiscordSRV/DiscordSRV#1223.
Details
Proposed feature:
This PR adds two new events: GlobalChatEvent and LocalChatEvent, which allow other plugin developers to know whether the message sent is a global or local one and act accordingly. If either of those events is cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract class ChatEvent is created with the change made for LocalChatSpyEvent to use it without breaking its API.
Environments tested:
OS: Windows 10 20H2.
Java version:
openjdk version "17" 2021-09-14 LTS
OpenJDK Runtime Environment Zulu17.28+13-CA (build 17+35-LTS)
OpenJDK 64-Bit Server VM Zulu17.28+13-CA (build 17+35-LTS, mixed mode, sharing)

  •  Most recent Paper version (1.18.1, git-Paper-71)
  •  CraftBukkit/Spigot/Paper 1.12.2
  •  CraftBukkit 1.8.8
Demonstration:
Following this pull request, a draft pull request with the use of that API in Essentials Discord module was created — #4684.
@brawarubrawaru
mentioned this pull request
Dec 12, 2021
 Merged

3 tasks
brawaru
brawaru
commented
Dec 12, 2021
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
842e9fb to
45a0678CompareDecember 12, 2021 22:59
@triagonaltriagonal
added

module: chat
Issues or PRs for the EssentialsChat module
type: api
Issue/Pull Request regards user-facing API
labels
Dec 15, 2021
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
45a0678 to
bc14df3CompareFebruary 14, 2022 08:36
JRoy
JRoy
requested changes
Mar 27, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/ess3/api/events/LocalChatSpyEvent.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/ChatStore.java
Outdated

Comment thread...tialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
18f24f7 to
f9e6f52CompareApril 2, 2022 18:23
@brawaru
brawaru
commented
Apr 2, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Hello and thanks for the review! Sorry it took some time, but all noted issues should be fixed now.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
f9e6f52 to
1bf775eCompareJune 1, 2022 03:08
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
1bf775e to
a0fc04cCompareJune 16, 2022 07:27
JRoy
JRoy
requested changes
Jul 5, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/GlobalChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/LocalChatEvent.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
21b8556 to
0cd4898CompareJuly 6, 2022 19:47
@brawaru
brawaru
commented
Jul 6, 2022

Copy link


Copy Markdown

ContributorAuthor
Rebased and moved new event classes to net.essentialsx.api.v2.events.chat 👍🏻
JRoy
JRoy
previously approved these changes
Jul 6, 2022
View reviewed changes
@JRoyJRoy
added this to the 2.20.0 milestone
Jul 6, 2022
@mdcfe
mdcfe
commented
Aug 16, 2022•

edited

Loading

Copy link


Copy Markdown

Member
Hey, apologies for the slow response on this. We recently refactored EssentialsX Chat, so this PR will need need to be updated this PR accordingly (ie moving the callChatEvent method and call into AbstractChatHandler) before it can be merged. Aside from this, the PR looks good! If you'd like to update the PR, we would greatly appreciate it, but otherwise we'll update it when we're ready to merge it.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
0cd4898 to
c162217CompareAugust 17, 2022 08:52
@brawaru
brawaru
commented
Aug 17, 2022

Copy link


Copy Markdown

ContributorAuthor
Heyo! I have rebased this on 2.x, partly re-implementing the changes instead of resolving confusing merge conflicts, so please review the code again, perhaps I missed something.
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/ChatType.java
brawaru
brawaru
commented
Aug 17, 2022
View reviewed changes
Comment threadEssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
Outdated

@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
2 times, most recently
from
8977e3f to
3c60995CompareAugust 19, 2022 11:35
JRoy
JRoy
requested changes
Aug 19, 2022
View reviewed changes
@JRoyJRoy
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final few things, otherwise approved for 2.20!
Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/ChatEvent.java
Outdated

Comment threadEssentials/src/main/java/net/essentialsx/api/v2/events/chat/LocalChatEvent.java
@brawaru
Add separate events for local and global chat
7bd890d
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
@brawaru
brawaruforce-pushed
the
feat/add-chat-type-events
branch
from
3c60995 to
7bd890dCompareAugust 20, 2022 08:57
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
disabled auto-merge
February 13, 2023 23:12
@mdcfe
mdcfe
enabled auto-merge (squash)
February 13, 2023 23:12
@mdcfe
mdcfe
merged commit 17051ea
into
EssentialsX:2.xFeb 13, 2023
rewsdjad1 pushed a commit
to rewsdjad1/EssentialsXPlus
that referenced
this pull request
Aug 13, 2026
@brawaru@JRoy@mdcfe
Add separate events for local and global chat (EssentialsX#4683)
7bc17d6
This commit adds two new events: GlobalChatEvent and LocalChatEvent,
which allow other plugin developers to know whether the message sent is
a global or local one and act accordingly. If either of those events is
cancelled, then the source event is cancelled too.
Since all chat-related events share the same structure, a new abstract
class ChatEvent is created with change made for LocalChatSpyEvent to use
it without breaking its API.
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
Co-authored-by: MD <1917406+mdcfe@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@mdcfemdcfemdcfe approved these changes
@JRoyJRoyJRoy approved these changes

Assignees


No one assigned


Labels

module: chatIssues or PRs for the EssentialsChat moduletype: apiIssue/Pull Request regards user-facing API

Projects


None yet


Milestone

2.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@brawaru@mdcfe@JRoy@triagonal