Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add video chat instances icon to the selection dialogue #3426

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
- fix clipboard not working in webxdc apps
- fix `target=_blank` links in html emails don't work #3408

### Added

- add video chat instances favicons to selection dialog

<a id="1_40_4"></a>

## [1.40.4] - 2023-09-14
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/components/Radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ type RadioProps = {
className?: string
name?: string
subtitle?: string
icon?: HTMLElement
}

export default function Radio({
Expand All @@ -19,6 +20,7 @@ export default function Radio({
className,
name,
subtitle,
icon,
}: RadioProps) {
const id: string = Math.floor(Math.random() * 10000).toString()
return (
Expand All @@ -31,6 +33,7 @@ export default function Radio({
value={value}
defaultChecked={Boolean(selected)}
/>
{icon}
<label htmlFor={id} className={classNames(!subtitle && 'no-subtitle')}>
<span>{label}</span>
{subtitle && <span>{subtitle}</span>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import SettingsStoreInstance, {
} from '../../stores/settings'
import RadioGroup from '../RadioGroup'
import Radio from '../Radio'
import blobStore from '../../stores/blobstore'

const VIDEO_CHAT_INSTANCE_SYSTEMLI = 'https://meet.systemli.org/$ROOM'
const VIDEO_CHAT_INSTANCE_AUTISTICI = 'https://vc.autistici.org/$ROOM'
Expand All @@ -27,6 +28,12 @@ export function SettingsExperimentalFeatures({
settingsStore: SettingsStoreState
}) {
const tx = window.static_translate
blobStore.load(VIDEO_CHAT_INSTANCE_AUTISTICI.replace('$ROOM', ''))
blobStore.load(VIDEO_CHAT_INSTANCE_SYSTEMLI.replace('$ROOM', ''))
function getVideoChatIcon(url: string): any {
let b = blobStore.get(url.replace('$ROOM', ''))
return b ? <img src={URL.createObjectURL(b)} /> : undefined
}
const { openDialog } = useContext(ScreenContext)

const onClickEdit = async () => {
Expand All @@ -43,6 +50,7 @@ export function SettingsExperimentalFeatures({
}
},
settingsStore,
getVideoChatIcon,
})
}

Expand Down Expand Up @@ -103,13 +111,19 @@ export function SettingsExperimentalFeatures({

type RadioButtonValue = 'disabled' | 'custom' | 'systemli' | 'autistici'

type EditVideochatInstanceDialogAdditionalProps = {
settingsStore: SettingsStoreState
getVideoChatIcon: (url: string) => any
}

export function EditVideochatInstanceDialog({
isOpen,
onClose,
onOk,
onCancel,
settingsStore,
}: DialogProps & { settingsStore: SettingsStoreState }) {
getVideoChatIcon,
}: DialogProps & EditVideochatInstanceDialogAdditionalProps) {
const tx = useTranslationFunction()
const [configValue, setConfigValue] = useState(
settingsStore.settings['webrtc_instance']
Expand Down Expand Up @@ -189,12 +203,14 @@ export function EditVideochatInstanceDialog({
label='Systemli'
value='systemli'
subtitle={VIDEO_CHAT_INSTANCE_SYSTEMLI}
icon={getVideoChatIcon(VIDEO_CHAT_INSTANCE_SYSTEMLI)}
/>
<Radio
key='select-autistici'
label='Autistici'
value='autistici'
subtitle={VIDEO_CHAT_INSTANCE_AUTISTICI}
icon={getVideoChatIcon(VIDEO_CHAT_INSTANCE_AUTISTICI)}
/>
<Radio
key='select-custom'
Expand Down
25 changes: 25 additions & 0 deletions src/renderer/stores/blobstore.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { C } from '@deltachat/jsonrpc-client'

Check failure on line 1 in src/renderer/stores/blobstore.ts

View workflow job for this annotation

GitHub Actions / Code Validation

Property 'getHttpResponse' does not exist on type 'typeof C'.

Check failure on line 1 in src/renderer/stores/blobstore.ts

View workflow job for this annotation

GitHub Actions / Code Validation

Parameter 'response' implicitly has an 'any' type.

Check failure on line 1 in src/renderer/stores/blobstore.ts

View workflow job for this annotation

GitHub Actions / Code Validation

Argument of type 'string' is not assignable to parameter of type 'BlobPart[]'.
import { selectedAccountId } from '../ScreenController'

class BlobStore {
private _store: Map<string, Blob>

constructor() {
this._store = new Map()
}

load(this: BlobStore, url: string) {
C.getHttpResponse(selectedAccountId(), url).then(response => {
this._store.set(url, new Blob(btoa(response.blob)))
})
}

get(this: BlobStore, url: string): Blob | null {
let b = this._store.get(url)
return b ? b : null
}
}

let blobStore = new BlobStore()

export default blobStore
Loading