forked from abner/for-legacy-web
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84b84a31fa | ||
| add955d46f | |||
|
|
952a92ba1b | ||
|
|
b6d763df35 | ||
|
|
bb3f114e01 | ||
|
|
39284db8d1 | ||
| 52980560dd | |||
|
|
1b2a980a47 | ||
|
|
1ce522579e |
66
.github/ISSUE_TEMPLATE/bug.yml
vendored
66
.github/ISSUE_TEMPLATE/bug.yml
vendored
@@ -1,66 +0,0 @@
|
|||||||
name: Bug report
|
|
||||||
description: File a bug report
|
|
||||||
title: "bug: "
|
|
||||||
labels: ["bug"]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Thanks for taking the time to fill out this bug report!
|
|
||||||
- type: textarea
|
|
||||||
id: what-happened
|
|
||||||
attributes:
|
|
||||||
label: What happened?
|
|
||||||
description: What did you expect to happen?
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: dropdown
|
|
||||||
id: branch
|
|
||||||
attributes:
|
|
||||||
label: Branch
|
|
||||||
description: What branch of Revolt are you using?
|
|
||||||
options:
|
|
||||||
- Production (app.revolt.chat)
|
|
||||||
- Nightly (nightly.revolt.chat)
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: commit-hash
|
|
||||||
attributes:
|
|
||||||
label: Commit hash
|
|
||||||
description: What is your commit hash? You can find this at the bottom of Settings, next to the branch name.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: dropdown
|
|
||||||
id: browsers
|
|
||||||
attributes:
|
|
||||||
label: What browsers are you seeing the problem on?
|
|
||||||
multiple: true
|
|
||||||
options:
|
|
||||||
- Firefox
|
|
||||||
- Chrome
|
|
||||||
- Safari
|
|
||||||
- Microsoft Edge
|
|
||||||
- Other (please specify in the "What happened" form)
|
|
||||||
- type: textarea
|
|
||||||
id: logs
|
|
||||||
attributes:
|
|
||||||
label: Relevant log output
|
|
||||||
description: Please copy and paste any relevant log output. (To get this, press `CTRL`- or `CMD`-`SHIFT`-`I` and navigate to the "Console" tab.)
|
|
||||||
render: shell
|
|
||||||
- type: checkboxes
|
|
||||||
id: desktop
|
|
||||||
attributes:
|
|
||||||
label: Desktop
|
|
||||||
description: Is this bug specific to [the desktop client](https://github.com/revoltchat/desktop)? (If not, leave this unchecked.)
|
|
||||||
options:
|
|
||||||
- label: Yes, this bug is specific to Revolt Desktop and is *not* an issue with Revolt Desktop itself.
|
|
||||||
required: false
|
|
||||||
- type: checkboxes
|
|
||||||
id: pwa
|
|
||||||
attributes:
|
|
||||||
label: PWA
|
|
||||||
description: Is this bug specific to the PWA (i.e. "installing" the web app on iOS or Android)? (If not, leave this unchecked.)
|
|
||||||
options:
|
|
||||||
- label: Yes, this bug is specific to the PWA.
|
|
||||||
required: false
|
|
||||||
7
.github/ISSUE_TEMPLATE/config.yml
vendored
7
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,7 +0,0 @@
|
|||||||
contact_links:
|
|
||||||
- name: Lounge Chat
|
|
||||||
url: https://rvlt.gg/Testers
|
|
||||||
about: Ask questions and discuss with others.
|
|
||||||
- name: Discussions
|
|
||||||
url: https://github.com/orgs/revoltchat/discussions
|
|
||||||
about: For larger feature requests and general question & answer.
|
|
||||||
24
.github/ISSUE_TEMPLATE/feature.yml
vendored
24
.github/ISSUE_TEMPLATE/feature.yml
vendored
@@ -1,24 +0,0 @@
|
|||||||
name: Feature request
|
|
||||||
description: Make a feature request
|
|
||||||
title: "feature request: "
|
|
||||||
labels: ["enhancement"]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Before you start, a lot of bigger features may be better suited as [API issues](https://github.com/revoltchat/delta/issues/new) or [centralised discussions](https://github.com/revoltchat/revolt/discussions/new).
|
|
||||||
- type: textarea
|
|
||||||
id: your-idea
|
|
||||||
attributes:
|
|
||||||
label: What do you want to see?
|
|
||||||
description: Describe your idea in as much detail as possible - if applicable, screenshots/mockups are really useful.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: checkboxes
|
|
||||||
id: pwa
|
|
||||||
attributes:
|
|
||||||
label: PWA
|
|
||||||
description: Is this feature request specific to the PWA (i.e. "installing" the web app on iOS or Android)? (If not, leave this unchecked.)
|
|
||||||
options:
|
|
||||||
- label: Yes, this feature request is specific to the PWA.
|
|
||||||
required: false
|
|
||||||
7
.github/pull_request_template.md
vendored
7
.github/pull_request_template.md
vendored
@@ -1,7 +0,0 @@
|
|||||||
## Please make sure to check the following tasks before opening and submitting a PR
|
|
||||||
|
|
||||||
* [ ] I understand and have followed the [contribution guide](https://developers.revolt.chat/contrib.html)
|
|
||||||
* [ ] I have tested my changes locally and they are working as intended
|
|
||||||
* [ ] These changes do not have any notable side effects on other Revolt projects
|
|
||||||
* [ ] (optional) I have opened a pull request on [the translation repository](https://github.com/revoltchat/translations)
|
|
||||||
* [ ] I have included screenshots to demonstrate my changes
|
|
||||||
43
.github/workflows/docker.yml
vendored
43
.github/workflows/docker.yml
vendored
@@ -1,38 +1,16 @@
|
|||||||
name: Docker
|
name: Docker
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- "master"
|
- "handmade"
|
||||||
tags:
|
pull_request:
|
||||||
- "*"
|
branches:
|
||||||
paths-ignore:
|
- "handmade"
|
||||||
- ".github/**"
|
|
||||||
- "!.github/workflows/docker.yml"
|
|
||||||
- "!.github/workflows/preview_*.yml"
|
|
||||||
- ".vscode/**"
|
|
||||||
- ".gitignore"
|
|
||||||
- ".gitlab-ci.yml"
|
|
||||||
- "LICENSE"
|
|
||||||
- "README"
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- "master"
|
|
||||||
paths-ignore:
|
|
||||||
- ".github/**"
|
|
||||||
- "!.github/workflows/docker.yml"
|
|
||||||
- "!.github/workflows/preview_*.yml"
|
|
||||||
- ".vscode/**"
|
|
||||||
- ".gitignore"
|
|
||||||
- ".gitlab-ci.yml"
|
|
||||||
- "LICENSE"
|
|
||||||
- "README"
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish:
|
publish:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name != 'pull_request'
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -46,7 +24,7 @@ jobs:
|
|||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: revoltchat/client, ghcr.io/revoltchat/client
|
images: handmadecities/handmade-revolt-web-client
|
||||||
env:
|
env:
|
||||||
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
|
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
@@ -55,13 +33,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Login to Github Container Registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
if: github.event_name != 'pull_request'
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
- name: Build and publish
|
- name: Build and publish
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
|
|||||||
54
.github/workflows/triage_issue.yml
vendored
54
.github/workflows/triage_issue.yml
vendored
@@ -1,54 +0,0 @@
|
|||||||
name: Add Issue to Board
|
|
||||||
|
|
||||||
on:
|
|
||||||
issues:
|
|
||||||
types: [opened]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
track_issue:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Get project data
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.PAT }}
|
|
||||||
run: |
|
|
||||||
gh api graphql -f query='
|
|
||||||
query {
|
|
||||||
organization(login: "revoltchat"){
|
|
||||||
projectV2(number: 3) {
|
|
||||||
id
|
|
||||||
fields(first:20) {
|
|
||||||
nodes {
|
|
||||||
... on ProjectV2SingleSelectField {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
options {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' > project_data.json
|
|
||||||
|
|
||||||
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo 'TODO_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Add issue to project
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.PAT }}
|
|
||||||
ISSUE_ID: ${{ github.event.issue.node_id }}
|
|
||||||
run: |
|
|
||||||
item_id="$( gh api graphql -f query='
|
|
||||||
mutation($project:ID!, $issue:ID!) {
|
|
||||||
addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
|
|
||||||
item {
|
|
||||||
id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
|
|
||||||
|
|
||||||
echo 'ITEM_ID='$item_id >> $GITHUB_ENV
|
|
||||||
79
.github/workflows/triage_pr.yml
vendored
79
.github/workflows/triage_pr.yml
vendored
@@ -1,79 +0,0 @@
|
|||||||
name: Add PR to Board
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request_target:
|
|
||||||
types: [opened, synchronize, ready_for_review, review_requested]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
track_pr:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Get project data
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.PAT }}
|
|
||||||
run: |
|
|
||||||
gh api graphql -f query='
|
|
||||||
query {
|
|
||||||
organization(login: "revoltchat"){
|
|
||||||
projectV2(number: 5) {
|
|
||||||
id
|
|
||||||
fields(first:20) {
|
|
||||||
nodes {
|
|
||||||
... on ProjectV2SingleSelectField {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
options {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' > project_data.json
|
|
||||||
|
|
||||||
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo 'INCOMING_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="🆕 Untriaged") |.id' project_data.json) >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Add PR to project
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.PAT }}
|
|
||||||
PR_ID: ${{ github.event.pull_request.node_id }}
|
|
||||||
run: |
|
|
||||||
item_id="$( gh api graphql -f query='
|
|
||||||
mutation($project:ID!, $pr:ID!) {
|
|
||||||
addProjectV2ItemById(input: {projectId: $project, contentId: $pr}) {
|
|
||||||
item {
|
|
||||||
id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectV2ItemById.item.id')"
|
|
||||||
|
|
||||||
echo 'ITEM_ID='$item_id >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Set fields
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.PAT }}
|
|
||||||
run: |
|
|
||||||
gh api graphql -f query='
|
|
||||||
mutation (
|
|
||||||
$project: ID!
|
|
||||||
$item: ID!
|
|
||||||
$status_field: ID!
|
|
||||||
$status_value: String!
|
|
||||||
) {
|
|
||||||
set_status: updateProjectV2ItemFieldValue(input: {
|
|
||||||
projectId: $project
|
|
||||||
itemId: $item
|
|
||||||
fieldId: $status_field
|
|
||||||
value: {
|
|
||||||
singleSelectOptionId: $status_value
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
projectV2Item {
|
|
||||||
id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.INCOMING_OPTION_ID }} --silent
|
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -15,3 +15,5 @@ public/assets_*
|
|||||||
!public/assets_default
|
!public/assets_default
|
||||||
|
|
||||||
.vscode/chrome_data
|
.vscode/chrome_data
|
||||||
|
|
||||||
|
.direnv
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
# Deprecation Notice
|
# Handmade Revolt
|
||||||
|
Fork of Revolt (now Stoat chat) maintained by the handmade cities community.
|
||||||
This project is deprecated, however it still may receive maintenance updates.
|
|
||||||
|
|
||||||
PRs for small fixes are more than welcome.
|
|
||||||
|
|
||||||
## Deploying a new release
|
## Deploying a new release
|
||||||
|
|
||||||
|
|||||||
64
flake.lock
generated
Normal file
64
flake.lock
generated
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": [
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770169770,
|
||||||
|
"narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"systems": "systems"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
28
flake.nix
Normal file
28
flake.nix
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
description = "Node+yarn dev shell flake";
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
systems.url = "github:nix-systems/default";
|
||||||
|
flake-utils = {
|
||||||
|
url = "github:numtide/flake-utils";
|
||||||
|
inputs.systems.follows = "systems";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
{ nixpkgs, flake-utils, ... }:
|
||||||
|
flake-utils.lib.eachDefaultSystem (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
devShells.default = pkgs.mkShell {
|
||||||
|
packages = with pkgs; [
|
||||||
|
nodejs_24
|
||||||
|
yarn
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -16,6 +16,11 @@ import { IconButton } from "@revoltchat/ui";
|
|||||||
|
|
||||||
import { emojiDictionary } from "../../../../assets/emojis";
|
import { emojiDictionary } from "../../../../assets/emojis";
|
||||||
import { useClient } from "../../../../controllers/client/ClientController";
|
import { useClient } from "../../../../controllers/client/ClientController";
|
||||||
|
import { modalController } from "../../../../controllers/modals/ModalController";
|
||||||
|
import { isTouchscreenDevice } from "../../../../lib/isTouchscreenDevice";
|
||||||
|
import Tooltip from "../../Tooltip";
|
||||||
|
import UserIcon from "../../user/UserIcon";
|
||||||
|
import { Username } from "../../user/UserShort";
|
||||||
import { RenderEmoji } from "../../../markdown/plugins/emoji";
|
import { RenderEmoji } from "../../../markdown/plugins/emoji";
|
||||||
import { HackAlertThisFileWillBeReplaced } from "../MessageBox";
|
import { HackAlertThisFileWillBeReplaced } from "../MessageBox";
|
||||||
|
|
||||||
@@ -85,6 +90,38 @@ const Reaction = styled.div<{ active: boolean }>`
|
|||||||
`}
|
`}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tooltip content for reaction users
|
||||||
|
*/
|
||||||
|
const TooltipUserList = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 4px 0;
|
||||||
|
max-width: 200px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const TooltipUserRow = styled.div`
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
font-size: 0.9em;
|
||||||
|
padding: 4px 6px;
|
||||||
|
margin: -4px -6px;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: var(--secondary-background);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const TooltipMoreText = styled.div`
|
||||||
|
font-size: 0.85em;
|
||||||
|
color: var(--secondary-foreground);
|
||||||
|
padding-top: 2px;
|
||||||
|
`;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render reactions on a message
|
* Render reactions on a message
|
||||||
*/
|
*/
|
||||||
@@ -98,16 +135,97 @@ export const Reactions = observer(({ message }: Props) => {
|
|||||||
const Entry = useCallback(
|
const Entry = useCallback(
|
||||||
observer(({ id, user_ids }: { id: string; user_ids?: Set<string> }) => {
|
observer(({ id, user_ids }: { id: string; user_ids?: Set<string> }) => {
|
||||||
const active = user_ids?.has(client.user!._id) || false;
|
const active = user_ids?.has(client.user!._id) || false;
|
||||||
|
const userIds = user_ids ? Array.from(user_ids) : [];
|
||||||
|
const longPressTimer = useRef<number | null>(null);
|
||||||
|
const didLongPress = useRef(false);
|
||||||
|
|
||||||
return (
|
const handleClick = () => {
|
||||||
|
if (didLongPress.current) {
|
||||||
|
didLongPress.current = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
active ? message.unreact(id) : message.react(id);
|
||||||
|
};
|
||||||
|
|
||||||
|
const openModal = () => {
|
||||||
|
modalController.push({
|
||||||
|
type: "reaction_users",
|
||||||
|
emoji: id,
|
||||||
|
userIds,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchStart = (e: TouchEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
didLongPress.current = false;
|
||||||
|
longPressTimer.current = window.setTimeout(() => {
|
||||||
|
didLongPress.current = true;
|
||||||
|
openModal();
|
||||||
|
}, 500);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchEnd = (e: TouchEvent) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
if (longPressTimer.current) {
|
||||||
|
clearTimeout(longPressTimer.current);
|
||||||
|
longPressTimer.current = null;
|
||||||
|
// Short tap - trigger manually since preventDefault blocks click
|
||||||
|
if (!didLongPress.current) {
|
||||||
|
active ? message.unreact(id) : message.react(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
didLongPress.current = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
const openUserProfile = (userId: string) => {
|
||||||
|
modalController.push({ type: "user_profile", user_id: userId });
|
||||||
|
};
|
||||||
|
|
||||||
|
// Build tooltip content showing up to 10 users
|
||||||
|
const tooltipContent = (
|
||||||
|
<TooltipUserList>
|
||||||
|
{userIds.slice(0, 10).map((userId) => {
|
||||||
|
const user = client.users.get(userId);
|
||||||
|
return (
|
||||||
|
<TooltipUserRow
|
||||||
|
key={userId}
|
||||||
|
onClick={() => openUserProfile(userId)}>
|
||||||
|
<UserIcon target={user} size={18} />
|
||||||
|
<Username user={user} />
|
||||||
|
</TooltipUserRow>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
{userIds.length > 10 && (
|
||||||
|
<TooltipMoreText>
|
||||||
|
and {userIds.length - 10} more...
|
||||||
|
</TooltipMoreText>
|
||||||
|
)}
|
||||||
|
</TooltipUserList>
|
||||||
|
);
|
||||||
|
|
||||||
|
const reactionElement = (
|
||||||
<Reaction
|
<Reaction
|
||||||
active={active}
|
active={active}
|
||||||
onClick={() =>
|
onClick={handleClick}
|
||||||
active ? message.unreact(id) : message.react(id)
|
onTouchStart={isTouchscreenDevice ? handleTouchStart : undefined}
|
||||||
}>
|
onTouchEnd={isTouchscreenDevice ? handleTouchEnd : undefined}
|
||||||
|
onTouchCancel={isTouchscreenDevice ? handleTouchEnd : undefined}>
|
||||||
<RenderEmoji match={id} /> {user_ids?.size || 0}
|
<RenderEmoji match={id} /> {user_ids?.size || 0}
|
||||||
</Reaction>
|
</Reaction>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Desktop: show tooltip on hover
|
||||||
|
// Mobile: long-press opens modal, handled by touch events
|
||||||
|
if (!isTouchscreenDevice && userIds.length > 0) {
|
||||||
|
return (
|
||||||
|
<Tooltip content={tooltipContent} delay={300} interactive>
|
||||||
|
{reactionElement}
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return reactionElement;
|
||||||
}),
|
}),
|
||||||
[],
|
[],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ type Transition =
|
|||||||
| "SUCCESS"
|
| "SUCCESS"
|
||||||
| "DISCONNECT"
|
| "DISCONNECT"
|
||||||
| "RETRY"
|
| "RETRY"
|
||||||
|
| "RETRY_FAILED"
|
||||||
| "LOGOUT"
|
| "LOGOUT"
|
||||||
| "ONLINE"
|
| "ONLINE"
|
||||||
| "OFFLINE";
|
| "OFFLINE";
|
||||||
@@ -40,6 +41,7 @@ export default class Session {
|
|||||||
state: State = window.navigator.onLine ? "Ready" : "Offline";
|
state: State = window.navigator.onLine ? "Ready" : "Offline";
|
||||||
user_id: string | null = null;
|
user_id: string | null = null;
|
||||||
client: Client | null = null;
|
client: Client | null = null;
|
||||||
|
retryAttempts: number = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new Session
|
* Create a new Session
|
||||||
@@ -89,9 +91,11 @@ export default class Session {
|
|||||||
* Called when the client signals it has disconnected
|
* Called when the client signals it has disconnected
|
||||||
*/
|
*/
|
||||||
private onDropped() {
|
private onDropped() {
|
||||||
this.emit({
|
if (this.state === "Connecting") {
|
||||||
action: "DISCONNECT",
|
this.emit({ action: "RETRY_FAILED" });
|
||||||
});
|
} else {
|
||||||
|
this.emit({ action: "DISCONNECT" });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -211,6 +215,7 @@ export default class Session {
|
|||||||
// Ready successfully received
|
// Ready successfully received
|
||||||
case "SUCCESS": {
|
case "SUCCESS": {
|
||||||
this.assert("Connecting");
|
this.assert("Connecting");
|
||||||
|
this.retryAttempts = 0;
|
||||||
this.state = "Online";
|
this.state = "Online";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -239,6 +244,18 @@ export default class Session {
|
|||||||
this.state = "Connecting";
|
this.state = "Connecting";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
// Reconnect attempt failed, schedule another with backoff
|
||||||
|
case "RETRY_FAILED": {
|
||||||
|
this.assert("Connecting");
|
||||||
|
this.retryAttempts++;
|
||||||
|
const delay = Math.min(500 * Math.pow(2, this.retryAttempts), 16000);
|
||||||
|
setTimeout(() => {
|
||||||
|
if (this.state === "Connecting") {
|
||||||
|
this.client!.websocket.connect();
|
||||||
|
}
|
||||||
|
}, delay);
|
||||||
|
break;
|
||||||
|
}
|
||||||
// User instructed logout
|
// User instructed logout
|
||||||
case "LOGOUT": {
|
case "LOGOUT": {
|
||||||
this.assert("Connecting", "Online", "Disconnected");
|
this.assert("Connecting", "Online", "Disconnected");
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ import CreateRole from "./components/CreateRole";
|
|||||||
import CreateServer from "./components/CreateServer";
|
import CreateServer from "./components/CreateServer";
|
||||||
import CustomStatus from "./components/CustomStatus";
|
import CustomStatus from "./components/CustomStatus";
|
||||||
import DeleteMessage from "./components/DeleteMessage";
|
import DeleteMessage from "./components/DeleteMessage";
|
||||||
|
import ReactMessage from "./components/ReactMessage";
|
||||||
|
import ReactionUsers from "./components/ReactionUsers";
|
||||||
import Error from "./components/Error";
|
import Error from "./components/Error";
|
||||||
import ImageViewer from "./components/ImageViewer";
|
import ImageViewer from "./components/ImageViewer";
|
||||||
import KickMember from "./components/KickMember";
|
import KickMember from "./components/KickMember";
|
||||||
@@ -275,6 +277,8 @@ export const modalController = new ModalControllerExtended({
|
|||||||
create_bot: CreateBot,
|
create_bot: CreateBot,
|
||||||
custom_status: CustomStatus,
|
custom_status: CustomStatus,
|
||||||
delete_message: DeleteMessage,
|
delete_message: DeleteMessage,
|
||||||
|
react_message: ReactMessage,
|
||||||
|
reaction_users: ReactionUsers,
|
||||||
error: Error,
|
error: Error,
|
||||||
image_viewer: ImageViewer,
|
image_viewer: ImageViewer,
|
||||||
kick_member: KickMember,
|
kick_member: KickMember,
|
||||||
|
|||||||
46
src/controllers/modals/components/ReactMessage.tsx
Normal file
46
src/controllers/modals/components/ReactMessage.tsx
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
import styled from "styled-components";
|
||||||
|
|
||||||
|
import { Modal } from "@revoltchat/ui";
|
||||||
|
import { ModalProps } from "../types"
|
||||||
|
|
||||||
|
import { Message } from "revolt.js";
|
||||||
|
import { emojiDictionary } from "../../../assets/emojis"
|
||||||
|
import { HackAlertThisFileWillBeReplaced } from "../../../components/common/messaging/MessageBox"
|
||||||
|
|
||||||
|
const PickerContainer = styled.div`
|
||||||
|
max-height: 420px;
|
||||||
|
max-width: 370px;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
> div {
|
||||||
|
position: unset;
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
|
export default function ReactMessage({
|
||||||
|
target: message,
|
||||||
|
onClose,
|
||||||
|
...props
|
||||||
|
}: ModalProps<"react_message">) {
|
||||||
|
return (
|
||||||
|
<Modal
|
||||||
|
{...props}
|
||||||
|
padding={false}
|
||||||
|
maxWidth="370px"
|
||||||
|
>
|
||||||
|
<PickerContainer>
|
||||||
|
<HackAlertThisFileWillBeReplaced
|
||||||
|
onSelect={(emoji) =>{
|
||||||
|
message.react(
|
||||||
|
emojiDictionary[
|
||||||
|
emoji as keyof typeof emojiDictionary
|
||||||
|
] ?? emoji,
|
||||||
|
);
|
||||||
|
onClose();
|
||||||
|
}}
|
||||||
|
onClose={onClose}
|
||||||
|
/>
|
||||||
|
</PickerContainer>
|
||||||
|
</Modal>
|
||||||
|
)
|
||||||
|
}
|
||||||
92
src/controllers/modals/components/ReactionUsers.tsx
Normal file
92
src/controllers/modals/components/ReactionUsers.tsx
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import styled from "styled-components";
|
||||||
|
|
||||||
|
import { Modal } from "@revoltchat/ui";
|
||||||
|
|
||||||
|
import UserIcon from "../../../components/common/user/UserIcon";
|
||||||
|
import { Username } from "../../../components/common/user/UserShort";
|
||||||
|
import { RenderEmoji } from "../../../components/markdown/plugins/emoji";
|
||||||
|
import { useClient } from "../../client/ClientController";
|
||||||
|
import { modalController } from "../ModalController";
|
||||||
|
import { ModalProps } from "../types";
|
||||||
|
|
||||||
|
const List = styled.div`
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 360px;
|
||||||
|
overflow-y: auto;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const UserRow = styled.div`
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: var(--secondary-background);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Header = styled.div`
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
font-size: 1.1em;
|
||||||
|
|
||||||
|
img {
|
||||||
|
width: 1.5em;
|
||||||
|
height: 1.5em;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
export default function ReactionUsers({
|
||||||
|
emoji,
|
||||||
|
userIds,
|
||||||
|
onClose,
|
||||||
|
...props
|
||||||
|
}: ModalProps<"reaction_users">) {
|
||||||
|
const client = useClient();
|
||||||
|
|
||||||
|
const openProfile = (userId: string) => {
|
||||||
|
onClose();
|
||||||
|
modalController.push({ type: "user_profile", user_id: userId });
|
||||||
|
};
|
||||||
|
|
||||||
|
// Modal must be nonDismissable, it conflicts with the message context menu otherwise.
|
||||||
|
return (
|
||||||
|
<Modal
|
||||||
|
{...props}
|
||||||
|
nonDismissable
|
||||||
|
title={
|
||||||
|
<Header>
|
||||||
|
<RenderEmoji match={emoji} />
|
||||||
|
<span>{userIds.length}</span>
|
||||||
|
</Header>
|
||||||
|
}
|
||||||
|
actions={[
|
||||||
|
{
|
||||||
|
onClick: () => {
|
||||||
|
onClose();
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
children: "Close",
|
||||||
|
},
|
||||||
|
]}>
|
||||||
|
<List>
|
||||||
|
{userIds.map((userId) => {
|
||||||
|
const user = client.users.get(userId);
|
||||||
|
return (
|
||||||
|
<UserRow
|
||||||
|
key={userId}
|
||||||
|
onClick={() => openProfile(userId)}>
|
||||||
|
<UserIcon target={user} size={32} />
|
||||||
|
<Username user={user} />
|
||||||
|
</UserRow>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</List>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -153,6 +153,15 @@ export type Modal = {
|
|||||||
type: "delete_message";
|
type: "delete_message";
|
||||||
target: Message;
|
target: Message;
|
||||||
}
|
}
|
||||||
|
| {
|
||||||
|
type: "react_message",
|
||||||
|
target: Message;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
type: "reaction_users";
|
||||||
|
emoji: string;
|
||||||
|
userIds: string[];
|
||||||
|
}
|
||||||
| {
|
| {
|
||||||
type: "kick_member";
|
type: "kick_member";
|
||||||
member: Member;
|
member: Member;
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ type Action =
|
|||||||
| { action: "quote_message"; content: string }
|
| { action: "quote_message"; content: string }
|
||||||
| { action: "edit_message"; id: string }
|
| { action: "edit_message"; id: string }
|
||||||
| { action: "delete_message"; target: Message }
|
| { action: "delete_message"; target: Message }
|
||||||
|
| { action: "react_message"; target: Message }
|
||||||
| { action: "open_file"; attachment: API.File }
|
| { action: "open_file"; attachment: API.File }
|
||||||
| { action: "save_file"; attachment: API.File }
|
| { action: "save_file"; attachment: API.File }
|
||||||
| { action: "copy_file_link"; attachment: API.File }
|
| { action: "copy_file_link"; attachment: API.File }
|
||||||
@@ -402,6 +403,13 @@ export default function ContextMenus() {
|
|||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case "react_message":
|
||||||
|
modalController.push({
|
||||||
|
type: "react_message",
|
||||||
|
target: data.target,
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
|
||||||
case "leave_group":
|
case "leave_group":
|
||||||
case "close_dm":
|
case "close_dm":
|
||||||
case "delete_channel":
|
case "delete_channel":
|
||||||
@@ -508,6 +516,8 @@ export default function ContextMenus() {
|
|||||||
"Open in Admin Panel"
|
"Open in Admin Panel"
|
||||||
) : locale === "admin_system" ? (
|
) : locale === "admin_system" ? (
|
||||||
"Open User in Admin Panel"
|
"Open User in Admin Panel"
|
||||||
|
) : locale === "react_message" ? (
|
||||||
|
"React"
|
||||||
) : (
|
) : (
|
||||||
<Text
|
<Text
|
||||||
id={`app.context_menu.${
|
id={`app.context_menu.${
|
||||||
@@ -833,6 +843,16 @@ export default function ContextMenus() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (message.channel?.havePermission("React")) {
|
||||||
|
generateAction(
|
||||||
|
{
|
||||||
|
action: "react_message",
|
||||||
|
target: message,
|
||||||
|
},
|
||||||
|
"react_message",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (message.author_id !== userId) {
|
if (message.author_id !== userId) {
|
||||||
generateAction(
|
generateAction(
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user