').append( $('').attr({ 'class': 'btn btn-outline-secondary btn-nav-settings channel-btn', - id: `${server.hostname}:${channel['name']}`, + id: chan_id, }).text(channel['name']) ) ) ) // Not using jquery for this because it breaks with weird id names really easily - let ref = document.getElementById(`${server.hostname}:${channel['name']}`) + let ref = document.getElementById(chan_id) ref.addEventListener('click', () => { // now for the actual handler where we deal with clicks $('#channel-name').text('#' + channel['name']) @@ -58,34 +66,59 @@ function push(server, user, channel) { * Listener callback for actually getting a list of channels * @param {Object} server Object containing server configuration * @param {Object} user Object containing user access data + * @param {Number} kind * */ -exports.list = async function(server, user) { +async function list(server, user, kind) { - // TODO: add some kind of caching system here: should probably check for some kind of cache here but hey fuck it right? + // TODO: caching bro $('#channels-list').html('') $('#server-name').text(server['name']) try { - const url = `${server['protocol']}://${server['hostname']}:${server['port']}/channels/list` - const text_channel_response = await got(url, { - searchParams: { id: user['id'], jwt: user['jwt'], kind: TEXT_KIND }, + const url = `${server['url']}/channels/list` + const response = await got(url, { + searchParams: { id: user['id'], jwt: user['jwt'], kind: kind }, responseType: 'json' }) - let text_channels = text_channel_response.body['channels'] - console.log('text: ', text_channels) + let channels_json = response.body['channels'] - - const channels = text_channels - - - for(const channel of channels) { - console.log(channel) - push(server, user, channel) + let channels_parsed = [] + for(const chan of channels_json) { + console.log("channel: ", chan) + let c = new Channel(chan['name'], chan['kind'], chan['id'], chan['desc']) + channels_parsed.push(c) } + return channels_parsed } catch (err) { console.log(err) console.log(err['name']) + return [] + } +} + +/** + * @param {List} + */ +async function assemble_channels_dom(channels) { + for(const channel of channels) { + console.log(channel) + push(server, user, channel) + } +} + +/** + * @param {String} remote.url + * @param {String} user.id + * @param {String} user.jwt + */ +exports.server_button_cb = async function(remote, user) { + let vc = await list(remote, user, VOICE_KIND) + let tc = await list(remote, user, TEXT_KIND) + vc.push(...tc) + + for(const chan of vc) { + push(remote, user, chan) } } diff --git a/freechat-client/src/config.js b/freechat-client/src/config.js index b337995..5dcb645 100644 --- a/freechat-client/src/config.js +++ b/freechat-client/src/config.js @@ -2,6 +2,10 @@ const { ArgumentParser } = require('argparse') const fs = require('fs').promises const syncFs = require('fs') +// required because freechat by default uses i64/u64 in json payloads +// timestamps will get especially rekt'd if we don't parse things correctly +const JSONBig = require('json-bigint') + class Config { /** * @@ -38,7 +42,7 @@ exports.from_cli_parser = function(parser) { // Allow errors from here to bubble up instead of handling them fs.readFile(path).then(file => { - const json = JSON.parse(file) + const json = JSONBig.parse(file) for(const key of Object.keys(json)) { ret.data[key] = json[key] diff --git a/freechat-client/src/messages.js b/freechat-client/src/messages.js index ca298b4..709f4cd 100644 --- a/freechat-client/src/messages.js +++ b/freechat-client/src/messages.js @@ -34,9 +34,7 @@ function rebind_message_box(server, auth, channel_id) { * @param {String} auth.jwt | jwt for quick auth * @param {u64} auth.id user | id required by most/all endpoints * - * @param {String} server.hostname | Hostname of target server - * @param {u16} server.port | Port to use for server - * @param {String} server.protocol | http/https (no colon) + * @param {String} server.url | Url of target server * * @param {u64} channel_id | Channel id to query * @param {i64} start_time | Unix time to start fetching messages from @@ -47,7 +45,7 @@ function rebind_message_box(server, auth, channel_id) { * @throws HTTPResponseError */ async function get_range(auth, server, channel_id, start_time, end_time, limit) { - const url = `${server.protocol}://${server.hostname}:${server.port}/message/get_range` + const url = `${server.url}/message/get_range` const response = await got(url, { searchParams: { diff --git a/freechat-client/src/settings.js b/freechat-client/src/settings.js index 1be94c3..adac901 100644 --- a/freechat-client/src/settings.js +++ b/freechat-client/src/settings.js @@ -17,9 +17,7 @@ exports.add_server_to_config = async function() { try { await auth.login( - data['server']['protocol'], - data['server']['host'], - data['server']['port'], + data['server']['url'], data['user'] ) $('#admni-json-err').text('=|:^)') diff --git a/freechat-client/src/types.ts b/freechat-client/src/types.ts index 0b4cdc8..ba6e346 100644 --- a/freechat-client/src/types.ts +++ b/freechat-client/src/types.ts @@ -48,15 +48,27 @@ export class Channel { } export class ServerConfig { - hostname: String - port: Number - protocol: String + url: String + name: String + description: String - constructor(protocol: String, hostname: String, port: Number) { - this.protocol = protocol - this.hostname = hostname - this.port = port + constructor(json: Object) { + this.url = json['url'] + this.name = json['name'] + this.description = json['description'] } } +export class UserConfig { + id: Number + jwt: String|null + permissions: Number + secret: String + constructor(json: Object) { + this.id = json['id'] + this.jwt = json['jwt'] + this.permissions = json['permissions'] + this.secret = json['secret'] + } +}