mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-02-15 16:34:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen1234 2025-01-30 08:16:07 -05:00
commit ee8de6081a
5 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/alwaysAnimate/index.ts
View file

@ -43,8 +43,8 @@ export default definePlugin({
// Status emojis // Status emojis
find: "#{intl::GUILD_OWNER}),children:", find: "#{intl::GUILD_OWNER}),children:",
replacement: { replacement: {
match: /(?<=\.activityEmoji,.+?animate:)\i/, match: /(\.CUSTOM_STATUS.+?animate:)\i/,
replace: "!0" replace: (_, rest) => `${rest}!0`
} }
}, },
{ {

2
src/plugins/ignoreActivities/index.tsx
View file

@ -242,7 +242,7 @@ export default definePlugin({
find: '"LocalActivityStore"', find: '"LocalActivityStore"',
replacement: [ replacement: [
{ {
match: /HANG_STATUS.+?(?=!?\i\(\)\(\i,\i\))(?<=(\i)\.push.+?)/, match: /\.LISTENING.+?(?=!?\i\(\)\(\i,\i\))(?<=(\i)\.push.+?)/,
replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);` replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
} }
] ]

2
src/plugins/quickReply/index.ts
View file

@ -197,7 +197,7 @@ function nextReply(isUp: boolean) {
channel, channel,
message, message,
shouldMention: shouldMention(message), shouldMention: shouldMention(message),
showMentionToggle: channel.isPrivate() && message.author.id !== meId, showMentionToggle: !channel.isPrivate() && message.author.id !== meId,
_isQuickReply: true _isQuickReply: true
}); });
ComponentDispatch.dispatchToLastSubscribed("TEXTAREA_FOCUS"); ComponentDispatch.dispatchToLastSubscribed("TEXTAREA_FOCUS");

28
src/plugins/typingIndicator/index.tsx
View file

@ -100,16 +100,24 @@ function TypingIndicator({ channelId, guildId }: { channelId: string; guildId: s
{props => ( {props => (
<div className="vc-typing-indicator" {...props}> <div className="vc-typing-indicator" {...props}>
{((settings.store.indicatorMode & IndicatorMode.Avatars) === IndicatorMode.Avatars) && ( {((settings.store.indicatorMode & IndicatorMode.Avatars) === IndicatorMode.Avatars) && (
<UserSummaryItem <div
users={typingUsersArray.map(id => UserStore.getUser(id))} onClick={e => {
guildId={guildId} e.stopPropagation();
renderIcon={false} e.preventDefault();
max={3} }}
showDefaultAvatarsForNullUsers onKeyPress={e => e.stopPropagation()}
showUserPopout >
size={16} <UserSummaryItem
className="vc-typing-indicator-avatars" users={typingUsersArray.map(id => UserStore.getUser(id))}
/> guildId={guildId}
renderIcon={false}
max={3}
showDefaultAvatarsForNullUsers
showUserPopout
size={16}
className="vc-typing-indicator-avatars"
/>
</div>
)} )}
{((settings.store.indicatorMode & IndicatorMode.Dots) === IndicatorMode.Dots) && ( {((settings.store.indicatorMode & IndicatorMode.Dots) === IndicatorMode.Dots) && (
<div className="vc-typing-indicator-dots"> <div className="vc-typing-indicator-dots">

6
src/plugins/whoReacted/index.tsx
View file

@ -94,7 +94,7 @@ function makeRenderMoreUsers(users: User[]) {
}; };
} }
function handleClickAvatar(event: React.MouseEvent<HTMLElement, MouseEvent>) { function handleClickAvatar(event: React.UIEvent<HTMLElement, Event>) {
event.stopPropagation(); event.stopPropagation();
} }
@ -176,7 +176,7 @@ export default definePlugin({
style={{ marginLeft: "0.5em", transform: "scale(0.9)" }} style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
> >
{settings.store.avatarClick ? ( {settings.store.avatarClick ? (
<div onClick={handleClickAvatar}> <div onClick={handleClickAvatar} onKeyPress={handleClickAvatar}>
<UserSummaryItem <UserSummaryItem
users={users} users={users}
guildId={ChannelStore.getChannel(message.channel_id)?.guild_id} guildId={ChannelStore.getChannel(message.channel_id)?.guild_id}
@ -195,7 +195,7 @@ export default definePlugin({
renderIcon={false} renderIcon={false}
max={5} max={5}
showDefaultAvatarsForNullUsers showDefaultAvatarsForNullUsers
showUserPopout={false} showUserPopout
renderMoreUsers={makeRenderMoreUsers(users)} renderMoreUsers={makeRenderMoreUsers(users)}
/> />
</div> </div>