iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

use async / await.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-08-31 17:58:32 +02:00
parent aae55ea585
commit b808530f0c
7 changed files with 96 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
client/src/components/about.vue
View File

@ -143,23 +143,27 @@
return this.$accessor.client.about_page
}
async Load() {
this.loading = true
try {
const res = await this.$http.get<string>('https://raw.githubusercontent.com/m1k1o/neko/dev/README.md')
const res2 = await this.$http.post('https://api.github.com/markdown', {
text: res.data,
mode: 'gfm',
context: 'github/gollum',
})
this.$accessor.client.setAbout(res2.data)
} catch (err) {
console.error(err)
} finally {
this.loading = false
}
}
mounted() {
if (this.about === '') {
this.loading = true
this.$http
.get<string>('https://raw.githubusercontent.com/m1k1o/neko/dev/README.md')
.then((res) => {
return this.$http.post('https://api.github.com/markdown', {
text: res.data,
mode: 'gfm',
context: 'github/gollum',
})
})
.then((res) => {
this.$accessor.client.setAbout(res.data)
this.loading = false
})
.catch((err) => console.error(err))
this.Load()
}
}

14
client/src/components/connect.vue
View File

@ -204,23 +204,23 @@
}
}
async login() {
login() {
let password = this.password
if (this.autoPassword !== null) {
password = this.autoPassword
}
try {
await this.$accessor.login({ displayname: this.displayname, password })
this.autoPassword = null
} catch (err) {
if (this.displayname == '') {
this.$swal({
title: this.$t('connect.error') as string,
text: err.message,
text: 'Display Name cannot be empty.' as string, // TODO: Add to i18n.
icon: 'error',
})
return
}
this.$accessor.login({ displayname: this.displayname, password })
this.autoPassword = null
}
about() {

48
client/src/components/context.vue
View File

@ -165,64 +165,64 @@
this.context.open(event, data)
}
kick(member: Member) {
this.$swal({
async kick(member: Member) {
const value = await this.$swal({
title: this.$t('context.confirm.kick_title', { name: member.displayname }) as string,
text: this.$t('context.confirm.kick_text', { name: member.displayname }) as string,
icon: 'warning',
showCancelButton: true,
confirmButtonText: this.$t('context.confirm.button_yes') as string,
cancelButtonText: this.$t('context.confirm.button_cancel') as string,
}).then(({ value }) => {
if (value) {
this.$accessor.user.kick(member)
}
})
if (value) {
this.$accessor.user.kick(member)
}
}
ban(member: Member) {
this.$swal({
async ban(member: Member) {
const value = await this.$swal({
title: this.$t('context.confirm.ban_title', { name: member.displayname }) as string,
text: this.$t('context.confirm.ban_text', { name: member.displayname }) as string,
icon: 'warning',
showCancelButton: true,
confirmButtonText: this.$t('context.confirm.button_yes') as string,
cancelButtonText: this.$t('context.confirm.button_cancel') as string,
}).then(({ value }) => {
if (value) {
this.$accessor.user.ban(member)
}
})
if (value) {
this.$accessor.user.ban(member)
}
}
mute(member: Member) {
this.$swal({
async mute(member: Member) {
const value = await this.$swal({
title: this.$t('context.confirm.mute_title', { name: member.displayname }) as string,
text: this.$t('context.confirm.mute_text', { name: member.displayname }) as string,
icon: 'warning',
showCancelButton: true,
confirmButtonText: this.$t('context.confirm.button_yes') as string,
cancelButtonText: this.$t('context.confirm.button_cancel') as string,
}).then(({ value }) => {
if (value) {
this.$accessor.user.mute(member)
}
})
if (value) {
this.$accessor.user.mute(member)
}
}
unmute(member: Member) {
this.$swal({
async unmute(member: Member) {
const value = await this.$swal({
title: this.$t('context.confirm.unmute_title', { name: member.displayname }) as string,
text: this.$t('context.confirm.unmute_text', { name: member.displayname }) as string,
icon: 'warning',
showCancelButton: true,
confirmButtonText: this.$t('context.confirm.button_yes') as string,
cancelButtonText: this.$t('context.confirm.button_cancel') as string,
}).then(({ value }) => {
if (value) {
this.$accessor.user.unmute(member)
}
})
if (value) {
this.$accessor.user.unmute(member)
}
}
adminRelease(member: Member) {

30
client/src/components/video.vue
View File

@ -482,18 +482,14 @@
return key
}
play() {
async play() {
if (!this._video.paused || !this.playable) {
return
}
try {
this._video
.play()
.then(() => {
this.onResise()
})
.catch((err) => this.$log.error)
await this._video.play()
this.onResise()
} catch (err) {
this.$log.error(err)
}
@ -569,21 +565,21 @@
this.onResise()
}
onFocus() {
async onFocus() {
if (!document.hasFocus() || !this.$accessor.active) {
return
}
if (this.hosting && this.clipboard_read_available) {
navigator.clipboard
.readText()
.then((text) => {
if (this.clipboard !== text) {
this.$accessor.remote.setClipboard(text)
this.$accessor.remote.sendClipboard(text)
}
})
.catch(this.$log.error)
try {
const text = await navigator.clipboard.readText()
if (this.clipboard !== text) {
this.$accessor.remote.setClipboard(text)
this.$accessor.remote.sendClipboard(text)
}
} catch (err) {
this.$log.error(err)
}
}
}

33
client/src/neko/base.ts
View File

@ -52,10 +52,6 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
return
}
if (displayname === '') {
throw new Error('Display Name cannot be empty.')
}
this._displayname = displayname
this[EVENT.CONNECTING]()
@ -184,7 +180,7 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
this._ws!.send(JSON.stringify({ event, ...payload }))
}
public createPeer(sdp: string, lite: boolean, servers: RTCIceServer[]) {
public async createPeer(sdp: string, lite: boolean, servers: RTCIceServer[]) {
this.emit('debug', `creating peer`)
if (!this.socketOpen) {
this.emit(
@ -262,19 +258,20 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
}
this._candidates = []
this._peer
.createAnswer()
.then((d) => {
this._peer!.setLocalDescription(d)
this._ws!.send(
JSON.stringify({
event: EVENT.SIGNAL.ANSWER,
sdp: d.sdp,
displayname: this._displayname,
}),
)
})
.catch((err) => this.emit('error', err))
try {
const d = await this._peer.createAnswer()
this._peer!.setLocalDescription(d)
this._ws!.send(
JSON.stringify({
event: EVENT.SIGNAL.ANSWER,
sdp: d.sdp,
displayname: this._displayname,
}),
)
} catch (err) {
this.emit('error', err)
}
}
private onMessage(e: MessageEvent) {

22
client/src/store/emoji.ts
View File

@ -58,17 +58,17 @@ export const mutations = mutationTree(state, {
export const actions = actionTree(
{ state, getters, mutations },
{
initialise() {
$http
.get<Emojis>('emoji.json')
.then((req) => {
for (const group of req.data.groups) {
accessor.emoji.addGroup(group)
}
accessor.emoji.setList(req.data.list)
accessor.emoji.setKeywords(req.data.keywords)
})
.catch(console.error)
async initialise() {
try {
const req = await $http.get<Emojis>('emoji.json')
for (const group of req.data.groups) {
accessor.emoji.addGroup(group)
}
accessor.emoji.setList(req.data.list)
accessor.emoji.setKeywords(req.data.keywords)
} catch (err) {
console.error(err)
}
},
},
)

14
client/src/store/settings.ts
View File

@ -70,13 +70,13 @@ export const mutations = mutationTree(state, {
export const actions = actionTree(
{ state, getters, mutations },
{
initialise() {
$http
.get<KeyboardLayouts>('keyboard_layouts.json')
.then((req) => {
accessor.settings.setKeyboardLayoutsList(req.data)
})
.catch(console.error)
async initialise() {
try {
const req = await $http.get<KeyboardLayouts>('keyboard_layouts.json')
accessor.settings.setKeyboardLayoutsList(req.data)
} catch (err) {
console.error(err)
}
},
broadcastStatus({ getters }, { url, isActive }) {