@@ -53,15 +51,12 @@
{/await}
{/if}
- {#if pinned}
-
{lang.string('post.pinned')}
- {/if}
{#if is_boost && !post_context.text}
{/if}
{mouse_pos.left = e.pageX; mouse_pos.top = e.pageY}}
on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost(e)}}
@@ -79,24 +74,18 @@
diff --git a/src/routes/[server]/[account]/[post]/+page.js b/src/routes/[server]/[account]/[post]/+page.js
index 107da19..0cd52c3 100644
--- a/src/routes/[server]/[account]/[post]/+page.js
+++ b/src/routes/[server]/[account]/[post]/+page.js
@@ -1,8 +1,4 @@
export async function load({ params }) {
- let handle = params.account;
- if (handle.startsWith('@'))
- handle = handle.substring(1);
-
return {
server_host: params.server,
account_handle: params.account,
diff --git a/src/routes/[server]/[account]/[post]/+page.svelte b/src/routes/[server]/[account]/[post]/+page.svelte
index f4c345c..75daa65 100644
--- a/src/routes/[server]/[account]/[post]/+page.svelte
+++ b/src/routes/[server]/[account]/[post]/+page.svelte
@@ -4,16 +4,13 @@
import { app } from '$lib/client/app.js';
import { parsePost } from '$lib/post.js';
import { goto, afterNavigate } from '$app/navigation';
- import { base } from '$app/paths';
- import Lang from '$lib/lang';
+ import { base } from '$app/paths'
import Post from '$lib/ui/post/Post.svelte';
import Button from '$lib/ui/Button.svelte';
export let data;
- const lang = Lang();
-
let post = fetchPost(data.post_id);
let error = false;
let previous_page = base;
@@ -33,16 +30,16 @@
// TODO: make `server` a key/value pair to support multiple servers
server.set(await createServer(data.server_host));
if (!$server) {
- error = lang.string('error.connection_failed', data.server_host);
- console.error(lang.string('logs.connection_failed', data.server_host));
+ error = `Failed to connect to ${data.server_host}.`;
+ console.error(`Failed to connect to ${data.server_host}.`);
return;
}
}
const post_data = await api.getPost($server.host, token, post_id);
if (!post_data || post_data.error) {
- error = lang.string('error.post_fetch_failed_id', post_id);
- console.error(lang.string('logs.post_fetch_failed_id', post_id));
+ error = `Failed to retrieve post ${post_id}.`;
+ console.error(`Failed to retrieve post ${post_id}.`);
return;
}
let post = await parsePost(post_data, 0);
@@ -71,7 +68,7 @@
{#await post}
- {lang.string('post.loading')}
+ loading post...
{:then post}
{#if error}
@@ -80,12 +77,12 @@
{#if previous_page}
{/if}
-
+
- {@html lang.string('post.by', post.account.rich_name)}
+ Post by {@html post.account.rich_name}
diff --git a/src/routes/callback/+page.svelte b/src/routes/callback/+page.svelte
index b52e328..8b6985e 100644
--- a/src/routes/callback/+page.svelte
+++ b/src/routes/callback/+page.svelte
@@ -8,20 +8,17 @@
import { error } from '@sveltejs/kit';
import { unread_notif_count, last_read_notif_id } from '$lib/notifications.js';
import { account } from '$lib/stores/account.js';
- import Lang from '$lib/lang';
export let data;
- const lang = Lang();
-
let auth_code = data.code;
if (!auth_code || !get(server) || !get(app)) {
- error(400, { message: lang.string('error.bad_request') });
+ error(400, { message: "Bad request" });
} else {
api.getToken(get(server).host, get(app).id, get(app).secret, auth_code).then(token => {
if (!token) {
- error(400, { message: lang.string('error.invalid_auth_code') });
+ error(400, { message: "Invalid auth code provided" });
}
app.update(app => {
@@ -33,7 +30,7 @@
if (!data) return goto("/");
account.set(parseAccount(data));
- console.log(lang.string('logs.logged_in', get(account).fqn));
+ console.log(`Logged in as @${get(account).username}@${get(account).host}`);
// spin up async task to fetch notifications
return api.getNotifications(
diff --git a/src/routes/favourites/+page.svelte b/src/routes/favourites/+page.svelte
deleted file mode 100644
index 0bd0331..0000000
--- a/src/routes/favourites/+page.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
- {#if $timeline.length <= 0}
-
- {lang.string('timeline.fetching')}
-
- {/if}
- {#each $timeline as post}
-
- {/each}
-
{lang.string('follow_requests.none')}
-{/if}
-
-
- {#each $followRequests as req}
-
-
- 
-
-
-
-
-
-
-
- {/each}
-
{#if $notifications.length === 0}
- {lang.string('notification.fetching')}
+ fetching notifications...
{:else}
{#each $notifications as notif}
@@ -49,6 +47,18 @@